Added abstraction types for position rewriting in 1.7 -> 1.8, cleanup…

… of SpawnPackets, added groups for Via types.
ViaVersion · Oct 10, 2023 · 14a314d · 14a314d
1 parent dc2babd
commit 14a314d
Show file tree

Hide file tree

Showing 21 changed files with 249 additions and 230 deletions.
diff --git a/...ava/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/emulator/ArmorStandModel.java b/...ava/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/emulator/ArmorStandModel.java
@@ -21,7 +21,7 @@
 import com.viaversion.viarewind.protocol.protocol1_7_2_5to1_7_6_10.ClientboundPackets1_7_2_5;
 import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.Protocol1_7_6_10To1_8;
 import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.model.EntityModel1_7_6_10;
-import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.MetaType1_7_6_10;
+import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.metadata.MetaType1_7_6_10;
 import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.Types1_7_6_10;
 import com.viaversion.viarewind.utils.PacketUtil;
 import com.viaversion.viarewind.utils.math.AABB;

diff --git a/...java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/emulator/EndermiteModel.java b/...java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/emulator/EndermiteModel.java
@@ -115,7 +115,7 @@ public void sendSpawnPacket() {
 	@Override
 	public void deleteEntity() {
 		PacketWrapper despawn = PacketWrapper.create(ClientboundPackets1_7_2_5.DESTROY_ENTITIES, null, user);
-		despawn.write(Types1_7_6_10.INT_ARRAY, new int[]{entityId});
+		despawn.write(Types1_7_6_10.BYTE_INT_ARRAY, new int[]{entityId});
 
 		PacketUtil.sendPacket(despawn, Protocol1_7_6_10To1_8.class, true, true);
 	}

diff --git a/.../java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/emulator/GuardianModel.java b/.../java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/emulator/GuardianModel.java
@@ -116,7 +116,7 @@ public void sendSpawnPacket() {
 	@Override
 	public void deleteEntity() {
 		PacketWrapper despawn = PacketWrapper.create(ClientboundPackets1_7_2_5.DESTROY_ENTITIES, null, user);
-		despawn.write(Types1_7_6_10.INT_ARRAY, new int[]{entityId});
+		despawn.write(Types1_7_6_10.BYTE_INT_ARRAY, new int[]{entityId});
 
 		PacketUtil.sendPacket(despawn, Protocol1_7_6_10To1_8.class, true, true);
 	}

diff --git a/...in/java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/emulator/RabbitModel.java b/...in/java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/emulator/RabbitModel.java
@@ -115,7 +115,7 @@ public void sendSpawnPacket() {
 	@Override
 	public void deleteEntity() {
 		PacketWrapper despawn = PacketWrapper.create(ClientboundPackets1_7_2_5.DESTROY_ENTITIES, null, user);
-		despawn.write(Types1_7_6_10.INT_ARRAY, new int[]{entityId});
+		despawn.write(Types1_7_6_10.BYTE_INT_ARRAY, new int[]{entityId});
 
 		PacketUtil.sendPacket(despawn, Protocol1_7_6_10To1_8.class, true, true);
 	}

diff --git a/...com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/model/MetaIndex1_7_6_10To1_8.java b/...com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/model/MetaIndex1_7_6_10To1_8.java
@@ -18,7 +18,7 @@
 
 package com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.model;
 
-import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.MetaType1_7_6_10;
+import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.metadata.MetaType1_7_6_10;
 import com.viaversion.viaversion.api.minecraft.entities.Entity1_10Types;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_8;
 import com.viaversion.viaversion.util.Pair;

diff --git a/...n/java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/packets/EntityPackets.java b/...n/java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/packets/EntityPackets.java
@@ -75,13 +75,7 @@ public void register() {
 			@Override
 			public void register() {
 				map(Type.VAR_INT, Type.INT); // entity id
-				handler(wrapper -> {
-					final Position position = wrapper.read(Type.POSITION);
-
-					wrapper.write(Type.INT, position.x());
-					wrapper.write(Type.UNSIGNED_BYTE, (short) position.y());
-					wrapper.write(Type.INT, position.z());
-				});
+				map(Type.POSITION, Types1_7_6_10.U_BYTE_POSITION); // position
 			}
 		});
 
@@ -109,12 +103,12 @@ public void register() {
 		protocol.registerClientbound(ClientboundPackets1_8.DESTROY_ENTITIES, new PacketHandlers() {
 			@Override
 			public void register() {
-				map(Type.VAR_INT_ARRAY_PRIMITIVE, Types1_7_6_10.INT_ARRAY); // entity ids
+				map(Type.VAR_INT_ARRAY_PRIMITIVE, Types1_7_6_10.BYTE_INT_ARRAY); // entity ids
 
 				handler(wrapper -> {
 					final EntityTracker tracker = wrapper.user().get(EntityTracker.class);
 
-					for (int entityId : wrapper.get(Types1_7_6_10.INT_ARRAY, 0)) {
+					for (int entityId : wrapper.get(Types1_7_6_10.BYTE_INT_ARRAY, 0)) {
 						tracker.removeEntity(entityId);
 					}
 				});