mirror of
				https://github.com/nixietab/picodulce.git
				synced 2025-10-31 05:25:12 +00:00 
			
		
		
		
	Compare commits
	
		
			No commits in common. "723cd1dd56ffb0a447b7ef402c76ab80cf26e79d" and "9523f1ab0ca4c379e909092d714cd5ce82c1169e" have entirely different histories.
		
	
	
		
			723cd1dd56
			...
			9523f1ab0c
		
	
		
							
								
								
									
										28
									
								
								picodulce.py
									
									
									
									
									
								
							
							
						
						
									
										28
									
								
								picodulce.py
									
									
									
									
									
								
							| @ -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) | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -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.1-204" |   "versionBleeding": "0.13.1-202" | ||||||
| } | } | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user