Update VV API usage

Author: FlorianMichael

build-logic/src/main/groovy/vr.base-conventions.gradle

@@ -22,8 +22,8 @@ base {
 }
 
 dependencies {
-    compileOnly "com.viaversion:viaversion:5.2.1"
-    compileOnly "com.viaversion:viabackwards:5.2.1"
+    compileOnly "com.viaversion:viaversion:5.2.2-SNAPSHOT"
+    compileOnly "com.viaversion:viabackwards:5.2.2-SNAPSHOT"
 }
 
 publishing {

common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/rewriter/EntityPacketRewriter1_8.java

@@ -145,7 +145,8 @@ public void register() {
 
 				handler(wrapper -> {
 					final int entityId = wrapper.get(Types.VAR_INT, 0);
-					final EntityTypes1_8.EntityType type = EntityTypes1_8.getTypeFromId(wrapper.get(Types.BYTE, 0), true);
+					int data = wrapper.get(Types.INT, 3);
+					final EntityTypes1_8.EntityType type = EntityTypes1_8.ObjectType.getEntityType(wrapper.get(Types.BYTE, 0), data);
 					if (type == null) {
 						return;
 					}
@@ -157,8 +158,6 @@ public void register() {
 					byte pitch = wrapper.get(Types.BYTE, 1);
 					byte yaw = wrapper.get(Types.BYTE, 2);
 
-					int data = wrapper.get(Types.INT, 3);
-
 					if (type == EntityTypes1_8.ObjectType.ITEM_FRAME.getType()) {
 						yaw = switch (yaw) {
 							case -128 -> {
@@ -267,7 +266,7 @@ public void register() {
 				handler(wrapper -> {
 					final short typeId = wrapper.get(Types.UNSIGNED_BYTE, 0);
 
-					final EntityTypes1_8.EntityType type = EntityTypes1_8.getTypeFromId(typeId, false);
+					final EntityTypes1_8.EntityType type = EntityTypes1_8.EntityType.findById(typeId);
 					if (type == EntityTypes1_8.EntityType.ARMOR_STAND) {
 						wrapper.cancel();
 						final int entityId = wrapper.get(Types.VAR_INT, 0);
@@ -698,11 +697,11 @@ public void handleEntityData(EntityDataHandlerEvent event, EntityData entityData
 
 	@Override
 	public EntityTypes1_8.EntityType typeFromId(int type) {
-		return EntityTypes1_8.getTypeFromId(type, false);
+		return EntityTypes1_8.EntityType.findById(type);
 	}
 
 	@Override
-	public EntityTypes1_8.EntityType objectTypeFromId(int type) {
-		return EntityTypes1_8.getTypeFromId(type, true);
+	public EntityTypes1_8.EntityType objectTypeFromId(int type, int data) {
+		return EntityTypes1_8.ObjectType.getEntityType(type, data);
 	}
 }

common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/rewriter/EntityPacketRewriter1_9.java

@@ -97,7 +97,8 @@ public void register() {
 				handler(wrapper -> {
 					final int entityId = wrapper.get(Types.VAR_INT, 0);
 					final int entityType = wrapper.get(Types.BYTE, 0);
-					final EntityTypes1_9.EntityType type = EntityTypes1_9.getTypeFromId(entityType, true);
+					int data = wrapper.get(Types.INT, 0);
+					final EntityTypes1_9.EntityType type = EntityTypes1_9.ObjectType.getEntityType(entityType, data);
 
 					// Cancel new entities which can't be handled properly
 					if (type == null || type == EntityTypes1_9.EntityType.AREA_EFFECT_CLOUD || type == EntityTypes1_9.EntityType.SPECTRAL_ARROW || type == EntityTypes1_9.EntityType.DRAGON_FIREBALL) {
@@ -115,8 +116,6 @@ public void register() {
 						wrapper.set(Types.INT, 1, y);
 					}
 
-					int data = wrapper.get(Types.INT, 3);
-
 					if (type.isOrHasParent(EntityTypes1_9.EntityType.ARROW) && data != 0) {
 						wrapper.set(Types.INT, 3, --data);
 					}
@@ -623,11 +622,11 @@ private void handleEntityData(EntityDataHandlerEvent event, EntityData entityDat
 
 	@Override
 	public EntityTypes1_9.EntityType typeFromId(int type) {
-		return EntityTypes1_9.getTypeFromId(type, false);
+		return EntityTypes1_9.EntityType.findById(type);
 	}
 
 	@Override
-	public EntityTypes1_9.EntityType objectTypeFromId(int type) {
-		return EntityTypes1_9.getTypeFromId(type, true);
+	public EntityTypes1_9.EntityType objectTypeFromId(int type, int data) {
+		return EntityTypes1_9.ObjectType.getEntityType(type, data);
 	}
 }

fabric/src/main/resources/fabric.mod.json

@@ -24,7 +24,7 @@
   },
   "depends": {
     "viafabric": ">=0.4.14",
-    "viabackwards": ">=5.2.1"
+    "viabackwards": ">=5.2.2-SNAPSHOT"
   },
   "custom": {
     "modmenu:api": true,

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.parallel=true
 
 # project
 maven_group=com.viaversion
-maven_version=4.0.5
+maven_version=4.0.6-SNAPSHOT
 maven_description=ViaBackwards addon to allow 1.8.x and 1.7.x clients on newer server versions.
 
 # Smile emoji