3
0
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-12-25 15:50:10 +01:00

WIP fix, ping works but it still doesn't connect

Dieser Commit ist enthalten in:
Myles 2016-06-23 22:33:06 +01:00 committet von Myles
Ursprung 839d46f5ed
Commit 8093c424e2
3 geänderte Dateien mit 274 neuen und 2 gelöschten Zeilen

Datei anzeigen

@ -8,6 +8,7 @@ import us.myles.ViaVersion.api.data.UserConnection;
import us.myles.ViaVersion.api.type.Type;
import us.myles.ViaVersion.bukkit.util.NMSUtil;
import us.myles.ViaVersion.exception.CancelException;
import us.myles.ViaVersion.handlers.*;
import us.myles.ViaVersion.packets.Direction;
import us.myles.ViaVersion.protocols.base.ProtocolInfo;
import us.myles.ViaVersion.util.PipelineUtil;
@ -15,7 +16,7 @@ import us.myles.ViaVersion.util.PipelineUtil;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
public class BukkitEncodeHandler extends MessageToByteEncoder {
public class BukkitEncodeHandler extends MessageToByteEncoder implements ViaHandler {
private static Field versionField = null;
static {
@ -44,13 +45,18 @@ public class BukkitEncodeHandler extends MessageToByteEncoder {
if (!(o instanceof ByteBuf)) {
// call minecraft encoder
try {
PipelineUtil.callEncode(this.minecraftEncoder, ctx, o, bytebuf);
PipelineUtil.callEncode(this.minecraftEncoder, new ChannelHandlerContextWrapper(ctx, this), o, bytebuf);
} catch (InvocationTargetException e) {
if (e.getCause() instanceof Exception) {
throw (Exception) e.getCause();
}
}
}
transform(bytebuf);
}
public void transform(ByteBuf bytebuf) throws Exception {
if (bytebuf.readableBytes() == 0) {
throw new CancelException();
}

Datei anzeigen

@ -0,0 +1,255 @@
package us.myles.ViaVersion.handlers;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
import io.netty.channel.*;
import io.netty.util.Attribute;
import io.netty.util.AttributeKey;
import io.netty.util.concurrent.EventExecutor;
import java.net.SocketAddress;
public class ChannelHandlerContextWrapper implements ChannelHandlerContext {
private ChannelHandlerContext base;
private ViaHandler handler;
public ChannelHandlerContextWrapper(ChannelHandlerContext base, ViaHandler handler) {
this.base = base;
this.handler = handler;
}
@Override
public Channel channel() {
return base.channel();
}
@Override
public EventExecutor executor() {
return base.executor();
}
@Override
public String name() {
return base.name();
}
@Override
public ChannelHandler handler() {
return base.handler();
}
@Override
public boolean isRemoved() {
return base.isRemoved();
}
@Override
public ChannelHandlerContext fireChannelRegistered() {
base.fireChannelRegistered();
return this;
}
@Override
public ChannelHandlerContext fireChannelUnregistered() {
base.fireChannelUnregistered();
return this;
}
@Override
public ChannelHandlerContext fireChannelActive() {
base.fireChannelActive();
return this;
}
@Override
public ChannelHandlerContext fireChannelInactive() {
base.fireChannelInactive();
return this;
}
@Override
public ChannelHandlerContext fireExceptionCaught(Throwable throwable) {
base.fireExceptionCaught(throwable);
return this;
}
@Override
public ChannelHandlerContext fireUserEventTriggered(Object o) {
base.fireUserEventTriggered(o);
return this;
}
@Override
public ChannelHandlerContext fireChannelRead(Object o) {
base.fireChannelRead(o);
return this;
}
@Override
public ChannelHandlerContext fireChannelReadComplete() {
base.fireChannelReadComplete();
return this;
}
@Override
public ChannelHandlerContext fireChannelWritabilityChanged() {
base.fireChannelWritabilityChanged();
return this;
}
@Override
public ChannelFuture bind(SocketAddress socketAddress) {
return base.bind(socketAddress);
}
@Override
public ChannelFuture connect(SocketAddress socketAddress) {
return base.connect(socketAddress);
}
@Override
public ChannelFuture connect(SocketAddress socketAddress, SocketAddress socketAddress1) {
return base.connect(socketAddress, socketAddress1);
}
@Override
public ChannelFuture disconnect() {
return base.disconnect();
}
@Override
public ChannelFuture close() {
return base.close();
}
@Override
public ChannelFuture deregister() {
return base.deregister();
}
@Override
public ChannelFuture bind(SocketAddress socketAddress, ChannelPromise channelPromise) {
return base.bind(socketAddress, channelPromise);
}
@Override
public ChannelFuture connect(SocketAddress socketAddress, ChannelPromise channelPromise) {
return base.connect(socketAddress, channelPromise);
}
@Override
public ChannelFuture connect(SocketAddress socketAddress, SocketAddress socketAddress1, ChannelPromise channelPromise) {
return base.connect(socketAddress, socketAddress1, channelPromise);
}
@Override
public ChannelFuture disconnect(ChannelPromise channelPromise) {
return base.disconnect(channelPromise);
}
@Override
public ChannelFuture close(ChannelPromise channelPromise) {
return base.close(channelPromise);
}
@Override
public ChannelFuture deregister(ChannelPromise channelPromise) {
return base.deregister(channelPromise);
}
@Override
public ChannelHandlerContext read() {
base.read();
return this;
}
@Override
public ChannelFuture write(Object o) {
if (o instanceof ByteBuf) {
if (transform((ByteBuf) o)) return base.newFailedFuture(new Throwable());
}
return base.write(o);
}
@Override
public ChannelFuture write(Object o, ChannelPromise channelPromise) {
if (o instanceof ByteBuf) {
if (transform((ByteBuf) o)) return base.newFailedFuture(new Throwable());
}
return base.write(o, channelPromise);
}
public boolean transform(ByteBuf buf) {
try {
handler.transform(buf);
return false;
} catch (Exception e) {
try {
handler.exceptionCaught(base, e);
} catch (Exception e1) {
base.fireExceptionCaught(e1);
}
return true;
}
}
@Override
public ChannelHandlerContext flush() {
base.flush();
return this;
}
@Override
public ChannelFuture writeAndFlush(Object o, ChannelPromise channelPromise) {
ChannelFuture future = write(o, channelPromise);
flush();
return future;
}
@Override
public ChannelFuture writeAndFlush(Object o) {
ChannelFuture future = write(o);
flush();
return future;
}
@Override
public ChannelPipeline pipeline() {
return base.pipeline();
}
@Override
public ByteBufAllocator alloc() {
return base.alloc();
}
@Override
public ChannelPromise newPromise() {
return base.newPromise();
}
@Override
public ChannelProgressivePromise newProgressivePromise() {
return base.newProgressivePromise();
}
@Override
public ChannelFuture newSucceededFuture() {
return base.newSucceededFuture();
}
@Override
public ChannelFuture newFailedFuture(Throwable throwable) {
return base.newFailedFuture(throwable);
}
@Override
public ChannelPromise voidPromise() {
return base.voidPromise();
}
@Override
public <T> Attribute<T> attr(AttributeKey<T> attributeKey) {
return base.attr(attributeKey);
}
}

Datei anzeigen

@ -0,0 +1,11 @@
package us.myles.ViaVersion.handlers;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
public interface ViaHandler {
public void transform(ByteBuf bytebuf) throws Exception;
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception;
}