minecraft-server-creator 2.1.0__tar.gz → 2.1.2__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (40) hide show
  1. {minecraft_server_creator-2.1.0/src/minecraft_server_creator.egg-info → minecraft_server_creator-2.1.2}/PKG-INFO +1 -1
  2. {minecraft_server_creator-2.1.0 → minecraft_server_creator-2.1.2}/pyproject.toml +1 -1
  3. minecraft_server_creator-2.1.2/src/mcsc/__init__.py +10 -0
  4. minecraft_server_creator-2.1.2/src/mcsc/__main__.py +12 -0
  5. minecraft_server_creator-2.1.2/src/mcsc/main.py +97 -0
  6. {minecraft_server_creator-2.1.0 → minecraft_server_creator-2.1.2}/src/mcsc/modules/pages.py +52 -45
  7. {minecraft_server_creator-2.1.0 → minecraft_server_creator-2.1.2}/src/mcsc/modules/servers/forge.py +29 -53
  8. {minecraft_server_creator-2.1.0 → minecraft_server_creator-2.1.2}/src/mcsc/modules/servers/models.py +66 -58
  9. {minecraft_server_creator-2.1.0 → minecraft_server_creator-2.1.2}/src/mcsc/modules/utils.py +20 -18
  10. {minecraft_server_creator-2.1.0 → minecraft_server_creator-2.1.2}/src/mcsc/static/style.css +23 -0
  11. minecraft_server_creator-2.1.2/src/mcsc/tasks.py +139 -0
  12. minecraft_server_creator-2.1.2/src/mcsc/telemetry.py +97 -0
  13. {minecraft_server_creator-2.1.0 → minecraft_server_creator-2.1.2/src/minecraft_server_creator.egg-info}/PKG-INFO +1 -1
  14. {minecraft_server_creator-2.1.0 → minecraft_server_creator-2.1.2}/src/minecraft_server_creator.egg-info/SOURCES.txt +2 -1
  15. minecraft_server_creator-2.1.2/tests/test_entrypoints.py +16 -0
  16. minecraft_server_creator-2.1.0/src/mcsc/__init__.py +0 -4
  17. minecraft_server_creator-2.1.0/src/mcsc/__main__.py +0 -10
  18. minecraft_server_creator-2.1.0/src/mcsc/main.py +0 -120
  19. minecraft_server_creator-2.1.0/src/mcsc/tasks.py +0 -152
  20. minecraft_server_creator-2.1.0/src/mcsc/telemetry.py +0 -99
  21. {minecraft_server_creator-2.1.0 → minecraft_server_creator-2.1.2}/LICENSE +0 -0
  22. {minecraft_server_creator-2.1.0 → minecraft_server_creator-2.1.2}/README.md +0 -0
  23. {minecraft_server_creator-2.1.0 → minecraft_server_creator-2.1.2}/setup.cfg +0 -0
  24. {minecraft_server_creator-2.1.0 → minecraft_server_creator-2.1.2}/src/mcsc/config/settings.py +0 -0
  25. {minecraft_server_creator-2.1.0 → minecraft_server_creator-2.1.2}/src/mcsc/config/update_files.py +0 -0
  26. {minecraft_server_creator-2.1.0 → minecraft_server_creator-2.1.2}/src/mcsc/localization/it.py +0 -0
  27. {minecraft_server_creator-2.1.0 → minecraft_server_creator-2.1.2}/src/mcsc/modules/classes.py +0 -0
  28. {minecraft_server_creator-2.1.0 → minecraft_server_creator-2.1.2}/src/mcsc/modules/logger.py +0 -0
  29. {minecraft_server_creator-2.1.0 → minecraft_server_creator-2.1.2}/src/mcsc/modules/servers/java.py +0 -0
  30. {minecraft_server_creator-2.1.0 → minecraft_server_creator-2.1.2}/src/mcsc/modules/servers/paper.py +0 -0
  31. {minecraft_server_creator-2.1.0 → minecraft_server_creator-2.1.2}/src/mcsc/modules/servers/utils.py +0 -0
  32. {minecraft_server_creator-2.1.0 → minecraft_server_creator-2.1.2}/src/mcsc/modules/translations.py +0 -0
  33. {minecraft_server_creator-2.1.0 → minecraft_server_creator-2.1.2}/src/mcsc/modules/user_settings.py +0 -0
  34. {minecraft_server_creator-2.1.0 → minecraft_server_creator-2.1.2}/src/mcsc/static/logo.png +0 -0
  35. {minecraft_server_creator-2.1.0 → minecraft_server_creator-2.1.2}/src/mcsc/update.py +0 -0
  36. {minecraft_server_creator-2.1.0 → minecraft_server_creator-2.1.2}/src/mcsc/utils.py +0 -0
  37. {minecraft_server_creator-2.1.0 → minecraft_server_creator-2.1.2}/src/minecraft_server_creator.egg-info/dependency_links.txt +0 -0
  38. {minecraft_server_creator-2.1.0 → minecraft_server_creator-2.1.2}/src/minecraft_server_creator.egg-info/entry_points.txt +0 -0
  39. {minecraft_server_creator-2.1.0 → minecraft_server_creator-2.1.2}/src/minecraft_server_creator.egg-info/requires.txt +0 -0
  40. {minecraft_server_creator-2.1.0 → minecraft_server_creator-2.1.2}/src/minecraft_server_creator.egg-info/top_level.txt +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: minecraft-server-creator
