Upstream/ViaFabricPlus
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabricPlus.git synced 2024-11-22 11:56:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bump version

Browse Source
This commit is contained in:
FlorianMichael 2023-03-14 21:10:03 +01:00
parent 42eb7e46e4
commit 5c893ba9b8
3 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -8,7 +8,7 @@ yarn_mappings=1.19.3+build.5
loader_version=0.14.14 loader_version=0.14.14
# viafabricplus # viafabricplus
mod_version=1.8.9 mod_version=1.8.10
maven_group=de.florianmichael maven_group=de.florianmichael
archives_base_name=viafabricplus archives_base_name=viafabricplus

12
src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinClientConnection_1.java
View File

@ -79,9 +79,9 @@ public class MixinClientConnection_1 {
@Inject(method = "initChannel", at = @At("TAIL")) @Inject(method = "initChannel", at = @At("TAIL"))
public void hackNettyPipeline(Channel channel, CallbackInfo ci) { public void hackNettyPipeline(Channel channel, CallbackInfo ci) {
final boolean isBedrock = ViaLoadingBase.getClassWrapper().getTargetVersion().isEqualTo(BedrockProtocolVersion.bedrockLatest); final boolean rakNet = ViaLoadingBase.getClassWrapper().getTargetVersion().isEqualTo(BedrockProtocolVersion.bedrockLatest);
if (channel instanceof SocketChannel || isBedrock) { if (channel instanceof SocketChannel || rakNet) {
final UserConnection user = new UserConnectionImpl(channel, true); final UserConnection user = new UserConnectionImpl(channel, true);
channel.attr(ViaFabricPlus.LOCAL_VIA_CONNECTION).set(user); channel.attr(ViaFabricPlus.LOCAL_VIA_CONNECTION).set(user);
channel.attr(ViaFabricPlus.LOCAL_MINECRAFT_CONNECTION).set(field_11663); channel.attr(ViaFabricPlus.LOCAL_MINECRAFT_CONNECTION).set(field_11663);
@ -91,7 +91,7 @@ public class MixinClientConnection_1 {
channel.pipeline().addBefore("encoder", NettyConstants.HANDLER_ENCODER_NAME, new VLBViaEncodeHandler(user)); channel.pipeline().addBefore("encoder", NettyConstants.HANDLER_ENCODER_NAME, new VLBViaEncodeHandler(user));
channel.pipeline().addBefore("decoder", NettyConstants.HANDLER_DECODER_NAME, new VFPVLBViaDecodeHandler(user)); channel.pipeline().addBefore("decoder", NettyConstants.HANDLER_DECODER_NAME, new VFPVLBViaDecodeHandler(user));
if (isBedrock) { if (rakNet) {
user.getProtocolInfo().getPipeline().add(BedrockBaseProtocol.INSTANCE); user.getProtocolInfo().getPipeline().add(BedrockBaseProtocol.INSTANCE);
channel.pipeline().replace("splitter", BedrockRakNetConstants.BATCH_LENGTH_HANDLER_NAME, new BatchLengthCodec()); channel.pipeline().replace("splitter", BedrockRakNetConstants.BATCH_LENGTH_HANDLER_NAME, new BatchLengthCodec());
@ -108,8 +108,6 @@ public class MixinClientConnection_1 {
// Pinging in RakNet is something different // Pinging in RakNet is something different
if (RakNetPingSessions.isPingSession(address.getAddress())) { if (RakNetPingSessions.isPingSession(address.getAddress())) {
RakNetPingSessions.pingSessions.remove(address.getAddress()); RakNetPingSessions.pingSessions.remove(address.getAddress());
Via.getPlatform().getLogger().info("ViaFabricPlus is capturing RakNet/Ping protocol");
{ // Temporary fix for the ping encoder { // Temporary fix for the ping encoder
final RakClientChannel rakChannel = (RakClientChannel) channel; final RakClientChannel rakChannel = (RakClientChannel) channel;
@ -130,10 +128,6 @@ public class MixinClientConnection_1 {
channel.pipeline().addBefore("prepender", PreNettyConstants.HANDLER_ENCODER_NAME, new VFPPreNettyEncoder(user)); channel.pipeline().addBefore("prepender", PreNettyConstants.HANDLER_ENCODER_NAME, new VFPPreNettyEncoder(user));
channel.pipeline().addBefore("splitter", PreNettyConstants.HANDLER_DECODER_NAME, new VFPPreNettyDecoder(user)); channel.pipeline().addBefore("splitter", PreNettyConstants.HANDLER_DECODER_NAME, new VFPPreNettyDecoder(user));
} }
for (String name : channel.pipeline().names()) {
System.out.println(name);
}
} }
} }
} }

11
src/main/resources/viafabricplus.mixins.json
View File

@ -139,14 +139,11 @@
"fixes.viaversion.protocol1_9to1_8.MixinEntityTracker1_9", "fixes.viaversion.protocol1_9to1_8.MixinEntityTracker1_9",
"fixes.viaversion.protocol1_9to1_8.MixinMetadataRewriter1_9To1_8", "fixes.viaversion.protocol1_9to1_8.MixinMetadataRewriter1_9To1_8",
"fixes.viaversion.protocol1_9to1_8.MixinMovementTracker", "fixes.viaversion.protocol1_9to1_8.MixinMovementTracker",
"fixes.viaversion.protocol1_9to1_8.MixinViaIdleThread" "fixes.viaversion.protocol1_9to1_8.MixinViaIdleThread",
"base.MixinClientConnection_1",
"fixes.block.MixinAbstractBlock"
], ],
"injectors": { "injectors": {
"defaultRequire": 1 "defaultRequire": 1
}, }
"mixins": [
"base.MixinClientConnection_1",
"fixes.block.MixinAbstractBlock",
"fixes.vialegacy.MixinBedrockProtocol"
]
} }