Update VV api usage

ViaVersion · Jan 10, 2025 · 072c2a7 · 072c2a7
1 parent ed88d8b
commit 072c2a7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -23,7 +23,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly "com.viaversion:viaversion-common:5.2.1"
+    compileOnly "com.viaversion:viaversion-common:5.2.2-SNAPSHOT"
     compileOnly "com.google.guava:guava:33.4.0-jre"
     compileOnly "io.netty:netty-handler:4.1.116.Final"
 }

diff --git a/...net/raphimc/vialegacy/protocol/release/r1_2_4_5tor1_3_1_2/Protocolr1_2_4_5Tor1_3_1_2.java b/...net/raphimc/vialegacy/protocol/release/r1_2_4_5tor1_3_1_2/Protocolr1_2_4_5Tor1_3_1_2.java
@@ -234,14 +234,15 @@ public void register() {
                     final EntityTracker entityTracker = wrapper.user().get(EntityTracker.class);
                     final int entityId = wrapper.get(Types.INT, 0);
                     final byte typeId = wrapper.get(Types.BYTE, 0);
+                    final int data = wrapper.get(Types.INT, 1);
                     final EntityTypes1_8.EntityType type;
                     if (typeId == 70 || typeId == 71 || typeId == 74) {
                         type = EntityTypes1_8.ObjectType.FALLING_BLOCK.getType();
                         wrapper.set(Types.BYTE, 0, (byte) EntityTypes1_8.ObjectType.FALLING_BLOCK.getId());
                     } else if (typeId == 10 || typeId == 11 || typeId == 12) {
                         type = EntityTypes1_8.ObjectType.MINECART.getType();
                     } else {
-                        type = EntityTypes1_8.getTypeFromId(typeId, true);
+                        type = EntityTypes1_8.ObjectType.getEntityType(typeId, data);
                     }
                     final double x = wrapper.get(Types.INT, 1) / 32.0D;
                     final double y = wrapper.get(Types.INT, 2) / 32.0D;
@@ -313,7 +314,7 @@ public void register() {
                     final double y = wrapper.get(Types.INT, 2) / 32.0D;
                     final double z = wrapper.get(Types.INT, 3) / 32.0D;
                     final List<EntityData> entityDataList = wrapper.get(Types1_3_1.ENTITY_DATA_LIST, 0);
-                    final EntityTypes1_8.EntityType entityType = EntityTypes1_8.getTypeFromId(type, false);
+                    final EntityTypes1_8.EntityType entityType = EntityTypes1_8.EntityType.findById(type);
                     if (entityType == null) {
                         wrapper.cancel();
                         return;

diff --git a/...in/java/net/raphimc/vialegacy/protocol/release/r1_5_2tor1_6_1/Protocolr1_5_2Tor1_6_1.java b/...in/java/net/raphimc/vialegacy/protocol/release/r1_5_2tor1_6_1/Protocolr1_5_2Tor1_6_1.java
@@ -133,7 +133,8 @@ public void register() {
                 handler(wrapper -> {
                     final int entityID = wrapper.get(Types.INT, 0);
                     final int typeID = wrapper.get(Types.BYTE, 0);
-                    final EntityTypes1_8.EntityType entityType = EntityTypes1_8.getTypeFromId(typeID, true);
+                    final int data = wrapper.get(Types.INT, 0);
+                    final EntityTypes1_8.EntityType entityType = EntityTypes1_8.ObjectType.getEntityType(typeID, data);
                     if (entityType != null) {
                         wrapper.user().get(EntityTracker.class).getTrackedEntities().put(entityID, entityType);
                     }
@@ -158,7 +159,7 @@ public void register() {
                 handler(wrapper -> {
                     final int entityID = wrapper.get(Types.INT, 0);
                     final int typeID = wrapper.get(Types.UNSIGNED_BYTE, 0);
-                    final EntityTypes1_8.EntityType entityType = EntityTypes1_8.getTypeFromId(typeID, false);
+                    final EntityTypes1_8.EntityType entityType = EntityTypes1_8.EntityType.findById(typeID);
                     if (entityType == null) {
                         wrapper.cancel();
                         return;

diff --git a/...ava/net/raphimc/vialegacy/protocol/release/r1_6_4tor1_7_2_5/Protocolr1_6_4Tor1_7_2_5.java b/...ava/net/raphimc/vialegacy/protocol/release/r1_6_4tor1_7_2_5/Protocolr1_6_4Tor1_7_2_5.java
@@ -315,7 +315,7 @@ public void register() {
                 map(Types.INT); // data
                 handler(wrapper -> {
                     int data = wrapper.get(Types.INT, 3);
-                    if (EntityTypes1_8.getTypeFromId(wrapper.get(Types.BYTE, 0), true) == EntityTypes1_8.ObjectType.FALLING_BLOCK.getType()) {
+                    if (EntityTypes1_8.ObjectType.findById(wrapper.get(Types.BYTE, 0), data) == EntityTypes1_8.ObjectType.FALLING_BLOCK) {
                         final int id = data & 0xFFFF;
                         final int metadata = data >> 16;
                         final IdAndData block = new IdAndData(id, metadata);

diff --git a/.../java/net/raphimc/vialegacy/protocol/release/r1_7_6_10tor1_8/Protocolr1_7_6_10Tor1_8.java b/.../java/net/raphimc/vialegacy/protocol/release/r1_7_6_10tor1_8/Protocolr1_7_6_10Tor1_8.java
@@ -304,7 +304,7 @@ public void register() {
                     int z = wrapper.get(Types.INT, 2);
                     byte yaw = wrapper.get(Types.BYTE, 2);
                     int data = wrapper.get(Types.INT, 3);
-                    final EntityTypes1_8.EntityType type = EntityTypes1_8.getTypeFromId(typeID, true);
+                    final EntityTypes1_8.EntityType type = EntityTypes1_8.ObjectType.getEntityType(typeID, data);
                     if (type == null) {
                         return;
                     }
@@ -372,7 +372,7 @@ public void register() {
                     final int y = wrapper.get(Types.INT, 1);
                     final int z = wrapper.get(Types.INT, 2);
                     final List<EntityData> entityDataList = wrapper.get(Types1_8.ENTITY_DATA_LIST, 0);
-                    final EntityTypes1_8.EntityType entityType = EntityTypes1_8.getTypeFromId(typeID, false);
+                    final EntityTypes1_8.EntityType entityType = EntityTypes1_8.EntityType.findById(typeID);
                     if (entityType == null) {
                         wrapper.cancel();
                         return;