3
- Version: 2.1.0
3
+ Version: 2.1.2
4
4
  Summary: Minecraft Server Creator - Manage Minecraft servers
5
5
  Author-email: ddavidel <ddavidel@proton.me>
6
6
  License: This project is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License.
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "minecraft-server-creator"
7
- version = "2.1.0"
7
+ version = "2.1.2"
8
8
  description = "Minecraft Server Creator - Manage Minecraft servers"
9
9
  authors = [{ name = "ddavidel", email = "ddavidel@proton.me" }]
10
10
  readme = "README.md"
@@ -0,0 +1,10 @@
1
+ """Public package interface for the Minecraft Server Creator."""
2
+
3
+ from .main import ServerCreatorGUI
4
+
5
+ __all__ = ["ServerCreatorGUI"]
6
+
7
+
8
+ def main() -> None:
9
+ """Application entry point used by the package CLI."""
10
+ ServerCreatorGUI().run()
@@ -0,0 +1,12 @@
1
+ """Module entry point for the project CLI."""
2
+
3
+ from .main import ServerCreatorGUI
4
+
5
+
6
+ def main() -> None:
7
+ """Run the application window."""
8
+ ServerCreatorGUI().run()
9
+
10
+
11
+ if __name__ == "__main__":
12
+ main()
@@ -0,0 +1,97 @@
1
+ """Application bootstrap and lifecycle for the NiceGUI desktop app."""
2
+
3
+ from __future__ import annotations
4
+
5
+ import json
6
+ import shutil
7
+ from importlib.metadata import version
8
+ from pathlib import Path
9
+
10
+ from nicegui import app, html, ui
11
+
12
+ from mcsc.config.settings import DATA_DIR_PATH, PACKAGE_NAME, SERVER_DIR_PATH
13
+ from mcsc.modules.pages import build_base_window, build_drawer, home
14
+ from mcsc.modules.servers.utils import TYPE_TO_CLASS, load_servers
15
+ from mcsc.modules.utils import load_server_versions
16
+ from mcsc.telemetry import TelemetryClient
17
+ from mcsc.utils import static_dir
18
+
19
+ app.native.window_args["resizable"] = False
20
+
21
+
22
+ class ServerCreatorGUI:
23
+ """Main desktop application class."""
24
+
25
+ DEFAULT_WINDOW_SIZE = (1300, 800)
26
+
27
+ def __init__(self) -> None:
28
+ """Initialize the app state and data bootstrap."""
29
+ self.telemetry_client = TelemetryClient()
30
+ load_servers()
31
+ load_server_versions()
32
+ self.migrate_legacy()
33
+
34
+ @staticmethod
35
+ @ui.page("/")
36
+ def main_page() -> None:
37
+ """Render the home route."""
38
+ header = ui.header().classes("content-header")
39
+ container = html.section()
40
+ build_base_window(header=header)
41
+ build_drawer()
42
+ home(header=header, container=container)
43
+
44
+ def initialize_runtime(self) -> None:
45
+ """Register static assets and prepare the app runtime."""
46
+ app.add_static_files("/static", str(static_dir))
47
+
48
+ def run(self, *, debug: bool = False) -> None:
49
+ """Run the desktop UI using NiceGUI's native mode."""
50
+ self.telemetry_client.send_event(
51
+ event_name="app_start",
52
+ details={"version": version(PACKAGE_NAME)},
53
+ )
54
+ self.initialize_runtime()
55
+
56
+ ui.run(
57
+ native=True,
58
+ window_size=self.DEFAULT_WINDOW_SIZE,
59
+ reload=False,
60
+ title="Minecraft Server Creator",
61
+ dark=True,
62
+ frameless=True,
63
+ show=debug,
64
+ reconnect_timeout=60,
65
+ )
66
+
67
+ def migrate_legacy(self) -> None:
68
+ """Perform migration from a legacy server config to the current layout."""
69
+ migration_file = Path(DATA_DIR_PATH) / "migration.mgr"
70
+ if not migration_file.exists():
71
+ return
72
+
73
+ print("Detected servers migration for legacy version of MCSC")
74
+ legacy_servers_json = migration_file.read_text(encoding="utf-8").strip()
75
+ legacy_servers_dict = json.loads(Path(legacy_servers_json).read_text(encoding="utf-8"))
76
+
77
+ for server_uuid, config in legacy_servers_dict.items():
78
+ print(f"Migrating server '{server_uuid}' ({config['name']})...")
79
+ server_folder = config["folder_path"]
80
+ new_server_folder = Path(SERVER_DIR_PATH) / server_uuid
81
+
82
+ if not new_server_folder.exists():
83
+ shutil.copytree(server_folder, new_server_folder)
84
+ else:
85
+ continue
86
+
87
+ config["folder_path"] = str(new_server_folder)
88
+ instance = TYPE_TO_CLASS[config["jar_type"]](settings=config, uuid=server_uuid)
89
+ instance.save()
90
+
91
+ migration_file.rename(migration_file.with_suffix(".mgr.done"))
92
+ print("Migration completed successfully.")
93
+
94
+
95
+ def main() -> None:
96
+ """Module-level entry point for the application."""
97
+ ServerCreatorGUI().run()
@@ -33,20 +33,47 @@ logger = RotatingLogger()
33
33
 
