rustplus 6.0.4__tar.gz → 6.0.7__tar.gz

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: rustplus
-Version: 6.0.4
+Version: 6.0.7
 Summary: A python wrapper for the Rust Plus API
 Home-page: https://github.com/olijeffers0n/rustplus
 Author: olijeffers0n
@@ -17,12 +17,13 @@ Requires-Dist: http-ece
 Requires-Dist: requests
 Requires-Dist: numpy
 Requires-Dist: scipy
-Requires-Dist: betterproto==2.0.0b6
+Requires-Dist: betterproto==2.0.0b7
 Dynamic: author
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: project-url
 Dynamic: requires-dist
 Dynamic: requires-python

{rustplus-6.0.4 → rustplus-6.0.7}/requirements.txt

@@ -6,4 +6,4 @@ http-ece
 requests
 numpy
 scipy
-betterproto==2.0.0b6
+betterproto==2.0.0b7

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

@@ -6,12 +6,13 @@ from .rust_api import RustSocket
 from .identification import ServerDetails
 from .annotations import Command, ChatEvent, ProtobufEvent, TeamEvent, EntityEvent
 from .remote.fcm import FCMListener
+from .remote.camera import MovementControls, CameraMovementOptions
 from .commands import CommandOptions, ChatCommand
 from .events import ChatEventPayload, TeamEventPayload, EntityEventPayload
 from .utils import convert_event_type_to_name, Emoji, convert_coordinates
-from .structs import RustError, RustMarker
+from .structs import RustError, RustMarker, Vector
 
 __name__ = "rustplus"
 __author__ = "olijeffers0n"
-__version__ = "6.0.4"
+__version__ = "6.0.7"
 __support__ = "Discord: https://discord.gg/nQqJe8qvP8"

{rustplus-6.0.4 → rustplus-6.0.7}/rustplus/remote/camera/camera_manager.py

@@ -155,7 +155,7 @@ class CameraManager:
         subscribe.camera_id = self._cam_id
         packet.camera_subscribe = subscribe
 
-        self.rust_socket.ws.send_message(packet, True)
+        await self.rust_socket.ws.send_message(packet, True)
 
         self.time_since_last_subscribe = time.time()
         self._open = True

{rustplus-6.0.4 → rustplus-6.0.7}/rustplus/remote/rustplus_proto/rustplus.py

@@ -1,6 +1,8 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # sources: rustplus.proto
 # plugin: python-betterproto
+# This file has been @generated
+
 from dataclasses import dataclass
 from typing import List
 
@@ -8,6 +10,7 @@ import betterproto
 
 
 class AppEntityType(betterproto.Enum):
+    UnknownType = 0
     Switch = 1
     Alarm = 2
     StorageMonitor = 3
@@ -27,6 +30,7 @@ class AppMarkerType(betterproto.Enum):
 
 
 class AppCameraRaysEntityType(betterproto.Enum):
+    UnknownType = 0
     Tree = 1
     Player = 2
 
@@ -278,6 +282,7 @@ class AppInfo(betterproto.Message):
     nexus: str = betterproto.string_field(13)
     nexus_id: int = betterproto.int32_field(14)
     nexus_zone: str = betterproto.string_field(15)
+    cameras_enabled: bool = betterproto.bool_field(16)
 
 
 @dataclass
@@ -427,7 +432,7 @@ class AppClanChat(betterproto.Message):
 
 @dataclass
 class AppNexusAuth(betterproto.Message):
-    server_details: str = betterproto.string_field(1)
+    server_id: str = betterproto.string_field(1)
     player_token: int = betterproto.int32_field(2)
 
 

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

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

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

@@ -83,11 +83,11 @@ def generate_grid(
 
 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
-    )
+    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)
+    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]:
@@ -217,6 +217,7 @@ def convert_monument(name: str, override_images: Dict[str, Image.Image]) -> Imag
         "mining_quarry_hqm_display_name": "mining_quarry_hqm.png",
         "train_tunnel_link_display_name": "train.png",
         "train_tunnel_display_name": "train.png",
+        "radtown": "radtown.png",
     }
 
     try:

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: rustplus
-Version: 6.0.4
+Version: 6.0.7
 Summary: A python wrapper for the Rust Plus API
 Home-page: https://github.com/olijeffers0n/rustplus
 Author: olijeffers0n
@@ -17,12 +17,13 @@ Requires-Dist: http-ece
 Requires-Dist: requests
 Requires-Dist: numpy
 Requires-Dist: scipy
-Requires-Dist: betterproto==2.0.0b6
+Requires-Dist: betterproto==2.0.0b7
 Dynamic: author
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: project-url
 Dynamic: requires-dist
 Dynamic: requires-python

{rustplus-6.0.4 → rustplus-6.0.7}/rustplus.egg-info/SOURCES.txt

@@ -59,6 +59,7 @@ rustplus/icons/outpost.png
 rustplus/icons/oxums.png
 rustplus/icons/patrol.png
 rustplus/icons/power_plant.png
+rustplus/icons/radtown.png
 rustplus/icons/satellite.png
 rustplus/icons/sewer.png
 rustplus/icons/small_oil_rig.png

{rustplus-6.0.4 → rustplus-6.0.7}/rustplus.egg-info/requires.txt

@@ -6,4 +6,4 @@ http-ece
 requests
 numpy
 scipy
-betterproto==2.0.0b6
+betterproto==2.0.0b7

{rustplus-6.0.4 → rustplus-6.0.7}/setup.py

@@ -12,23 +12,23 @@ with open("requirements.txt") as input_file:
     for line in input_file.readlines():
         requirements.append(line.strip())
 
-with open("README.md", errors='ignore') as input_file:
+with open("README.md", errors="ignore") as input_file:
     readme = input_file.read()
 
 setup(
-    name='rustplus',
-    author='olijeffers0n',
-    url='https://github.com/olijeffers0n/rustplus',
+    name="rustplus",
+    author="olijeffers0n",
+    url="https://github.com/olijeffers0n/rustplus",
     project_urls={
         "Issue tracker": "https://github.com/olijeffers0n/rustplus/issues",
     },
     version=version,
-    packages=find_packages(include=['rustplus', 'rustplus.*']),
-    license='MIT',
-    description='A python wrapper for the Rust Plus API',
+    packages=find_packages(include=["rustplus", "rustplus.*"]),
+    license="MIT",
+    description="A python wrapper for the Rust Plus API",
     long_description=readme,
     include_package_data=True,
-    long_description_content_type='text/markdown',
+    long_description_content_type="text/markdown",
     install_requires=requirements,
-    python_requires='>=3.8.0',
+    python_requires=">=3.8.0",
 )