diff --git a/build.gradle b/build.gradle index e89412f25dd..09e79cdd989 100644 --- a/build.gradle +++ b/build.gradle @@ -120,7 +120,10 @@ dependencies { modRuntimeOnly "com.terraformersmc:modmenu:${project.mod_menu_version}" modImplementation "maven.modrinth:sodium:${project.sodium_version}" modImplementation "maven.modrinth:lithium:${project.lithium_version}" - modImplementation "com.viaversion:viafabricplus:${project.viafabricplus_version}" + + // ViaFabricPlus + modImplementation "com.viaversion:viafabricplus-api:${project.viafabricplus_version}" + modRuntimeOnly "com.viaversion:viafabricplus:${project.viafabricplus_version}" // Minecraft Authlib includeDependency ("com.github.CCBlueX:mc-authlib:${project.mc_authlib_version}") { @@ -181,6 +184,9 @@ dependencies { testImplementation "org.junit.jupiter:junit-jupiter:5.11.3" testRuntimeOnly "org.junit.platform:junit-platform-launcher" + // Fix nullable annotations + compileOnly "com.google.code.findbugs:jsr305:3.0.2" + afterEvaluate { configurations.includeDependency.incoming.resolutionResult.allDependencies.each { dependencies.include(dependencies.implementation(dependencies.compileOnlyApi(it.requested.toString()) { diff --git a/gradle.properties b/gradle.properties index 5cbe724aa22..61f477ce9bd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -46,4 +46,4 @@ mc_authlib_version=1.4.1 mod_menu_version=13.0.0-beta.1 sodium_version=mc1.21.4-0.6.5-fabric lithium_version=mc1.21.4-0.14.3-fabric -viafabricplus_version=4.0.0-SNAPSHOT +viafabricplus_version=4.0.0 diff --git a/src/main/java/net/ccbluex/liquidbounce/utils/client/vfp/VfpCompatibility1_8.java b/src/main/java/net/ccbluex/liquidbounce/utils/client/vfp/VfpCompatibility1_8.java index 67c16f2093f..4b0482d502f 100644 --- a/src/main/java/net/ccbluex/liquidbounce/utils/client/vfp/VfpCompatibility1_8.java +++ b/src/main/java/net/ccbluex/liquidbounce/utils/client/vfp/VfpCompatibility1_8.java @@ -21,6 +21,7 @@ package net.ccbluex.liquidbounce.utils.client.vfp; +import com.viaversion.viafabricplus.ViaFabricPlus; import com.viaversion.viaversion.api.minecraft.BlockPosition; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType; @@ -30,8 +31,6 @@ import java.util.function.Consumer; -import static de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator.getPlayNetworkUserConnection; - /** * Compatibility layer for ViaFabricPlus on protocol 1.8 *
@@ -61,7 +60,7 @@ private void writePacket(ServerboundPacketType packetType, Consumer