Skip to content

Commit 772ebc1

Browse files
SpaceWalkerRSSpaceWalkerRS
committed
finish PacketBuffer impls
1 parent b768337 commit 772ebc1

File tree

41 files changed

+1003
-473
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1003
-473
lines changed

‎libraries/networking-impl/networking-impl-mc1.13-pre3-mc1.13-pre3/src/main/java/net/ornithemc/osl/networking/impl/Networking.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public void init() {
2424
MinecraftServerEvents.START.register(ServerPlayNetworkingImpl::setUp);
2525
MinecraftServerEvents.STOP.register(ServerPlayNetworkingImpl::destroy);
2626
ServerPlayNetworkingImpl.setUpPacketFactory((channel, data) ->
27-
new CustomPayloadS2CPacket(IdentifierChannelParser.toIdentifier(channel), PacketBuffers.unpack(data)));
27+
new CustomPayloadS2CPacket(IdentifierChannelParser.toIdentifier(channel), PacketBuffers.unwrapped(data)));
2828
ServerPlayNetworkingImpl.registerListener(HandshakePayload.CHANNEL, HandshakePayload::new, (server, handler, player, payload) -> {
2929
// send channel registration data as a response to receiving client channel registration data
3030
ServerPlayNetworkingImpl.sendNoCheck(player, HandshakePayload.CHANNEL, HandshakePayload.server());
@@ -41,7 +41,7 @@ public void initClient() {
4141
MinecraftClientEvents.START.register(ClientPlayNetworkingImpl::setUp);
4242
MinecraftClientEvents.STOP.register(ClientPlayNetworkingImpl::destroy);
4343
ClientPlayNetworkingImpl.setUpPacketFactory((channel, data) ->
44-
new CustomPayloadC2SPacket(StringChannelParser.toString(channel), PacketBuffers.unpack(data)));
44+
new CustomPayloadC2SPacket(StringChannelParser.toString(channel), PacketBuffers.unwrapped(data)));
4545
ClientPlayNetworkingImpl.registerListener(HandshakePayload.CHANNEL, HandshakePayload::new, (minecraft, handler, payload) -> {
4646
((NetworkHandlerAccess)handler).osl$networking$registerChannels(payload.channels);
4747
ClientConnectionEvents.PLAY_READY.invoker().accept(minecraft);

‎libraries/networking-impl/networking-impl-mc1.13-pre3-mc1.13-pre3/src/main/java/net/ornithemc/osl/networking/impl/mixin/common/CustomPayloadC2SPacketMixin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ public class CustomPayloadC2SPacketMixin implements CustomPayloadPacketAccess {
5858

5959
@Override
6060
public PacketBuffer osl$networking$getData() {
61-
return PacketBuffers.wrap(data.copy());
61+
return PacketBuffers.wrapped(data.copy());
6262
}
6363
}

‎libraries/networking-impl/networking-impl-mc1.13-pre3-mc1.13-pre3/src/main/java/net/ornithemc/osl/networking/impl/mixin/common/CustomPayloadS2CPacketMixin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ public class CustomPayloadS2CPacketMixin implements CustomPayloadPacketAccess {
2626

2727
@Override
2828
public PacketBuffer osl$networking$getData() {
29-
return PacketBuffers.wrap(data.copy());
29+
return PacketBuffers.wrapped(data.copy());
3030
}
3131
}

‎libraries/networking-impl/networking-impl-mc1.13-pre4-mc1.13.2/src/main/java/net/ornithemc/osl/networking/impl/Networking.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public void init() {
2323
MinecraftServerEvents.START.register(ServerPlayNetworkingImpl::setUp);
2424
MinecraftServerEvents.STOP.register(ServerPlayNetworkingImpl::destroy);
2525
ServerPlayNetworkingImpl.setUpPacketFactory((channel, data) ->
26-
new CustomPayloadS2CPacket(IdentifierChannelParser.toIdentifier(channel), PacketBuffers.unpack(data)));
26+
new CustomPayloadS2CPacket(IdentifierChannelParser.toIdentifier(channel), PacketBuffers.unwrapped(data)));
2727
ServerPlayNetworkingImpl.registerListener(HandshakePayload.CHANNEL, HandshakePayload::new, (server, handler, player, payload) -> {
2828
// send channel registration data as a response to receiving client channel registration data
2929
ServerPlayNetworkingImpl.sendNoCheck(player, HandshakePayload.CHANNEL, HandshakePayload.server());
@@ -40,7 +40,7 @@ public void initClient() {
4040
MinecraftClientEvents.START.register(ClientPlayNetworkingImpl::setUp);
4141
MinecraftClientEvents.STOP.register(ClientPlayNetworkingImpl::destroy);
4242
ClientPlayNetworkingImpl.setUpPacketFactory((channel, data) ->
43-
new CustomPayloadC2SPacket(IdentifierChannelParser.toIdentifier(channel), PacketBuffers.unpack(data)));
43+
new CustomPayloadC2SPacket(IdentifierChannelParser.toIdentifier(channel), PacketBuffers.unwrapped(data)));
4444
ClientPlayNetworkingImpl.registerListener(HandshakePayload.CHANNEL, HandshakePayload::new, (minecraft, handler, payload) -> {
4545
((NetworkHandlerAccess)handler).osl$networking$registerChannels(payload.channels);
4646
ClientConnectionEvents.PLAY_READY.invoker().accept(minecraft);

‎libraries/networking-impl/networking-impl-mc1.13-pre4-mc1.13.2/src/main/java/net/ornithemc/osl/networking/impl/mixin/common/CustomPayloadC2SPacketMixin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ public class CustomPayloadC2SPacketMixin implements CustomPayloadPacketAccess {
4747

4848
@Override
4949
public PacketBuffer osl$networking$getData() {
50-
return PacketBuffers.wrap(data.copy());
50+
return PacketBuffers.wrapped(data.copy());
5151
}
5252
}

‎libraries/networking-impl/networking-impl-mc1.13-pre4-mc1.13.2/src/main/java/net/ornithemc/osl/networking/impl/mixin/common/CustomPayloadS2CPacketMixin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ public class CustomPayloadS2CPacketMixin implements CustomPayloadPacketAccess {
2626

2727
@Override
2828
public PacketBuffer osl$networking$getData() {
29-
return PacketBuffers.wrap(data.copy());
29+
return PacketBuffers.wrapped(data.copy());
3030
}
3131
}

‎libraries/networking-impl/networking-impl-mc13w41a-mc14w20b/src/main/java/net/ornithemc/osl/networking/impl/Networking.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public void init() {
2323
MinecraftServerEvents.START.register(ServerPlayNetworkingImpl::setUp);
2424
MinecraftServerEvents.STOP.register(ServerPlayNetworkingImpl::destroy);
2525
ServerPlayNetworkingImpl.setUpPacketFactory((channel, data) ->
26-
new CustomPayloadS2CPacket(StringChannelParser.toString(channel), PacketBuffers.unwrap(data)));
26+
new CustomPayloadS2CPacket(StringChannelParser.toString(channel), PacketBuffers.unwrapped(data)));
2727
ServerPlayNetworkingImpl.registerListener(HandshakePayload.CHANNEL, HandshakePayload::new, (server, handler, player, payload) -> {
2828
// send channel registration data as a response to receiving client channel registration data
2929
ServerPlayNetworkingImpl.sendNoCheck(player, HandshakePayload.CHANNEL, HandshakePayload.server());
@@ -40,7 +40,7 @@ public void initClient() {
4040
MinecraftClientEvents.START.register(ClientPlayNetworkingImpl::setUp);
4141
MinecraftClientEvents.STOP.register(ClientPlayNetworkingImpl::destroy);
4242
ClientPlayNetworkingImpl.setUpPacketFactory((channel, data) ->
43-
new CustomPayloadC2SPacket(StringChannelParser.toString(channel), PacketBuffers.unwrap(data)));
43+
new CustomPayloadC2SPacket(StringChannelParser.toString(channel), PacketBuffers.unwrapped(data)));
4444
ClientPlayNetworkingImpl.registerListener(HandshakePayload.CHANNEL, HandshakePayload::new, (minecraft, handler, payload) -> {
4545
((NetworkHandlerAccess)handler).osl$networking$registerChannels(payload.channels);
4646
ClientConnectionEvents.PLAY_READY.invoker().accept(minecraft);

‎libraries/networking-impl/networking-impl-mc14w21a-mc14w30c/src/main/java/net/ornithemc/osl/networking/impl/Networking.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public void init() {
2323
MinecraftServerEvents.START.register(ServerPlayNetworkingImpl::setUp);
2424
MinecraftServerEvents.STOP.register(ServerPlayNetworkingImpl::destroy);
2525
ServerPlayNetworkingImpl.setUpPacketFactory((channel, data) ->
26-
new CustomPayloadS2CPacket(StringChannelParser.toString(channel), PacketBuffers.unwrap(data)));
26+
new CustomPayloadS2CPacket(StringChannelParser.toString(channel), PacketBuffers.unwrapped(data)));
2727
ServerPlayNetworkingImpl.registerListener(HandshakePayload.CHANNEL, HandshakePayload::new, (server, handler, player, payload) -> {
2828
// send channel registration data as a response to receiving client channel registration data
2929
ServerPlayNetworkingImpl.sendNoCheck(player, HandshakePayload.CHANNEL, HandshakePayload.server());
@@ -40,7 +40,7 @@ public void initClient() {
4040
MinecraftClientEvents.START.register(ClientPlayNetworkingImpl::setUp);
4141
MinecraftClientEvents.STOP.register(ClientPlayNetworkingImpl::destroy);
4242
ClientPlayNetworkingImpl.setUpPacketFactory((channel, data) ->
43-
new CustomPayloadC2SPacket(StringChannelParser.toString(channel), PacketBuffers.unwrap(data)));
43+
new CustomPayloadC2SPacket(StringChannelParser.toString(channel), PacketBuffers.unwrapped(data)));
4444
ClientPlayNetworkingImpl.registerListener(HandshakePayload.CHANNEL, HandshakePayload::new, (minecraft, handler, payload) -> {
4545
((NetworkHandlerAccess)handler).osl$networking$registerChannels(payload.channels);
4646
ClientConnectionEvents.PLAY_READY.invoker().accept(minecraft);

‎libraries/networking-impl/networking-impl-mc14w31a-mc1.13-pre2/src/main/java/net/ornithemc/osl/networking/impl/Networking.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public void init() {
2323
MinecraftServerEvents.START.register(ServerPlayNetworkingImpl::setUp);
2424
MinecraftServerEvents.STOP.register(ServerPlayNetworkingImpl::destroy);
2525
ServerPlayNetworkingImpl.setUpPacketFactory((channel, data) ->
26-
new CustomPayloadS2CPacket(StringChannelParser.toString(channel),PacketBuffers.unpack(data)));
26+
new CustomPayloadS2CPacket(StringChannelParser.toString(channel),PacketBuffers.unwrapped(data)));
2727
ServerPlayNetworkingImpl.registerListener(HandshakePayload.CHANNEL, HandshakePayload::new, (server, handler, player, payload) -> {
2828
// send channel registration data as a response to receiving client channel registration data
2929
ServerPlayNetworkingImpl.sendNoCheck(player, HandshakePayload.CHANNEL, HandshakePayload.server());
@@ -40,7 +40,7 @@ public void initClient() {
4040
MinecraftClientEvents.START.register(ClientPlayNetworkingImpl::setUp);
4141
MinecraftClientEvents.STOP.register(ClientPlayNetworkingImpl::destroy);
4242
ClientPlayNetworkingImpl.setUpPacketFactory((channel, data) ->
43-
new CustomPayloadC2SPacket(StringChannelParser.toString(channel), PacketBuffers.unpack(data)));
43+
new CustomPayloadC2SPacket(StringChannelParser.toString(channel), PacketBuffers.unwrapped(data)));
4444
ClientPlayNetworkingImpl.registerListener(HandshakePayload.CHANNEL, HandshakePayload::new, (minecraft, handler, payload) -> {
4545
((NetworkHandlerAccess)handler).osl$networking$registerChannels(payload.channels);
4646
ClientConnectionEvents.PLAY_READY.invoker().accept(minecraft);

‎libraries/networking-impl/networking-impl-mc14w31a-mc1.13-pre2/src/main/java/net/ornithemc/osl/networking/impl/mixin/common/CustomPayloadC2SPacketMixin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ public class CustomPayloadC2SPacketMixin implements CustomPayloadPacketAccess {
5858

5959
@Override
6060
public PacketBuffer osl$networking$getData() {
61-
return PacketBuffers.wrap(data.copy());
61+
return PacketBuffers.wrapped(data.copy());
6262
}
6363
}

0 commit comments

Comments
 (0)