34
34
 
35
35
  def load_head():
36
- """Loads page head"""
37
- # add here other css files.
36
+ """Loads page head."""
38
37
  ui.add_head_html("<link rel='stylesheet' href='/static/style.css'>")
39
38
  ui.colors(primary="#13c187")
40
39
 
41
40
 
42
41
  def build_base_window(header: ui.header):
43
- """Builds base window for app"""
42
+ """Build the common app window chrome."""
44
43
  load_head()
45
44
  with header:
46
45
  ui.button("", on_click=minimize_window, icon="remove").classes("minimize-button")
47
46
  ui.button("", on_click=shutdown, icon="close").classes("close-button")
48
47
 
49
48
 
49
+ def build_server_stats(server: MinecraftServer) -> None:
50
+ """Build the server resource summary cards."""
51
+ with ui.grid(rows=2, columns=2).classes("stat-grid"):
52
+ with ui.chip("", icon="donut_large").bind_text_from(
53
+ server.monitor, "ram_usage", lambda x: f"{x} MB"
54
+ ).classes("stat-chip"):
55
+ ui.tooltip(_("RAM usage")).style("font-size: 15px;")
56
+
57
+ with ui.chip("", icon="memory").bind_text_from(
58
+ server.monitor, "cpu_usage", lambda x: f"{x} %"
59
+ ).classes("stat-chip"):
60
+ ui.tooltip(_("CPU usage")).style("font-size: 15px;")
61
+
62
+ with ui.chip("", icon="swap_vert").bind_text_from(
63
+ server.monitor,
64
+ "disk_read",
65
+ lambda x: f"{x} MB/s",
66
+ ).classes("stat-chip"):
67
+ ui.tooltip(_("Disk read")).style("font-size: 15px;")
68
+
69
+ with ui.chip("", icon="swap_vert").bind_text_from(
70
+ server.monitor,
71
+ "disk_write",
72
+ lambda x: f"{x} MB/s",
73
+ ).classes("stat-chip"):
74
+ ui.tooltip(_("Disk write")).style("font-size: 15px;")
75
+
76
+
50
77
  def build_drawer():
51
78
  """Builds left drawer"""
52
79
  # Setup
