Update for LibJF 2.6

This commit is contained in:
Johannes Frohnmeyer 2022-03-25 19:52:25 +01:00
parent 7a62276aac
commit ec7cff19db
Signed by: Johannes
GPG Key ID: E76429612C2929F4
3 changed files with 7 additions and 5 deletions

View File

@ -1,12 +1,12 @@
# https://fabricmc.net/develop/
minecraft_version=1.18.2
yarn_mappings=build.1
yarn_mappings=build.2
loader_version=0.13.3
maven_group=io.gitlab.jfronny
archives_base_name=GoogleChat
jfapi_version=2.5.0
fabric_version=0.47.8+1.18.2
jfapi_version=2.6.1
fabric_version=0.48.0+1.18.2
modrinth_id=Hd7ZLKRk
modrinth_optional_dependencies=mOgUt4GM

View File

@ -2,6 +2,7 @@ package io.gitlab.jfronny.googlechat.mixin;
import io.gitlab.jfronny.googlechat.GoogleChat;
import io.gitlab.jfronny.googlechat.GoogleChatConfig;
import io.gitlab.jfronny.libjf.translate.api.Language;
import io.gitlab.jfronny.libjf.translate.api.TranslateException;
import io.gitlab.jfronny.libjf.translate.api.TranslateService;
import net.minecraft.network.PacketByteBuf;
@ -31,7 +32,7 @@ public class ChatMessageC2SPacketMixin {
googlechat$translate(GoogleChat.TRANSLATE_SERVICE);
}
private <T> void googlechat$translate(TranslateService<T> ts) {
private <T extends Language> void googlechat$translate(TranslateService<T> ts) {
if (!GoogleChatConfig.enabled) return;
T server = ts.parseLang(GoogleChatConfig.serverLanguage);
if (server == ts.parseLang("auto") || chatMessage.startsWith("/")) return;

View File

@ -2,6 +2,7 @@ package io.gitlab.jfronny.googlechat.mixin;
import io.gitlab.jfronny.googlechat.GoogleChat;
import io.gitlab.jfronny.googlechat.GoogleChatConfig;
import io.gitlab.jfronny.libjf.translate.api.Language;
import io.gitlab.jfronny.libjf.translate.api.TranslateException;
import io.gitlab.jfronny.libjf.translate.api.TranslateService;
import net.fabricmc.api.EnvType;
@ -36,7 +37,7 @@ public class GameMessageS2CPacketMixin {
googlechat$translate(GoogleChat.TRANSLATE_SERVICE);
}
private <T> void googlechat$translate(TranslateService<T> ts) {
private <T extends Language> void googlechat$translate(TranslateService<T> ts) {
if (!GoogleChatConfig.enabled) return;
if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT && GoogleChat.isSelf(sender)) {
return;