Merge branch 'main' of https://github.com/PCL-Community/PCL2-Python

Author: CreeperIsASpy

.gitignore

@@ -1,8 +1,15 @@
+# Editor Config
 idea/
 .vs/
-venv/
+
+# Python Environment & Cache
+**/*venv*/
 __pycache__/
 *.pyc
-Plain_Craft_Launcher_2/.minecraft/
-Plain_Craft_Launcher_2/logs/
-Plain_Craft_Launcher_2/Modules/Minecraft/logs
+
+# Log
+**/logs/
+Plain_Craft_Launcher_2/data/*.log
+
+# Debugging Files
+Plain_Craft_Launcher_2/.minecraft/

Plain_Craft_Launcher_2/Controls/RoundShadow.py

@@ -1,18 +1,22 @@
-from PyQt5.QtWidgets import *
-from PyQt5.QtCore import *
-from PyQt5.QtGui import *
+# from PyQt5.QtWidgets import *
+# from PyQt5.QtCore import *
+# from PyQt5.QtGui import *
+
+from PyQt5.QtWidgets import QWidget
+from PyQt5.QtCore import Qt, QRectF
+from PyQt5.QtGui import QPainter, QPainterPath, QBrush, QColor, QPaintEvent
 
 class RoundShadow(QWidget):
     """圆角边框类"""
 
-    def __init__(self, parent=None):
-        super(RoundShadow, self).__init__(parent)
+    def __init__(self):
+        super().__init__()
         self.border_width = 8
         # 设置 窗口无边框和背景透明 *必须
         self.setAttribute(Qt.WA_TranslucentBackground)
         self.setWindowFlags(Qt.FramelessWindowHint | Qt.Window)
 
-    def paintEvent(self, event):
+    def paintEvent(self, a0: QPaintEvent):
         # 阴影
         path = QPainterPath()
         path.setFillRule(Qt.WindingFill)

Plain_Craft_Launcher_2/FormMain.py

@@ -1,9 +1,7 @@
-from PyQt5.QtWidgets import *
-from PyQt5.QtCore import *
-from PyQt5.QtGui import *
-
 import sys
 import os
+from PyQt5.QtWidgets import QApplication, QWidget
+from PyQt5.QtGui import QResizeEvent
 
 # 设置工作目录为当前文件所在目录
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
@@ -14,8 +12,8 @@
 class FormMain(RoundShadow):
     """主窗口"""
 
-    def __init__(self, parent=None):
-        super().__init__(parent)
+    def __init__(self):
+        super().__init__()
         # 设置窗口大小
         self.resize(900, 550)
 
@@ -28,11 +26,11 @@ def __init__(self, parent=None):
         self.ui.setupUi(self.container)
 
         # 添加窗口大小变化事件处理
-        self.resizeEvent = self.onResize
-    
-    def onResize(self, event):
+        # 通过重写resizeEvent方法处理窗口大小变化
+
+    def resizeEvent(self, a0: QResizeEvent):
         """处理窗口大小变化"""
-        super().resizeEvent(event)
+        super().resizeEvent(a0)
         # 更新容器大小
         self.container.setGeometry(9, 9, self.width() - 18, self.height() - 18)
 

Plain_Craft_Launcher_2/FormMain_ui.py

@@ -1,9 +1,8 @@
 from PyQt5 import QtCore, QtGui, QtWidgets
 from Modules.Base.ModSetup import ModSetup as Setup
 
-
 class Ui_FormMain(object):
-    def setupUi(self, FormMain):
+    def setupUi(self, FormMain: QtWidgets.QWidget):
         FormMain.setObjectName("FormMain")
         FormMain.resize(900, 550)
         FormMain.setBaseSize(QtCore.QSize(900, 550))
@@ -27,7 +26,8 @@ def setupUi(self, FormMain):
         self.retranslateUi(FormMain)
         QtCore.QMetaObject.connectSlotsByName(FormMain)
 
-    def retranslateUi(self, FormMain):
+    def retranslateUi(self, FormMain: QtWidgets.QWidget):
         _translate = QtCore.QCoreApplication.translate
         FormMain.setWindowTitle(_translate("FormMain", "Plain Craft Launcher 2"))
+
 from Resources import *

Plain_Craft_Launcher_2/Modules/Base/ModLogging.py

@@ -8,6 +8,18 @@
 def now() -> str:
     return datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
 
+class LoggingType(Enum):
+    INFO = 'Info'
+    WARN = 'Warn'
+    ERROR = 'Error'
+    FATAL = 'Fatal'
+    
+    def __str__(self) -> str:
+        return self.value
+    
+    def __repr__(self) -> str:
+        return self.value
+
 class ModLogging():
     def __init__(
         self,
@@ -42,7 +54,7 @@ def __init__(
     def write(
         self, 
         message:str, 
-        log_level:str
+        log_level:LoggingType
     ) -> None:
         r'''
         Writing A Log Into File
@@ -63,16 +75,16 @@ def write(
                 'Error': ' ',
                 'Fatal': ' '
             }
-            log_level = str(log_level)
+            log_level_str = str(log_level)
             with open(f'{launcher_data_folder}/Log1.log', 'a', encoding='utf-8') as f:
-                f.write(f'[{log_level}]{space_map[log_level]}[{self.module_name}] {now()} > {message}\n')
+                f.write(f'[{log_level_str}]{space_map[log_level_str]}[{self.module_name}] {now()} > {message}\n')
             color_map = {
                 'Info': green,
                 'Warn': yellow,
                 'Error': red,
                 'Fatal': red
             }
-            print(f'{color_map[log_level]}[{log_level}]{clear}{space_map[log_level]}[{self.module_name}] {now()} > {message}')
+            print(f'{color_map[log_level_str]}[{log_level_str}]{clear}{space_map[log_level_str]}[{self.module_name}] {now()} > {message}')
         except Exception as ex:
             time = now()
             print(f'[{red}FATAL{clear}] [Logging] {time} > 记录日志时发生错误')
@@ -83,17 +95,7 @@ def write(
                 fatal.write(f'[FATAL] 错误类型：{type(ex).__name__}\n')
                 fatal.write(f'[FATAL] 错误堆栈信息：\n{str(getTraceBack())}\n')
 
-class LoggingType(Enum):
-    INFO = 'Info'
-    WARN = 'Warn'
-    ERROR = 'Error'
-    FATAL = 'Fatal'
-    
-    def __str__(self) -> str:
-        return self.value
-    
-    def __repr__(self) -> str:
-        return self.value
+
 
 # Console Color Code, using f-string to insert, like {red}[Error]{clear}Exception
 clear = '\033[0m'  

Plain_Craft_Launcher_2/Modules/Base/ModSetup.py

@@ -1,6 +1,6 @@
 import json
-from ModLogging import ModLogging, LoggingType as LT
-
+from typing import Any
+from .ModLogging import ModLogging, LoggingType as LT
 
 class ModSetup:
     """写入/读取设置相关的类"""
@@ -16,7 +16,7 @@ def setup_settings(self):
 
         self.logger.write("设置初始化完成", LT.INFO)
 
-    def load_settings(self, file_path="."):
+    def load_settings(self, file_path:str="./data/Config.json"):
         """读取已经存储的设置"""
         try:
             with open(file_path, "r") as f:
@@ -29,19 +29,19 @@ def load_settings(self, file_path="."):
             self.logger.write("设置文件未找到，进行初始化", LT.INFO)
             self.setup_settings()           
 
-    def save_settings(self, file_path="."):
+    def save_settings(self, file_path:str="./data/Config.json"):
         """保存设置"""
         settings = self.__dict__
         with open(file_path, "w") as f:
             json.dump(settings, f)
 
         self.logger.write("设置文件保存成功", LT.INFO)
 
-    def get_settings(self, setting):
+    def get_settings(self, setting: str):
         """获取设置"""
         return getattr(self, setting, None)
-
-    def set_settings(self, setting, value):
+    
+    def set_settings(self, setting: str, value: Any) -> None:
         """设置设置"""
         setattr(self, setting, value)
         self.save_settings()