Skip to content

Commit 36a8d68

Browse files
committed
Move configuration state tracking into shared registrations
Signed-off-by: Florian Reuth <git@florianreuth.de>
1 parent 9af3076 commit 36a8d68

4 files changed

Lines changed: 4 additions & 9 deletions

File tree

common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_2to1_20/Protocol1_20_2To1_20.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -195,11 +195,6 @@ public void transform(final Direction direction, final State state, final Packet
195195
}
196196
}
197197

198-
@Override
199-
protected void registerConfigurationChangeHandlers() {
200-
// Don't register them in the transitioning protocol
201-
}
202-
203198
@Override
204199
public void init(final UserConnection connection) {
205200
addEntityTracker(connection, new EntityTrackerBase(connection, EntityTypes1_19_4.PLAYER));

common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_5to1_20_3/Protocol1_20_5To1_20_3.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,11 @@ protected void registerPackets() {
9191
tagRewriter.handleGeneric(wrapper);
9292
});
9393

94-
registerClientbound(ClientboundConfigurationPackets1_20_5.FINISH_CONFIGURATION, wrapper -> {
94+
appendClientbound(ClientboundConfigurationPackets1_20_5.FINISH_CONFIGURATION, wrapper -> {
9595
// In case the server for some reason does not send tags
9696
sendRegistryData(wrapper.user());
9797
});
98-
registerClientbound(ClientboundPackets1_20_5.START_CONFIGURATION, wrapper -> wrapper.user().get(RegistryDataStorage.class).clear());
98+
appendClientbound(ClientboundPackets1_20_5.START_CONFIGURATION, wrapper -> wrapper.user().get(RegistryDataStorage.class).clear());
9999

100100
registerClientbound(State.LOGIN, ClientboundLoginPackets.HELLO, wrapper -> {
101101
wrapper.passthrough(Types.STRING); // Server ID

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
projectVersion=5.9.0
1+
projectVersion=5.9.1-SNAPSHOT
22

33
# Smile emoji (note that modrinth may not have added the version on release yet)
44
mcVersions=26.1.2, 26.1.1, 26.1, 1.21.11, 1.21.10, 1.21.9, 1.21.8, 1.21.7, 1.21.6, 1.21.5, 1.21.4, 1.21.3, 1.21.2, 1.21.1, 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 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

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ metadata.format.version = "1.1"
33
[versions]
44

55
# ViaVersion
6-
viaver = "5.9.0"
6+
viaver = "5.9.1-SNAPSHOT"
77

88
# Common provided
99
netty = "4.0.20.Final"

0 commit comments

Comments
 (0)