DR_Team/Difficult-Rocket
DR_Team/Difficult-Rocket
6
2
Fork 0
Code Issues Pull Requests Projects Releases 25 Wiki Activity

remove old logger, reformat, add tag for new logger

Browse Source
This commit is contained in:
shenjack 2023-12-13 12:38:26 +08:00
parent 0741edc293
commit da50c2d965
20 changed files with 216 additions and 1448 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Difficult_Rocket/__init__.py
View File

@ -13,7 +13,6 @@ build_version = Version("2.2.0.0") # 编译文件版本(与游戏本体无关)
api_version = Version("0.1.1.0") # API 版本
__version__ = sdk_version
__all__ = [
# __init__
"DR_status",
@ -86,6 +85,7 @@ def load_logger():
if not log_config_path.is_file():
# 生成默认配置文件
from Difficult_Rocket.data import log_config
try:
log_config_path.write_text(log_config.default_config)
except (FileNotFoundError, OSError, PermissionError):
@ -94,29 +94,31 @@ def load_logger():
logger_config = rtoml.loads(log_config.default_config)
else:
# 读取配置文件
with open(log_config_path, encoding='utf-8') as f:
with open(log_config_path, encoding="utf-8") as f:
logger_config = rtoml.load(f)
# 输入 lndl 进行配置
from lib_not_dr.loggers.config import read_config, get_logger
read_config(logger_config)
logger = get_logger("main")
logger.info("Logger config loaded", tag='DR-init')
logger.info(f"DR status:\n{DR_status.as_markdown()}", tag='DR-init')
logger.info("Logger config loaded", tag="DR-init")
logger.info(f"DR status:\n{DR_status.as_markdown()}", tag="DR-init")
if warn_config:
logger.warn("Failed to load log config file, use default config", tag='DR-init')
logger.warn("Failed to load log config file, use default config", tag="DR-init")
# 读取日志配置
# 也保证可以直接运行，不带日志 ( 因为有默认配置 )
load_logger()
if DR_status.playing:
from Difficult_Rocket.utils.thread import new_thread
def think_it(something):
return something
@new_thread("think")
def think(some_thing_to_think):
gotcha = think_it(some_thing_to_think)

1
Difficult_Rocket/api/__init__.py
View File

@ -11,7 +11,6 @@ github: @shenjackyuanjie
gitee: @shenjackyuanjie
"""
__all__ = [
"exception",
# 错误类定义

25
Difficult_Rocket/api/screen.py
View File

@ -33,7 +33,6 @@ class BaseScreen(EventDispatcher, Options):
self.window_pointer = main_window
if TYPE_CHECKING:
def on_command(self, command: CommandText, window: ClientWindow):
"""
命令输入事件
@ -154,7 +153,7 @@ class BaseScreen(EventDispatcher, Options):
"""
def on_file_drop(
self, x: int, y: int, paths: List[PathLike], window: ClientWindow
self, x: int, y: int, paths: List[PathLike], window: ClientWindow
):
"""File(s) were dropped into the window, will return the position of the cursor and
a list of paths to the files that were dropped.
@ -217,14 +216,14 @@ class BaseScreen(EventDispatcher, Options):
"""
def on_mouse_drag(
self,
x: int,
y: int,
dx: int,
dy: int,
buttons: int,
modifiers: int,
window: ClientWindow,
self,
x: int,
y: int,
dx: int,
dy: int,
buttons: int,
modifiers: int,
window: ClientWindow,
):
"""The mouse was moved with one or more mouse buttons pressed.
@ -250,7 +249,7 @@ class BaseScreen(EventDispatcher, Options):
"""
def on_mouse_press(
self, x: int, y: int, button: int, modifiers: int, window: ClientWindow
self, x: int, y: int, button: int, modifiers: int, window: ClientWindow
):
"""A mouse button was pressed (and held down).
@ -269,7 +268,7 @@ class BaseScreen(EventDispatcher, Options):
"""
def on_mouse_release(
self, x: int, y: int, button: int, modifiers: int, window: ClientWindow
self, x: int, y: int, button: int, modifiers: int, window: ClientWindow
):
"""A mouse button was released.
@ -288,7 +287,7 @@ class BaseScreen(EventDispatcher, Options):
"""
def on_mouse_scroll(
self, x: int, y: int, scroll_x: float, scroll_y: float, window: ClientWindow
self, x: int, y: int, scroll_x: float, scroll_y: float, window: ClientWindow
):
"""The mouse wheel was scrolled.

19
Difficult_Rocket/client/__init__.py
View File

@ -44,7 +44,6 @@ from Difficult_Rocket.exception.language import LanguageNotFound
from lib_not_dr import loggers
logger = loggers.config.get_logger("client")
@ -129,7 +128,7 @@ def pyglet_load_fonts_folder(folder) -> None:
if not font_path.exists():
font_path.mkdir(parents=True)
return None
logger.info(tr().client.load.font.start().format(font_path), tag='font')
logger.info(tr().client.load.font.start().format(font_path), tag="font")
start_time = time.time_ns()
for dir_path, dir_names, file_names in os.walk(font_path):
dir_path = Path(dir_path)
@ -137,7 +136,8 @@ def pyglet_load_fonts_folder(folder) -> None:
file_name = Path(file_name)
if file_name.suffix in (".ttf", ".otf"):
logger.debug(
tr().client.load.font.file().format(str(dir_path / file_name)), tag='font'
tr().client.load.font.file().format(str(dir_path / file_name)),
tag="font",
)
try:
pyglet.font.add_file(str(dir_path / file_name))
@ -149,7 +149,9 @@ def pyglet_load_fonts_folder(folder) -> None:
)
end_time = time.time_ns()
use_time = end_time - start_time
logger.info(tr().client.load.font.use_time().format(use_time / 1000000000), tag='font')
logger.info(
tr().client.load.font.use_time().format(use_time / 1000000000), tag="font"
)
def _call_back(call_back: Callable) -> Callable:
@ -308,10 +310,13 @@ class ClientWindow(Window):
# TODO: wait for pyglet 2.1
pyglet.app.run(float(self.SPF))
except KeyboardInterrupt:
self.logger.warn("==========client stop. KeyboardInterrupt info==========", tag="starter")
self.logger.warn(
"==========client stop. KeyboardInterrupt info==========", tag="starter"
)
traceback.print_exc()
self.logger.warn(
"==========client stop. KeyboardInterrupt info end==========", tag="starter"
"==========client stop. KeyboardInterrupt info end==========",
tag="starter",
)
self.dispatch_event("on_close", "input")
sys.exit(0)
@ -498,7 +503,7 @@ class ClientWindow(Window):
@_call_screen_after
def on_key_press(self, symbol, modifiers) -> None:
if symbol == key.ESCAPE and not (
modifiers & ~(key.MOD_NUMLOCK | key.MOD_CAPSLOCK | key.MOD_SCROLLLOCK)
modifiers & ~(key.MOD_NUMLOCK | key.MOD_CAPSLOCK | key.MOD_SCROLLLOCK)
):
self.dispatch_event("on_close", "window")
if symbol == key.SLASH:

