Compare commits

..

No commits in common. "main" and "0.13.1" have entirely different histories.
main ... 0.13.1

3 changed files with 9 additions and 46 deletions

View File

@ -14,16 +14,12 @@ class HealthCheck:
"CheckUpdate": False, "CheckUpdate": False,
"IsBleeding": False, "IsBleeding": False,
"LastPlayed": "", "LastPlayed": "",
"TotalPlaytime": 0,
"IsFirstLaunch": True, "IsFirstLaunch": True,
"Instance": "default", "Instance": "default",
"Theme": "Dark.json", "Theme": "Dark.json",
"ThemeBackground": True, "ThemeBackground": True,
"ThemeRepository": "https://raw.githubusercontent.com/nixietab/picodulce-themes/main/repo.json", "ThemeRepository": "https://raw.githubusercontent.com/nixietab/picodulce-themes/main/repo.json",
"Locale": "en", "Locale": "en"
"ManageJava": False,
"MaxRAM": 2,
"JavaPath": ""
} }
# Step 1: Check if the file exists; if not, create it with default values # Step 1: Check if the file exists; if not, create it with default values
@ -120,4 +116,4 @@ class HealthCheck:
# Check if both files exist and print OK message # Check if both files exist and print OK message
if os.path.isfile(dark_theme_file) and os.path.isfile(native_theme_file): if os.path.isfile(dark_theme_file) and os.path.isfile(native_theme_file):
print("Theme Integrity OK") print("Theme Integrity OK")

View File

@ -832,7 +832,6 @@ class PicomcVersionSelector(QWidget):
try: try:
# Set current_state to the selected instance # Set current_state to the selected instance
self.current_state = selected_instance self.current_state = selected_instance
self.start_time = time.time()
# Read the config.json to get the "Instance" value # Read the config.json to get the "Instance" value
with open('config.json', 'r') as config_file: with open('config.json', 'r') as config_file:
@ -861,7 +860,6 @@ class PicomcVersionSelector(QWidget):
finally: finally:
# Reset current_state to "menu" after the game closes # Reset current_state to "menu" after the game closes
self.current_state = "menu" self.current_state = "menu"
self.update_total_playtime(self.start_time)
def update_last_played(self, selected_instance): def update_last_played(self, selected_instance):
@ -870,12 +868,6 @@ class PicomcVersionSelector(QWidget):
with open(config_path, "w") as config_file: with open(config_path, "w") as config_file:
json.dump(self.config, config_file, indent=4) json.dump(self.config, config_file, indent=4)
def update_total_playtime(self, start_time):
config_path = "config.json"
self.config["TotalPlaytime"] += time.time() - self.start_time
print("TOTAL PLAYTIME:" + str(self.config["TotalPlaytime"]))
with open(config_path, "w") as config_file:
json.dump(self.config, config_file, indent=4)
def showError(self, title, message): def showError(self, title, message):
QMessageBox.critical(self, title, message) QMessageBox.critical(self, title, message)
@ -1095,21 +1087,6 @@ class PicomcVersionSelector(QWidget):
QMessageBox.critical(self, "Error", error_message) QMessageBox.critical(self, "Error", error_message)
def get_playtime(self, config_data):
#Gets the playtime from the json and
total_playtime = config_data.get("TotalPlaytime")/60
#if total playtime is over 60 minutes, uses hours instead
if(total_playtime > 60):
total_playtime = total_playtime / 60
playtime_unit = "hours"
else:
playtime_unit = "minutes"
total_playtime = round(total_playtime)
#returs the playtime and the unit used to measure in a string
return(f"{total_playtime} {playtime_unit}")
def show_about_dialog(self): def show_about_dialog(self):
# Load the version number from version.json # Load the version number from version.json
try: try:
@ -1133,16 +1110,13 @@ class PicomcVersionSelector(QWidget):
if is_bleeding and version_bleeding: if is_bleeding and version_bleeding:
version_number = version_bleeding version_number = version_bleeding
about_message = ( about_message = (
f"PicoDulce Launcher (v{version_number})\n\n" f"PicoDulce Launcher (v{version_number})\n\n"
"A simple Minecraft launcher built using Qt, based on the picomc project.\n\n" "A simple Minecraft launcher built using Qt, based on the picomc project.\n\n"
"Credits:\n" "Credits:\n"
"Nixietab: Code and UI design\n" "Nixietab: Code and UI design\n"
"Wabaano: Graphic design\n" "Wabaano: Graphic design\n"
"Olinad: Christmas!!!!\n\n" "Olinad: Christmas!!!!"
f"Playtime: {self.get_playtime(config_data)}"
) )
QMessageBox.about(self, "About", about_message) QMessageBox.about(self, "About", about_message)
@ -1329,7 +1303,7 @@ class PicomcVersionSelector(QWidget):
def open_mod_loader_and_version_menu(self): def open_mod_loader_and_version_menu(self):
dialog = ModLoaderAndVersionMenu(parent=self) dialog = ModLoaderAndVersionMenu()
dialog.finished.connect(self.populate_installed_versions) dialog.finished.connect(self.populate_installed_versions)
dialog.exec_() dialog.exec_()
@ -1350,17 +1324,10 @@ class DownloadThread(QThread):
self.completed.emit(False, error_message) self.completed.emit(False, error_message)
class ModLoaderAndVersionMenu(QDialog): class ModLoaderAndVersionMenu(QDialog):
def __init__(self, parent=None): def __init__(self):
super().__init__(parent) super().__init__()
self.setWindowTitle("Mod Loader and Version Menu") self.setWindowTitle("Mod Loader and Version Menu")
# Set window position relative to parent self.setGeometry(100, 100, 400, 300)
if parent:
parent_pos = parent.pos()
x = parent_pos.x() + (parent.width() - 400) // 2
y = parent_pos.y() + (parent.height() - 300) // 2
self.setGeometry(x, y, 400, 300)
else:
self.setGeometry(100, 100, 400, 300)
main_layout = QVBoxLayout(self) main_layout = QVBoxLayout(self)

View File

@ -1,5 +1,5 @@
{ {
"version": "0.13.2", "version": "0.13.1",
"links": [ "links": [
"https://raw.githubusercontent.com/nixietab/picodulce/main/version.json", "https://raw.githubusercontent.com/nixietab/picodulce/main/version.json",
"https://raw.githubusercontent.com/nixietab/picodulce/main/picodulce.py", "https://raw.githubusercontent.com/nixietab/picodulce/main/picodulce.py",
@ -11,5 +11,5 @@
"https://raw.githubusercontent.com/nixietab/picodulce/main/healthcheck.py", "https://raw.githubusercontent.com/nixietab/picodulce/main/healthcheck.py",
"https://raw.githubusercontent.com/nixietab/picodulce/main/modulecli.py" "https://raw.githubusercontent.com/nixietab/picodulce/main/modulecli.py"
], ],
"versionBleeding": "0.13.2-208" "versionBleeding": "0.13-198"
} }