Update necto to new rlgym_compat

Author: VirxEC

.gitignore

@@ -178,3 +178,4 @@ pyrightconfig.json
 .vscode/
 *.obj
 RLBotServer*
+collision_meshes/

rlbot/interface.py

@@ -1,10 +1,11 @@
 import logging
+from collections.abc import Callable
 from enum import IntEnum
 from pathlib import Path
 from socket import IPPROTO_TCP, TCP_NODELAY, socket, timeout
 from threading import Thread
 from time import sleep
-from typing import Callable, Optional
+from typing import Optional
 
 from rlbot import flat
 from rlbot.utils.logging import get_logger

rlbot/managers/rendering.py

@@ -1,4 +1,5 @@
-from typing import Callable, Optional, Sequence
+from collections.abc import Callable, Sequence
+from typing import Optional
 
 from rlbot import flat
 from rlbot.interface import SocketRelay

tests/necto/bot.py

@@ -1,8 +1,10 @@
+from pathlib import Path
 import numpy as np
 import torch
 from agent import Agent
 from necto_obs import NectoObsBuilder
-from rlgym_compat import GameState
+from rlgym_compat import V1GameState
+from rlgym_compat.sim_extra_info import SimExtraInfo
 
 from rlbot.flat import ControllerState, GameStateType, GameTickPacket, Vector3
 from rlbot.managers import Bot
@@ -33,6 +35,8 @@
     ]
 )
 
+COLLISION_MESH_PATH = Path(__file__).parent / "collision_meshes"
+
 
 class Necto(Bot):
     agent = Agent()
@@ -51,6 +55,8 @@ class Necto(Bot):
     kickoff_index = -1
     ticks = tick_skip  # So we take an action the first tick
 
+    sim_extra_info: SimExtraInfo | None = None
+
     def initialize_agent(self):
         # Initialize the rlgym GameState object now that the game is active and the info is available
         self.obs_builder = NectoObsBuilder(self.field_info)
@@ -62,7 +68,14 @@ def initialize_agent(self):
                 "\n".join(map(str, self.field_info.boost_pads)),
             )
 
-        self.game_state = GameState(self.field_info, self.tick_skip)
+        self.game_state = V1GameState(
+            self.field_info, self.match_settings, self.tick_skip
+        )
+
+        if COLLISION_MESH_PATH.exists():
+            self.sim_extra_info = SimExtraInfo(
+                self.field_info, self.match_settings, self.tick_skip
+            )
 
         self.logger.warning(
             "Remember to run Necto at 120fps with vsync off! "
@@ -124,7 +137,11 @@ def get_output(self, packet: GameTickPacket) -> ControllerState:
         if len(packet.balls) == 0:
             return self.controls
 
-        self.game_state.decode(packet)
+        extra_info = None
+        if self.sim_extra_info is not None:
+            extra_info = self.sim_extra_info.get_extra_info(packet)
+
+        self.game_state.update(packet, extra_info)
 
         if self.update_action == 1 and len(self.game_state.players) > self.index:
             self.update_action = 0

tests/necto/necto_obs.py

@@ -1,8 +1,7 @@
 from collections import Counter
 
 import numpy as np
-from rlgym_compat.common_values import BLUE_TEAM, ORANGE_TEAM
-from rlgym_compat.game_state import GameState, PlayerData
+from rlgym_compat import BLUE_TEAM, ORANGE_TEAM, V1GameState, V1PlayerData
 
 from rlbot import flat
 
@@ -30,11 +29,11 @@ def __init__(self, field_info: flat.FieldInfo, tick_skip: int = 8):
             [bp.is_full_boost for bp in field_info.boost_pads]
         )
 
-    def reset(self, initial_state: GameState):
+    def reset(self, initial_state: V1GameState):
         self.demo_timers = Counter()
         self.boost_timers = np.zeros(len(initial_state.boost_pads))
 
-    def _maybe_update_obs(self, state: GameState):
+    def _maybe_update_obs(self, state: V1GameState):
         if self.boost_timers is None:
             self.reset(state)
         else:
@@ -109,7 +108,7 @@ def _maybe_update_obs(self, state: GameState):
         self.current_mask = mask
 
     def build_obs(
-        self, player: PlayerData, state: GameState, previous_action: np.ndarray
+        self, player: V1PlayerData, state: V1GameState, previous_action: np.ndarray
     ) -> tuple[np.ndarray, np.ndarray, np.ndarray]:
         self._maybe_update_obs(state)
         invert = player.team_num == ORANGE_TEAM

tests/necto/requirements.txt

@@ -1,5 +1,6 @@
 rlbot==5.*
 numpy==1.*
-rlgym_compat @ git+https://github.com/JPK314/rlgym-compat@v5-rework
---find-links https://download.pytorch.org/whl/torch_stable.html
-torch==2.3.1+cpu
+rocketsim==2.1.*
+rlgym_compat @ git+https://github.com/JPK314/rlgym-compat@rlgymv2-rlbot-v5
+--extra-index-url https://download.pytorch.org/whl/cpu
+torch