4
Difficult_Rocket/client/fps/fps_log.py
View File

@ -36,9 +36,9 @@ class FpsLogger:
else:
self.fps_list.append(float(1 / tick))
if len(self.fps_list) > self.count:
self.fps_list = self.fps_list[-self.count + 1 :] # 整个列表往前挪一位
self.fps_list = self.fps_list[-self.count + 1:] # 整个列表往前挪一位
if len(self.get_fps_list) > self.count:
self.get_fps_list = self.get_fps_list[-self.count + 1 :] # 整个列表往前挪一位
self.get_fps_list = self.get_fps_list[-self.count + 1:] # 整个列表往前挪一位
try:
self._fps = statistics.geometric_mean(
self.fps_list[-100:]

66
Difficult_Rocket/client/guis/format/html.py
View File

@ -20,8 +20,8 @@ from pyglet.text.formats import structured
default_style = {
"font_name": "Times New Roman",
"font_size": 12,
"bold": False,
"italic": False,
"bold": False,
"italic": False,
}
@ -35,17 +35,17 @@ class SingleTextStyle:
"""
def __init__(
self,
font_name: str = "",
font_size: int = 12,
bold: bool = False,
italic: bool = False,
color: str = "white",
text_tag: list = None,
show: bool = True,
prefix: str = "",
suffix: str = "",
text: str = "",
self,
font_name: str = "",
font_size: int = 12,
bold: bool = False,
italic: bool = False,
color: str = "white",
text_tag: list = None,
show: bool = True,
prefix: str = "",
suffix: str = "",
text: str = "",
):
self.font_name = font_name
self.font_size = font_size
@ -142,10 +142,10 @@ class SingleTextStyle:
"""
assert isinstance(other, SingleTextStyle)
return (
self.font_name == other.font_name
and self.font_size == other.font_size
and self.color == other.color
and self.show == other.show
self.font_name == other.font_name
and self.font_size == other.font_size
and self.color == other.color
and self.show == other.show
)
def same_bold(self, other: "SingleTextStyle") -> bool:
@ -215,9 +215,9 @@ class SingleTextStyle:
"""
return (
(
font_HTML_end
+ (bold_HTML_end if self.bold else "")
+ (italic_HTML_end if self.italic else "")
font_HTML_end
+ (bold_HTML_end if self.bold else "")
+ (italic_HTML_end if self.italic else "")
)
if suffix
else self.HTML_bold() + self.HTML_italic() + self.HTML_font()
@ -248,7 +248,7 @@ default_fonts_config = [
# Markdown 粗体语法规则匹配
"match": re.compile(r"\*\*(.*?(?<!\s))\*\*"),
"shown": re.compile(r"(?<=\*\*)(.*?(?<!\s))(?=\*\*)"),
"tag": {
"tag": {
# 为 match 匹配到的字符添加标签
"match": re.compile(r"\*\*"),
"style": SingleTextStyle(text_tag=["bold"]),
@ -257,14 +257,14 @@ default_fonts_config = [
},
{
# Markdown 斜体语法规则匹配
"match": re.compile(r"\*(.*?(?<!\s))\*"),
"shown": re.compile(r"(?<=\*)(.*?(?<!\s))(?=\*)"),
"match": re.compile(r"\*(.*?(?<!\s))\*"),
"shown": re.compile(r"(?<=\*)(.*?(?<!\s))(?=\*)"),
"ignore": {
# 如果匹配到的字符含有 tag 就忽略本次解析
"match": re.compile(r"\*"),
"tag": SingleTextStyle(text_tag=["italic"]),
"tag": SingleTextStyle(text_tag=["italic"]),
},
"style": SingleTextStyle(italic=True),
"style": SingleTextStyle(italic=True),
},
{
# Markdown 链接规则匹配
@ -308,11 +308,11 @@ def decode_text2HTML(text: str, configs=None, show_style: bool = False) -> str:
if ignore: # 为了方便退出
break
for ignore_index in range(
match_start + ignore_text.span()[0],
match_start + ignore_text.span()[1],
match_start + ignore_text.span()[0],
match_start + ignore_text.span()[1],
): # 对每一个可能的字符进行检测
if style_list[ignore_index].have_tag(
config["ignore"]["tag"]
config["ignore"]["tag"]
): # 如果确实包含要忽略的
ignore = True # 忽略为True
break
@ -324,7 +324,7 @@ def decode_text2HTML(text: str, configs=None, show_style: bool = False) -> str:
) # 根据配置的正则表达式匹配要添加tag的字符
for tag_text in tag_texts: # 对每一个匹配到的~~~~~~
for tag_index in range(
match_start + tag_text.span()[0], match_start + tag_text.span()[1]
match_start + tag_text.span()[0], match_start + tag_text.span()[1]
): # 用于遍历匹配到的字符
style_list[tag_index] += config["tag"]["style"]
# 为匹配到的字符添加样式
@ -337,7 +337,7 @@ def decode_text2HTML(text: str, configs=None, show_style: bool = False) -> str:
# 为每一个显示的字符设置显示属性
for shown_text in shown_texts: # 每一个显示的匹配项
for shown_index in range(
match_start + shown_text.span()[0], match_start + shown_text.span()[1]
match_start + shown_text.span()[0], match_start + shown_text.span()[1]
):
style_list[shown_index].show = True
# 字体样式列表的 [shown_index] 设置显示属性变为 True
@ -349,17 +349,17 @@ def decode_text2HTML(text: str, configs=None, show_style: bool = False) -> str:
if not style_list[style_index - 1].same_font(style_list[style_index]):
style_list[style_index - 1].suffix += style_list[
style_index - 1
].HTML_font(suffix=True)
].HTML_font(suffix=True)
style_list[style_index].prefix += style_list[style_index].HTML_font()
if not style_list[style_index - 1].same_bold(style_list[style_index]):
style_list[style_index - 1].suffix += style_list[
style_index - 1
].HTML_bold(suffix=True)
].HTML_bold(suffix=True)
style_list[style_index].prefix += style_list[style_index].HTML_bold()
if not style_list[style_index - 1].same_italic(style_list[style_index]):
style_list[style_index - 1].suffix += style_list[
style_index - 1
].HTML_italic(suffix=True)
].HTML_italic(suffix=True)
style_list[style_index].prefix += style_list[
style_index
].HTML_italic()

6
Difficult_Rocket/command/api.py
View File

@ -50,9 +50,9 @@ class CommandText:
if find != -1:
if not len(text) == len(self.text):
self.text = (
self.text[find + len(text) :]
self.text[find + len(text):]
if not self.text[find + len(text)] == " "
else self.text[find + len(text) + 1 :]
else self.text[find + len(text) + 1:]
)
return True
return False
@ -68,7 +68,7 @@ class CommandText:
# 20230122 我现在也不知道为啥这么写了
# 果然使用正则表达式就是让一个问题变成两个问题
except IndexError:
self.text = self.text[finding.span()[1] + 1 :]
self.text = self.text[finding.span()[1] + 1:]
return True
if next_find == " ":
return True

66
Difficult_Rocket/command/line.py
View File

@ -36,15 +36,15 @@ class CommandLineTextEntry(widgets.TextEntry):
"""
def __init__(
self,
x: int,
y: int,
width: int,
color: Optional[Tuple[int, int, int, int]] = (255, 255, 255, 255),
text_color: Optional[Tuple[int, int, int, int]] = (0, 0, 0, 255),
caret_color: Optional[Tuple[int, int, int, int]] = (0, 0, 0),
batch: Optional[Batch] = None,
group: Optional[Group] = None,
self,
x: int,
y: int,
width: int,
color: Optional[Tuple[int, int, int, int]] = (255, 255, 255, 255),
text_color: Optional[Tuple[int, int, int, int]] = (0, 0, 0, 255),
caret_color: Optional[Tuple[int, int, int, int]] = (0, 0, 0),
batch: Optional[Batch] = None,
group: Optional[Group] = None,
):
super().__init__(
x=x,
@ -66,16 +66,16 @@ class CommandLine(widgets.WidgetBase):
"""
def __init__(
self,
x: int,
y: int,
width: int,
height: int,
length: int,
batch: Batch,
group: Group = None,
command_text: str = "/",
font_size: int = 20,
self,
x: int,
y: int,
width: int,
height: int,
length: int,
batch: Batch,
group: Group = None,
command_text: str = "/",
font_size: int = 20,
):
super().__init__(x, y, width, height)
@ -182,14 +182,14 @@ class CommandLine(widgets.WidgetBase):
"""
assert isinstance(value, int), "Command View must be integer"
assert (
-self.length < value < self.length
-self.length < value < self.length
), f"Command View must be bigger than {-self.length} and smaller than {self.length}"
if value == -1: # flush command list
self._label.insert(0, self._label[-1])
self._label.pop(-1)
for line in range(self.length):
self._label[line].y = (
self.y + self.command_distance + (line * self.command_split)
self.y + self.command_distance + (line * self.command_split)
)
self._label[0].text = self.text
self.text = ""
@ -223,10 +223,10 @@ class CommandLine(widgets.WidgetBase):
time.sleep(wait)
if self._label[0].visible and not self.editing:
while (
(self._label[0].opacity >= 30)
and self._label[0].visible
and (self._label[0] is this)
and not self.editing
(self._label[0].opacity >= 30)
and self._label[0].visible
and (self._label[0] is this)
and not self.editing
):
# (label 的透明度不是 0) and (label 还在显示) and (label 还是载入线程时候的那个label) and (现在不在输入新行)
self._label[0].opacity -= 2
@ -279,7 +279,7 @@ class CommandLine(widgets.WidgetBase):
if motion == key.MOTION_DELETE: # 确保不越界
self.text = f"{self.text[:self._text_position]}{self.text[self._text_position + 1:]}" # 简单粗暴的删除
elif (
motion == key.MOTION_BACKSPACE and self._text_position >= 1
motion == key.MOTION_BACKSPACE and self._text_position >= 1
): # 确保不越界
self.text = f"{self.text[:self._text_position - 1]}{self.text[self._text_position:]}" # 简单粗暴的删除
self._text_position -= 1 # 记得切换光标位置
@ -288,19 +288,19 @@ class CommandLine(widgets.WidgetBase):
elif motion == key.MOTION_LEFT and self._text_position >= 0: # 确保不越界
self._text_position -= 1
elif motion == key.MOTION_RIGHT and self._text_position <= len(
self.text
self.text
): # 确保不越界
self._text_position += 1
elif motion in (
key.MOTION_BEGINNING_OF_LINE,
key.MOTION_BEGINNING_OF_FILE,
key.MOTION_PREVIOUS_PAGE,
key.MOTION_BEGINNING_OF_LINE,
key.MOTION_BEGINNING_OF_FILE,
key.MOTION_PREVIOUS_PAGE,
):
self._text_position = 0
elif motion in (
key.MOTION_END_OF_LINE,
key.MOTION_END_OF_FILE,
key.MOTION_NEXT_PAGE,
key.MOTION_END_OF_LINE,
key.MOTION_END_OF_FILE,
key.MOTION_NEXT_PAGE,
):
self._text_position = len(self.text)

8
Difficult_Rocket/crash/__init__.py
View File

@ -61,10 +61,10 @@ def crash_info_handler(info: Optional[str] = None) -> str:
def markdown_line_handler(
string: Optional[Union[str, bool, int, float]],
code: bool = False,
level: int = 1,
end: str = "\n",
string: Optional[Union[str, bool, int, float]],
code: bool = False,
level: int = 1,
end: str = "\n",
) -> str:
lvl = "- " * level
f_string = string

20
Difficult_Rocket/gui/widget/button.py
View File

@ -94,15 +94,15 @@ class PressTextButton(widgets.WidgetBase):
"""
def __init__(
self,
x: int,
y: int,
width: int,
height: int,
text: str,
batch: Optional[Batch] = None,
group: Optional[Group] = None,
theme: Optional[ButtonThemeOptions] = None,
self,
x: int,
y: int,
width: int,
height: int,
text: str,
batch: Optional[Batch] = None,
group: Optional[Group] = None,
theme: Optional[ButtonThemeOptions] = None,
):
super().__init__(x, y, width, height)
self.main_batch = batch or Batch()
@ -160,7 +160,7 @@ class PressTextButton(widgets.WidgetBase):
text_width = self.text_label.content_width
self.text_label.x = self._x + (self.width - text_width) // 2
self.text_label.y = (
self._y + (self.height - self.font_height) // 2 + (self.font_height * 0.2)
self._y + (self.height - self.font_height) // 2 + (self.font_height * 0.2)
) # 修正一下位置
def __contains__(self, item):

1
Difficult_Rocket/gui/widget/theme/__init__.py
View File

@ -23,7 +23,6 @@ class BaseTheme(dict):
setattr(self, k, v)
if TYPE_CHECKING:
def init(self, batch: Batch, group: Group, **kwargs) -> None:
"""
Init theme

1
Difficult_Rocket/mod/__init__.py
View File

@ -3,4 +3,3 @@
# Copyright © 2020-2023 by shenjackyuanjie 3695888@qq.com
# All rights reserved
# -------------------------------

67
Difficult_Rocket/mod/loader/__init__.py
View File

@ -74,25 +74,27 @@ class ModManager(Options):
:return:
"""
if not mod_path.exists():
logger.error(tr().mod.load.faild.not_exist().format(mod_path))
logger.error(tr().mod.load.faild.not_exist().format(mod_path), tag="load")
return None
_add_path_to_sys([mod_path.parent])
try:
if mod_path.name == "__pycache__":
# 忽略 __pycache__ 文件夹 (Python 编译文件)
return None
logger.info(tr().mod.load.loading().format(mod_path))
logger.info(tr().mod.load.loading().format(mod_path), tag="load")
if (
mod_path.is_dir()
or mod_path.suffix in PACKAGE_SUFFIX
or mod_path.suffix in ONE_FILE_SUFFIX
mod_path.is_dir()
or mod_path.suffix in PACKAGE_SUFFIX
or mod_path.suffix in ONE_FILE_SUFFIX
):
# 文件夹 mod
loading_mod = importlib.import_module(mod_path.name)
if not hasattr(loading_mod, "mod_class") or not issubclass(
loading_mod.mod_class, ModInfo
loading_mod.mod_class, ModInfo
):
logger.warn(tr().mod.load.faild.no_mod_class().format(mod_path))
logger.warn(
tr().mod.load.faild.no_mod_class().format(mod_path), tag="load"
)
return None
mod_class: type(ModInfo) = loading_mod.mod_class # 获取 mod 类
if mod_class.mod_id not in self.find_mod_paths:
@ -100,12 +102,13 @@ class ModManager(Options):
return mod_class
except ImportError:
logger.warn(
tr().mod.load.faild.error().format(mod_path, traceback.format_exc())
tr().mod.load.faild.error().format(mod_path, traceback.format_exc()),
tag="load",
)
return None
def find_mods_in_path(
self, extra_mods_path: Optional[List[Path]] = None
self, extra_mods_path: Optional[List[Path]] = None
) -> List[Path]:
"""
查找所有 mod 路径
@ -125,19 +128,21 @@ class ModManager(Options):
# 忽略 __pycache__ 文件夹 (Python 编译文件)
continue
if (
mod.is_dir()
or mod.suffix in PACKAGE_SUFFIX
or mod.suffix in ONE_FILE_SUFFIX
mod.is_dir()
or mod.suffix in PACKAGE_SUFFIX
or mod.suffix in ONE_FILE_SUFFIX
):
# 文件夹 mod
mods_path.append(mod)
logger.info(tr().mod.finded().format(len(mods_path), time.time() - start_time))
logger.info(
tr().mod.finded().format(len(mods_path), time.time() - start_time), tag="find"
)
return mods_path
def load_mods(
self,
extra_path: Optional[List[Path]] = None,
extra_mod_path: Optional[List[Path]] = None,
self,
extra_path: Optional[List[Path]] = None,
extra_mod_path: Optional[List[Path]] = None,
) -> List[type(ModInfo)]:
"""
加载所有 mod (可提供额外的 mod 路径)
@ -149,7 +154,7 @@ class ModManager(Options):
_add_path_to_sys(find_path)
mods = []
start_time = time.time()
logger.info(tr().mod.load.start().format(find_path))
logger.info(tr().mod.load.start().format(find_path), tag="load")
for path in find_path:
if not path.exists():
path.mkdir(parents=True)
@ -161,7 +166,7 @@ class ModManager(Options):
for path in extra_mod_path:
if (cache := self.load_mod(path)) is not None:
mods.append(cache)
logger.info(tr().mod.load.use_time().format(time.time() - start_time))
logger.info(tr().mod.load.use_time().format(time.time() - start_time), tag="load")
return mods
def init_mods(self, mods: List[type(ModInfo)]):
@ -175,13 +180,16 @@ class ModManager(Options):
try:
init_mod = mod_class()
self.loaded_mod_modules[init_mod.mod_id] = init_mod
logger.info(tr().mod.init.success().format(init_mod, init_mod.version))
logger.info(
tr().mod.init.success().format(init_mod, init_mod.version), tag="init"
)
except Exception as e:
logger.error(
tr().mod.init.faild().format(mod_class, e, traceback.format_exc())
tr().mod.init.faild().format(mod_class, e, traceback.format_exc()),
tag="init",
)
continue
logger.info(tr().mod.init.use_time().format(time.time() - start_time))
logger.info(tr().mod.init.use_time().format(time.time() - start_time), tag="init")
def unload_mod(self, mod_id: str, game: Game) -> Optional[ModInfo]:
"""
@ -191,19 +199,20 @@ class ModManager(Options):
:return: 卸载的 mod 的 ModInfo 类
"""
if (
not (mod_class := self.loaded_mod_modules.get(mod_id))
and (mod_class := self.get_mod_module(mod_id)) is None
not (mod_class := self.loaded_mod_modules.get(mod_id))
and (mod_class := self.get_mod_module(mod_id)) is None
):
logger.warn(tr().mod.unload.faild.not_find().format(mod_id))
logger.warn(tr().mod.unload.faild.not_find().format(mod_id), tag="unload")
return None
try:
mod_class.on_unload(game=game)
self.loaded_mod_modules.pop(mod_class.mod_id)
logger.info(tr().mod.unload.success().format(mod_id))
logger.info(tr().mod.unload.success().format(mod_id), tag="unload")
return mod_class
except Exception as e:
logger.error(
tr().mod.unload.faild.error().format(mod_id, e, traceback.format_exc())
tr().mod.unload.faild.error().format(mod_id, e, traceback.format_exc()),
tag="unload",
)
return None
@ -219,7 +228,9 @@ class ModManager(Options):
return
mod_class: Optional[ModInfo] = None
if unload.mod_id not in self.find_mod_paths:
logger.warn(tr().mod.reload.faild.not_find().format(unload.mod_id))
logger.warn(
tr().mod.reload.faild.not_find().format(unload.mod_id), tag="reload"
)
paths = self.find_mods_in_path()
for path in paths:
mod_class = self.load_mod(path)
@ -232,4 +243,4 @@ class ModManager(Options):
self.init_mods([mod_class])
if mod_id in self.loaded_mod_modules and mod_class is not None:
self.loaded_mod_modules[mod_id].on_load(game=game, old_self=mod_class)
logger.info(tr().mod.reload.success().format(mod_id))
logger.info(tr().mod.reload.success().format(mod_id), tag="reload")

1
Difficult_Rocket/runtime.py
View File

@ -14,7 +14,6 @@ from typing import Optional, List, Tuple
from Difficult_Rocket.api.types import Options, Version
__all__ = ["DR_runtime"]

54
Difficult_Rocket/utils/camera.py
View File

@ -29,13 +29,13 @@ class Camera:
"""
def __init__(
self,
window,
zoom: Optional[float] = 1.0,
dx: Optional[float] = 1.0,
dy: Optional[float] = 1.0,
min_zoom: Optional[float] = 1.0,
max_zoom: Optional[float] = 1.0,
self,
window,
zoom: Optional[float] = 1.0,
dx: Optional[float] = 1.0,
dy: Optional[float] = 1.0,
min_zoom: Optional[float] = 1.0,
max_zoom: Optional[float] = 1.0,
) -> None:
self.window = window
self.dx = dx
@ -126,15 +126,15 @@ class GroupCamera(Group):
"""
def __init__(
self,
window,
order: int = 0,
parent: Optional[Group] = None,
view_x: Optional[int] = 0,
view_y: Optional[int] = 0,
zoom: Optional[float] = 1.0,
min_zoom: Optional[float] = 1.0,
max_zoom: Optional[float] = 1.0,
self,
window,
order: int = 0,
parent: Optional[Group] = None,
view_x: Optional[int] = 0,
view_y: Optional[int] = 0,
zoom: Optional[float] = 1.0,
min_zoom: Optional[float] = 1.0,
max_zoom: Optional[float] = 1.0,
):
super().__init__(order=order, parent=parent)
self._window = window
@ -219,17 +219,17 @@ class CenterGroupFrame(Group):
"""
def __init__(
self,
window,
order: int = 0,
parent: Optional[Group] = None,
dx: Optional[int] = 0,
dy: Optional[int] = 0,
width: Optional[int] = 0,
height: Optional[int] = 0,
zoom: Optional[float] = 1.0,
min_zoom: Optional[float] = 1.0,
max_zoom: Optional[float] = 1.0,
self,
window,
order: int = 0,
parent: Optional[Group] = None,
dx: Optional[int] = 0,
dy: Optional[int] = 0,
width: Optional[int] = 0,
height: Optional[int] = 0,
zoom: Optional[float] = 1.0,
min_zoom: Optional[float] = 1.0,
max_zoom: Optional[float] = 1.0,
):
super().__init__(order=order, parent=parent)
self.window = window

6
Difficult_Rocket/utils/thread.py
View File

@ -120,9 +120,9 @@ class FunctionThread(threading.Thread):
def new_thread(
arg: Optional[Union[str, Callable]] = None,
daemon: bool = False,
log_thread: bool = True,
arg: Optional[Union[str, Callable]] = None,
daemon: bool = False,
log_thread: bool = True,
):
"""
This is a one line solution to make your function executes in parallels.

38
Difficult_Rocket/utils/translate.py
View File

@ -36,7 +36,7 @@ class TranslateConfig:
def set(self, item: str, value: Union[bool, "Tr", "Translates"]) -> "TranslateConfig":
assert (
getattr(self, item, None) is not None
getattr(self, item, None) is not None
), f"Config {item} is not in TranslateConfig"
assert isinstance(value, bool)
setattr(self, item, value)
@ -62,10 +62,10 @@ key_type = Union[str, int, Hashable]
class Translates:
def __init__(
self,
value: Union[Dict[str, Any], list, tuple, str],
config: Optional[TranslateConfig] = None,
get_list: Optional[List[Tuple[bool, str]]] = None,
self,
value: Union[Dict[str, Any], list, tuple, str],
config: Optional[TranslateConfig] = None,
get_list: Optional[List[Tuple[bool, str]]] = None,
):
"""一个用于翻译的东西
:param value: 翻译键节点
@ -77,9 +77,9 @@ class Translates:
self._get_list = get_list or []
def set_conf_(
self,
option: Union[str, TranslateConfig],
value: Optional[Union[bool, List[str]]] = None,
self,
option: Union[str, TranslateConfig],
value: Optional[Union[bool, List[str]]] = None,
) -> "Translates":
assert isinstance(option, (TranslateConfig, str))
if isinstance(option, TranslateConfig):
@ -117,7 +117,7 @@ class Translates:
print(raise_info)
def __getitem__(
self, item: Union[key_type, List[key_type], Tuple[key_type]]
self, item: Union[key_type, List[key_type], Tuple[key_type]]
) -> "Translates":
try:
if isinstance(item, (str, int, Hashable)):
@ -127,11 +127,11 @@ class Translates:
for a_item in item:
cache_value = cache_value[a_item]
if isinstance(
cache_value,
(
int,
str,
),
cache_value,
(
int,
str,
),
):
self._config.is_final = True
self._get_list.append((True, item))
@ -158,7 +158,7 @@ class Translates:
def __getattr__(self, item: key_type) -> "Translates":
if (self._config.is_final or any(x[0] for x in self._get_list)) and hasattr(
self._value, item
self._value, item
):
return getattr(self._value, item)
# 实际上我这里完全不需要处理正常需求，因为 __getattribute__ 已经帮我处理过了
@ -181,10 +181,10 @@ class Tr:
"""
def __init__(
self,
language: str = None,
config: Optional[TranslateConfig] = None,
lang_path: Optional[Path] = None,
self,
language: str = None,
config: Optional[TranslateConfig] = None,
lang_path: Optional[Path] = None,
):
"""
诶嘿，我抄的MCDR

123
config/local_logger.toml
View File

@ -1,123 +0,0 @@
logger_version = '1.0.0'
[Loggers]
[Loggers.root]
level = 'DEBUG'
color = 'main_color'
file = 'main_log_file'
handlers = ['main_std_handler']
[Loggers.client]
level = 'TRACE'
color = 'main_color'
file = 'main_log_file'
handlers = ['main_std_handler']
[Loggers.server]
level = 'TRACE'
color = 'DiGua_color'
file = 'main_log_file'
handlers = ['main_std_handler']
[Files]
[Files.main_log_file]
name = './logs/{long_time}_logs.md'
level = 'TRACE'
cache_len = 20
cache_time = 1
mode = 'a'
encoding = 'utf-8'
[Handler]
[Handler.main_std_handler]
class = 'str handler'
format = 'format.main_format'
[Handler.main_file_hander]
class = 'cached file handler'
format = 'format.main_format'
[Formatter]
main_format = '[{long_time}] [{logger_name}] {level} | {file_name}:{code_line} | {marker} | {message}'
file_name = 'no frame'
code_line = 'no frame'
short_time = '%Y-%m-%d %H-%M-%S'
long_time = '%Y-%m-%d %H-%M-%S:%%S'
[Colors]
[Colors.main_color]
# 翻了三个月的颜色啊
long_time = '\u001b[38;2;201;222;56m'
short_time = '\u001b[38;2;201;222;56m'
code_line = '\u001b[38;2;0;255;180m'
file_name = '\u001b[38;2;0;255;180m'
info = '\u001b[0m'
message = '\u001b[0m'
logger = '\u001b[0m'
marker = '\u001b[0m'
# level colors
TRACE.info = '\u001b[38;2;138;173;244m'
FINE.info = '\u001b[35;48;2;44;44;54m'
DEBUG.info = '\u001b[38;2;133;138;149m'
INFO.info = '\u001b[0m'
WARNING.info = '\u001b[33m'
ERROR.info = '\u001b[31m'
FATAL.info = '\u001b[38;2;255;255;0;48;2;120;10;10m'
FATAL.logger = '\u001b[38;2;245;189;230m'
[Colors.fancy_main_color]
long_time = '\u001b[38;2;201;222;56m'
short_time = '\u001b[38;2;201;222;56m'
file_name = '\u001b[38;2;0;255;180m'
code_line = '\u001b[38;2;0;255;180m'
info = '\u001b[0m'
message = '\u001b[0m'
logger = '\u001b[0m'
marker = '\u001b[0m'
# level colors
TRACE.info = '\u001b[38;2;138;173;244m'
TRACE.message = '\u001b[38;2;138;173;244m'
FINE.info = '\u001b[35;48;2;44;44;54m'
FINE.message = '\u001b[35m'
DEBUG.info = '\u001b[38;2;133;138;149m'
DEBUG.message = '\u001b[38;2;133;138;149m'
INFO.info = '\u001b[0m'
INFO.message = '\u001b[0m'
WARNING.info = '\u001b[33m'
WARNING.message = '\u001b[33m'
ERROR.info = '\u001b[31m'
ERROR.message = '\u001b[31m'
FATAL.info = '\u001b[38;2;255;255;0;48;2;120;10;10m'
FATAL.message = '\u001b[38;2;255;255;0;48;2;120;10;10m'
FATAL.logger = '\u001b[38;2;245;189;230m'
[Colors.DiGua_color]
# catppuccin Macchiato
long_time = '\u001b[38;2;202;211;245m'
short_time = '\u001b[38;2;202;211;245m'
file_name = '\u001b[38;2;139;213;202m'
code_line = '\u001b[38;2;166;218;149m'
info = '\u001b[0m'
logger = '\u001b[0m'
message = '\u001b[0m'
marker = '\u001b[0m'
# level colors
TRACE.info = '\u001b[38;2;138;173;244m'
TRACE.message = '\u001b[38;2;138;173;244m'
FINE.info = '\u001b[38;2;198;160;246m'
FINE.message = '\u001b[38;2;198;160;246m'
DEBUG.info = '\u001b[38;2;133;138;149m'
DEBUG.message = '\u001b[38;2;133;138;149m'
ERROR.info = '\u001b[38;2;237;135;150m'
ERROR.message = '\u001b[38;2;237;135;150m'
WARNING.info = '\u001b[38;2;245;169;127m'
WARNING.message = '\u001b[38;2;245;169;127m'
FATAL.info = '\u001b[38;2;255;255;0;48;2;120;10;10m'
FATAL.message = '\u001b[38;2;255;255;0;48;2;120;10;10m'
FATAL.loggger = '\u001b[38;2;245;189;230m'

1116
libs/utils/logger-old.py
View File

File diff suppressed because it is too large Load Diff

28
scripts/lndl-config.py
View File

@ -13,12 +13,8 @@ from lib_not_dr.nuitka import nuitka_config_type, raw_config_type
def gen_pyglet_no_follow_import() -> list:
no_follow_import = []
no_follow_import += [
f"pyglet.app.{x}" for x in ["win32", "xlib", "cocoa"]
]
no_follow_import += [
f"pyglet.input.{x}" for x in ["win32", "linux", "macos"]
]
no_follow_import += [f"pyglet.app.{x}" for x in ["win32", "xlib", "cocoa"]]
no_follow_import += [f"pyglet.input.{x}" for x in ["win32", "linux", "macos"]]
no_follow_import += [
f"pyglet.libs.{x}"
for x in ["win32", "x11", "wayland", "darwin", "egl", "headless"]
@ -36,9 +32,7 @@ def gen_pyglet_no_follow_import() -> list:
"headless",
)
]
no_follow_import += [
f"pyglet.gl.{x}" for x in ["win32", "xlib", "cocoa", "headless"]
]
no_follow_import += [f"pyglet.gl.{x}" for x in ["win32", "xlib", "cocoa", "headless"]]
mult_plat_libs = ["app", "input", "libs", "window", "canvas", "gl"]
if platform.system() == "Windows":
@ -59,15 +53,15 @@ def gen_pyglet_no_follow_import() -> list:
def main(config: raw_config_type) -> nuitka_config_type:
print('debug', config)
config = config['cli']
print("debug", config)
config = config["cli"]
config['file-version'] = str(build_version)
config['product-version'] = str(sdk_version)
config['macos-app-version'] = str(sdk_version)
config["file-version"] = str(build_version)
config["product-version"] = str(sdk_version)
config["macos-app-version"] = str(sdk_version)
config['nofollow-import-to'] += gen_pyglet_no_follow_import()
config['output-dir'] = './build/nuitka-' + platform.system().lower()
config["nofollow-import-to"] += gen_pyglet_no_follow_import()
config["output-dir"] = "./build/nuitka-" + platform.system().lower()
print('done', config)
print("done", config)
return config