diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/always_set_highest_op_level/MixinClientPlayerEntity.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/always_set_highest_op_level/MixinClientPlayerEntity.java deleted file mode 100644 index 339b29ea..00000000 --- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/always_set_highest_op_level/MixinClientPlayerEntity.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * This file is part of ViaFabricPlus - https://github.com/ViaVersion/ViaFabricPlus - * Copyright (C) 2021-2024 the original authors - * - FlorianMichael/EnZaXD - * - RK_01/RaphiMC - * Copyright (C) 2023-2024 ViaVersion 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 com.viaversion.viafabricplus.injection.mixin.features.networking.always_set_highest_op_level; - -import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator; -import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; -import net.minecraft.client.network.ClientPlayerEntity; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(ClientPlayerEntity.class) -public abstract class MixinClientPlayerEntity { - - @Shadow - public abstract void setClientPermissionLevel(int clientPermissionLevel); - - @Inject(method = "init", at = @At("RETURN")) - private void setOpLevel4(CallbackInfo ci) { - if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_8)) { - this.setClientPermissionLevel(4); - } - } - -} diff --git a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/warn_feature_updates/MixinClientConfigurationNetworkHandler.java b/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/warn_feature_updates/MixinClientConfigurationNetworkHandler.java deleted file mode 100644 index cdb040f1..00000000 --- a/src/main/java/com/viaversion/viafabricplus/injection/mixin/features/networking/warn_feature_updates/MixinClientConfigurationNetworkHandler.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * This file is part of ViaFabricPlus - https://github.com/ViaVersion/ViaFabricPlus - * Copyright (C) 2021-2024 the original authors - * - FlorianMichael/EnZaXD - * - RK_01/RaphiMC - * Copyright (C) 2023-2024 ViaVersion 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 com.viaversion.viafabricplus.injection.mixin.features.networking.warn_feature_updates; - -import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator; -import com.viaversion.viafabricplus.util.ChatUtil; -import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; -import net.minecraft.client.network.ClientConfigurationNetworkHandler; -import net.minecraft.network.packet.s2c.config.FeaturesS2CPacket; -import net.minecraft.text.Text; -import net.minecraft.util.Formatting; -import net.minecraft.util.Identifier; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(ClientConfigurationNetworkHandler.class) -public abstract class MixinClientConfigurationNetworkHandler { - - @Inject(method = "onFeatures", at = @At(value = "HEAD")) - private void notifyAboutFeatures(FeaturesS2CPacket packet, CallbackInfo ci) { - if (ProtocolTranslator.getTargetVersion().olderThan(ProtocolVersion.v1_20) && packet.features().contains(Identifier.of("update_1_20"))) { - ChatUtil.sendPrefixedMessage(Text.translatable("translation.viafabricplus.updates_1_20").formatted(Formatting.RED)); - } - } - -} \ No newline at end of file diff --git a/src/main/resources/assets/viafabricplus/lang/de_de.json b/src/main/resources/assets/viafabricplus/lang/de_de.json index efb44205..1e5d234f 100644 --- a/src/main/resources/assets/viafabricplus/lang/de_de.json +++ b/src/main/resources/assets/viafabricplus/lang/de_de.json @@ -140,7 +140,6 @@ "betacraft.viafabricplus.loading": "Laden...", "betacraft.viafabricplus.warning": "Durch Drücken dieser Schaltfläche werden API-Anfragen an \"betacraft.de/serverlist\" gesendet.", - "translation.viafabricplus.updates_1_20": "Dieser Server hat die update_1_20-Funktionen aktiviert. Dies wird nicht vollständig unterstützt und kann zu Problemen führen.", "translation.viafabricplus.packet_error": "Beim Übersetzen eines Pakets ist ein Fehler aufgetreten! Weitere Details findest du in den Protokollen!", "classic4j_library.viafabricplus.error.token": "Falsches Token. Ist dein ViaFabricPlus veraltet?", diff --git a/src/main/resources/assets/viafabricplus/lang/en_us.json b/src/main/resources/assets/viafabricplus/lang/en_us.json index b115a197..de6792be 100644 --- a/src/main/resources/assets/viafabricplus/lang/en_us.json +++ b/src/main/resources/assets/viafabricplus/lang/en_us.json @@ -141,7 +141,6 @@ "betacraft.viafabricplus.loading": "Loading...", "betacraft.viafabricplus.warning": "Pressing this button will send API requests to \"betacraft.uk/serverlist\".", - "translation.viafabricplus.updates_1_20": "This server has the update_1_20 features enabled. This is not fully supported and may cause issues.", "translation.viafabricplus.packet_error": "An error occurred while translating a packet! See more details in the logs!", "classic4j_library.viafabricplus.error.token": "Incorrect token. Is your ViaFabricPlus out of date?", diff --git a/src/main/resources/assets/viafabricplus/lang/ja_jp.json b/src/main/resources/assets/viafabricplus/lang/ja_jp.json index b58a0600..2cf159f1 100644 --- a/src/main/resources/assets/viafabricplus/lang/ja_jp.json +++ b/src/main/resources/assets/viafabricplus/lang/ja_jp.json @@ -141,7 +141,6 @@ "betacraft.viafabricplus.loading": "読み込み中...", "betacraft.viafabricplus.warning": "このボタンを押すと、APIリクエストが\"betacraft.uk/serverlist\"に送信されます", - "translation.viafabricplus.updates_1_20": "このサーバーでは1.20のアップデート機能が有効になっています。これは完全にはサポートされておらず、問題が発生する可能性があります", "translation.viafabricplus.packet_error": "パケットの変換中にエラーが発生しました。詳細はログを参照してください", "classic4j_library.viafabricplus.error.token": "トークンが無効です。ViaFabricPlusのバージョンが古くなっている可能性があります", @@ -167,4 +166,4 @@ "bedrock_realms.viafabricplus.invite": "招待コードを承認", "bedrock_realms.viafabricplus.expired": "Realmの有効期限が切れました", "bedrock_realms.viafabricplus.incompatible": "Realmsのバージョンが古い、または新しすぎる可能性があります" -} \ No newline at end of file +} diff --git a/src/main/resources/assets/viafabricplus/lang/ko_kr.json b/src/main/resources/assets/viafabricplus/lang/ko_kr.json index c3b495c6..0694f1b9 100644 --- a/src/main/resources/assets/viafabricplus/lang/ko_kr.json +++ b/src/main/resources/assets/viafabricplus/lang/ko_kr.json @@ -135,7 +135,6 @@ "betacraft.viafabricplus.loading": "불러오는 중...", "betacraft.viafabricplus.warning": "이것으로 betacraft.uk/serverlist에 API 요청을 보내게 됩니다.", - "translation.viafabricplus.updates_1_20": "이 서버는 update_1_20 실험 기능이 켜져있습니다. 이는 전체적으로 지원되지 않으며, 오류를 일으킬 수 있습니다.", "translation.viafabricplus.packet_error": "패킷을 변환하는 도중 오류가 발생했습니다... 자세한 정보는 로그를 참조하세요.", "classic4j_library.viafabricplus.error.token": "잘못된 토큰입니다. ViaFabricPlus 버전이 오래되었나요?", diff --git a/src/main/resources/assets/viafabricplus/lang/lzh.json b/src/main/resources/assets/viafabricplus/lang/lzh.json index 80c863cb..bdc3b081 100644 --- a/src/main/resources/assets/viafabricplus/lang/lzh.json +++ b/src/main/resources/assets/viafabricplus/lang/lzh.json @@ -129,7 +129,6 @@ "betacraft.viafabricplus.loading": "方載", "betacraft.viafabricplus.warning": "押此鈕將送API請求至「betacraft.uk/serverlist」。", - "translation.viafabricplus.updates_1_20": "是伺服器既啟一點二〇之新物。此尚未完備，恐致舛誤。", "translation.viafabricplus.packet_error": "有舛生於譯囊之時！察誌以閱其詳！", "classic4j_library.viafabricplus.error.token": "其令有誤。汝之ViaFabricPlus逾期乎？", @@ -143,4 +142,4 @@ "minecraftauth_library.viafabricplus.mcchain": "方驗礦藝服務", "minecraftauth_library.viafabricplus.xblxststoken": "方求XSTS之令", "minecraftauth_library.viafabricplus.playfabtoken": "方驗PlayFab" -} \ No newline at end of file +} diff --git a/src/main/resources/assets/viafabricplus/lang/pl_pl.json b/src/main/resources/assets/viafabricplus/lang/pl_pl.json index 31aa1259..a90b0264 100644 --- a/src/main/resources/assets/viafabricplus/lang/pl_pl.json +++ b/src/main/resources/assets/viafabricplus/lang/pl_pl.json @@ -141,7 +141,6 @@ "betacraft.viafabricplus.loading": "Ładowanie...", "betacraft.viafabricplus.warning": "Naciśnięcie tego przycisku wyśle zapytanie api pod ten adres: https://betacraft.uk/serverlist", - "translation.viafabricplus.updates_1_20": "Ten serwer ma włączony update_1_20. Nie jest to w pełni wspierane i może powodować problemy.", "translation.viafabricplus.packet_error": "Wystąpił błąd podczas tłumaczenia pakietu! Więcej detali w logach.", "classic4j_library.viafabricplus.error.token": "Niepoprawny token. Czy jesteś pewnien, że twoja wersja ViaFabricPlus nie jest przestarzała? Spróbuj zaktualizować tą modyfikację.", diff --git a/src/main/resources/assets/viafabricplus/lang/ru_ru.json b/src/main/resources/assets/viafabricplus/lang/ru_ru.json index b65efb16..da62562b 100644 --- a/src/main/resources/assets/viafabricplus/lang/ru_ru.json +++ b/src/main/resources/assets/viafabricplus/lang/ru_ru.json @@ -135,7 +135,6 @@ "betacraft.viafabricplus.loading": "Загрузка...", "betacraft.viafabricplus.warning": "Нажатие этой кнопки отправит запрос к API \"betacraft.uk/serverlist\".", - "translation.viafabricplus.updates_1_20": "На этом сервере включены эксперименты обновления 1.20. Они полноценно не поддерживаются и могут привести к ошибкам.", "translation.viafabricplus.packet_error": "Во время преобразования пакета произошла ошибка. Проверьте журнал для получения подробностей.", "classic4j_library.viafabricplus.error.token": "Некорректный токен. Возможно, версия ViaFabricPlus устарела.", diff --git a/src/main/resources/assets/viafabricplus/lang/tr_tr.json b/src/main/resources/assets/viafabricplus/lang/tr_tr.json index ea428908..21787bdb 100644 --- a/src/main/resources/assets/viafabricplus/lang/tr_tr.json +++ b/src/main/resources/assets/viafabricplus/lang/tr_tr.json @@ -118,7 +118,6 @@ "betacraft.viafabricplus.loading": "Yükleniyor...", "betacraft.viafabricplus.warning": "Bu butona tıklamak şuraya API isteği gönderir: \"betacraft.uk/serverlist\".", - "translation.viafabricplus.updates_1_20": "Bu sunucuda update_1_20 özellikleri etkinleştirilmiştir. Bu tam olarak desteklenmemektedir ve sorunlara neden olabilir.", "translation.viafabricplus.packet_error": "Bir paket çevrilirken bir hata oluştu! Daha fazla ayrıntı için logları konrol edin!", "classic4j_library.viafabricplus.error.token": "Yanlış token. ViaFabricPlus'ınızın güncel olup olmadığını kontrol edin.", diff --git a/src/main/resources/assets/viafabricplus/lang/zh_cn.json b/src/main/resources/assets/viafabricplus/lang/zh_cn.json index f172f4a9..b812521a 100644 --- a/src/main/resources/assets/viafabricplus/lang/zh_cn.json +++ b/src/main/resources/assets/viafabricplus/lang/zh_cn.json @@ -137,7 +137,6 @@ "betacraft.viafabricplus.loading": "加载中…", "betacraft.viafabricplus.warning": "按下此按钮将向“betacraft.uk/serverlist”发送API请求。", - "translation.viafabricplus.updates_1_20": "此服务器启用了“1.20更新”功能。此功能未完全支持，可能会引起问题。", "translation.viafabricplus.packet_error": "转译数据包时发生错误！请在日志中查看更多详细信息！", "classic4j_library.viafabricplus.error.token": "令牌不正确。你的ViaFabricPlus版本是否过旧？", diff --git a/src/main/resources/assets/viafabricplus/lang/zh_hk.json b/src/main/resources/assets/viafabricplus/lang/zh_hk.json index 3d6e81e0..87f7c678 100644 --- a/src/main/resources/assets/viafabricplus/lang/zh_hk.json +++ b/src/main/resources/assets/viafabricplus/lang/zh_hk.json @@ -118,7 +118,6 @@ "betacraft.viafabricplus.loading": "載入中...", "betacraft.viafabricplus.warning": "點擊這個按鈕會向 “betacraft.uk/serverlist” 發送 API 請求", - "translation.viafabricplus.updates_1_20": "這個伺服器啓用咗 1.20 更新特性. 這沒有被完全支援，可能導致問題.", "translation.viafabricplus.packet_error": "翻譯網路封包時發生錯誤! 在游戲日誌中查看更多信息!", "classic4j_library.viafabricplus.error.token": "Token 唔正確。请确认你嘅 ViaFabricPlus 系最新版本！", diff --git a/src/main/resources/assets/viafabricplus/lang/zh_tw.json b/src/main/resources/assets/viafabricplus/lang/zh_tw.json index 7294f1ce..4b0550a4 100644 --- a/src/main/resources/assets/viafabricplus/lang/zh_tw.json +++ b/src/main/resources/assets/viafabricplus/lang/zh_tw.json @@ -139,7 +139,6 @@ "betacraft.viafabricplus.loading": "正在載入...", "betacraft.viafabricplus.warning": "按下這個按鈕將向「betacraft.uk/serverlist」傳送 API 請求。", - "translation.viafabricplus.updates_1_20": "這個伺服器啟用了 1.20 更新特性。這沒有被完全支援，可能導致問題。", "translation.viafabricplus.packet_error": "轉譯網路封包時發生錯誤！在遊戲記錄檔中查看更多資訊！", "classic4j_library.viafabricplus.error.token": "權杖不正確。您的 ViaFabricPlus 版本是否太舊？", diff --git a/src/main/resources/viafabricplus.mixins.json b/src/main/resources/viafabricplus.mixins.json index ac04bd8b..2f65506f 100644 --- a/src/main/resources/viafabricplus.mixins.json +++ b/src/main/resources/viafabricplus.mixins.json @@ -197,7 +197,6 @@ "features.movement.water_movement.MixinItemEntity", "features.movement.water_movement.MixinLivingEntity", "features.movement.water_movement.MixinSkeletonHorseEntity", - "features.networking.always_set_highest_op_level.MixinClientPlayerEntity", "features.networking.config_state.MixinClientConfigurationNetworkHandler", "features.networking.config_state.MixinClientPlayNetworkHandler", "features.networking.config_state.MixinNetworkStateTransitionHandler", @@ -229,7 +228,6 @@ "features.networking.srv_resolving.MixinConnectScreen_1", "features.networking.srv_resolving.MixinRedirectResolver", "features.networking.srv_resolving.MixinServerAddress", - "features.networking.warn_feature_updates.MixinClientConfigurationNetworkHandler", "features.recipe_emulation.MixinCraftingScreenHandler", "features.recipe_emulation.MixinEntityPacketRewriter1_12", "features.recipe_emulation.MixinPlayerScreenHandler",