Skip to content

Commit cc671a7

Browse files
committed
Update to the newest flatbuffers spec
1 parent 8b5df06 commit cc671a7

File tree

5 files changed

+14
-11
lines changed

5 files changed

+14
-11
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ description = "A high performance Python interface for communicating with RLBot
88
dynamic = ["version"]
99
requires-python = ">= 3.11"
1010
dependencies = [
11-
"rlbot_flatbuffers~=0.11.5",
11+
"rlbot_flatbuffers~=0.12.0",
1212
"psutil==6.*",
1313
]
1414
readme = "README.md"

rlbot/interface.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,15 +172,15 @@ def connect(
172172
*,
173173
wants_match_communications: bool,
174174
wants_ball_predictions: bool,
175-
close_after_match: bool = True,
175+
close_between_matches: bool = True,
176176
rlbot_server_port: int = RLBOT_SERVER_PORT,
177177
):
178178
"""
179179
Connects to the RLBot server specifying the given settings.
180180
181181
- wants_match_communications: Whether match communication messages should be sent to this process.
182182
- wants_ball_predictions: Whether ball prediction messages should be sent to this process.
183-
- close_after_match: Whether RLBot should close this connection between matches, specifically upon
183+
- close_between_matches: Whether RLBot should close this connection between matches, specifically upon
184184
`StartMatch` and `StopMatch` messages, since RLBot does not actually detect the ending of matches.
185185
"""
186186
assert not self.is_connected, "Connection has already been established"
@@ -231,7 +231,7 @@ def connect(
231231
agent_id=self.agent_id,
232232
wants_ball_predictions=wants_ball_predictions,
233233
wants_comms=wants_match_communications,
234-
close_after_match=close_after_match,
234+
close_between_matches=close_between_matches,
235235
).pack()
236236
self.send_bytes(flatbuffer, SocketDataType.CONNECTION_SETTINGS)
237237

rlbot/managers/match.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def get_player_loadout(path: str, team: int) -> flat.PlayerLoadout:
5757

5858

5959
def get_player_config(
60-
type: flat.RLBot | flat.Psyonix, team: int, path: Path | str
60+
type: flat.CustomBot | flat.Psyonix, team: int, path: Path | str
6161
) -> flat.PlayerConfiguration:
6262
"""
6363
Reads the bot toml file at the provided path and
@@ -198,21 +198,21 @@ def connect(
198198
*,
199199
wants_match_communications: bool,
200200
wants_ball_predictions: bool,
201-
close_after_match: bool = True,
201+
close_between_matches: bool = True,
202202
rlbot_server_port: int = RLBOT_SERVER_PORT,
203203
):
204204
"""
205205
Connects to the RLBot server specifying the given settings.
206206
207207
- wants_match_communications: Whether match communication messages should be sent to this process.
208208
- wants_ball_predictions: Whether ball prediction messages should be sent to this process.
209-
- close_after_match: Whether RLBot should close this connection between matches, specifically upon
209+
- close_between_matches: Whether RLBot should close this connection between matches, specifically upon
210210
`StartMatch` and `StopMatch` messages, since RLBot does not actually detect the ending of matches.
211211
"""
212212
self.rlbot_interface.connect(
213213
wants_match_communications=wants_match_communications,
214214
wants_ball_predictions=wants_ball_predictions,
215-
close_after_match=close_after_match,
215+
close_between_matches=close_between_matches,
216216
rlbot_server_port=rlbot_server_port,
217217
)
218218

@@ -238,7 +238,7 @@ def start_match(
238238
self.rlbot_interface.connect(
239239
wants_match_communications=False,
240240
wants_ball_predictions=False,
241-
close_after_match=False,
241+
close_between_matches=False,
242242
)
243243
self.rlbot_interface.run(background_thread=True)
244244

rlbot/version.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = "5.0.0-beta.14"
1+
__version__ = "5.0.0-beta.15"
22

33

44
RESET_SEQ = "\033[0m"
@@ -15,6 +15,9 @@ def _get_color(color: int) -> str:
1515
)
1616

1717
RELEASE_NOTES = {
18+
"5.0.0-beta.15": """
19+
- Update to the newest flatbuffers spec
20+
""",
1821
"5.0.0-beta.14": """
1922
- Add warning to Renderer when trying to render without calling `begin_rendering` first
2023
""",

tests/run_only.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
CURRENT_FILE = Path(__file__).parent
66

77
MATCH_CONFIG_PATH = CURRENT_FILE / "human_vs_necto.toml"
8-
RLBOT_SERVER_FOLDER = CURRENT_FILE / "../../core/RLBotCS/bin/Release/"
8+
RLBOT_SERVER_FOLDER = CURRENT_FILE / "../"
99

1010
if __name__ == "__main__":
1111
# start the match

0 commit comments

Comments
 (0)