diff --git a/build.gradle b/build.gradle index ed1ae889..0fd82c72 100644 --- a/build.gradle +++ b/build.gradle @@ -65,12 +65,13 @@ dependencies { } jis "net.raphimc:ViaAprilFools:${project.viaaprilfools_version}" jis ("net.raphimc:ViaBedrock:${project.viabedrock_version}") { + exclude group: "io.netty" + exclude group: "io.jsonwebtoken" exclude group: "net.lenni0451.mcstructs", module: "text" - exclude group: "io.jsonwebtoken", module: "jjwt-impl" - exclude group: "io.jsonwebtoken", module: "jjwt-gson" exclude group: "com.mojang", module: "brigadier" } jis ("net.raphimc:ViaLoader:${project.vialoader_version}") { + exclude group: "com.google.guava", module: "guava" exclude group: "org.slf4j", module: "slf4j-api" } @@ -80,10 +81,7 @@ dependencies { exclude group: "org.slf4j", module: "slf4j-api" } jis("org.cloudburstmc.netty:netty-transport-raknet:${project.raknet_transport_version}") { - exclude group: "io.netty", module: "netty-common" - exclude group: "io.netty", module: "netty-buffer" - exclude group: "io.netty", module: "netty-codec" - exclude group: "io.netty", module: "netty-transport" + exclude group: "io.netty" } // Lenni0451 Libraries diff --git a/gradle.properties b/gradle.properties index abcf2443..ee308e1d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ archives_base_name=viafabricplus # ViaVersion Libraries viaversion_version=4.9.0-23w44a-SNAPSHOT -viabackwards_version=4.9.0-23w43a-SNAPSHOT +viabackwards_version=4.9.0-23w44a-SNAPSHOT vialegacy_version=2.2.21-SNAPSHOT viaaprilfools_version=2.0.10-SNAPSHOT viabedrock_version=0.0.3-SNAPSHOT diff --git a/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/viaversion/ViaFabricPlusPlayerLookTargetProvider.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/viaversion/ViaFabricPlusPlayerLookTargetProvider.java index b8c93ca2..182861d9 100644 --- a/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/viaversion/ViaFabricPlusPlayerLookTargetProvider.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/provider/viaversion/ViaFabricPlusPlayerLookTargetProvider.java @@ -22,14 +22,12 @@ import com.viaversion.viaversion.api.minecraft.Position; import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.PlayerLookTargetProvider; import net.minecraft.client.MinecraftClient; import net.minecraft.util.hit.BlockHitResult; -import net.minecraft.util.hit.HitResult; import net.minecraft.util.math.BlockPos; -import org.checkerframework.checker.nullness.qual.Nullable; public class ViaFabricPlusPlayerLookTargetProvider extends PlayerLookTargetProvider { @Override - public @Nullable Position getPlayerLookTarget(UserConnection info) { + public Position getPlayerLookTarget(UserConnection info) { if (MinecraftClient.getInstance().crosshairTarget instanceof BlockHitResult blockHitResult) { final BlockPos pos = blockHitResult.getBlockPos(); return new Position(pos.getX(), pos.getY(), pos.getZ());