rustplus 6.0.5__tar.gz → 6.0.8__tar.gz

{rustplus-6.0.5/rustplus.egg-info → rustplus-6.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: rustplus
-Version: 6.0.5
+Version: 6.0.8
 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.5 → rustplus-6.0.8}/requirements.txt

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

{rustplus-6.0.5 → rustplus-6.0.8}/rustplus/__init__.py

@@ -14,5 +14,5 @@ from .structs import RustError, RustMarker, Vector
 
 __name__ = "rustplus"
 __author__ = "olijeffers0n"
-__version__ = "6.0.5"
+__version__ = "6.0.8"
 __support__ = "Discord: https://discord.gg/nQqJe8qvP8"

{rustplus-6.0.5 → rustplus-6.0.8}/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.5 → rustplus-6.0.8}/rustplus/rust_api.py

@@ -333,7 +333,7 @@ class RustSocket:
             for marker in map_markers:
                 if add_events:
                     if marker.type in [2, 4, 5, 6, 8]:
-                        icon = convert_marker(str(marker.type), marker.rotation)
+                        icon = convert_marker(int(marker.type), marker.rotation)
                         if marker.type == 6:
                             x, y = marker.x, marker.y
                             y = min(max(y, 0), map_size)

{rustplus-6.0.5 → rustplus-6.0.8}/rustplus/utils/utils.py

@@ -144,31 +144,31 @@ async def avatar_processing(
     return border_image
 
 
-def convert_marker(name, angle) -> Image.Image:
+def convert_marker(marker_type: int, angle) -> Image.Image:
     name_to_file = {
-        "2": "explosion.png",
-        "4": "chinook.png",
-        "5": "cargo.png",
-        "6": "crate.png",
-        "8": "patrol.png",
+        2: "explosion.png",
+        4: "chinook.png",
+        5: "cargo.png",
+        6: "crate.png",
+        8: "patrol.png",
     }
 
-    with resources.path(ICONS_PATH, name_to_file[name]) as path:
+    with resources.path(ICONS_PATH, name_to_file[marker_type]) as path:
         icon = Image.open(path).convert("RGBA")
 
-    if name == "6":
+    if marker_type == 6:
         icon = icon.resize((85, 85))
-    elif name == "2":
+    elif marker_type == 2:
         icon = icon.resize((96, 96))
-    elif name in ["4", "8"]:
+    elif marker_type == 4 or marker_type == 8:
         blades_file = "chinook_blades.png"
-        blades_size = (100, 100) if name == "4" else (200, 200)
+        blades_size = (100, 100) if marker_type == 4 else (200, 200)
 
         with resources.path(ICONS_PATH, blades_file) as path:
             blades = Image.open(path).convert("RGBA")
         blades = blades.resize(blades_size)
 
-        if name == "4":
+        if marker_type == 4:
             icon.paste(blades, (64 - 50, 96 - 50), blades)
             icon.paste(blades, (64 - 50, 32 - 50), blades)
         else:
@@ -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.5 → rustplus-6.0.8/rustplus.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: rustplus
-Version: 6.0.5
+Version: 6.0.8
 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.5 → rustplus-6.0.8}/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.5 → rustplus-6.0.8}/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.5 → rustplus-6.0.8}/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",
 )