Skip to content

Commit a6b5541

Browse files
committed
Update VV API usage
1 parent 61ce987 commit a6b5541

5 files changed

Lines changed: 104 additions & 95 deletions

File tree

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ allprojects {
2424
subprojects {
2525

2626
dependencies {
27-
compileOnly("com.viaversion:viaversion:5.9.0")
28-
compileOnly("com.viaversion:viabackwards:5.9.0")
27+
compileOnly("com.viaversion:viaversion:5.9.1-SNAPSHOT")
28+
compileOnly("com.viaversion:viabackwards:5.9.1-SNAPSHOT")
2929
}
3030

3131
tasks {

common/src/main/java/com/viaversion/viaaprilfools/protocol/s25w14craftminetov1_21_5/Protocol25w14craftmineTo1_21_5.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
*/
2121
package com.viaversion.viaaprilfools.protocol.s25w14craftminetov1_21_5;
2222

23-
import com.viaversion.viaaprilfools.api.minecraft.entities.EntityTypes25w14craftmine;
2423
import com.viaversion.viaaprilfools.api.minecraft.item.StructuredDataKeys25w14craftmine;
2524
import com.viaversion.viaaprilfools.api.types.VAFTypes;
2625
import com.viaversion.viaaprilfools.protocol.s25w14craftminetov1_21_5.data.MappingData25w14craftmine;
@@ -45,15 +44,14 @@
4544
import com.viaversion.viaversion.api.protocol.packet.provider.SimplePacketTypesProvider;
4645
import com.viaversion.viaversion.api.type.types.version.Types1_20_5;
4746
import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
48-
import com.viaversion.viaversion.data.entity.EntityTrackerBase;
49-
import com.viaversion.viaversion.data.item.ItemHasherBase;
47+
import com.viaversion.viaversion.protocol.shared_registration.RegistrationContext;
48+
import com.viaversion.viaversion.protocol.shared_registration.def.base.ConfigurationRegistrations;
5049
import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.packet.ClientboundPacket1_21_5;
5150
import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.packet.ClientboundPackets1_21_5;
5251
import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.packet.ServerboundPacket1_21_5;
5352
import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.packet.ServerboundPackets1_21_5;
5453
import com.viaversion.viaversion.rewriter.AttributeRewriter;
5554
import com.viaversion.viaversion.rewriter.ParticleRewriter;
56-
import com.viaversion.viaversion.rewriter.RegistryDataRewriter;
5755
import com.viaversion.viaversion.rewriter.StatisticsRewriter;
5856
import com.viaversion.viaversion.rewriter.TagRewriter;
5957

@@ -114,11 +112,17 @@ protected void registerPackets() {
114112

115113
@Override
116114
public void init(final UserConnection connection) {
117-
addEntityTracker(connection, new EntityTrackerBase(connection, EntityTypes25w14craftmine.PLAYER));
118-
addItemHasher(connection, new ItemHasherBase(this, connection));
115+
addEntityTracker(connection);
116+
addItemHasher(connection);
119117
connection.put(new CurrentContainer());
120118
}
121119

120+
@Override
121+
protected void applySharedRegistrations() {
122+
super.applySharedRegistrations();
123+
ConfigurationRegistrations.registerConfigurationStateSwitching(new RegistrationContext<>(this, getClientVersion(), null));
124+
}
125+
122126
@Override
123127
public MappingData25w14craftmine getMappingData() {
124128
return MAPPINGS;

common/src/main/java/com/viaversion/viaaprilfools/protocol/v1_21_5to25w14craftmine/Protocol1_21_5To_25w14craftmine.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
import com.viaversion.viaversion.api.type.types.misc.ParticleType;
4444
import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
4545
import com.viaversion.viaversion.api.type.types.version.VersionedTypesHolder;
46-
import com.viaversion.viaversion.data.entity.EntityTrackerBase;
47-
import com.viaversion.viaversion.data.item.ItemHasherBase;
46+
import com.viaversion.viaversion.protocol.shared_registration.RegistrationContext;
47+
import com.viaversion.viaversion.protocol.shared_registration.def.base.ConfigurationRegistrations;
4848
import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.packet.ClientboundPacket1_21_5;
4949
import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.packet.ClientboundPackets1_21_5;
5050
import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.packet.ServerboundPacket1_21_5;
@@ -147,8 +147,14 @@ protected void onMappingDataLoaded() {
147147

148148
@Override
149149
public void init(final UserConnection connection) {
150-
addEntityTracker(connection, new EntityTrackerBase(connection, EntityTypes25w14craftmine.PLAYER));
151-
addItemHasher(connection, new ItemHasherBase(this, connection));
150+
addEntityTracker(connection);
151+
addItemHasher(connection);
152+
}
153+
154+
@Override
155+
protected void applySharedRegistrations() {
156+
super.applySharedRegistrations();
157+
ConfigurationRegistrations.registerConfigurationStateSwitching(new RegistrationContext<>(this, getClientVersion(), null));
152158
}
153159

154160
@Override

fabric/src/main/java/com/viaversion/viaaprilfools/ViaFabricAddon.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
package com.viaversion.viaaprilfools;
2222

2323
import com.viaversion.viaversion.api.Via;
24-
import com.viaversion.viaversion.api.ViaManager;
2524
import com.viaversion.viaversion.api.protocol.version.VersionProvider;
2625
import net.fabricmc.loader.api.FabricLoader;
2726
import com.viaversion.viaaprilfools.api.VAFServerVersionProvider;

gradlew.bat

Lines changed: 82 additions & 82 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)