@@ -210,35 +237,9 @@ def server_detail(uuid: str):
210
237
  "background-color: rgb(216, 68, 68) !important"
211
238
  )
212
239
 
213
- # Stats section
214
240
  ui.space()
215
- # ui.label(_("System Usage")).style("font-size: 25px opacity: 0.6;")
216
241
  ui.separator()
217
- with ui.grid(rows=2, columns=2).classes("stat-grid"):
218
- # RAM usage
219
- with ui.chip("", icon="donut_large").bind_text_from(
220
- server.monitor, "ram_usage", lambda x: f"{x} MB"
221
- ).classes("stat-chip"):
222
- ui.tooltip(_("RAM usage")).style("font-size: 15px;")
223
- # CPU usage
224
- with ui.chip("", icon="memory").bind_text_from(
225
- server.monitor, "cpu_usage", lambda x: f"{x} %"
226
- ).classes("stat-chip"):
227
- ui.tooltip(_("CPU usage")).style("font-size: 15px;")
228
- # Disk read
229
- with ui.chip("", icon="swap_vert").bind_text_from(
230
- server.monitor,
231
- "disk_read",
232
- lambda x: f"{x} MB/s",
233
- ).classes("stat-chip"):
234
- ui.tooltip(_("Disk read")).style("font-size: 15px;")
235
- # Disk write
236
- with ui.chip("", icon="swap_vert").bind_text_from(
237
- server.monitor,
238
- "disk_write",
239
- lambda x: f"{x} MB/s",
240
- ).classes("stat-chip"):
241
- ui.tooltip(_("Disk write")).style("font-size: 15px;")
242
+ build_server_stats(server)
242
243
 
243
244
  with container:
244
245
  log = ui.log(mcssettings.MAX_LOG_LINES).classes("log-window")
@@ -258,7 +259,7 @@ def server_detail(uuid: str):
258
259
 
259
260
 
260
261
  def create_server_card(server: MinecraftServer):
261
- """Create a server card for server"""
262
+ """Create a server card for the dashboard."""
262
263
  with ui.card().classes("server-card"):
263
264
  with ui.row():
264
265
  ui.link(server.name, f"/server_detail/{server.uuid}").classes(
@@ -284,6 +285,25 @@ def create_server_card(server: MinecraftServer):
284
285
  )
285
286
 
286
287
 
288
+ def render_server_collection(container, server_list):
289
+ """Create the visible server list or empty-state content."""
290
+ if server_list:
291
+ if "content-empty-state" in container.classes:
292
+ container.classes.remove("content-empty-state")
293
+ container.classes("content")
294
+ for server in server_list:
295
+ create_server_card(server=server)
296
+ return
297
+
298
+ container.classes("content content-empty-state")
299
+ with ui.row().classes("center-text-horizontal").style(
300
+ "margin-left: 47% !important;"
301
+ ):
302
+ ui.icon("splitscreen").style("font-size: 80px;")
303
+ with ui.row().classes("center-text-horizontal"):
304
+ ui.label(_("Seems like you don't have any. Let's create one!"))
305
+
306
+
287
307
  @ui.refreshable
288
308
  def home(header: ui.header, container):
289
309
  """Home page"""
@@ -300,20 +320,7 @@ def home(header: ui.header, container):
300
320
 
301
321
  with container.classes("content"):
302
322
  with ui.row(align_items="center").style("width: 100%"):
303
- if server_list:
304
- if "content-empty-state" in container.classes:
305
- container.classes.remove("content-empty-state")
306
- container.classes("content")
307
- for server in server_list:
308
- create_server_card(server=server)
309
- else:
310
- container.classes("content content-empty-state")
311
- with ui.row().classes("center-text-horizontal").style(
312
- "margin-left: 47% !important;"
313
- ):
314
- ui.icon("splitscreen").style("font-size: 80px;")
315
- with ui.row().classes("center-text-horizontal"):
316
- ui.label(_("Seems like you don't have any. Let's create one!"))
323
+ render_server_collection(container, server_list)
317
324
 
318
325
 
319
326
  @ui.page("/edit/{uuid}/{what}")
@@ -81,41 +81,20 @@ class ForgeServer(MinecraftServer):
81
81
  raise ValueError("This is not a Forge server")
82
82
 
83
83
  async def start(self):
84
- """Starts the forge server"""
84
+ """Starts the forge server."""
85
85
  self.starting = True
