Upstream/ViaForge
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaForge.git synced 2024-09-28 04:37:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix pipeline injection in 1.17+

Browse Source
This commit is contained in:
FlorianMichael 2024-04-28 22:57:52 +02:00
parent d2d5ed4458
commit f589b3a28d
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
4 changed files with 40 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
viaforge-mc1171/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection_1.java
View File

@ -20,25 +20,22 @@ package de.florianmichael.viaforge.mixin;
import de.florianmichael.viaforge.common.ViaForgeCommon; import de.florianmichael.viaforge.common.ViaForgeCommon;
import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager; import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager;
import io.netty.channel.Channel; import io.netty.channel.ChannelHandler;
import net.minecraft.network.Connection; import io.netty.channel.ChannelPipeline;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Mutable;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(targets = "net.minecraft.network.Connection$1") @Mixin(targets = "net.minecraft.network.Connection$1")
public class MixinConnection_1 { public class MixinConnection_1 {
@Final @Redirect(method = "initChannel", at = @At(value = "INVOKE", target = "Lio/netty/channel/ChannelPipeline;addLast(Ljava/lang/String;Lio/netty/channel/ChannelHandler;)Lio/netty/channel/ChannelPipeline;"))
@Mutable private ChannelPipeline hookViaPipeline(ChannelPipeline instance, String s, ChannelHandler channelHandler) {
Connection val$connection; final ChannelPipeline handler = instance.addLast(s, channelHandler);
if (channelHandler instanceof VFNetworkManager mixinNetworkManager) {
@Inject(method = "initChannel", at = @At(value = "TAIL"), remap = false) ViaForgeCommon.getManager().inject(instance.channel(), mixinNetworkManager);
private void onInitChannel(Channel channel, CallbackInfo ci) { }
ViaForgeCommon.getManager().inject(channel, (VFNetworkManager) val$connection); return handler;
} }
} }

23
viaforge-mc1182/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection_1.java
View File

@ -20,25 +20,22 @@ package de.florianmichael.viaforge.mixin;
import de.florianmichael.viaforge.common.ViaForgeCommon; import de.florianmichael.viaforge.common.ViaForgeCommon;
import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager; import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager;
import io.netty.channel.Channel; import io.netty.channel.ChannelHandler;
import net.minecraft.network.Connection; import io.netty.channel.ChannelPipeline;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Mutable;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(targets = "net.minecraft.network.Connection$1") @Mixin(targets = "net.minecraft.network.Connection$1")
public class MixinConnection_1 { public class MixinConnection_1 {
@Final @Redirect(method = "initChannel", at = @At(value = "INVOKE", target = "Lio/netty/channel/ChannelPipeline;addLast(Ljava/lang/String;Lio/netty/channel/ChannelHandler;)Lio/netty/channel/ChannelPipeline;"))
@Mutable private ChannelPipeline hookViaPipeline(ChannelPipeline instance, String s, ChannelHandler channelHandler) {
Connection val$connection; final ChannelPipeline handler = instance.addLast(s, channelHandler);
if (channelHandler instanceof VFNetworkManager mixinNetworkManager) {
@Inject(method = "initChannel", at = @At(value = "TAIL"), remap = false) ViaForgeCommon.getManager().inject(instance.channel(), mixinNetworkManager);
private void onInitChannel(Channel channel, CallbackInfo ci) { }
ViaForgeCommon.getManager().inject(channel, (VFNetworkManager) val$connection); return handler;
} }
} }

23
viaforge-mc1194/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection_1.java
View File

@ -20,25 +20,22 @@ package de.florianmichael.viaforge.mixin;
import de.florianmichael.viaforge.common.ViaForgeCommon; import de.florianmichael.viaforge.common.ViaForgeCommon;
import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager; import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager;
import io.netty.channel.Channel; import io.netty.channel.ChannelHandler;
import net.minecraft.network.Connection; import io.netty.channel.ChannelPipeline;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Mutable;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(targets = "net.minecraft.network.Connection$1") @Mixin(targets = "net.minecraft.network.Connection$1")
public class MixinConnection_1 { public class MixinConnection_1 {
@Final @Redirect(method = "initChannel", at = @At(value = "INVOKE", target = "Lio/netty/channel/ChannelPipeline;addLast(Ljava/lang/String;Lio/netty/channel/ChannelHandler;)Lio/netty/channel/ChannelPipeline;"))
@Mutable private ChannelPipeline hookViaPipeline(ChannelPipeline instance, String s, ChannelHandler channelHandler) {
Connection val$connection; final ChannelPipeline handler = instance.addLast(s, channelHandler);
if (channelHandler instanceof VFNetworkManager mixinNetworkManager) {
@Inject(method = "initChannel", at = @At(value = "TAIL"), remap = false) ViaForgeCommon.getManager().inject(instance.channel(), mixinNetworkManager);
private void onInitChannel(Channel channel, CallbackInfo ci) { }
ViaForgeCommon.getManager().inject(channel, (VFNetworkManager) val$connection); return handler;
} }
} }

23
viaforge-mc1204/src/main/java/de/florianmichael/viaforge/mixin/MixinConnection_1.java
View File

@ -20,25 +20,22 @@ package de.florianmichael.viaforge.mixin;
import de.florianmichael.viaforge.common.ViaForgeCommon; import de.florianmichael.viaforge.common.ViaForgeCommon;
import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager; import de.florianmichael.viaforge.common.protocoltranslator.netty.VFNetworkManager;
import io.netty.channel.Channel; import io.netty.channel.ChannelHandler;
import net.minecraft.network.Connection; import io.netty.channel.ChannelPipeline;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Mutable;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(targets = "net.minecraft.network.Connection$1") @Mixin(targets = "net.minecraft.network.Connection$1")
public class MixinConnection_1 { public class MixinConnection_1 {
@Final @Redirect(method = "initChannel", at = @At(value = "INVOKE", target = "Lio/netty/channel/ChannelPipeline;addLast(Ljava/lang/String;Lio/netty/channel/ChannelHandler;)Lio/netty/channel/ChannelPipeline;"))
@Mutable private ChannelPipeline hookViaPipeline(ChannelPipeline instance, String s, ChannelHandler channelHandler) {
Connection val$connection; final ChannelPipeline handler = instance.addLast(s, channelHandler);
if (channelHandler instanceof VFNetworkManager mixinNetworkManager) {
@Inject(method = "initChannel", at = @At(value = "TAIL"), remap = false) ViaForgeCommon.getManager().inject(instance.channel(), mixinNetworkManager);
private void onInitChannel(Channel channel, CallbackInfo ci) { }
ViaForgeCommon.getManager().inject(channel, (VFNetworkManager) val$connection); return handler;
} }
} }