Skip to content
This repository was archived by the owner on Apr 27, 2019. It is now read-only.

Commit b11e744

Browse files
committed
Merge pull request #133 from kharidiron/master
Lets get this new version live. way late. <.<
2 parents 2a2501a + 61a1f6f commit b11e744

12 files changed

Lines changed: 369 additions & 222 deletions

File tree

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
StarryPy is Twisted-based plugin-driven Starbound server wrapper. It is currently
44
in beta.
55

6+
**NOTE! Player warping is currently __broken__**
7+
68
## Features
79

810
With the built-in plugins (which are removable):
@@ -15,7 +17,7 @@ With the built-in plugins (which are removable):
1517
* Join/quit announcements.
1618
* And more.
1719

18-
## Version 1.5 is here!
20+
## Version 1.6 is here!
1921

2022
With this most recent release, we are compatible with the current release of Starbound (Upbeat Giraffe). Any bugs found in the process, please open an issue ticket, so we can squash them as quickly as possible.
2123

base_plugin.py

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,10 @@ def on_update_world_properties(self, data):
176176
def on_heartbeat(self, data):
177177
return True
178178

179-
def on_connect_response(self, data):
179+
def on_connect_success(self, data):
180+
return True
181+
182+
def on_connect_failure(self, data):
180183
return True
181184

182185
def on_chat_sent(self, data):
@@ -194,6 +197,9 @@ def on_client_disconnect_request(self, player):
194197
def on_player_warp(self, data):
195198
return True
196199

200+
def on_player_warp_result(self, data):
201+
return True
202+
197203
def on_fly_ship(self, data):
198204
return True
199205

@@ -332,7 +338,10 @@ def after_update_world_properties(self, data):
332338
def after_heartbeat(self, data):
333339
return True
334340

335-
def after_connect_response(self, data):
341+
def after_connect_success(self, data):
342+
return True
343+
344+
def after_connect_failure(self, data):
336345
return True
337346

338347
def after_chat_sent(self, data):
@@ -350,6 +359,9 @@ def after_client_disconnect_request(self, data):
350359
def after_player_warp(self, data):
351360
return True
352361

362+
def after_player_warp_result(self, data):
363+
return True
364+
353365
def after_fly_ship(self, data):
354366
return True
355367

packets/data_types.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import logging
2-
from construct import Construct, Struct, Byte, BFloat64, Flag, \
2+
from construct import Construct, Struct, Byte, BFloat32, BFloat64, Flag, \
33
String, Container, Field
44
from construct.core import _read_stream, _write_stream, Adapter
55

@@ -85,6 +85,18 @@ def _parse(self, stream, context):
8585
l = VLQ("").parse_stream(stream)
8686
return [Variant("").parse_stream(stream) for _ in range(l)]
8787

88+
class ChunkVariant(Construct):
89+
def _parse(self, stream, context):
90+
l = VLQ("").parse_stream(stream)
91+
c = {}
92+
for x in range(l):
93+
junk1 = Byte("").parse_stream(stream)
94+
junk2 = Byte("").parse_stream(stream)
95+
junk3 = BFloat32("").parse_stream(stream)
96+
junk4 = Byte("").parse_stream(stream)
97+
junk5 = StarByteArray("").parse_stream(stream)
98+
return c
99+
88100
class DictVariant(Construct):
89101
def _parse(self, stream, context):
90102
l = VLQ("").parse_stream(stream)

0 commit comments

Comments
 (0)