86
86
  logger.info(f"Starting server {self.uuid}")
87
87
  try:
88
88
  if not os.path.exists(os.path.join(self.server_path, "run.bat")):
89
89
  raise ValueError(_("Unsupported Forge Version. THIS IS NOT A BUG!"))
90
90
 
91
- cmd = ["cmd.exe", "/c", "run.bat"]
92
-
93
- # Start the subprocess
94
- self.process = await asyncio.create_subprocess_exec(
95
- *cmd,
96
- cwd=self.server_path,
97
- stdin=asyncio.subprocess.PIPE,
98
- stdout=asyncio.subprocess.PIPE,
99
- stderr=asyncio.subprocess.STDOUT,
91
+ monitor_task, output_task = await self._spawn_process(
92
+ ["cmd.exe", "/c", "run.bat"],
93
+ self.server_path,
100
94
  )
101
95
 
102
- # Start monitoring the process
103
- self.monitor.process = self.process
104
- monitor_task = asyncio.create_task(self.monitor.run())
105
-
106
- # Start tasks for reading output and taking input
107
- output_task = asyncio.create_task(self._console_reader())
108
- # input_task = asyncio.create_task(self.console_writer())
109
-
110
96
  telemetry_client.send_event("server_start", details=self.settings)
111
- # Wait for the server process to finish
112
- await self.process.wait()
113
-
114
- self.running = False
115
-
116
- # Cancel input and output tasks once the server stops
117
- await asyncio.gather(output_task, return_exceptions=True)
118
- await asyncio.gather(monitor_task, return_exceptions=True)
97
+ await self._await_process_exit(monitor_task, output_task)
119
98
 
120
99
  except FileNotFoundError as e:
121
100
  logger.error(f"Error: {e}")
@@ -128,34 +107,31 @@ class ForgeServer(MinecraftServer):
128
107
  self.running = False
129
108
 
130
109
  async def stop(self):
131
- """
132
- Stops the server. Same as regular stop but
133
- without waiting for the process to finish.
134
- """
135
- if self.process and self.running:
136
- logger.info(f"Stopping server {self.uuid}...")
137
- self.running = False
138
- self.stopping = True
139
- try:
140
- # Send the 'stop' command to the server
141
- if self.process.stdin:
142
- self.process.stdin.write(b"stop\n")
143
- telemetry_client.send_event("server_stop", details=self.settings)
144
- await asyncio.sleep(2)
145
- self.process.stdin.write(b"\n")
146
- await self.process.stdin.drain()
147
-
148
- logger.info(f"Server {self.uuid} stopped.")
149
- except Exception as e:
150
- logger.error(f"Error while stopping the server: {e}")
151
- finally:
152
- # Ensure process cleanup
153
- self.process = None
154
- self.running = False
155
- self.stopping = False
156
- self.monitor.stop()
157
- else:
110
+ """Stops the server with a slightly different shutdown sequence for Forge."""
111
+ if not (self.process and self.running):
158
112
  logger.error("Server is not running.")
113
+ return
114
+
115
+ logger.info(f"Stopping server {self.uuid}...")
116
+ self.running = False
117
+ self.stopping = True
118
+ try:
119
+ if self.process.stdin:
120
+ self.process.stdin.write(b"stop\n")
121
+ telemetry_client.send_event("server_stop", details=self.settings)
122
+ await asyncio.sleep(2)
123
+ self.process.stdin.write(b"\n")
124
+ await self.process.stdin.drain()
125
+
126
+ await self.process.wait()
127
+ logger.info(f"Server {self.uuid} stopped.")
128
+ except Exception as e:
129
+ logger.error(f"Error while stopping the server: {e}")
130
+ finally:
131
+ self.process = None
132
+ self.running = False
133
+ self.stopping = False
134
+ self.monitor.stop()
159
135
 
160
136
  def _create_server(self):
161
137
  """
@@ -206,47 +206,51 @@ class MinecraftServer:
206
206
 
207
207
  logger.info(f"Server {self.uuid} saved!")
208
208
 
209
+ def _build_start_command(self) -> list[str]:
210
+ """Build the Java command that launches this server type."""
211
+ return [
212
+ "java",
213
+ f"-Xmx{self.settings['dedicated_ram']}G",
214
+ f"-Xms{self.settings['dedicated_ram']}G",
215
+ "-jar",
216
+ self.jar_path,
217
+ "nogui" if mcssettings.NOGUI else "",
218
+ ]
219
+
220
+ async def _spawn_process(self, command: list[str], cwd: str | None = None):
221
+ """Start a subprocess for the server and begin monitoring it."""
222
+ self.process = await asyncio.create_subprocess_exec(
223
+ *command,
224
+ cwd=cwd or self.server_path,
225
+ stdin=asyncio.subprocess.PIPE,
226
+ stdout=asyncio.subprocess.PIPE,
227
+ stderr=asyncio.subprocess.STDOUT,
228
+ )
229
+ self.monitor.process = self.process
230
+ monitor_task = asyncio.create_task(self.monitor.run())
231
+ output_task = asyncio.create_task(self._console_reader())
232
+ return monitor_task, output_task
233
+
234
+ async def _await_process_exit(self, monitor_task, output_task):
235
+ """Wait for the server process to exit and clean up background tasks."""
236
+ if self.process is not None:
237
+ await self.process.wait()
238
+ self.running = False
239
+ await asyncio.gather(output_task, return_exceptions=True)
240
+ await asyncio.gather(monitor_task, return_exceptions=True)
241
+
209
242
  async def start(self):
210
- """Starts the server"""
243
+ """Starts the server."""
211
244
  self.starting = True
212
245
  logger.info(f"Starting server {self.uuid}...")
213
246
  try:
214
- cmd = [
215
- "java",
216
- # f"-d{mcssettings.JAVA_BIT_MODEL}",
217
- f"-Xmx{self.settings['dedicated_ram']}G",
218
- f"-Xms{self.settings['dedicated_ram']}G",
219
- "-jar",
220
- self.jar_path,
221
- "nogui" if mcssettings.NOGUI else "",
222
- ]
223
-
224
- # Start the subprocess
225
- self.process = await asyncio.create_subprocess_exec(
226
- *cmd,
227
- cwd=self.server_path,
228
- stdin=asyncio.subprocess.PIPE,
229
- stdout=asyncio.subprocess.PIPE,
230
- stderr=asyncio.subprocess.STDOUT,
247
+ monitor_task, output_task = await self._spawn_process(
248
+ self._build_start_command(),
249
+ self.server_path,
231
250
  )
232
251
 
233
- # Start monitoring the process
234
- self.monitor.process = self.process
235
- monitor_task = asyncio.create_task(self.monitor.run())
236
-
237
- # Start tasks for reading output and taking input
238
- output_task = asyncio.create_task(self._console_reader())
239
- # input_task = asyncio.create_task(self.console_writer())
240
-
241
252
  telemetry_client.send_event("server_start", details=self.settings)
242
- # Wait for the server process to finish
243
- await self.process.wait()
244
-
245
- self.running = False
246
-
247
- # Cancel input and output tasks once the server stops
248
- await asyncio.gather(output_task, return_exceptions=True)
249
- await asyncio.gather(monitor_task, return_exceptions=True)
253
+ await self._await_process_exit(monitor_task, output_task)
250
254
 
251
255
  except FileNotFoundError as e:
252
256
  logger.error(f"Error: {e}")
@@ -258,32 +262,36 @@ class MinecraftServer:
258
262
  self.starting = False
259
263
  self.running = False
260
264
 
261
- async def stop(self):
262
- """Stops the server"""
263
- if self.process and self.running:
264
- logger.info(f"Stopping server {self.uuid}...")
265
+ async def _stop_process(self, stop_command: bytes = b"stop\n"):
266
+ """Gracefully stop a running server and finalize the lifecycle."""
267
+ if not (self.process and self.running):
268
+ logger.warning("Server is not running.")
269
+ return False
270
+
271
+ logger.info(f"Stopping server {self.uuid}...")
272
+ self.running = False
273
+ self.stopping = True
274
+ try:
275
+ if self.process.stdin:
276
+ self.process.stdin.write(stop_command)
277
+ await self.process.stdin.drain()
278
+
279
+ await self.process.wait()
280
+ telemetry_client.send_event("server_stop", details=self.settings)
281
+ logger.info(f"Server {self.uuid} stopped.")
282
+ return True
283
+ except Exception as e:
284
+ logger.info(f"Error while stopping the server: {e}")
285
+ return False
286
+ finally:
287
+ self.process = None
265
288
  self.running = False
266
- self.stopping = True
267
- try:
268
- # Send the 'stop' command to the server
269
- if self.process.stdin:
270
- self.process.stdin.write(b"stop\n")
271
- await self.process.stdin.drain()
289
+ self.stopping = False
290
+ self.monitor.stop()
272
291
 
273
- # Wait for the process to terminate gracefully
274
- await self.process.wait()
275
- telemetry_client.send_event("server_stop", details=self.settings)
276
- logger.info(f"Server {self.uuid} stopped.")
277
- except Exception as e:
278
- logger.info(f"Error while stopping the server: {e}")
279
- finally:
280
- # Ensure process cleanup
281
- self.process = None
282
- self.running = False
283
- self.stopping = False
284
- self.monitor.stop()
285
- else:
286
- logger.warning("Server is not running.")
292
+ async def stop(self):
293
+ """Stops the server."""
294
+ await self._stop_process()
287
295
 
288
296
  async def console_writer(self, command: str):
289
297
  """Reads user input and sends it to the server."""
@@ -34,9 +34,26 @@ server_types = {
34
34
  2: "Forge",
35
35
  }
36
36
 
37
+ DEFAULT_SERVER_SETTINGS = {
38
+ "name": "",
39
+ "dedicated_ram": 2,
40
+ "version": "",
41
+ "jar_type": 0,
42
+ "address": "default",
43
+ "port": 25565,
44
+ }
45
+
37
46
  urls = None # pylint: disable=invalid-name
38
47
 
39
48
 
49
+ def get_default_server_settings() -> dict:
50
+ """Return the default values used for creating a server."""
51
+ return {
52
+ **DEFAULT_SERVER_SETTINGS,
53
+ "dedicated_ram": get_suggested_ram(),
54
+ }
55
+
56
+
40
57
  def get_system_total_ram():
41
58
  """Total ram on device in GB"""
42
59
  return round(psutil.virtual_memory().total / (1024**3))
@@ -145,17 +162,9 @@ def open_file_explorer(path: str):
145
162
 
146
163
 
147
164
  def popup_create_server():
148
- """Create server popup window"""
149
- # local variables
165
+ """Create server popup window."""
150
166
  system_ram = get_system_total_ram()
151
- server_settings = {
152
- "name": "",
153
- "dedicated_ram": get_suggested_ram(),
154
- "version": "",
155
- "jar_type": 0,
156
- "address": "default",
157
- "port": 25565,
158
- }
167
+ server_settings = get_default_server_settings()
159
168
 
160
169
  async def _create_server(caller: ui.button, settings: dict):
161
170
  caller.disable()
@@ -174,14 +183,7 @@ def popup_create_server():
174
183
  create_server(settings=settings.copy())
175
184
 
176
185
  # Reset settings and name
177
- settings = {
178
- "name": "",
179
- "dedicated_ram": get_suggested_ram(),
180
- "version": "",
181
- "jar_type": 0,
182
- "address": "default",
183
- "port": 25565,
184
- }
186
+ settings = get_default_server_settings()
185
187
 
186
188
  # Notify user
187
189
  caller.enable()
@@ -246,4 +246,27 @@
246
246
  top: 10px !important;
247
247
  right: 50px !important;
248
248
  outline: transparent !important;
249
+ }
250
+
251
+ /* Ensure NiceGUI default button styles don't make every button primary-colored.
252
+ Reset generic button background for buttons that don't explicitly opt-in
253
+ to the primary styling, then re-apply our semantic classes. */
254
+ .q-btn:not(.normal-primary-button):not(.drawer-button-primary):not(.start-button):not(.stop-button) {
255
+ background-color: rgb(70, 70, 70) !important;
256
+ color: white !important;
257
+ box-shadow: none !important;
258
+ }
259
+
260
+ /* Primary semantic buttons */
261
+ .normal-primary-button,
262
+ .drawer-button-primary {
263
+ background-color: rgba(15, 255, 175, 0.726) !important;
264
+ color: black !important;
265
+ }
266
+
267
+ /* Secondary semantic buttons (explicit) */
268
+ .normal-secondary-button,
269
+ .drawer-button {
270
+ background-color: rgb(70, 70, 70) !important;
271
+ color: white !important;
249
272
  }