rustplus 6.0.3__tar.gz → 6.0.4__tar.gz

{rustplus-6.0.3/rustplus.egg-info → rustplus-6.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: rustplus
-Version: 6.0.3
+Version: 6.0.4
 Summary: A python wrapper for the Rust Plus API
 Home-page: https://github.com/olijeffers0n/rustplus
 Author: olijeffers0n
@@ -18,6 +18,15 @@ Requires-Dist: requests
 Requires-Dist: numpy
 Requires-Dist: scipy
 Requires-Dist: betterproto==2.0.0b6
+Dynamic: author
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 ![Rust+.py](https://raw.githubusercontent.com/olijeffers0n/rustplus/master/icon.png)
 <div align = "center">

{rustplus-6.0.3 → rustplus-6.0.4}/rustplus/__init__.py

@@ -8,10 +8,10 @@ from .annotations import Command, ChatEvent, ProtobufEvent, TeamEvent, EntityEve
 from .remote.fcm import FCMListener
 from .commands import CommandOptions, ChatCommand
 from .events import ChatEventPayload, TeamEventPayload, EntityEventPayload
-from .utils import convert_event_type_to_name, Emoji
+from .utils import convert_event_type_to_name, Emoji, convert_coordinates
 from .structs import RustError, RustMarker
 
 __name__ = "rustplus"
 __author__ = "olijeffers0n"
-__version__ = "6.0.3"
+__version__ = "6.0.4"
 __support__ = "Discord: https://discord.gg/nQqJe8qvP8"

{rustplus-6.0.3 → rustplus-6.0.4}/rustplus/rust_api.py

@@ -147,7 +147,7 @@ class RustSocket:
         response = await self.ws.send_and_get(packet)
 
         if response is None:
-            return RustError("get_time", "misc")
+            return RustError("get_time", "No response received")
 
         if error_present(response):
             return RustError("get_time", response.response.error.error)
@@ -185,7 +185,7 @@ class RustSocket:
         response = await self.ws.send_and_get(packet)
 
         if response is None:
-            return RustError("get_info", "misc")
+            return RustError("get_info", "No response received")
 
         if error_present(response):
             return RustError("get_info", response.response.error.error)
@@ -203,7 +203,7 @@ class RustSocket:
         response = await self.ws.send_and_get(packet)
 
         if response is None:
-            return RustError("get_team_chat", "misc")
+            return RustError("get_team_chat", "No response received")
 
         if error_present(response):
             return RustError("get_team_chat", response.response.error.error)
@@ -223,7 +223,7 @@ class RustSocket:
         response = await self.ws.send_and_get(packet)
 
         if response is None:
-            return RustError("get_team_info", "misc")
+            return RustError("get_team_info", "No response received")
 
         if error_present(response):
             return RustError("get_team_info", response.response.error.error)
@@ -241,7 +241,7 @@ class RustSocket:
         response = await self.ws.send_and_get(packet)
 
         if response is None:
-            return RustError("get_markers", "misc")
+            return RustError("get_markers", "No response received")
 
         if error_present(response):
             return RustError("get_markers", response.response.error.error)
@@ -283,7 +283,7 @@ class RustSocket:
         response = await self.ws.send_and_get(packet)
 
         if response is None:
-            return RustError("get_map", "misc")
+            return RustError("get_map", "No response received")
 
         if error_present(response):
             return RustError("get_map", response.response.error.error)
@@ -381,7 +381,7 @@ class RustSocket:
         response = await self.ws.send_and_get(packet)
 
         if response is None:
-            return RustError("get_map_info", "misc")
+            return RustError("get_map_info", "No response received")
 
         if error_present(response):
             return RustError("get_map_info", response.response.error.error)
@@ -403,7 +403,7 @@ class RustSocket:
         response = await self.ws.send_and_get(packet)
 
         if response is None:
-            return RustError("get_entity_info", "misc")
+            return RustError("get_entity_info", "No response received")
 
         if error_present(response):
             return RustError("get_entity_info", response.response.error.error)
@@ -455,7 +455,7 @@ class RustSocket:
         response = await self.ws.send_and_get(packet)
 
         if response is None:
-            return RustError("check_subscription_to_entity", "misc")
+            return RustError("check_subscription_to_entity", "No response received")
 
         if error_present(response):
             return RustError(
@@ -552,7 +552,7 @@ class RustSocket:
         response = await self.ws.send_and_get(packet)
 
         if response is None:
-            return RustError("get_camera_manager", "misc")
+            return RustError("get_camera_manager", "No response received")
 
         if error_present(response):
             return RustError("get_camera_manager", response.response.error.error)

{rustplus-6.0.3 → rustplus-6.0.4}/rustplus/structs/rust_error.py

@@ -1,8 +1,13 @@
+import logging
+from typing import Any
+
 from .serialization import Serializable
 
 
 class RustError(Serializable):
 
+    LOGGER = logging.getLogger("rustplus.py")
+
     def __init__(self, method: str, reason: str) -> None:
         self._method = method
         self._reason = reason
@@ -17,3 +22,12 @@ class RustError(Serializable):
 
     def __str__(self) -> str:
         return f"Error Propagating from {self._method}: {self._reason}"
+
+    def __getattr__(self, attr_name: str) -> Any:
+        if attr_name in self.__dict__:
+            return self.__dict__[attr_name]
+
+        # This means we are gonna chuck the error in the user's face
+        self.LOGGER.error(
+            f"An Unhandled Error has occurred over the {self._method} method, reason: {self.reason}"
+        )

{rustplus-6.0.3 → rustplus-6.0.4}/rustplus/utils/__init__.py

@@ -7,6 +7,7 @@ from .utils import (
     convert_marker,
     convert_monument,
     convert_event_type_to_name,
+    convert_coordinates
 )
 from .grab_items import translate_stack_to_id, translate_id_to_stack
 from .yielding_event import YieldingEvent

{rustplus-6.0.3 → rustplus-6.0.4}/rustplus/utils/utils.py

@@ -81,6 +81,15 @@ def generate_grid(
     return img
 
 
+def convert_coordinates(coords: Tuple[int, int], map_size: int) -> Tuple[str, int]:
+    grids = list(string.ascii_uppercase)
+    grids.extend(
+        a + b for a in string.ascii_uppercase for b in string.ascii_uppercase
+    )
+
+    return grids[int(coords[0] // GRID_DIAMETER)], int((map_size - coords[1]) // GRID_DIAMETER)
+
+
 def format_coord(x: int, y: int, map_size: int) -> Tuple[int, int]:
     # Adjust y and x coordinates with offsets
     y = max(0, min(map_size - y - 75, map_size - 150))

{rustplus-6.0.3 → rustplus-6.0.4/rustplus.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: rustplus
-Version: 6.0.3
+Version: 6.0.4
 Summary: A python wrapper for the Rust Plus API
 Home-page: https://github.com/olijeffers0n/rustplus
 Author: olijeffers0n
@@ -18,6 +18,15 @@ Requires-Dist: requests
 Requires-Dist: numpy
 Requires-Dist: scipy
 Requires-Dist: betterproto==2.0.0b6
+Dynamic: author
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 ![Rust+.py](https://raw.githubusercontent.com/olijeffers0n/rustplus/master/icon.png)
 <div align = "center">