CLI: Bedrock support and misc improvements

mcstatus/__main__.py

@@ -65,8 +65,8 @@ def json(server: SupportedServers) -> int:
 
         if isinstance(server, JavaServer):
             query_res = server.query(tries=1)
-            data["host_ip"] = query_res.raw["hostip"]
-            data["host_port"] = query_res.raw["hostport"]
+            data["host_ip"] = query_res.hostip
+            data["host_port"] = query_res.hostport
             data["map"] = query_res.map
             data["plugins"] = query_res.software.plugins
     except Exception:  # TODO: Check what this actually excepts
@@ -93,7 +93,7 @@ def query(server: SupportedServers) -> int:
         )
         return 1
 
-    print(f"host: {response.raw['hostip']}:{response.raw['hostport']}")
+    print(f"host: {response.hostip}:{response.hostport}")
     print(f"software: v{response.software.version} {response.software.brand}")
     print(f"plugins: {response.software.plugins}")
     print(f"motd: {response.motd.to_ansi()}")

mcstatus/querier.py

@@ -132,6 +132,8 @@ def __init__(self, version: str, plugins: str):
     map: str
     players: Players
     software: Software
+    hostip: str
+    hostport: int
 
     def __init__(self, raw: dict[str, str], players: list[str]):
         try:
@@ -140,8 +142,10 @@ def __init__(self, raw: dict[str, str], players: list[str]):
             self.map = raw["map"]
             self.players = QueryResponse.Players(raw["numplayers"], raw["maxplayers"], players)
             self.software = QueryResponse.Software(raw["version"], raw["plugins"])
-        except KeyError:
-            raise ValueError("The provided data is not valid")
+            self.hostip = raw["hostip"]
+            self.hostport = int(raw["hostport"])
+        except KeyError as e:
+            raise ValueError("The provided data is not valid") from e
 
     @classmethod
     def from_connection(cls, response: Connection) -> Self: