Update Via API usage

Author: FlorianMichael

common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/data/EntityDataIndex1_8.java

@@ -19,23 +19,23 @@
 
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_9;
-import com.viaversion.viaversion.protocols.v1_8to1_9.data.MetaIndex1_8;
+import com.viaversion.viaversion.protocols.v1_8to1_9.data.EntityDataIndex1_9;
 import com.viaversion.viaversion.util.Pair;
 
 import java.util.HashMap;
 import java.util.Optional;
 
 public class EntityDataIndex1_8 {
 
-	private static final HashMap<Pair<EntityTypes1_9.EntityType, Integer>, MetaIndex1_8> metadataRewrites = new HashMap<>();
+	private static final HashMap<Pair<EntityTypes1_9.EntityType, Integer>, EntityDataIndex1_9> metadataRewrites = new HashMap<>();
 
 	static {
-		for (MetaIndex1_8 index : MetaIndex1_8.values()) {
+		for (EntityDataIndex1_9 index : EntityDataIndex1_9.values()) {
 			metadataRewrites.put(new Pair<>(index.getClazz(), index.getNewIndex()), index);
 		}
 	}
 
-	private static Optional<MetaIndex1_8> getIndex(final EntityType type, final int index) {
+	private static Optional<EntityDataIndex1_9> getIndex(final EntityType type, final int index) {
 		final Pair<EntityType, Integer> pair = new Pair<>(type, index);
 		if (metadataRewrites.containsKey(pair)) {
 			return Optional.of(metadataRewrites.get(pair));
@@ -44,10 +44,10 @@ private static Optional<MetaIndex1_8> getIndex(final EntityType type, final int
 		}
 	}
 
-	public static MetaIndex1_8 searchIndex(final EntityType type, final int index) {
+	public static EntityDataIndex1_9 searchIndex(final EntityType type, final int index) {
 		EntityType currentType = type;
 		do {
-			final Optional<MetaIndex1_8> optMeta = getIndex(currentType, index);
+			final Optional<EntityDataIndex1_9> optMeta = getIndex(currentType, index);
 			if (optMeta.isPresent()) {
 				return optMeta.get();
 			}

common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/data/PotionIdMappings1_8.java

@@ -17,7 +17,7 @@
  */
 package com.viaversion.viarewind.protocol.v1_9to1_8.data;
 
-import com.viaversion.viaversion.protocols.v1_8to1_9.data.PotionIds1_8;
+import com.viaversion.viaversion.protocols.v1_8to1_9.data.PotionIdMappings1_9;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -28,7 +28,7 @@ public class PotionIdMappings1_8 {
 	public static final Map<String, Integer> POTION_NAME_TO_ID = new HashMap<>();
 
 	static {
-		POTION_NAME_TO_ID.putAll(PotionIds1_8.POTION_NAME_TO_ID);
+		POTION_NAME_TO_ID.putAll(PotionIdMappings1_9.POTION_NAME_TO_ID);
 		POTION_NAME_TO_ID.put("luck", 8203);
 
 		POTION_NAME_INDEX.put("water", "§rWater Bottle");

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

@@ -30,7 +30,7 @@
 import com.viaversion.viaversion.libs.gson.JsonParser;
 import com.viaversion.nbt.tag.*;
 import com.viaversion.viaversion.protocols.v1_8to1_9.data.EntityIds1_8;
-import com.viaversion.viaversion.protocols.v1_8to1_9.data.PotionIds1_8;
+import com.viaversion.viaversion.protocols.v1_8to1_9.data.PotionIdMappings1_9;
 import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_9;
 import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ServerboundPackets1_8;
 import com.viaversion.viaversion.util.Key;
@@ -322,7 +322,7 @@ public Item handleItemToServer(UserConnection connection, Item item) {
 				item.setData((short) (item.data() - 8192));
 			}
 
-			final String name = item.data() == 8192 ? "water" : PotionIds1_8.potionNameFromDamage(item.data());
+			final String name = item.data() == 8192 ? "water" : PotionIdMappings1_9.potionNameFromDamage(item.data());
 			tag.put("Potion", new StringTag("minecraft:" + name));
 			item.setData((short) 0);
 		}

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

@@ -42,7 +42,7 @@
 import com.viaversion.viaversion.api.type.types.version.Types1_9;
 import com.viaversion.viaversion.libs.fastutil.ints.IntArrayList;
 import com.viaversion.viaversion.libs.fastutil.ints.IntList;
-import com.viaversion.viaversion.protocols.v1_8to1_9.data.MetaIndex1_8;
+import com.viaversion.viaversion.protocols.v1_8to1_9.data.EntityDataIndex1_9;
 import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_8;
 import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_9;
 import com.viaversion.viaversion.rewriter.entitydata.EntityDataHandlerEvent;
@@ -535,24 +535,24 @@ protected void registerRewrites() {
 
 	private void handleEntityData(EntityDataHandlerEvent event, EntityData metadata) {
 		final EntityTracker1_9 tracker = tracker(event.user());
-		if (metadata.id() == MetaIndex1_8.ENTITY_STATUS.getIndex()) {
+		if (metadata.id() == EntityDataIndex1_9.ENTITY_STATUS.getIndex()) {
 			tracker.getStatus().put(event.entityId(), (Byte) metadata.value());
 		}
-		final MetaIndex1_8 metaIndex = EntityDataIndex1_8.searchIndex(event.entityType(), metadata.id());
+		final EntityDataIndex1_9 metaIndex = EntityDataIndex1_8.searchIndex(event.entityType(), metadata.id());
 		if (metaIndex == null) {
 			// Almost certainly bad data, remove it
 			event.cancel();
 			return;
 		}
 		if (metaIndex.getOldType() == null || metaIndex.getNewType() == null) {
-			if (metaIndex == MetaIndex1_8.PLAYER_HAND) { // Player eating/aiming/drinking
+			if (metaIndex == EntityDataIndex1_9.PLAYER_HAND) { // Player eating/aiming/drinking
 				byte status = (byte) tracker.getStatus().getOrDefault(event.entityId(), 0);
 				if ((((byte) metadata.value()) & 1 << HAND_ACTIVE_BIT) != 0) {
 					status = (byte) (status | 1 << STATUS_USE_BIT);
 				} else {
 					status = (byte) (status & ~(1 << STATUS_USE_BIT));
 				}
-				event.createExtraData(new EntityData(MetaIndex1_8.ENTITY_STATUS.getIndex(), EntityDataTypes1_8.BYTE, status));
+				event.createExtraData(new EntityData(EntityDataIndex1_9.ENTITY_STATUS.getIndex(), EntityDataTypes1_8.BYTE, status));
 			}
 			event.cancel();
 			return;
@@ -601,7 +601,7 @@ private void handleEntityData(EntityDataHandlerEvent event, EntityData metadata)
 				break;
 			case BOOLEAN:
 				final boolean bool = (Boolean) value;
-				if (metaIndex == MetaIndex1_8.ABSTRACT_AGEABLE_AGE) {
+				if (metaIndex == EntityDataIndex1_9.ABSTRACT_AGEABLE_AGE) {
 					metadata.setValue((byte) (bool ? -1 : 0));
 				} else {
 					metadata.setValue((byte) (bool ? 1 : 0));