From 26dad992659f7db5993ded7e444d41052dc9a3c5 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Thu, 12 Oct 2023 01:13:19 +1000 Subject: [PATCH] 23w41a --- .../api/protocol/version/ProtocolVersion.java | 2 +- .../Protocol1_20_3To1_20_2.java | 23 ++++++++++++------ .../viaversion/data/identifiers-1.20.3.nbt | Bin 0 -> 3269 bytes .../data/mappings-1.20.2to1.20.3.nbt | Bin 0 -> 273 bytes gradle.properties | 2 +- 5 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 common/src/main/resources/assets/viaversion/data/identifiers-1.20.3.nbt create mode 100644 common/src/main/resources/assets/viaversion/data/mappings-1.20.2to1.20.3.nbt 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 0c7bf63e6..eb9ee2959 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 @@ -85,7 +85,7 @@ public class ProtocolVersion { public static final ProtocolVersion v1_19_4 = register(762, "1.19.4"); public static final ProtocolVersion v1_20 = register(763, "1.20/1.20.1", new VersionRange("1.20", 0, 1)); public static final ProtocolVersion v1_20_2 = register(764, "1.20.2"); - public static final ProtocolVersion v1_20_3 = register(765, 154, "1.20.3"); + public static final ProtocolVersion v1_20_3 = register(765, 156, "1.20.3"); public static final ProtocolVersion unknown = register(-1, "UNKNOWN"); public static ProtocolVersion register(int version, String name) { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/Protocol1_20_3To1_20_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/Protocol1_20_3To1_20_2.java index 4b5d649a1..7bc393021 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/Protocol1_20_3To1_20_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/Protocol1_20_3To1_20_2.java @@ -37,6 +37,8 @@ import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; +import com.viaversion.viaversion.api.data.MappingData; +import com.viaversion.viaversion.api.data.MappingDataBase; import com.viaversion.viaversion.api.minecraft.entities.Entity1_19_4Types; import com.viaversion.viaversion.api.protocol.AbstractProtocol; import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType; @@ -53,7 +55,7 @@ import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.Clientbou import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ServerboundConfigurationPackets1_20_2; import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ServerboundPackets1_20_2; import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.rewriter.EntityPacketRewriter1_20_3; -import com.viaversion.viaversion.util.GsonUtil; +import com.viaversion.viaversion.rewriter.SoundRewriter; import java.util.BitSet; import java.util.Map; import java.util.UUID; @@ -61,6 +63,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; public final class Protocol1_20_3To1_20_2 extends AbstractProtocol { + public static final MappingData MAPPINGS = new MappingDataBase("1.20.2", "1.20.3"); private final EntityPacketRewriter1_20_3 entityRewriter = new EntityPacketRewriter1_20_3(this); public Protocol1_20_3To1_20_2() { @@ -71,6 +74,10 @@ public final class Protocol1_20_3To1_20_2 extends AbstractProtocol soundRewriter = new SoundRewriter<>(this); + soundRewriter.register1_19_3Sound(ClientboundPackets1_20_2.SOUND); + soundRewriter.registerEntitySound(ClientboundPackets1_20_2.ENTITY_SOUND); + // Components are now (mostly) written as nbt instead of json strings registerClientbound(ClientboundPackets1_20_2.ADVANCEMENTS, wrapper -> { wrapper.passthrough(Type.BOOLEAN); // Reset/clear @@ -271,14 +278,10 @@ public final class Protocol1_20_3To1_20_2 extends AbstractProtocolP=lux{k2u(`qbwUJjPqSvhov~LC#lgOKnWjt!D8W|F8 zn?W}hWpT{4^tEy02n|HJf7yjasM7?cJnq}J&iFxF+O*DI)SXUkkiD~_(?QiR5j&v2 zRV}@!zNe!yP($>S46T-yUKL(w!X3sMI$(muazkFi%qtlTI}c0HhpIBtNzq1K-33Y< z%3pNS_L1Jz2Q<^lHVSs8WE5U~id?91;I4%0M81mNI_RlwUo52)tA2CgA_5$%;O)+R z(5efrr*k(2D{=ASj&(oC2#5EuCef)k?k1qyD7t_U&^`;|Uz2WW)pKZei|w1i^>~*~ zgY(e%)18A0QPFCc;)V9wm?>&!Vd$&2Nd?&?OtBE)=iV7L(u$v?Lw@*yg#9Nqc1t++ zM#(sci*<>PM)yOq*>q=M1Q0n&+UFl5CeePB{U}8<)o}MH1G{^-7+;Of#UVHc4aNzM z-nd2qrnK`Cs^Vf=dtgY?#xstAF+adh*#F{n52?-`IF!Gr!-TNzJWQ57UfO$SWDqqV zfW5Am?I$El=yV)t6J%XO%WaU?d|(r$8R46C9Dq;S#$ht7@^K!BdNKwf-A8S%^Ci1@ zQIO%(@i7u50PAQpVt9-r0P+dZ(P~x!w^&5GL}16`4ES^O5`g~{&tvq+?jVgQ$-J49 zab0k+j##@x*%We)Zj)?bxS~T+A8E<#mjr+v@Oc8|fPw#BaG0-bM&5|Rcr&TLvJZzZCIBcwcfoEN-P*DXKCEb`pqJPjA z$q&FKnOpBOkJ1rD5bk1m0aS@pro&8S1;(3ts%yAqU08S31R&|$A_ICQp00VD39SZC zr-3ll-m^{yn4`mkJIc(!jmz3`*?N;m+b7SI>8hPT9AEe=8jyQn*V~8^0Vr-tMfeY2 zzJb;_gW#)yfj>`q(1Nd8!Uj~C#S=`1#xZ>eHR{A_REr1zc2+lFNhIWANmeTp29qFd z=NQns13RGJplSp-7d&!R5mz)wF%jJa{w`xE7HVjmRVYB-MOJw|fC0c)+Hz4uv~#(fS+Bb4I>?z4nR!drzGeDbvho!~g1E*J6@yke zTD$QMw$c;G3v39fcMjn7E^skg1yC4>Bp=vBs}zduDwATB^A;EZq~Z-kBVx>X)XsyJX8u~*d{hXdK6ETQmrmX(7s1c#DLmocJP3Ks^|>}#=xd@ z_k{p|p<^9%FI%m`@5o|9r{}yg+-{tog4RvUckfRLw-a1vKiy&+Q2Xf+7bQqGg;wa$ zg9C&QuG6@xDujwGMPpgO%H!2lHNWNWuk>2BAa9Xjr+I%+x$vMpDoL7?=a|QSSzBjP zq(TE0@6&cvF@l}xY-{FB&;!y-B-zuJB|O;iz%x@lP8EJOGe&jc;8jGn8| z2D+6}RnTqQ9(L`}s+6TuY=CRD%K@O~&ITOENiaC>V^Onj`r9|0SOLW&RmB|M_Z}3; zEud9I>6xGDCR@M^>$z^g u?jOGs2yVuA4P4( literal 0 HcmV?d00001 diff --git a/gradle.properties b/gradle.properties index 22c4455ac..34d1e758f 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.9.0-23w40a-SNAPSHOT +projectVersion=4.9.0-23w41a-SNAPSHOT # Smile emoji mcVersions=1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10, 1.9.4, 1.9.3, 1.9.2, 1.9.1, 1.9, 1.8.9