Fix 1.9->1.8 use item (#466)

Author: SplotyCode

common/src/main/java/com/viaversion/viarewind/protocol/protocol1_8to1_9/entityreplacement/ShulkerModel.java

@@ -20,6 +20,7 @@
 
 import com.viaversion.viarewind.protocol.protocol1_7_2_5to1_7_6_10.ClientboundPackets1_7_2_5;
 import com.viaversion.viarewind.protocol.protocol1_8to1_9.Protocol1_8To1_9;
+import com.viaversion.viarewind.protocol.protocol1_8to1_9.storage.EntityTracker;
 import com.viaversion.viarewind.utils.PacketUtil;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_10;
@@ -92,7 +93,7 @@ public void updateMetadata() {
 		}
 		metadataList.add(new Metadata(11, MetaType1_9.VarInt, 2));
 
-		getProtocol().getMetadataRewriter().transform(EntityTypes1_10.EntityType.MAGMA_CUBE, metadataList);
+		getProtocol().getMetadataRewriter().transform(user.get(EntityTracker.class), entityId, metadataList, EntityTypes1_10.EntityType.MAGMA_CUBE);
 
 		metadataPacket.write(Types1_8.METADATA_LIST, metadataList);
 

common/src/main/java/com/viaversion/viarewind/protocol/protocol1_8to1_9/metadata/MetadataRewriter.java

@@ -20,9 +20,10 @@
 
 import com.viaversion.viarewind.ViaRewind;
 import com.viaversion.viarewind.protocol.protocol1_8to1_9.Protocol1_8To1_9;
+import com.viaversion.viarewind.protocol.protocol1_8to1_9.storage.EntityTracker;
 import com.viaversion.viaversion.api.minecraft.EulerAngle;
 import com.viaversion.viaversion.api.minecraft.Vector;
-import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_10;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_10.EntityType;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_8;
@@ -39,13 +40,34 @@ public MetadataRewriter(Protocol1_8To1_9 protocol) {
 		this.protocol = protocol;
 	}
 
-	public void transform(EntityTypes1_10.EntityType type, List<Metadata> list) {
+	public void transform(EntityTracker tracker, int entityId, List<Metadata> list) {
+		transform(tracker, entityId, list, tracker.getClientEntityTypes().get(entityId));
+	}
+
+	private static final byte HAND_ACTIVE_BIT = 0;
+	private static final byte STATUS_USE_BIT = 4;
+
+	public void transform(EntityTracker tracker, int entityId, List<Metadata> list, EntityType entityType) {
+		for (Metadata metadata : list) {
+			if (metadata.id() == MetaIndex.ENTITY_STATUS.getIndex()) {
+				tracker.getStatusInformation().put(entityId, (Byte) metadata.getValue());
+			}
+		}
 		for (Metadata entry : new ArrayList<>(list)) {
-			MetaIndex metaIndex = MetaIndex1_8to1_9.searchIndex(type, entry.id());
+			MetaIndex metaIndex = MetaIndex1_8to1_9.searchIndex(entityType, entry.id());
 			try {
 				if (metaIndex != null) {
 					if (metaIndex.getOldType() == MetaType1_8.NonExistent || metaIndex.getNewType() == null) {
 						list.remove(entry);
+						if (metaIndex == MetaIndex.PLAYER_HAND) {
+							byte status = tracker.getStatusInformation().getOrDefault(entityId, (byte) 0);
+							if ((((byte) entry.value()) & 1 << HAND_ACTIVE_BIT) != 0) {
+								status = (byte) (status | 1 << STATUS_USE_BIT);
+							} else {
+								status = (byte) (status & ~(1 << STATUS_USE_BIT));
+							}
+							list.add(new Metadata(MetaIndex.ENTITY_STATUS.getIndex(), MetaType1_8.Byte, status));
+						}
 						continue;
 					}
 					Object value = entry.getValue();

common/src/main/java/com/viaversion/viarewind/protocol/protocol1_8to1_9/packets/EntityPackets.java

@@ -28,6 +28,7 @@
 import com.viaversion.viarewind.utils.PacketUtil;
 import com.viaversion.viaversion.api.minecraft.Vector;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_10;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_10.EntityType;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
@@ -289,7 +290,7 @@ public void register() {
 					int entityId = wrapper.get(Type.VAR_INT, 0);
 					EntityTracker tracker = wrapper.user().get(EntityTracker.class);
 					if (tracker.getClientEntityTypes().containsKey(entityId)) {
-						protocol.getMetadataRewriter().transform(tracker.getClientEntityTypes().get(entityId), metadataList);
+						protocol.getMetadataRewriter().transform(tracker, entityId, metadataList);
 						if (metadataList.isEmpty()) wrapper.cancel();
 					} else {
 						tracker.addMetadataToBuffer(entityId, metadataList);

common/src/main/java/com/viaversion/viarewind/protocol/protocol1_8to1_9/packets/SpawnPackets.java

@@ -216,7 +216,7 @@ public void register() {
 					if ((replacement = tracker.getEntityReplacement(entityId)) != null) {
 						replacement.updateMetadata(metadataList);
 					} else if (tracker.getClientEntityTypes().containsKey(entityId)) {
-						protocol.getMetadataRewriter().transform(tracker.getClientEntityTypes().get(entityId), metadataList);
+						protocol.getMetadataRewriter().transform(tracker, entityId, metadataList);
 					} else {
 						wrapper.cancel();
 					}
@@ -256,8 +256,9 @@ public void register() {
 				handler(packetWrapper -> packetWrapper.write(Type.SHORT, (short) 0));
 				map(Types1_9.METADATA_LIST, Types1_8.METADATA_LIST);
 				this.handler(wrapper -> {
+					int entityId = wrapper.get(Type.VAR_INT, 0);
 					List<Metadata> metadataList = wrapper.get(Types1_8.METADATA_LIST, 0);
-					protocol.getMetadataRewriter().transform(EntityTypes1_10.EntityType.PLAYER, metadataList);
+					protocol.getMetadataRewriter().transform(wrapper.user().get(EntityTracker.class), entityId, metadataList, EntityTypes1_10.EntityType.PLAYER);
 				});
 				handler(packetWrapper -> {
 					int entityId = packetWrapper.get(Type.VAR_INT, 0);

common/src/main/java/com/viaversion/viarewind/protocol/protocol1_8to1_9/storage/EntityTracker.java

@@ -25,6 +25,7 @@
 import com.viaversion.viaversion.api.data.entity.ClientEntityIdChangeListener;
 import com.viaversion.viaversion.api.minecraft.Vector;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_10;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_10.EntityType;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.type.Type;
@@ -43,6 +44,7 @@ public class EntityTracker extends StoredObject implements ClientEntityIdChangeL
 	private final Map<Integer, List<Metadata>> metadataBuffer = new ConcurrentHashMap<>();
 	private final Map<Integer, EntityModel> entityReplacements = new ConcurrentHashMap<>();
 	private final Map<Integer, Vector> entityOffsets = new ConcurrentHashMap<>();
+	private final Map<Integer, Byte> statusInformation = new ConcurrentHashMap<>();
 	private int playerId;
 	private int playerGamemode = 0;
 
@@ -163,7 +165,7 @@ public void sendMetadataBuffer(int entityId) {
 			PacketWrapper wrapper = PacketWrapper.create(ClientboundPackets1_8.ENTITY_METADATA, this.getUser());
 			wrapper.write(Type.VAR_INT, entityId);
 			wrapper.write(Types1_8.METADATA_LIST, this.metadataBuffer.get(entityId));
-			protocol.getMetadataRewriter().transform(this.getClientEntityTypes().get(entityId), this.metadataBuffer.get(entityId));
+			protocol.getMetadataRewriter().transform(this, entityId, this.metadataBuffer.get(entityId));
 			if (!this.metadataBuffer.get(entityId).isEmpty()) {
 				try {
 					wrapper.send(Protocol1_8To1_9.class);
@@ -182,4 +184,8 @@ public void setClientEntityId(int playerEntityId) {
 		this.playerId = playerEntityId;
 		clientEntityTypes.put(this.playerId, EntityTypes1_10.EntityType.ENTITY_HUMAN);
 	}
+
+	public Map<Integer, Byte> getStatusInformation() {
+		return statusInformation;
+	}
 }