Skip to content
This repository was archived by the owner on Jun 3, 2024. It is now read-only.

Commit 2e6192b

Browse files
committed
Merge branch 'feature/networking' of https://github.com/PatchworkMC/patchwork-api into feature/networking
� Conflicts: � patchwork-networking/src/main/java/com/patchworkmc/api/networking/Channel.java � patchwork-networking/src/main/java/com/patchworkmc/impl/networking/VersionedChannel.java
2 parents 1ff6d33 + e24c67b commit 2e6192b

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkDirection.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838

3939
import com.patchworkmc.mixin.networking.accessor.CustomPayloadC2SPacketAccessor;
4040
import com.patchworkmc.mixin.networking.accessor.CustomPayloadS2CPacketAccessor;
41-
import com.patchworkmc.mixin.networking.accessor.LoginQueryRequestS2CPacketAccessor;
42-
import com.patchworkmc.mixin.networking.accessor.LoginQueryResponseC2SPacketAccessor;
4341

4442
public enum NetworkDirection {
4543
PLAY_TO_SERVER(NetworkEvent.ClientCustomPayloadEvent::new, LogicalSide.CLIENT, 1),
@@ -100,9 +98,11 @@ private <T extends Packet<?>> ICustomPacket<T> construct() {
10098
case PLAY_TO_CLIENT:
10199
return (ICustomPacket<T>) CustomPayloadS2CPacketAccessor.patchwork$create();
102100
case LOGIN_TO_SERVER:
103-
return (ICustomPacket<T>) LoginQueryResponseC2SPacketAccessor.patchwork$create();
101+
throw new UnsupportedOperationException("login packets are not supported");
102+
// return (ICustomPacket<T>) LoginQueryResponseC2SPacketAccessor.patchwork$create();
104103
case LOGIN_TO_CLIENT:
105-
return (ICustomPacket<T>) LoginQueryRequestS2CPacketAccessor.patchwork$create();
104+
throw new UnsupportedOperationException("login packets are not supported");
105+
// return (ICustomPacket<T>) LoginQueryRequestS2CPacketAccessor.patchwork$create();
106106
default:
107107
throw new IllegalStateException("Unexpected NetworkDirection " + this + ", someone's been tampering with enums!");
108108
}

patchwork-networking/src/main/resources/patchwork-networking.accessor.mixins.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"ClientConnectionAccessor",
77
"CustomPayloadC2SPacketAccessor",
88
"CustomPayloadS2CPacketAccessor",
9-
"LoginQueryRequestS2CPacketAccessor",
10-
"LoginQueryResponseC2SPacketAccessor",
9+
// "LoginQueryRequestS2CPacketAccessor",
10+
// "LoginQueryResponseC2SPacketAccessor",
1111
"ThreadExecutorAccessor"
1212
],
1313
"injectors": {

patchwork-networking/src/main/resources/patchwork-networking.packet.mixins.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"mixins": [
66
"MixinCustomPayloadC2SPacket",
77
"MixinCustomPayloadS2CPacket",
8-
"MixinLoginQueryRequestS2CPacket",
9-
"MixinLoginQueryResponseC2SPacket"
8+
// "MixinLoginQueryRequestS2CPacket",
9+
// "MixinLoginQueryResponseC2SPacket"
1010
],
1111
"injectors": {
1212
"defaultRequire": 1

0 commit comments

Comments
 (0)