Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,14 @@ public final class Enchantments1_14_4 {
ENCHANTMENT_REGISTRY.put("piercing", Enchantments.PIERCING);
ENCHANTMENT_REGISTRY.put("mending", Enchantments.MENDING);
ENCHANTMENT_REGISTRY.put("vanishing_curse", Enchantments.VANISHING_CURSE);
// Minecraft 1.21 Mace enchantments
ENCHANTMENT_REGISTRY.put("density", Enchantments.DENSITY);
ENCHANTMENT_REGISTRY.put("breach", Enchantments.BREACH);
ENCHANTMENT_REGISTRY.put("wind_burst", Enchantments.WIND_BURST);
}

public static Optional<ResourceKey<Enchantment>> getOrEmpty(final String identifier) {
return Optional.ofNullable(ENCHANTMENT_REGISTRY.get(Key.stripMinecraftNamespace(identifier)));
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,18 @@

import com.viaversion.viafabricplus.ViaFabricPlusImpl;
import com.viaversion.viafabricplus.settings.impl.DebugSettings;
import com.viaversion.viafabricplus.settings.impl.GeneralSettings;
import com.viaversion.viafabricplus.util.ChatUtil;
import com.viaversion.viaversion.platform.ViaChannelInitializer;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.DecoderException;
import java.net.ConnectException;
import java.net.SocketException;
import io.netty.channel.SimpleChannelInboundHandler;
import net.minecraft.ChatFormatting;
import net.minecraft.network.Connection;
import net.minecraft.network.HandlerNames;
import net.minecraft.network.chat.Component;
import net.minecraft.network.protocol.Packet;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
Expand All @@ -39,7 +44,7 @@
@Mixin(Connection.class)
public abstract class MixinConnection extends SimpleChannelInboundHandler<Packet<?>> {

@Inject(method = "exceptionCaught", at = @At("HEAD"))
@Inject(method = "exceptionCaught", at = @At("HEAD"), cancellable = true)
private void printNetworkingErrors(ChannelHandlerContext context, Throwable ex, CallbackInfo ci) {
if (DebugSettings.INSTANCE.printNetworkingErrorsToLogs.getValue()) {
if (ex instanceof SocketException || ex instanceof ConnectException) {
Expand All @@ -48,6 +53,24 @@ private void printNetworkingErrors(ChannelHandlerContext context, Throwable ex,
}
ViaFabricPlusImpl.INSTANCE.getLogger().error("An exception occurred while handling a packet", ex);
}

// When ignorePacketTranslationErrors is enabled, swallow DecoderExceptions
// to prevent the client from being disconnected. The exception originates from
// ByteToMessageDecoder which catches it internally and fires exceptionCaught
// on the pipeline — it never reaches ViaFabricPlusDecoder's catch block.
if (ex instanceof DecoderException) {
final int mode = GeneralSettings.INSTANCE.ignorePacketTranslationErrors.getIndex();
if (mode > 0) {
ViaFabricPlusImpl.INSTANCE.getLogger().error("ViaFabricPlus ignored a packet translation error", ex);
if (mode == 1) {
ChatUtil.sendPrefixedMessage(
Component.translatable("translation.viafabricplus.packet_error")
.withStyle(ChatFormatting.RED)
);
}
ci.cancel();
}
}
}

@Override
Expand All @@ -64,4 +87,4 @@ public void userEventTriggered(final ChannelHandlerContext ctx, final Object evt
super.userEventTriggered(ctx, evt);
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

import com.viaversion.viafabricplus.ViaFabricPlusImpl;
import com.viaversion.viafabricplus.settings.impl.GeneralSettings;
import io.netty.handler.codec.DecoderException;
import com.viaversion.viafabricplus.util.ChatUtil;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.exception.CancelCodecException;
Expand All @@ -37,6 +38,24 @@ public ViaFabricPlusDecoder(UserConnection connection) {
super(connection);
}

@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
if (cause instanceof DecoderException) {
final int mode = GeneralSettings.INSTANCE.ignorePacketTranslationErrors.getIndex();
if (mode > 0) {
ViaFabricPlusImpl.INSTANCE.getLogger().error("ViaFabricPlus ignored a packet translation error", cause);
if (mode == 1) {
ChatUtil.sendPrefixedMessage(
Component.translatable("translation.viafabricplus.packet_error")
.withStyle(ChatFormatting.RED)
);
}
return;
}
}
super.exceptionCaught(ctx, cause);
}

@Override
public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
try {
Expand Down