Upstream
/
ViaVersion
mirror of https://github.com/ViaVersion/ViaVersion.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename ViaCodecException to CancelCodecException

This commit is contained in:
KennyTV 2020-06-10 08:58:40 +02:00
parent 7588609c56
commit 029f399a14
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
11 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bukkit/src/main/java/us/myles/ViaVersion/bukkit/handlers/BukkitDecodeHandler.java
View File

@ -6,7 +6,7 @@ import io.netty.handler.codec.ByteToMessageDecoder;
import us.myles.ViaVersion.api.data.UserConnection;
import us.myles.ViaVersion.bukkit.util.NMSUtil;
import us.myles.ViaVersion.exception.CancelDecoderException;
import us.myles.ViaVersion.exception.ViaCodecException;
import us.myles.ViaVersion.exception.CancelCodecException;
import us.myles.ViaVersion.util.PipelineUtil;
import java.lang.reflect.InvocationTargetException;
@ -53,7 +53,7 @@ public class BukkitDecodeHandler extends ByteToMessageDecoder {
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
if (PipelineUtil.containsCause(cause, ViaCodecException.class)) return; // ProtocolLib compat
if (PipelineUtil.containsCause(cause, CancelCodecException.class)) return; // ProtocolLib compat
super.exceptionCaught(ctx, cause);
if (!NMSUtil.isDebugPropertySet()) {

4
bukkit/src/main/java/us/myles/ViaVersion/bukkit/handlers/BukkitEncodeHandler.java
View File

@ -6,7 +6,7 @@ import io.netty.handler.codec.MessageToByteEncoder;
import us.myles.ViaVersion.api.data.UserConnection;
import us.myles.ViaVersion.bukkit.util.NMSUtil;
import us.myles.ViaVersion.exception.CancelEncoderException;
import us.myles.ViaVersion.exception.ViaCodecException;
import us.myles.ViaVersion.exception.CancelCodecException;
import us.myles.ViaVersion.handlers.ChannelHandlerContextWrapper;
import us.myles.ViaVersion.handlers.ViaHandler;
import us.myles.ViaVersion.util.PipelineUtil;
@ -65,7 +65,7 @@ public class BukkitEncodeHandler extends MessageToByteEncoder implements ViaHand
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
if (PipelineUtil.containsCause(cause, ViaCodecException.class)) return; // ProtocolLib compat
if (PipelineUtil.containsCause(cause, CancelCodecException.class)) return; // ProtocolLib compat
super.exceptionCaught(ctx, cause);
if (!NMSUtil.isDebugPropertySet()) {

4
bungee/src/main/java/us/myles/ViaVersion/bungee/handlers/BungeeDecodeHandler.java
View File

@ -6,7 +6,7 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToMessageDecoder;
import us.myles.ViaVersion.api.data.UserConnection;
import us.myles.ViaVersion.exception.CancelDecoderException;
import us.myles.ViaVersion.exception.ViaCodecException;
import us.myles.ViaVersion.exception.CancelCodecException;
import java.util.List;
@ -37,7 +37,7 @@ public class BungeeDecodeHandler extends MessageToMessageDecoder<ByteBuf> {
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
if (cause instanceof ViaCodecException) return;
if (cause instanceof CancelCodecException) return;
super.exceptionCaught(ctx, cause);
}
}

4
bungee/src/main/java/us/myles/ViaVersion/bungee/handlers/BungeeEncodeHandler.java
View File

@ -7,7 +7,7 @@ import io.netty.handler.codec.MessageToMessageEncoder;
import us.myles.ViaVersion.api.data.UserConnection;
import us.myles.ViaVersion.bungee.util.BungeePipelineUtil;
import us.myles.ViaVersion.exception.CancelEncoderException;
import us.myles.ViaVersion.exception.ViaCodecException;
import us.myles.ViaVersion.exception.CancelCodecException;
import java.util.List;
@ -78,7 +78,7 @@ public class BungeeEncodeHandler extends MessageToMessageEncoder<ByteBuf> {
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
if (cause instanceof ViaCodecException) return;
if (cause instanceof CancelCodecException) return;
super.exceptionCaught(ctx, cause);
}
}

2
common/src/main/java/us/myles/ViaVersion/exception/ViaCodecException.java → common/src/main/java/us/myles/ViaVersion/exception/CancelCodecException.java
View File

@ -6,5 +6,5 @@ package us.myles.ViaVersion.exception;
* @see CancelEncoderException
* @see CancelDecoderException
*/
public interface ViaCodecException {
public interface CancelCodecException {
}

2
common/src/main/java/us/myles/ViaVersion/exception/CancelDecoderException.java
View File

@ -7,7 +7,7 @@ import us.myles.ViaVersion.api.Via;
* Thrown during packet decoding when an incoming packet should be cancelled.
* Specifically extends {@link DecoderException} to prevent netty from wrapping the exception.
*/
public class CancelDecoderException extends DecoderException implements ViaCodecException {
public class CancelDecoderException extends DecoderException implements CancelCodecException {
public static final CancelDecoderException CACHED = new CancelDecoderException("This packet is supposed to be cancelled; If you have debug enabled, you can ignore these") {
@Override
public Throwable fillInStackTrace() {

2
common/src/main/java/us/myles/ViaVersion/exception/CancelEncoderException.java
View File

@ -7,7 +7,7 @@ import us.myles.ViaVersion.api.Via;
* Thrown during packet encoding when an outgoing packet should be cancelled.
* Specifically extends {@link EncoderException} to prevent netty from wrapping the exception.
*/
public class CancelEncoderException extends EncoderException implements ViaCodecException {
public class CancelEncoderException extends EncoderException implements CancelCodecException {
public static final CancelEncoderException CACHED = new CancelEncoderException("This packet is supposed to be cancelled; If you have debug enabled, you can ignore these") {
@Override
public Throwable fillInStackTrace() {

4
sponge/src/main/java/us/myles/ViaVersion/sponge/handlers/SpongeDecodeHandler.java
View File

@ -5,7 +5,7 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.ByteToMessageDecoder;
import us.myles.ViaVersion.api.data.UserConnection;
import us.myles.ViaVersion.exception.CancelDecoderException;
import us.myles.ViaVersion.exception.ViaCodecException;
import us.myles.ViaVersion.exception.CancelCodecException;
import us.myles.ViaVersion.util.PipelineUtil;
import java.lang.reflect.InvocationTargetException;
@ -53,7 +53,7 @@ public class SpongeDecodeHandler extends ByteToMessageDecoder {
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
if (cause instanceof ViaCodecException) return;
if (cause instanceof CancelCodecException) return;
super.exceptionCaught(ctx, cause);
}
}

4
sponge/src/main/java/us/myles/ViaVersion/sponge/handlers/SpongeEncodeHandler.java
View File

@ -5,7 +5,7 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToByteEncoder;
import us.myles.ViaVersion.api.data.UserConnection;
import us.myles.ViaVersion.exception.CancelEncoderException;
import us.myles.ViaVersion.exception.ViaCodecException;
import us.myles.ViaVersion.exception.CancelCodecException;
import us.myles.ViaVersion.handlers.ChannelHandlerContextWrapper;
import us.myles.ViaVersion.handlers.ViaHandler;
import us.myles.ViaVersion.util.PipelineUtil;
@ -49,7 +49,7 @@ public class SpongeEncodeHandler extends MessageToByteEncoder<Object> implements
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
if (cause instanceof ViaCodecException) return;
if (cause instanceof CancelCodecException) return;
super.exceptionCaught(ctx, cause);
}
}

4
velocity/src/main/java/us/myles/ViaVersion/velocity/handlers/VelocityDecodeHandler.java
View File

@ -6,7 +6,7 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToMessageDecoder;
import us.myles.ViaVersion.api.data.UserConnection;
import us.myles.ViaVersion.exception.CancelDecoderException;
import us.myles.ViaVersion.exception.ViaCodecException;
import us.myles.ViaVersion.exception.CancelCodecException;
import java.util.List;
@ -37,7 +37,7 @@ public class VelocityDecodeHandler extends MessageToMessageDecoder<ByteBuf> {
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
if (cause instanceof ViaCodecException) return;
if (cause instanceof CancelCodecException) return;
super.exceptionCaught(ctx, cause);
}
}

4
velocity/src/main/java/us/myles/ViaVersion/velocity/handlers/VelocityEncodeHandler.java
View File

@ -8,7 +8,7 @@ import io.netty.handler.codec.MessageToMessageDecoder;
import io.netty.handler.codec.MessageToMessageEncoder;
import us.myles.ViaVersion.api.data.UserConnection;
import us.myles.ViaVersion.exception.CancelEncoderException;
import us.myles.ViaVersion.exception.ViaCodecException;
import us.myles.ViaVersion.exception.CancelCodecException;
import us.myles.ViaVersion.util.PipelineUtil;
import java.lang.reflect.InvocationTargetException;
@ -81,7 +81,7 @@ public class VelocityEncodeHandler extends MessageToMessageEncoder<ByteBuf> {
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
if (cause instanceof ViaCodecException) return;
if (cause instanceof CancelCodecException) return;
super.exceptionCaught(ctx, cause);
}
}