diff --git a/src/main/java/net/raphimc/viaproxy/injection/ClassicWorldHeightInjection.java b/src/main/java/net/raphimc/viaproxy/injection/ClassicWorldHeightInjection.java index 5ccd748..365fe1a 100644 --- a/src/main/java/net/raphimc/viaproxy/injection/ClassicWorldHeightInjection.java +++ b/src/main/java/net/raphimc/viaproxy/injection/ClassicWorldHeightInjection.java @@ -26,9 +26,6 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_17; import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; -import com.viaversion.viaversion.libs.opennbt.tag.builtin.IntTag; -import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag; -import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag; import net.raphimc.vialegacy.api.LegacyProtocolVersion; import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.model.ClassicLevel; import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.providers.ClassicWorldHeightProvider; @@ -46,8 +43,8 @@ public class ClassicWorldHeightInjection { if (wrapper.isCancelled()) return; if (wrapper.user().getProtocolInfo().serverProtocolVersion().olderThanOrEqualTo(LegacyProtocolVersion.c0_28toc0_30)) { - for (Tag dimension : wrapper.get(Type.NAMED_COMPOUND_TAG, 0).get("minecraft:dimension_type").get("value")) { - changeDimensionTagHeight(wrapper.user(), ((CompoundTag) dimension).get("element")); + for (CompoundTag dimension : wrapper.get(Type.NAMED_COMPOUND_TAG, 0).getCompoundTag("minecraft:dimension_type").getListTag("value", CompoundTag.class)) { + changeDimensionTagHeight(wrapper.user(), dimension.getCompoundTag("element")); } changeDimensionTagHeight(wrapper.user(), wrapper.get(Type.NAMED_COMPOUND_TAG, 1)); } @@ -169,7 +166,7 @@ public class ClassicWorldHeightInjection { } private static void changeDimensionTagHeight(final UserConnection user, final CompoundTag tag) { - tag.put("height", new IntTag(Via.getManager().getProviders().get(ClassicWorldHeightProvider.class).getMaxChunkSectionCount(user) << 4)); + tag.putInt("height", Via.getManager().getProviders().get(ClassicWorldHeightProvider.class).getMaxChunkSectionCount(user) << 4); } } diff --git a/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinChatItemRewriter.java b/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinChatItemRewriter.java deleted file mode 100644 index 38e197b..0000000 --- a/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinChatItemRewriter.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * This file is part of ViaProxy - https://github.com/RaphiMC/ViaProxy - * Copyright (C) 2021-2024 RK_01/RaphiMC and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package net.raphimc.viaproxy.injection.mixins; - -import com.viaversion.viaversion.api.Via; -import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.ChatItemRewriter; -import net.lenni0451.mcstructs.snbt.SNbtSerializer; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -import java.util.logging.Level; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -@Mixin(value = ChatItemRewriter.class, remap = false) -public abstract class MixinChatItemRewriter { - - @Redirect(method = "toClient", at = @At(value = "INVOKE", target = "Ljava/util/regex/Pattern;matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher;")) - private static Matcher rewriteShowItem(Pattern pattern, CharSequence input) { - try { - input = SNbtSerializer.V1_12.serialize(SNbtSerializer.V1_8.deserialize(input.toString())); - } catch (Throwable e) { - Via.getPlatform().getLogger().log(Level.WARNING, "Error converting 1.11.2 nbt to 1.12.2 nbt: '" + input + "'", e); - } - return Pattern.compile("$^").matcher(input); - } - -}