From 57f0d58d587bade0eeb62889bd76bf173fee80cc Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Mon, 27 Feb 2023 16:12:35 +0100 Subject: [PATCH] 1.19.4-pre2 --- .../viaversion/api/platform/ViaServerProxyPlatform.java | 9 --------- .../protocol/packet/provider/PacketTypesProvider.java | 2 ++ .../packet/provider/SimplePacketTypesProvider.java | 2 ++ .../viaversion/api/protocol/version/ProtocolVersion.java | 2 +- build-logic/build.gradle.kts | 2 +- gradle.properties | 2 +- settings.gradle.kts | 2 +- 7 files changed, 8 insertions(+), 13 deletions(-) diff --git a/api/src/main/java/com/viaversion/viaversion/api/platform/ViaServerProxyPlatform.java b/api/src/main/java/com/viaversion/viaversion/api/platform/ViaServerProxyPlatform.java index c10424ef2..c8cc43385 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/platform/ViaServerProxyPlatform.java +++ b/api/src/main/java/com/viaversion/viaversion/api/platform/ViaServerProxyPlatform.java @@ -22,15 +22,6 @@ */ package com.viaversion.viaversion.api.platform; -import com.google.common.annotations.Beta; - -/** - * Represents a platform that proxies a list of Minecraft servers (Velocity, Bungee). - * A platform might not be a proxy platform, even if {@link ViaPlatform#isProxy()} is true. - * - * @param platform player type - */ -@Beta public interface ViaServerProxyPlatform extends ViaPlatform { /** diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/packet/provider/PacketTypesProvider.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/packet/provider/PacketTypesProvider.java index 1bd838622..e8ab757ca 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/protocol/packet/provider/PacketTypesProvider.java +++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/packet/provider/PacketTypesProvider.java @@ -22,6 +22,7 @@ */ package com.viaversion.viaversion.api.protocol.packet.provider; +import com.google.common.annotations.Beta; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType; import com.viaversion.viaversion.api.protocol.packet.State; @@ -36,6 +37,7 @@ import java.util.Map; * @param unmapped serverbound packet type * @see SimplePacketTypesProvider */ +@Beta public interface PacketTypesProvider { /** diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/packet/provider/SimplePacketTypesProvider.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/packet/provider/SimplePacketTypesProvider.java index 40da41c0d..10d7dfbc6 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/protocol/packet/provider/SimplePacketTypesProvider.java +++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/packet/provider/SimplePacketTypesProvider.java @@ -22,11 +22,13 @@ */ package com.viaversion.viaversion.api.protocol.packet.provider; +import com.google.common.annotations.Beta; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType; import com.viaversion.viaversion.api.protocol.packet.State; import java.util.Map; +@Beta public final class SimplePacketTypesProvider implements PacketTypesProvider { private final Map> unmappedClientboundPacketTypes; private final Map> mappedClientboundPacketTypes; diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java index 0569dcae3..4bfe506ab 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java +++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java @@ -82,7 +82,7 @@ public class ProtocolVersion { public static final ProtocolVersion v1_19 = register(759, "1.19"); public static final ProtocolVersion v1_19_1 = register(760, "1.19.1/2", new VersionRange("1.19", 1, 2)); public static final ProtocolVersion v1_19_3 = register(761, "1.19.3"); - public static final ProtocolVersion v1_19_4 = register(762, 120, "1.19.4"); + public static final ProtocolVersion v1_19_4 = register(762, 121, "1.19.4"); public static final ProtocolVersion unknown = register(-1, "UNKNOWN"); public static ProtocolVersion register(int version, String name) { diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts index 68297504b..8107b456d 100644 --- a/build-logic/build.gradle.kts +++ b/build-logic/build.gradle.kts @@ -8,5 +8,5 @@ repositories { dependencies { // version must be manually kept in sync with the one in root project settings.gradle.kts - implementation("gradle.plugin.com.github.johnrengelman", "shadow", "7.1.2") + implementation("gradle.plugin.com.github.johnrengelman", "shadow", "8.0.0") } diff --git a/gradle.properties b/gradle.properties index 2cf8d7644..a4b910643 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Project properties - we put these here so they can be modified without causing a recompile of the build scripts -projectVersion=4.6.0-1.19.4-pre1-SNAPSHOT +projectVersion=4.6.0-1.19.4-pre2-SNAPSHOT # Gradle properties org.gradle.daemon=true diff --git a/settings.gradle.kts b/settings.gradle.kts index b19c9cbe1..d4be6e988 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -18,7 +18,7 @@ pluginManagement { // default plugin versions plugins { id("net.kyori.blossom") version "1.2.0" - id("com.github.johnrengelman.shadow") version "7.1.2" + id("com.github.johnrengelman.shadow") version "8.0.0" } }