Cleanup and renames around types

api/src/main/java/com/viaversion/viaversion/api/ViaAPI.java

@@ -63,7 +63,7 @@ public interface ViaAPI<T> {
      * @return API version incremented with meaningful API changes
      */
     default int apiVersion() {
-        return 21;
+        return 22;
     }
 
     /**

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_10.java

@@ -28,7 +28,7 @@ import java.util.Map;
 import java.util.Optional;
 
 // 1.10 Entity / Object ids
-public class Entity1_10Types {
+public class EntityTypes1_10 {
 
     public static EntityType getTypeFromId(int typeID, boolean isObject) {
         Optional<EntityType> type;

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_11.java

@@ -28,7 +28,7 @@ import java.util.Map;
 import java.util.Optional;
 
 // 1.11 Entity / Object ids
-public class Entity1_11Types {
+public class EntityTypes1_11 {
 
     public static EntityType getTypeFromId(int typeID, boolean isObject) {
         Optional<EntityType> type;

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_12.java

@@ -29,7 +29,7 @@ import java.util.Map;
 import java.util.Optional;
 
 // 1.12 Entity / Object taken from https://github.com/Matsv/ViaBackwards/blob/master/core/src/main/java/nl/matsv/viabackwards/api/entities/types/EntityType1_12.java
-public class Entity1_12Types {
+public class EntityTypes1_12 {
 
     public static EntityType getTypeFromId(int typeID, boolean isObject) {
         Optional<EntityType> type;

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_13.java

@@ -27,7 +27,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
-public class Entity1_13Types {
+public class EntityTypes1_13 {
 
     public static EntityType getTypeFromId(int typeID, boolean isObject) {
         Optional<EntityType> type;

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_14.java

@@ -24,7 +24,7 @@ package com.viaversion.viaversion.api.minecraft.entities;
 
 import com.viaversion.viaversion.util.EntityTypeUtil;
 
-public enum Entity1_14Types implements EntityType {
+public enum EntityTypes1_14 implements EntityType {
 
     ENTITY(-1),
 
@@ -204,12 +204,12 @@ public enum Entity1_14Types implements EntityType {
     private final int id;
     private final EntityType parent;
 
-    Entity1_14Types(int id) {
+    EntityTypes1_14(int id) {
         this.id = id;
         this.parent = null;
     }
 
-    Entity1_14Types(int id, EntityType parent) {
+    EntityTypes1_14(int id, EntityType parent) {
         this.id = id;
         this.parent = parent;
     }

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_15.java

@@ -24,7 +24,7 @@ package com.viaversion.viaversion.api.minecraft.entities;
 
 import com.viaversion.viaversion.util.EntityTypeUtil;
 
-public enum Entity1_15Types implements EntityType {
+public enum EntityTypes1_15 implements EntityType {
 
     ENTITY(-1),
 
@@ -206,12 +206,12 @@ public enum Entity1_15Types implements EntityType {
     private final int id;
     private final EntityType parent;
 
-    Entity1_15Types(int id) {
+    EntityTypes1_15(int id) {
         this.id = id;
         this.parent = null;
     }
 
-    Entity1_15Types(int id, EntityType parent) {
+    EntityTypes1_15(int id, EntityType parent) {
         this.id = id;
         this.parent = parent;
     }

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_16.java

@@ -24,7 +24,7 @@ package com.viaversion.viaversion.api.minecraft.entities;
 
 import com.viaversion.viaversion.util.EntityTypeUtil;
 
-public enum Entity1_16Types implements EntityType {
+public enum EntityTypes1_16 implements EntityType {
 
     ENTITY(-1),
 
@@ -211,12 +211,12 @@ public enum Entity1_16Types implements EntityType {
     private final int id;
     private final EntityType parent;
 
-    Entity1_16Types(int id) {
+    EntityTypes1_16(int id) {
         this.id = id;
         this.parent = null;
     }
 
-    Entity1_16Types(int id, EntityType parent) {
+    EntityTypes1_16(int id, EntityType parent) {
         this.id = id;
         this.parent = parent;
     }

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_16_2.java

@@ -24,7 +24,7 @@ package com.viaversion.viaversion.api.minecraft.entities;
 
 import com.viaversion.viaversion.util.EntityTypeUtil;
 
-public enum Entity1_16_2Types implements EntityType {
+public enum EntityTypes1_16_2 implements EntityType {
 
     ENTITY(-1),
 
@@ -215,12 +215,12 @@ public enum Entity1_16_2Types implements EntityType {
     private final int id;
     private final EntityType parent;
 
-    Entity1_16_2Types(int id) {
+    EntityTypes1_16_2(int id) {
         this.id = id;
         this.parent = null;
     }
 
-    Entity1_16_2Types(int id, EntityType parent) {
+    EntityTypes1_16_2(int id, EntityType parent) {
         this.id = id;
         this.parent = parent;
     }

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_17.java

@@ -24,7 +24,7 @@ package com.viaversion.viaversion.api.minecraft.entities;
 
 import com.viaversion.viaversion.util.EntityTypeUtil;
 
-public enum Entity1_17Types implements EntityType {
+public enum EntityTypes1_17 implements EntityType {
 
     ENTITY(-1),
 
@@ -220,12 +220,12 @@ public enum Entity1_17Types implements EntityType {
     private final int id;
     private final EntityType parent;
 
-    Entity1_17Types(int id) {
+    EntityTypes1_17(int id) {
         this.id = id;
         this.parent = null;
     }
 
-    Entity1_17Types(int id, EntityType parent) {
+    EntityTypes1_17(int id, EntityType parent) {
         this.id = id;
         this.parent = parent;
     }

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_19.java

@@ -28,7 +28,7 @@ import com.viaversion.viaversion.util.EntityTypeUtil;
 import java.util.Locale;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-public enum Entity1_19Types implements EntityType {
+public enum EntityTypes1_19 implements EntityType {
 
     ENTITY(null, null),
 
@@ -229,12 +229,12 @@ public enum Entity1_19Types implements EntityType {
     private final String identifier;
     private int id = -1;
 
-    Entity1_19Types(final EntityType parent) {
+    EntityTypes1_19(final EntityType parent) {
         this.parent = parent;
         this.identifier = "minecraft:" + name().toLowerCase(Locale.ROOT);
     }
 
-    Entity1_19Types(final EntityType parent, @Nullable final String identifier) {
+    EntityTypes1_19(final EntityType parent, @Nullable final String identifier) {
         this.parent = parent;
         this.identifier = identifier;
     }

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_19_3.java

@@ -28,7 +28,7 @@ import com.viaversion.viaversion.util.EntityTypeUtil;
 import java.util.Locale;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-public enum Entity1_19_3Types implements EntityType {
+public enum EntityTypes1_19_3 implements EntityType {
 
     ENTITY(null, null),
 
@@ -230,12 +230,12 @@ public enum Entity1_19_3Types implements EntityType {
     private final String identifier;
     private int id = -1;
 
-    Entity1_19_3Types(final EntityType parent) {
+    EntityTypes1_19_3(final EntityType parent) {
         this.parent = parent;
         this.identifier = "minecraft:" + name().toLowerCase(Locale.ROOT);
     }
 
-    Entity1_19_3Types(final EntityType parent, @Nullable final String identifier) {
+    EntityTypes1_19_3(final EntityType parent, @Nullable final String identifier) {
         this.parent = parent;
         this.identifier = identifier;
     }

api/src/main/java/com/viaversion/viaversion/api/minecraft/entities/EntityTypes1_19_4.java

@@ -28,7 +28,7 @@ import com.viaversion.viaversion.util.EntityTypeUtil;
 import java.util.Locale;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-public enum Entity1_19_4Types implements EntityType {
+public enum EntityTypes1_19_4 implements EntityType {
 
     ENTITY(null, null),
 
@@ -237,12 +237,12 @@ public enum Entity1_19_4Types implements EntityType {
     private final String identifier;
     private int id = -1;
 
-    Entity1_19_4Types(final EntityType parent) {
+    EntityTypes1_19_4(final EntityType parent) {
         this.parent = parent;
         this.identifier = "minecraft:" + name().toLowerCase(Locale.ROOT);
     }
 
-    Entity1_19_4Types(final EntityType parent, @Nullable final String identifier) {
+    EntityTypes1_19_4(final EntityType parent, @Nullable final String identifier) {
         this.parent = parent;
         this.identifier = identifier;
     }

api/src/main/java/com/viaversion/viaversion/api/minecraft/metadata/types/MetaType1_12.java

@@ -31,7 +31,7 @@ public enum MetaType1_12 implements MetaType {
     Float(2, Type.FLOAT),
     String(3, Type.STRING),
     Chat(4, Type.COMPONENT),
-    Slot(5, Type.ITEM),
+    Slot(5, Type.ITEM1_8),
     Boolean(6, Type.BOOLEAN),
     Vector3F(7, Type.ROTATION),
     Position(8, Type.POSITION),

api/src/main/java/com/viaversion/viaversion/api/minecraft/metadata/types/MetaType1_13.java

@@ -1,69 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.viaversion.viaversion.api.minecraft.metadata.types;
-
-import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
-import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.version.Types1_13;
-
-@Deprecated/*(forRemoval = true)*/
-public enum MetaType1_13 implements MetaType {
-    Byte(0, Type.BYTE),
-    VarInt(1, Type.VAR_INT),
-    Float(2, Type.FLOAT),
-    String(3, Type.STRING),
-    Chat(4, Type.COMPONENT),
-    OptChat(5, Type.OPTIONAL_COMPONENT),
-    Slot(6, Type.FLAT_ITEM),
-    Boolean(7, Type.BOOLEAN),
-    Vector3F(8, Type.ROTATION),
-    Position(9, Type.POSITION),
-    OptPosition(10, Type.OPTIONAL_POSITION),
-    Direction(11, Type.VAR_INT),
-    OptUUID(12, Type.OPTIONAL_UUID),
-    BlockID(13, Type.VAR_INT),
-    NBTTag(14, Type.NAMED_COMPOUND_TAG),
-    PARTICLE(15, Types1_13.PARTICLE);
-
-    private final int typeID;
-    private final Type type;
-
-    MetaType1_13(int typeID, Type type) {
-        this.typeID = typeID;
-        this.type = type;
-    }
-
-    public static MetaType1_13 byId(int id) {
-        return values()[id];
-    }
-
-    @Override
-    public int typeId() {
-        return typeID;
-    }
-
-    @Override
-    public Type type() {
-        return type;
-    }
-}

api/src/main/java/com/viaversion/viaversion/api/minecraft/metadata/types/MetaType1_13_2.java

@@ -1,69 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.viaversion.viaversion.api.minecraft.metadata.types;
-
-import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
-import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.version.Types1_13_2;
-
-@Deprecated/*(forRemoval = true)*/
-public enum MetaType1_13_2 implements MetaType {
-    Byte(0, Type.BYTE),
-    VarInt(1, Type.VAR_INT),
-    Float(2, Type.FLOAT),
-    String(3, Type.STRING),
-    Chat(4, Type.COMPONENT),
-    OptChat(5, Type.OPTIONAL_COMPONENT),
-    Slot(6, Type.FLAT_VAR_INT_ITEM),
-    Boolean(7, Type.BOOLEAN),
-    Vector3F(8, Type.ROTATION),
-    Position(9, Type.POSITION),
-    OptPosition(10, Type.OPTIONAL_POSITION),
-    Direction(11, Type.VAR_INT),
-    OptUUID(12, Type.OPTIONAL_UUID),
-    BlockID(13, Type.VAR_INT),
-    NBTTag(14, Type.NAMED_COMPOUND_TAG),
-    PARTICLE(15, Types1_13_2.PARTICLE);
-
-    private final int typeID;
-    private final Type type;
-
-    MetaType1_13_2(int typeID, Type type) {
-        this.typeID = typeID;
-        this.type = type;
-    }
-
-    public static MetaType1_13_2 byId(int id) {
-        return values()[id];
-    }
-
-    @Override
-    public int typeId() {
-        return typeID;
-    }
-
-    @Override
-    public Type type() {
-        return type;
-    }
-}

api/src/main/java/com/viaversion/viaversion/api/minecraft/metadata/types/MetaType1_14.java

@@ -1,72 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.viaversion.viaversion.api.minecraft.metadata.types;
-
-import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
-import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.version.Types1_14;
-
-@Deprecated/*(forRemoval = true)*/
-public enum MetaType1_14 implements MetaType {
-    Byte(0, Type.BYTE),
-    VarInt(1, Type.VAR_INT),
-    Float(2, Type.FLOAT),
-    String(3, Type.STRING),
-    Chat(4, Type.COMPONENT),
-    OptChat(5, Type.OPTIONAL_COMPONENT),
-    Slot(6, Type.FLAT_VAR_INT_ITEM),
-    Boolean(7, Type.BOOLEAN),
-    Vector3F(8, Type.ROTATION),
-    Position(9, Type.POSITION1_14),
-    OptPosition(10, Type.OPTIONAL_POSITION_1_14),
-    Direction(11, Type.VAR_INT),
-    OptUUID(12, Type.OPTIONAL_UUID),
-    BlockID(13, Type.VAR_INT),
-    NBTTag(14, Type.NAMED_COMPOUND_TAG),
-    PARTICLE(15, Types1_14.PARTICLE),
-    VillagerData(16, Type.VILLAGER_DATA),
-    OptVarInt(17, Type.OPTIONAL_VAR_INT),
-    Pose(18, Type.VAR_INT);
-
-    private final int typeID;
-    private final Type type;
-
-    MetaType1_14(int typeID, Type type) {
-        this.typeID = typeID;
-        this.type = type;
-    }
-
-    public static MetaType1_14 byId(int id) {
-        return values()[id];
-    }
-
-    @Override
-    public int typeId() {
-        return typeID;
-    }
-
-    @Override
-    public Type type() {
-        return type;
-    }
-}

api/src/main/java/com/viaversion/viaversion/api/minecraft/metadata/types/MetaType1_16.java

@@ -1,73 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.viaversion.viaversion.api.minecraft.metadata.types;
-
-import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
-import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.version.Types1_16;
-
-@Deprecated/*(forRemoval = true)*/
-public enum MetaType1_16 implements MetaType {
-    BYTE(0, Type.BYTE),
-    VAR_INT(1, Type.VAR_INT),
-    FLOAT(2, Type.FLOAT),
-    STRING(3, Type.STRING),
-    COMPONENT(4, Type.COMPONENT),
-    OPT_COMPONENT(5, Type.OPTIONAL_COMPONENT),
-    ITEM(6, Type.FLAT_VAR_INT_ITEM),
-    BOOLEAN(7, Type.BOOLEAN),
-    ROTATION(8, Type.ROTATION),
-    POSITION(9, Type.POSITION1_14),
-    OPT_POSITION(10, Type.OPTIONAL_POSITION_1_14),
-    DIRECTION(11, Type.VAR_INT),
-    OPT_UUID(12, Type.OPTIONAL_UUID),
-    BLOCK_STATE(13, Type.VAR_INT),
-    NBT(14, Type.NAMED_COMPOUND_TAG),
-    PARTICLE(15, Types1_16.PARTICLE),
-    VILLAGER_DATA(16, Type.VILLAGER_DATA),
-    OPT_VAR_INT(17, Type.OPTIONAL_VAR_INT),
-    POSE(18, Type.VAR_INT);
-
-    private static final MetaType1_16[] VALUES = values();
-    private final int typeId;
-    private final Type type;
-
-    MetaType1_16(int typeId, Type type) {
-        this.typeId = typeId;
-        this.type = type;
-    }
-
-    public static MetaType1_16 byId(int id) {
-        return VALUES[id];
-    }
-
-    @Override
-    public int typeId() {
-        return typeId;
-    }
-
-    @Override
-    public Type type() {
-        return type;
-    }
-}

api/src/main/java/com/viaversion/viaversion/api/minecraft/metadata/types/MetaType1_17.java

@@ -1,73 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.viaversion.viaversion.api.minecraft.metadata.types;
-
-import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
-import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.version.Types1_17;
-
-@Deprecated/*(forRemoval = true)*/
-public enum MetaType1_17 implements MetaType {
-    BYTE(0, Type.BYTE),
-    VAR_INT(1, Type.VAR_INT),
-    FLOAT(2, Type.FLOAT),
-    STRING(3, Type.STRING),
-    COMPONENT(4, Type.COMPONENT),
-    OPT_COMPONENT(5, Type.OPTIONAL_COMPONENT),
-    ITEM(6, Type.FLAT_VAR_INT_ITEM),
-    BOOLEAN(7, Type.BOOLEAN),
-    ROTATION(8, Type.ROTATION),
-    POSITION(9, Type.POSITION1_14),
-    OPT_POSITION(10, Type.OPTIONAL_POSITION_1_14),
-    DIRECTION(11, Type.VAR_INT),
-    OPT_UUID(12, Type.OPTIONAL_UUID),
-    BLOCK_STATE(13, Type.VAR_INT),
-    NBT(14, Type.NAMED_COMPOUND_TAG),
-    PARTICLE(15, Types1_17.PARTICLE),
-    VILLAGER_DATA(16, Type.VILLAGER_DATA),
-    OPT_VAR_INT(17, Type.OPTIONAL_VAR_INT),
-    POSE(18, Type.VAR_INT);
-
-    private static final MetaType1_17[] VALUES = values();
-    private final int typeId;
-    private final Type type;
-
-    MetaType1_17(int typeId, Type type) {
-        this.typeId = typeId;
-        this.type = type;
-    }
-
-    public static MetaType1_17 byId(int id) {
-        return VALUES[id];
-    }
-
-    @Override
-    public int typeId() {
-        return typeId;
-    }
-
-    @Override
-    public Type type() {
-        return type;
-    }
-}

api/src/main/java/com/viaversion/viaversion/api/minecraft/metadata/types/MetaType1_18.java

@@ -1,73 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.viaversion.viaversion.api.minecraft.metadata.types;
-
-import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
-import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.version.Types1_18;
-
-@Deprecated/*(forRemoval = true)*/
-public enum MetaType1_18 implements MetaType {
-    BYTE(0, Type.BYTE),
-    VAR_INT(1, Type.VAR_INT),
-    FLOAT(2, Type.FLOAT),
-    STRING(3, Type.STRING),
-    COMPONENT(4, Type.COMPONENT),
-    OPT_COMPONENT(5, Type.OPTIONAL_COMPONENT),
-    ITEM(6, Type.FLAT_VAR_INT_ITEM),
-    BOOLEAN(7, Type.BOOLEAN),
-    ROTATION(8, Type.ROTATION),
-    POSITION(9, Type.POSITION1_14),
-    OPT_POSITION(10, Type.OPTIONAL_POSITION_1_14),
-    DIRECTION(11, Type.VAR_INT),
-    OPT_UUID(12, Type.OPTIONAL_UUID),
-    BLOCK_STATE(13, Type.VAR_INT),
-    NBT(14, Type.NAMED_COMPOUND_TAG),
-    PARTICLE(15, Types1_18.PARTICLE),
-    VILLAGER_DATA(16, Type.VILLAGER_DATA),
-    OPT_VAR_INT(17, Type.OPTIONAL_VAR_INT),
-    POSE(18, Type.VAR_INT);
-
-    private static final MetaType1_18[] VALUES = values();
-    private final int typeId;
-    private final Type type;
-
-    MetaType1_18(int typeId, Type type) {
-        this.typeId = typeId;
-        this.type = type;
-    }
-
-    public static MetaType1_18 byId(int id) {
-        return VALUES[id];
-    }
-
-    @Override
-    public int typeId() {
-        return typeId;
-    }
-
-    @Override
-    public Type type() {
-        return type;
-    }
-}

api/src/main/java/com/viaversion/viaversion/api/minecraft/metadata/types/MetaType1_8.java

@@ -24,6 +24,7 @@ package com.viaversion.viaversion.api.minecraft.metadata.types;
 
 import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
 import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.type.types.VoidType;
 
 public enum MetaType1_8 implements MetaType {
     Byte(0, Type.BYTE),
@@ -31,11 +32,11 @@ public enum MetaType1_8 implements MetaType {
     Int(2, Type.INT),
     Float(3, Type.FLOAT),
     String(4, Type.STRING),
-    Slot(5, Type.ITEM),
+    Slot(5, Type.ITEM1_8),
     Position(6, Type.VECTOR),
     Rotation(7, Type.ROTATION),
     @Deprecated
-    NonExistent(-1, Type.NOTHING);
+    NonExistent(-1, new VoidType());
 
     private final int typeID;
     private final Type type;

api/src/main/java/com/viaversion/viaversion/api/minecraft/metadata/types/MetaType1_9.java

@@ -31,7 +31,7 @@ public enum MetaType1_9 implements MetaType {
     Float(2, Type.FLOAT),
     String(3, Type.STRING),
     Chat(4, Type.COMPONENT),
-    Slot(5, Type.ITEM),
+    Slot(5, Type.ITEM1_8),
     Boolean(6, Type.BOOLEAN),
     Vector3F(7, Type.ROTATION),
     Position(8, Type.POSITION),

api/src/main/java/com/viaversion/viaversion/api/minecraft/metadata/types/MetaTypes1_13.java

@@ -24,7 +24,7 @@ package com.viaversion.viaversion.api.minecraft.metadata.types;
 
 import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.minecraft.ParticleType;
+import com.viaversion.viaversion.api.type.types.misc.ParticleType;
 
 public final class MetaTypes1_13 extends AbstractMetaTypes {
 
@@ -34,7 +34,7 @@ public final class MetaTypes1_13 extends AbstractMetaTypes {
     public final MetaType stringType = add(3, Type.STRING);
     public final MetaType componentType = add(4, Type.COMPONENT);
     public final MetaType optionalComponentType = add(5, Type.OPTIONAL_COMPONENT);
-    public final MetaType itemType = add(6, Type.FLAT_ITEM);
+    public final MetaType itemType = add(6, Type.ITEM1_13);
     public final MetaType booleanType = add(7, Type.BOOLEAN);
     public final MetaType rotationType = add(8, Type.ROTATION);
     public final MetaType positionType = add(9, Type.POSITION);

api/src/main/java/com/viaversion/viaversion/api/minecraft/metadata/types/MetaTypes1_13_2.java

@@ -24,7 +24,7 @@ package com.viaversion.viaversion.api.minecraft.metadata.types;
 
 import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.minecraft.ParticleType;
+import com.viaversion.viaversion.api.type.types.misc.ParticleType;
 
 public final class MetaTypes1_13_2 extends AbstractMetaTypes {
 
@@ -34,7 +34,7 @@ public final class MetaTypes1_13_2 extends AbstractMetaTypes {
     public final MetaType stringType = add(3, Type.STRING);
     public final MetaType componentType = add(4, Type.COMPONENT);
     public final MetaType optionalComponentType = add(5, Type.OPTIONAL_COMPONENT);
-    public final MetaType itemType = add(6, Type.FLAT_VAR_INT_ITEM);
+    public final MetaType itemType = add(6, Type.ITEM1_13_2);
     public final MetaType booleanType = add(7, Type.BOOLEAN);
     public final MetaType rotationType = add(8, Type.ROTATION);
     public final MetaType positionType = add(9, Type.POSITION);

api/src/main/java/com/viaversion/viaversion/api/minecraft/metadata/types/MetaTypes1_14.java

@@ -24,7 +24,7 @@ package com.viaversion.viaversion.api.minecraft.metadata.types;
 
 import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.minecraft.ParticleType;
+import com.viaversion.viaversion.api.type.types.misc.ParticleType;
 
 public final class MetaTypes1_14 extends AbstractMetaTypes {
 
@@ -34,7 +34,7 @@ public final class MetaTypes1_14 extends AbstractMetaTypes {
     public final MetaType stringType = add(3, Type.STRING);
     public final MetaType componentType = add(4, Type.COMPONENT);
     public final MetaType optionalComponentType = add(5, Type.OPTIONAL_COMPONENT);
-    public final MetaType itemType = add(6, Type.FLAT_VAR_INT_ITEM);
+    public final MetaType itemType = add(6, Type.ITEM1_13_2);
     public final MetaType booleanType = add(7, Type.BOOLEAN);
     public final MetaType rotationType = add(8, Type.ROTATION);
     public final MetaType positionType = add(9, Type.POSITION1_14);

api/src/main/java/com/viaversion/viaversion/api/minecraft/metadata/types/MetaTypes1_19.java

@@ -24,7 +24,7 @@ package com.viaversion.viaversion.api.minecraft.metadata.types;
 
 import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.minecraft.ParticleType;
+import com.viaversion.viaversion.api.type.types.misc.ParticleType;
 
 public final class MetaTypes1_19 extends AbstractMetaTypes {
 
@@ -34,7 +34,7 @@ public final class MetaTypes1_19 extends AbstractMetaTypes {
     public final MetaType stringType = add(3, Type.STRING);
     public final MetaType componentType = add(4, Type.COMPONENT);
     public final MetaType optionalComponentType = add(5, Type.OPTIONAL_COMPONENT);
-    public final MetaType itemType = add(6, Type.FLAT_VAR_INT_ITEM);
+    public final MetaType itemType = add(6, Type.ITEM1_13_2);
     public final MetaType booleanType = add(7, Type.BOOLEAN);
     public final MetaType rotationType = add(8, Type.ROTATION);
     public final MetaType positionType = add(9, Type.POSITION1_14);

api/src/main/java/com/viaversion/viaversion/api/minecraft/metadata/types/MetaTypes1_19_3.java

@@ -24,7 +24,7 @@ package com.viaversion.viaversion.api.minecraft.metadata.types;
 
 import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.minecraft.ParticleType;
+import com.viaversion.viaversion.api.type.types.misc.ParticleType;
 
 public final class MetaTypes1_19_3 extends AbstractMetaTypes {
 
@@ -35,7 +35,7 @@ public final class MetaTypes1_19_3 extends AbstractMetaTypes {
     public final MetaType stringType = add(4, Type.STRING);
     public final MetaType componentType = add(5, Type.COMPONENT);
     public final MetaType optionalComponentType = add(6, Type.OPTIONAL_COMPONENT);
-    public final MetaType itemType = add(7, Type.FLAT_VAR_INT_ITEM);
+    public final MetaType itemType = add(7, Type.ITEM1_13_2);
     public final MetaType booleanType = add(8, Type.BOOLEAN);
     public final MetaType rotationType = add(9, Type.ROTATION);
     public final MetaType positionType = add(10, Type.POSITION1_14);

api/src/main/java/com/viaversion/viaversion/api/minecraft/metadata/types/MetaTypes1_19_4.java

@@ -24,7 +24,7 @@ package com.viaversion.viaversion.api.minecraft.metadata.types;
 
 import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.minecraft.ParticleType;
+import com.viaversion.viaversion.api.type.types.misc.ParticleType;
 
 public final class MetaTypes1_19_4 extends AbstractMetaTypes {
 
@@ -35,7 +35,7 @@ public final class MetaTypes1_19_4 extends AbstractMetaTypes {
     public final MetaType stringType = add(4, Type.STRING);
     public final MetaType componentType = add(5, Type.COMPONENT);
     public final MetaType optionalComponentType = add(6, Type.OPTIONAL_COMPONENT);
-    public final MetaType itemType = add(7, Type.FLAT_VAR_INT_ITEM);
+    public final MetaType itemType = add(7, Type.ITEM1_13_2);
     public final MetaType booleanType = add(8, Type.BOOLEAN);
     public final MetaType rotationType = add(9, Type.ROTATION);
     public final MetaType positionType = add(10, Type.POSITION1_14);

api/src/main/java/com/viaversion/viaversion/api/minecraft/metadata/types/MetaTypes1_20_2.java

@@ -24,7 +24,7 @@ package com.viaversion.viaversion.api.minecraft.metadata.types;
 
 import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.minecraft.ParticleType;
+import com.viaversion.viaversion.api.type.types.misc.ParticleType;
 
 public final class MetaTypes1_20_2 extends AbstractMetaTypes {
 

api/src/main/java/com/viaversion/viaversion/api/minecraft/metadata/types/MetaTypes1_20_3.java

@@ -24,7 +24,7 @@ package com.viaversion.viaversion.api.minecraft.metadata.types;
 
 import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.minecraft.ParticleType;
+import com.viaversion.viaversion.api.type.types.misc.ParticleType;
 
 public final class MetaTypes1_20_3 extends AbstractMetaTypes {
 

api/src/main/java/com/viaversion/viaversion/api/rewriter/RewriterBase.java

@@ -27,7 +27,7 @@ import com.viaversion.viaversion.api.protocol.Protocol;
 public abstract class RewriterBase<T extends Protocol> implements Rewriter<T> {
     protected final T protocol;
 
-    protected RewriterBase(T protocol) {
+    protected RewriterBase(final T protocol) {
         this.protocol = protocol;
     }
 

api/src/main/java/com/viaversion/viaversion/api/type/Type.java

@@ -52,38 +52,36 @@ import com.viaversion.viaversion.api.type.types.RemainingBytesType;
 import com.viaversion.viaversion.api.type.types.ShortByteArrayType;
 import com.viaversion.viaversion.api.type.types.ShortType;
 import com.viaversion.viaversion.api.type.types.StringType;
-import com.viaversion.viaversion.api.type.types.UUIDIntArrayType;
 import com.viaversion.viaversion.api.type.types.UUIDType;
 import com.viaversion.viaversion.api.type.types.UnsignedByteType;
 import com.viaversion.viaversion.api.type.types.UnsignedShortType;
 import com.viaversion.viaversion.api.type.types.VarIntArrayType;
 import com.viaversion.viaversion.api.type.types.VarIntType;
 import com.viaversion.viaversion.api.type.types.VarLongType;
-import com.viaversion.viaversion.api.type.types.VoidType;
+import com.viaversion.viaversion.api.type.types.chunk.BlockChangeRecordType;
-import com.viaversion.viaversion.api.type.types.minecraft.BlockChangeRecordType;
+import com.viaversion.viaversion.api.type.types.math.ChunkPositionType;
-import com.viaversion.viaversion.api.type.types.minecraft.ChunkPositionType;
+import com.viaversion.viaversion.api.type.types.misc.CompoundTagType;
-import com.viaversion.viaversion.api.type.types.minecraft.CompoundTagType;
+import com.viaversion.viaversion.api.type.types.math.EulerAngleType;
-import com.viaversion.viaversion.api.type.types.minecraft.EulerAngleType;
+import com.viaversion.viaversion.api.type.types.item.ItemShortArrayType1_13;
-import com.viaversion.viaversion.api.type.types.minecraft.FlatItemArrayType;
+import com.viaversion.viaversion.api.type.types.item.ItemType1_13;
-import com.viaversion.viaversion.api.type.types.minecraft.FlatItemType;
+import com.viaversion.viaversion.api.type.types.item.ItemShortArrayType1_13_2;
-import com.viaversion.viaversion.api.type.types.minecraft.FlatVarIntItemArrayType;
+import com.viaversion.viaversion.api.type.types.item.ItemType1_13_2;
-import com.viaversion.viaversion.api.type.types.minecraft.FlatVarIntItemType;
+import com.viaversion.viaversion.api.type.types.math.GlobalPositionType;
-import com.viaversion.viaversion.api.type.types.minecraft.GlobalPositionType;
+import com.viaversion.viaversion.api.type.types.item.ItemType1_20_2;
-import com.viaversion.viaversion.api.type.types.minecraft.Item1_20_2Type;
+import com.viaversion.viaversion.api.type.types.item.ItemShortArrayType1_8;
-import com.viaversion.viaversion.api.type.types.minecraft.ItemArrayType;
+import com.viaversion.viaversion.api.type.types.item.ItemType1_8;
-import com.viaversion.viaversion.api.type.types.minecraft.ItemType;
+import com.viaversion.viaversion.api.type.types.misc.NamedCompoundTagType;
-import com.viaversion.viaversion.api.type.types.minecraft.NamedCompoundTagType;
+import com.viaversion.viaversion.api.type.types.OptionalVarIntType;
-import com.viaversion.viaversion.api.type.types.minecraft.OptionalVarIntType;
+import com.viaversion.viaversion.api.type.types.misc.PlayerMessageSignatureType;
-import com.viaversion.viaversion.api.type.types.minecraft.PlayerMessageSignatureType;
+import com.viaversion.viaversion.api.type.types.math.PositionType1_14;
-import com.viaversion.viaversion.api.type.types.minecraft.Position1_14Type;
+import com.viaversion.viaversion.api.type.types.math.PositionType1_8;
-import com.viaversion.viaversion.api.type.types.minecraft.PositionType;
+import com.viaversion.viaversion.api.type.types.misc.ProfileKeyType;
-import com.viaversion.viaversion.api.type.types.minecraft.ProfileKeyType;
+import com.viaversion.viaversion.api.type.types.math.QuaternionType;
-import com.viaversion.viaversion.api.type.types.minecraft.QuaternionType;
+import com.viaversion.viaversion.api.type.types.misc.TagType;
-import com.viaversion.viaversion.api.type.types.minecraft.TagType;
+import com.viaversion.viaversion.api.type.types.chunk.VarLongBlockChangeRecordType;
-import com.viaversion.viaversion.api.type.types.minecraft.VarLongBlockChangeRecordType;
+import com.viaversion.viaversion.api.type.types.math.Vector3fType;
-import com.viaversion.viaversion.api.type.types.minecraft.Vector3fType;
+import com.viaversion.viaversion.api.type.types.math.VectorType;
-import com.viaversion.viaversion.api.type.types.minecraft.VectorType;
+import com.viaversion.viaversion.api.type.types.misc.VillagerDataType;
-import com.viaversion.viaversion.api.type.types.minecraft.VillagerDataType;
 import java.util.UUID;
 
 /**
@@ -124,46 +122,17 @@ public abstract class Type<T> implements ByteBufReader<T>, ByteBufWriter<T> {
     public static final Type<UUID> UUID = new UUIDType();
     public static final Type<UUID> OPTIONAL_UUID = new UUIDType.OptionalUUIDType();
     public static final Type<UUID[]> UUID_ARRAY = new ArrayType<>(Type.UUID);
-    @Deprecated/*(forRemoval = true)*/
-    public static final Type<UUID> UUID_INT_ARRAY = new UUIDIntArrayType();
 
     public static final VarIntType VAR_INT = new VarIntType();
     public static final OptionalVarIntType OPTIONAL_VAR_INT = new OptionalVarIntType();
     public static final Type<int[]> VAR_INT_ARRAY_PRIMITIVE = new VarIntArrayType();
     public static final VarLongType VAR_LONG = new VarLongType();
 
-    /* Boxed number array types */
-    @Deprecated
-    public static final Type<Byte[]> BYTE_ARRAY = new ArrayType<>(Type.BYTE);
-    @Deprecated
-    public static final Type<Short[]> UNSIGNED_BYTE_ARRAY = new ArrayType<>(Type.UNSIGNED_BYTE);
-    @Deprecated
-    public static final Type<Boolean[]> BOOLEAN_ARRAY = new ArrayType<>(Type.BOOLEAN);
-    @Deprecated
-    public static final Type<Integer[]> INT_ARRAY = new ArrayType<>(Type.INT);
-    @Deprecated
-    public static final Type<Short[]> SHORT_ARRAY = new ArrayType<>(Type.SHORT);
-    @Deprecated
-    public static final Type<Integer[]> UNSIGNED_SHORT_ARRAY = new ArrayType<>(Type.UNSIGNED_SHORT);
-    @Deprecated
-    public static final Type<Double[]> DOUBLE_ARRAY = new ArrayType<>(Type.DOUBLE);
-    @Deprecated
-    public static final Type<Long[]> LONG_ARRAY = new ArrayType<>(Type.LONG);
-    @Deprecated
-    public static final Type<Float[]> FLOAT_ARRAY = new ArrayType<>(Type.FLOAT);
-    @Deprecated
-    public static final Type<Integer[]> VAR_INT_ARRAY = new ArrayType<>(Type.VAR_INT);
-    @Deprecated
-    public static final Type<Long[]> VAR_LONG_ARRAY = new ArrayType<>(Type.VAR_LONG);
-
-    /* Special Types */
-    public static final VoidType NOTHING = new VoidType(); // This is purely used for remapping.
-
     /* MC Types */
-    public static final Type<Position> POSITION = new PositionType();
+    public static final Type<Position> POSITION = new PositionType1_8();
-    public static final Type<Position> OPTIONAL_POSITION = new PositionType.OptionalPositionType();
+    public static final Type<Position> OPTIONAL_POSITION = new PositionType1_8.OptionalPositionType();
-    public static final Type<Position> POSITION1_14 = new Position1_14Type();
+    public static final Type<Position> POSITION1_14 = new PositionType1_14();
-    public static final Type<Position> OPTIONAL_POSITION_1_14 = new Position1_14Type.OptionalPosition1_14Type();
+    public static final Type<Position> OPTIONAL_POSITION_1_14 = new PositionType1_14.OptionalPosition1_14Type();
     public static final Type<EulerAngle> ROTATION = new EulerAngleType();
     public static final Type<Vector> VECTOR = new VectorType();
     public static final Type<Vector3f> VECTOR3F = new Vector3fType();
@@ -192,9 +161,6 @@ public abstract class Type<T> implements ByteBufReader<T>, ByteBufWriter<T> {
 
     public static final Type<VillagerData> VILLAGER_DATA = new VillagerDataType();
 
-    public static final Type<Item> ITEM = new ItemType();
-    public static final Type<Item[]> ITEM_ARRAY = new ItemArrayType();
-
     public static final Type<ProfileKey> PROFILE_KEY = new ProfileKeyType();
     public static final Type<ProfileKey> OPTIONAL_PROFILE_KEY = new ProfileKeyType.OptionalProfileKeyType();
 
@@ -206,16 +172,30 @@ public abstract class Type<T> implements ByteBufReader<T>, ByteBufWriter<T> {
     public static final ByteArrayType SIGNATURE_BYTES = new ByteArrayType(256);
     public static final ByteArrayType.OptionalByteArrayType OPTIONAL_SIGNATURE_BYTES = new ByteArrayType.OptionalByteArrayType(256);
 
-    /* 1.13 Flat Item (no data) */
+    public static final Type<Item> ITEM1_8 = new ItemType1_8();
-    public static final Type<Item> FLAT_ITEM = new FlatItemType();
+    public static final Type<Item> ITEM1_13 = new ItemType1_13();
-    public static final Type<Item> FLAT_VAR_INT_ITEM = new FlatVarIntItemType();
+    public static final Type<Item> ITEM1_13_2 = new ItemType1_13_2();
-    public static final Type<Item[]> FLAT_ITEM_ARRAY = new FlatItemArrayType();
+    public static final Type<Item> ITEM1_20_2 = new ItemType1_20_2();
-    public static final Type<Item[]> FLAT_VAR_INT_ITEM_ARRAY = new FlatVarIntItemArrayType();
+    public static final Type<Item[]> ITEM1_13_SHORT_ARRAY = new ItemShortArrayType1_13();
-    public static final Type<Item[]> FLAT_ITEM_ARRAY_VAR_INT = new ArrayType<>(FLAT_ITEM);
+    public static final Type<Item[]> ITEM1_13_2_SHORT_ARRAY = new ItemShortArrayType1_13_2();
-    public static final Type<Item[]> FLAT_VAR_INT_ITEM_ARRAY_VAR_INT = new ArrayType<>(FLAT_VAR_INT_ITEM);
+    public static final Type<Item[]> ITEM1_8_ARRAY = new ItemShortArrayType1_8();
-
+    public static final Type<Item[]> ITEM1_13_ARRAY = new ArrayType<>(ITEM1_13);
-    public static final Type<Item> ITEM1_20_2 = new Item1_20_2Type();
+    public static final Type<Item[]> ITEM1_13_2_ARRAY = new ArrayType<>(ITEM1_13_2);
-    public static final Type<Item[]> ITEM1_20_2_VAR_INT_ARRAY = new ArrayType<>(ITEM1_20_2);
+    public static final Type<Item[]> ITEM1_20_2_ARRAY = new ArrayType<>(ITEM1_20_2);
+    @Deprecated/*(forRemoval=true)*/
+    public static final Type<Item> ITEM = ITEM1_8;
+    @Deprecated/*(forRemoval=true)*/
+    public static final Type<Item> FLAT_ITEM = ITEM1_13;
+    @Deprecated/*(forRemoval=true)*/
+    public static final Type<Item> FLAT_VAR_INT_ITEM = ITEM1_13_2;
+    @Deprecated/*(forRemoval=true)*/
+    public static final Type<Item[]> FLAT_ITEM_ARRAY = ITEM1_13_SHORT_ARRAY;
+    @Deprecated/*(forRemoval=true)*/
+    public static final Type<Item[]> FLAT_VAR_INT_ITEM_ARRAY = ITEM1_13_2_SHORT_ARRAY;
+    @Deprecated/*(forRemoval=true)*/
+    public static final Type<Item[]> FLAT_ITEM_ARRAY_VAR_INT = ITEM1_13_ARRAY;
+    @Deprecated/*(forRemoval=true)*/
+    public static final Type<Item[]> FLAT_VAR_INT_ITEM_ARRAY_VAR_INT = ITEM1_13_2_ARRAY;
 
     /* Actual Class */
     private final Class<? super T> outputClass;

api/src/main/java/com/viaversion/viaversion/api/type/types/OptionalVarIntType.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types;
 
 import com.viaversion.viaversion.api.type.Type;
 import io.netty.buffer.ByteBuf;

api/src/main/java/com/viaversion/viaversion/api/type/types/VoidType.java

@@ -26,6 +26,7 @@ import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.TypeConverter;
 import io.netty.buffer.ByteBuf;
 
+@Deprecated
 public class VoidType extends Type<Void> implements TypeConverter<Void> {
     public VoidType() {
         super(Void.class);

api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/BaseChunkBulkType.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.chunk;
 
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
 import com.viaversion.viaversion.api.type.Type;

api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/BaseChunkType.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.chunk;
 
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
 import com.viaversion.viaversion.api.type.Type;

api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/BlockChangeRecordType.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.chunk;
 
 import com.viaversion.viaversion.api.minecraft.BlockChangeRecord;
 import com.viaversion.viaversion.api.minecraft.BlockChangeRecord1_8;

api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/BlockEntityType1_18.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.version;
+package com.viaversion.viaversion.api.type.types.chunk;
 
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity;

api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/BlockEntityType1_20_2.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.version;
+package com.viaversion.viaversion.api.type.types.chunk;
 
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity;

api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkSectionType1_13.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.version;
+package com.viaversion.viaversion.api.type.types.chunk;
 
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSectionImpl;

api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkSectionType1_16.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.version;
+package com.viaversion.viaversion.api.type.types.chunk;
 
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSectionImpl;

api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkSectionType1_18.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.version;
+package com.viaversion.viaversion.api.type.types.chunk;
 
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSectionImpl;

api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkSectionType1_8.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.version;
+package com.viaversion.viaversion.api.type.types.chunk;
 
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSectionImpl;

api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkSectionType1_9.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.version;
+package com.viaversion.viaversion.api.type.types.chunk;
 
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSectionImpl;

api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/PaletteType1_18.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.version;
+package com.viaversion.viaversion.api.type.types.chunk;
 
 import com.viaversion.viaversion.api.minecraft.chunks.DataPalette;
 import com.viaversion.viaversion.api.minecraft.chunks.DataPaletteImpl;

api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/VarLongBlockChangeRecordType.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.chunk;
 
 import com.viaversion.viaversion.api.minecraft.BlockChangeRecord;
 import com.viaversion.viaversion.api.minecraft.BlockChangeRecord1_16_2;

api/src/main/java/com/viaversion/viaversion/api/type/types/item/BaseItemArrayType.java

@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.item;
 
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.type.Type;
 
-public abstract class BaseItemArrayType extends Type<Item[]> {
+abstract class BaseItemArrayType extends Type<Item[]> {
 
     protected BaseItemArrayType() {
         super(Item[].class);

api/src/main/java/com/viaversion/viaversion/api/type/types/item/BaseItemType.java

@@ -20,12 +20,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.item;
 
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.type.Type;
 
-public abstract class BaseItemType extends Type<Item> {
+abstract class BaseItemType extends Type<Item> {
 
     protected BaseItemType() {
         super(Item.class);

api/src/main/java/com/viaversion/viaversion/api/type/types/item/ItemShortArrayType1_13.java

@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.item;
 
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.type.Type;
 import io.netty.buffer.ByteBuf;
 
-public class FlatItemArrayType extends BaseItemArrayType {
+public class ItemShortArrayType1_13 extends BaseItemArrayType {
 
-    public FlatItemArrayType() {
+    public ItemShortArrayType1_13() {
         super("Flat Item Array");
     }
 
@@ -37,7 +37,7 @@ public class FlatItemArrayType extends BaseItemArrayType {
         int amount = Type.SHORT.readPrimitive(buffer);
         Item[] array = new Item[amount];
         for (int i = 0; i < amount; i++) {
-            array[i] = Type.FLAT_ITEM.read(buffer);
+            array[i] = Type.ITEM1_13.read(buffer);
         }
         return array;
     }
@@ -46,7 +46,7 @@ public class FlatItemArrayType extends BaseItemArrayType {
     public void write(ByteBuf buffer, Item[] object) throws Exception {
         Type.SHORT.writePrimitive(buffer, (short) object.length);
         for (Item o : object) {
-            Type.FLAT_ITEM.write(buffer, o);
+            Type.ITEM1_13.write(buffer, o);
         }
     }
 }

api/src/main/java/com/viaversion/viaversion/api/type/types/item/ItemShortArrayType1_13_2.java

@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.item;
 
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import io.netty.buffer.ByteBuf;
 
-public class FlatVarIntItemArrayType extends BaseItemArrayType {
+public class ItemShortArrayType1_13_2 extends BaseItemArrayType {
 
-    public FlatVarIntItemArrayType() {
+    public ItemShortArrayType1_13_2() {
         super("Flat Item Array");
     }
 
@@ -36,7 +36,7 @@ public class FlatVarIntItemArrayType extends BaseItemArrayType {
         int amount = SHORT.readPrimitive(buffer);
         Item[] array = new Item[amount];
         for (int i = 0; i < amount; i++) {
-            array[i] = FLAT_VAR_INT_ITEM.read(buffer);
+            array[i] = ITEM1_13_2.read(buffer);
         }
         return array;
     }
@@ -45,7 +45,7 @@ public class FlatVarIntItemArrayType extends BaseItemArrayType {
     public void write(ByteBuf buffer, Item[] object) throws Exception {
         SHORT.writePrimitive(buffer, (short) object.length);
         for (Item o : object) {
-            FLAT_VAR_INT_ITEM.write(buffer, o);
+            ITEM1_13_2.write(buffer, o);
         }
     }
 }

api/src/main/java/com/viaversion/viaversion/api/type/types/item/ItemShortArrayType1_8.java

@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.item;
 
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import io.netty.buffer.ByteBuf;
 
-public class ItemArrayType extends BaseItemArrayType {
+public class ItemShortArrayType1_8 extends BaseItemArrayType {
 
-    public ItemArrayType() {
+    public ItemShortArrayType1_8() {
         super("Item Array");
     }
 
@@ -36,7 +36,7 @@ public class ItemArrayType extends BaseItemArrayType {
         int amount = SHORT.readPrimitive(buffer);
         Item[] array = new Item[amount];
         for (int i = 0; i < amount; i++) {
-            array[i] = ITEM.read(buffer);
+            array[i] = ITEM1_8.read(buffer);
         }
         return array;
     }
@@ -45,7 +45,7 @@ public class ItemArrayType extends BaseItemArrayType {
     public void write(ByteBuf buffer, Item[] object) throws Exception {
         SHORT.writePrimitive(buffer, (short) object.length);
         for (Item o : object) {
-            ITEM.write(buffer, o);
+            ITEM1_8.write(buffer, o);
         }
     }
 }

api/src/main/java/com/viaversion/viaversion/api/type/types/item/ItemType1_13.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.item;
 
 import com.viaversion.viaversion.api.minecraft.item.DataItem;
 import com.viaversion.viaversion.api.minecraft.item.Item;
@@ -28,8 +28,8 @@ import com.viaversion.viaversion.api.type.Type;
 import io.netty.buffer.ByteBuf;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-public class FlatItemType extends BaseItemType {
+public class ItemType1_13 extends BaseItemType {
-    public FlatItemType() {
+    public ItemType1_13() {
         super("FlatItem");
     }
 

api/src/main/java/com/viaversion/viaversion/api/type/types/item/ItemType1_13_2.java

@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.item;
 
 import com.viaversion.viaversion.api.minecraft.item.DataItem;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import io.netty.buffer.ByteBuf;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-public class FlatVarIntItemType extends BaseItemType {
+public class ItemType1_13_2 extends BaseItemType {
-    public FlatVarIntItemType() {
+    public ItemType1_13_2() {
         super("FlatVarIntItem");
     }
 

api/src/main/java/com/viaversion/viaversion/api/type/types/item/ItemType1_20_2.java

@@ -20,17 +20,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.item;
 
 import com.viaversion.viaversion.api.minecraft.item.DataItem;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import io.netty.buffer.ByteBuf;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-public class Item1_20_2Type extends BaseItemType {
+public class ItemType1_20_2 extends BaseItemType {
 
-    public Item1_20_2Type() {
+    public ItemType1_20_2() {
-        super("Item1_20_2Type");
+        super("ItemType1_20_2");
     }
 
     @Override

api/src/main/java/com/viaversion/viaversion/api/type/types/item/ItemType1_8.java

@@ -20,16 +20,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.item;
 
 import com.viaversion.viaversion.api.minecraft.item.DataItem;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import io.netty.buffer.ByteBuf;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-public class ItemType extends BaseItemType {
+public class ItemType1_8 extends BaseItemType {
 
-    public ItemType() {
+    public ItemType1_8() {
         super("Item");
     }
 

api/src/main/java/com/viaversion/viaversion/api/type/types/math/ChunkPositionType.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.math;
 
 import com.viaversion.viaversion.api.minecraft.metadata.ChunkPosition;
 import com.viaversion.viaversion.api.type.Type;

api/src/main/java/com/viaversion/viaversion/api/type/types/math/EulerAngleType.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.math;
 
 import com.viaversion.viaversion.api.minecraft.EulerAngle;
 import com.viaversion.viaversion.api.type.Type;

api/src/main/java/com/viaversion/viaversion/api/type/types/math/GlobalPositionType.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.math;
 
 import com.viaversion.viaversion.api.minecraft.GlobalPosition;
 import com.viaversion.viaversion.api.type.OptionalType;

api/src/main/java/com/viaversion/viaversion/api/type/types/math/PositionType1_14.java

@@ -20,15 +20,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.math;
 
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.api.type.OptionalType;
 import com.viaversion.viaversion.api.type.Type;
 import io.netty.buffer.ByteBuf;
 
-public class Position1_14Type extends Type<Position> {
+public class PositionType1_14 extends Type<Position> {
-    public Position1_14Type() {
+    public PositionType1_14() {
         super(Position.class);
     }
 
@@ -52,7 +52,7 @@ public class Position1_14Type extends Type<Position> {
 
     @Override
     public Class<? extends Type> getBaseClass() {
-        return PositionType.class;
+        return PositionType1_8.class;
     }
 
     public static final class OptionalPosition1_14Type extends OptionalType<Position> {

api/src/main/java/com/viaversion/viaversion/api/type/types/math/PositionType1_8.java

@@ -20,16 +20,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.math;
 
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.api.type.OptionalType;
 import com.viaversion.viaversion.api.type.Type;
 import io.netty.buffer.ByteBuf;
 
-public class PositionType extends Type<Position> {
+public class PositionType1_8 extends Type<Position> {
 
-    public PositionType() {
+    public PositionType1_8() {
         super(Position.class);
     }
 

api/src/main/java/com/viaversion/viaversion/api/type/types/math/QuaternionType.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.math;
 
 import com.viaversion.viaversion.api.minecraft.Quaternion;
 import com.viaversion.viaversion.api.type.Type;

api/src/main/java/com/viaversion/viaversion/api/type/types/math/Vector3fType.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.math;
 
 import com.viaversion.viaversion.api.minecraft.Vector3f;
 import com.viaversion.viaversion.api.type.Type;

api/src/main/java/com/viaversion/viaversion/api/type/types/math/VectorType.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.math;
 
 import com.viaversion.viaversion.api.minecraft.Vector;
 import com.viaversion.viaversion.api.type.Type;

api/src/main/java/com/viaversion/viaversion/api/type/types/metadata/MetaListType.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.metadata;
 
 import com.google.common.base.Preconditions;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;

api/src/main/java/com/viaversion/viaversion/api/type/types/metadata/MetaListTypeTemplate.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.metadata;
 
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.type.Type;

api/src/main/java/com/viaversion/viaversion/api/type/types/metadata/MetaTypeTemplate.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.metadata;
 
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.type.Type;

api/src/main/java/com/viaversion/viaversion/api/type/types/metadata/MetadataType.java

@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.version;
+package com.viaversion.viaversion.api.type.types.metadata;
 
 import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaTypes;
-import com.viaversion.viaversion.api.type.types.minecraft.ModernMetaType;
+import com.viaversion.viaversion.api.type.types.metadata.ModernMetaType;
 
 public final class MetadataType extends ModernMetaType {
 

api/src/main/java/com/viaversion/viaversion/api/type/types/metadata/MetadataType1_12.java

@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.version;
+package com.viaversion.viaversion.api.type.types.metadata;
 
 import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_12;
-import com.viaversion.viaversion.api.type.types.minecraft.ModernMetaType;
+import com.viaversion.viaversion.api.type.types.metadata.ModernMetaType;
 
-public class Metadata1_12Type extends ModernMetaType {
+public class MetadataType1_12 extends ModernMetaType {
     @Override
     protected MetaType getType(final int index) {
         return MetaType1_12.byId(index);

api/src/main/java/com/viaversion/viaversion/api/type/types/metadata/MetadataType1_8.java

@@ -20,14 +20,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.version;
+package com.viaversion.viaversion.api.type.types.metadata;
 
 
 import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_8;
-import com.viaversion.viaversion.api.type.types.minecraft.OldMetaType;
+import com.viaversion.viaversion.api.type.types.metadata.OldMetaType;
 
-public class Metadata1_8Type extends OldMetaType {
+public class MetadataType1_8 extends OldMetaType {
     @Override
     protected MetaType getType(int index) {
         return MetaType1_8.byId(index);

api/src/main/java/com/viaversion/viaversion/api/type/types/metadata/MetadataType1_9.java

@@ -20,13 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.version;
+package com.viaversion.viaversion.api.type.types.metadata;
 
 import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_9;
-import com.viaversion.viaversion.api.type.types.minecraft.ModernMetaType;
+import com.viaversion.viaversion.api.type.types.metadata.ModernMetaType;
 
-public class Metadata1_9Type extends ModernMetaType {
+public class MetadataType1_9 extends ModernMetaType {
     @Override
     protected MetaType getType(final int index) {
         return MetaType1_9.byId(index);

api/src/main/java/com/viaversion/viaversion/api/type/types/metadata/ModernMetaType.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.metadata;
 
 import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;

api/src/main/java/com/viaversion/viaversion/api/type/types/metadata/OldMetaType.java

@@ -20,10 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.metadata;
 
 import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
+import com.viaversion.viaversion.api.type.types.metadata.MetaTypeTemplate;
 import io.netty.buffer.ByteBuf;
 
 public abstract class OldMetaType extends MetaTypeTemplate {

api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/AbstractParticleType.java

@@ -1,116 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.viaversion.viaversion.api.type.types.minecraft;
-
-import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.minecraft.Position;
-import com.viaversion.viaversion.api.minecraft.item.Item;
-import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.Particle;
-import io.netty.buffer.ByteBuf;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-
-@Deprecated/*(forRemoval = true)*/
-public abstract class AbstractParticleType extends Type<Particle> {
-
-    protected final Int2ObjectMap<ParticleReader> readers = new Int2ObjectOpenHashMap<>();
-
-    protected AbstractParticleType() {
-        super("Particle", Particle.class);
-    }
-
-    @Override
-    public void write(ByteBuf buffer, Particle object) throws Exception {
-        Type.VAR_INT.writePrimitive(buffer, object.getId());
-        for (Particle.ParticleData data : object.getArguments()) {
-            data.getType().write(buffer, data.getValue());
-        }
-    }
-
-    @Override
-    public Particle read(ByteBuf buffer) throws Exception {
-        int type = Type.VAR_INT.readPrimitive(buffer);
-        Particle particle = new Particle(type);
-
-        ParticleReader reader = readers.get(type);
-        if (reader != null) {
-            reader.read(buffer, particle);
-        }
-        return particle;
-    }
-
-    protected ParticleReader blockHandler() {
-        return (buf, particle) -> {
-            particle.getArguments().add(new Particle.ParticleData(Type.VAR_INT, Type.VAR_INT.readPrimitive(buf))); // Flat Block
-        };
-    }
-
-    protected ParticleReader itemHandler(Type<Item> itemType) {
-        return (buf, particle) -> {
-            particle.getArguments().add(new Particle.ParticleData(itemType, itemType.read(buf))); // Flat item;
-        };
-    }
-
-    protected ParticleReader dustHandler() {
-        return (buf, particle) -> {
-            particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buf))); // Red 0 - 1
-            particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buf))); // Green 0 - 1
-            particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buf))); // Blue 0 - 1
-            particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buf))); // Scale 0.01 - 4
-        };
-    }
-
-    protected ParticleReader dustTransitionHandler() {
-        return (buf, particle) -> {
-            particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buf))); // Red 0 - 1
-            particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buf))); // Green 0 - 1
-            particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buf))); // Blue 0 - 1
-            particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buf))); // Scale 0.01 - 4
-            particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buf))); // Red
-            particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buf))); // Green
-            particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buf))); // Blue
-        };
-    }
-
-    protected ParticleReader vibrationHandler(Type<Position> positionType) {
-        return (buf, particle) -> {
-            particle.getArguments().add(new Particle.ParticleData(positionType, positionType.read(buf))); // From block pos
-            String resourceLocation = Type.STRING.read(buf);
-            if (resourceLocation.equals("block")) {
-                particle.getArguments().add(new Particle.ParticleData(positionType, positionType.read(buf))); // Target block pos
-            } else if (resourceLocation.equals("entity")) {
-                particle.getArguments().add(new Particle.ParticleData(Type.VAR_INT, Type.VAR_INT.readPrimitive(buf))); // Target entity
-            } else {
-                Via.getPlatform().getLogger().warning("Unknown vibration path position source type: " + resourceLocation);
-            }
-            particle.getArguments().add(new Particle.ParticleData(Type.VAR_INT, Type.VAR_INT.readPrimitive(buf))); // Arrival in ticks
-        };
-    }
-
-    @FunctionalInterface
-    public interface ParticleReader {
-
-        void read(ByteBuf buf, Particle particle) throws Exception;
-    }
-}

api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/Particle1_13Type.java

@@ -1,36 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.viaversion.viaversion.api.type.types.minecraft;
-
-import com.viaversion.viaversion.api.type.Type;
-
-@Deprecated/*(forRemoval = true)*/
-public class Particle1_13Type extends AbstractParticleType {
-
-    public Particle1_13Type() {
-        readers.put(3, blockHandler());
-        readers.put(20, blockHandler());
-        readers.put(11, dustHandler());
-        readers.put(27, itemHandler(Type.FLAT_ITEM));
-    }
-}

api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/Particle1_13_2Type.java

@@ -1,68 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.viaversion.viaversion.api.type.types.minecraft;
-
-import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.Particle;
-import io.netty.buffer.ByteBuf;
-
-@Deprecated/*(forRemoval = true)*/
-public class Particle1_13_2Type extends Type<Particle> {
-
-    public Particle1_13_2Type() {
-        super("Particle", Particle.class);
-    }
-
-    @Override
-    public void write(ByteBuf buffer, Particle object) throws Exception {
-        Type.VAR_INT.writePrimitive(buffer, object.getId());
-        for (Particle.ParticleData data : object.getArguments())
-            data.getType().write(buffer, data.getValue());
-    }
-
-    @Override
-    public Particle read(ByteBuf buffer) throws Exception {
-        int type = Type.VAR_INT.readPrimitive(buffer);
-        Particle particle = new Particle(type);
-
-        switch (type) {
-            // Block / Falling Dust /
-            case 3:
-            case 20:
-                particle.getArguments().add(new Particle.ParticleData(Type.VAR_INT, Type.VAR_INT.readPrimitive(buffer))); // Flat Block
-                break;
-            // Dust
-            case 11:
-                particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buffer))); // Red 0 - 1
-                particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buffer))); // Green 0 - 1
-                particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buffer))); // Blue 0 - 1
-                particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buffer)));// Scale 0.01 - 4
-                break;
-            // Item
-            case 27:
-                particle.getArguments().add(new Particle.ParticleData(Type.FLAT_VAR_INT_ITEM, Type.FLAT_VAR_INT_ITEM.read(buffer))); // Flat item
-                break;
-        }
-        return particle;
-    }
-}

api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/Particle1_14Type.java

@@ -1,36 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.viaversion.viaversion.api.type.types.minecraft;
-
-import com.viaversion.viaversion.api.type.Type;
-
-@Deprecated/*(forRemoval = true)*/
-public class Particle1_14Type extends AbstractParticleType {
-
-    public Particle1_14Type() {
-        readers.put(3, blockHandler());
-        readers.put(23, blockHandler());
-        readers.put(14, dustHandler());
-        readers.put(32, itemHandler(Type.FLAT_VAR_INT_ITEM));
-    }
-}

api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/Particle1_16Type.java

@@ -1,36 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.viaversion.viaversion.api.type.types.minecraft;
-
-import com.viaversion.viaversion.api.type.Type;
-
-@Deprecated/*(forRemoval = true)*/
-public class Particle1_16Type extends AbstractParticleType {
-
-    public Particle1_16Type() {
-        readers.put(3, blockHandler());
-        readers.put(23, blockHandler());
-        readers.put(14, dustHandler());
-        readers.put(34, itemHandler(Type.FLAT_VAR_INT_ITEM));
-    }
-}

api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/Particle1_17Type.java

@@ -1,39 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.viaversion.viaversion.api.type.types.minecraft;
-
-import com.viaversion.viaversion.api.type.Type;
-
-@Deprecated/*(forRemoval = true)*/
-public class Particle1_17Type extends AbstractParticleType {
-
-    public Particle1_17Type() {
-        readers.put(4, blockHandler());
-        readers.put(25, blockHandler());
-        readers.put(15, dustHandler());
-        readers.put(16, dustTransitionHandler());
-        readers.put(36, itemHandler(Type.FLAT_VAR_INT_ITEM));
-        readers.put(37, vibrationHandler(Type.POSITION1_14));
-    }
-}
-

api/src/main/java/com/viaversion/viaversion/api/type/types/minecraft/Particle1_18Type.java

@@ -1,40 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.viaversion.viaversion.api.type.types.minecraft;
-
-import com.viaversion.viaversion.api.type.Type;
-
-@Deprecated/*(forRemoval = true)*/
-public class Particle1_18Type extends AbstractParticleType {
-
-    public Particle1_18Type() {
-        readers.put(2, blockHandler());
-        readers.put(3, blockHandler());
-        readers.put(24, blockHandler());
-        readers.put(14, dustHandler());
-        readers.put(15, dustTransitionHandler());
-        readers.put(35, itemHandler(Type.FLAT_VAR_INT_ITEM));
-        readers.put(36, vibrationHandler(Type.POSITION1_14));
-    }
-}
-

api/src/main/java/com/viaversion/viaversion/api/type/types/misc/CompoundTagType.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.misc;
 
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.viaversion.viaversion.api.type.OptionalType;

api/src/main/java/com/viaversion/viaversion/api/type/types/misc/NamedCompoundTagType.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.misc;
 
 import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;

api/src/main/java/com/viaversion/viaversion/api/type/types/misc/ParticleType.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.misc;
 
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.data.ParticleMappings;
@@ -83,8 +83,8 @@ public class ParticleType extends Type<Particle> {
         public static final ParticleReader BLOCK = (buf, particle) -> {
             particle.add(Type.VAR_INT, Type.VAR_INT.readPrimitive(buf)); // Flat Block
         };
-        public static final ParticleReader ITEM = itemHandler(Type.FLAT_ITEM);
+        public static final ParticleReader ITEM = itemHandler(Type.ITEM1_13);
-        public static final ParticleReader VAR_INT_ITEM = itemHandler(Type.FLAT_VAR_INT_ITEM);
+        public static final ParticleReader VAR_INT_ITEM = itemHandler(Type.ITEM1_13_2);
         public static final ParticleReader DUST = (buf, particle) -> {
             particle.add(Type.FLOAT, Type.FLOAT.readPrimitive(buf)); // Red 0-1
             particle.add(Type.FLOAT, Type.FLOAT.readPrimitive(buf)); // Green 0-1

api/src/main/java/com/viaversion/viaversion/api/type/types/misc/PlayerMessageSignatureType.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.misc;
 
 import com.viaversion.viaversion.api.minecraft.PlayerMessageSignature;
 import com.viaversion.viaversion.api.type.OptionalType;

api/src/main/java/com/viaversion/viaversion/api/type/types/misc/ProfileKeyType.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.misc;
 
 import com.viaversion.viaversion.api.minecraft.ProfileKey;
 import com.viaversion.viaversion.api.type.OptionalType;

api/src/main/java/com/viaversion/viaversion/api/type/types/misc/TagType.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.misc;
 
 import com.github.steveice10.opennbt.tag.TagRegistry;
 import com.github.steveice10.opennbt.tag.builtin.Tag;

api/src/main/java/com/viaversion/viaversion/api/type/types/misc/VillagerDataType.java

@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.viaversion.viaversion.api.type.types.minecraft;
+package com.viaversion.viaversion.api.type.types.misc;
 
 import com.viaversion.viaversion.api.minecraft.VillagerData;
 import com.viaversion.viaversion.api.type.Type;

api/src/main/java/com/viaversion/viaversion/api/type/types/version/Metadata1_13Type.java

@@ -1,34 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.viaversion.viaversion.api.type.types.version;
-
-import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
-import com.viaversion.viaversion.api.type.types.minecraft.ModernMetaType;
-
-@Deprecated/*(forRemoval = true)*/
-public class Metadata1_13Type extends ModernMetaType {
-    @Override
-    protected MetaType getType(final int index) {
-        return Types1_13.META_TYPES.byId(index);
-    }
-}

api/src/main/java/com/viaversion/viaversion/api/type/types/version/Metadata1_13_2Type.java

@@ -1,34 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.viaversion.viaversion.api.type.types.version;
-
-import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
-import com.viaversion.viaversion.api.type.types.minecraft.ModernMetaType;
-
-@Deprecated/*(forRemoval = true)*/
-public class Metadata1_13_2Type extends ModernMetaType {
-    @Override
-    protected MetaType getType(final int index) {
-        return Types1_13_2.META_TYPES.byId(index);
-    }
-}

api/src/main/java/com/viaversion/viaversion/api/type/types/version/Metadata1_14Type.java

@@ -1,34 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.viaversion.viaversion.api.type.types.version;
-
-import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
-import com.viaversion.viaversion.api.type.types.minecraft.ModernMetaType;
-
-@Deprecated/*(forRemoval = true)*/
-public class Metadata1_14Type extends ModernMetaType {
-    @Override
-    protected MetaType getType(final int index) {
-        return Types1_14.META_TYPES.byId(index);
-    }
-}

api/src/main/java/com/viaversion/viaversion/api/type/types/version/Metadata1_16Type.java

@@ -1,35 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.viaversion.viaversion.api.type.types.version;
-
-import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
-import com.viaversion.viaversion.api.type.types.minecraft.ModernMetaType;
-
-@Deprecated/*(forRemoval = true)*/
-public class Metadata1_16Type extends ModernMetaType {
-
-    @Override
-    protected MetaType getType(final int index) {
-        return Types1_16.META_TYPES.byId(index);
-    }
-}

api/src/main/java/com/viaversion/viaversion/api/type/types/version/Metadata1_17Type.java

@@ -1,35 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.viaversion.viaversion.api.type.types.version;
-
-import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
-import com.viaversion.viaversion.api.type.types.minecraft.ModernMetaType;
-
-@Deprecated/*(forRemoval = true)*/
-public class Metadata1_17Type extends ModernMetaType {
-
-    @Override
-    protected MetaType getType(final int index) {
-        return Types1_17.META_TYPES.byId(index);
-    }
-}

api/src/main/java/com/viaversion/viaversion/api/type/types/version/Metadata1_18Type.java

@@ -1,35 +0,0 @@
-/*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
- * Copyright (C) 2016-2023 ViaVersion and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.viaversion.viaversion.api.type.types.version;
-
-import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
-import com.viaversion.viaversion.api.type.types.minecraft.ModernMetaType;
-
-@Deprecated/*(forRemoval = true)*/
-public class Metadata1_18Type extends ModernMetaType {
-
-    @Override
-    protected MetaType getType(final int index) {
-        return Types1_18.META_TYPES.byId(index);
-    }
-}

api/src/main/java/com/viaversion/viaversion/api/type/types/version/Types1_12.java

@@ -24,15 +24,16 @@ package com.viaversion.viaversion.api.type.types.version;
 
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.minecraft.MetaListType;
+import com.viaversion.viaversion.api.type.types.metadata.MetaListType;
+import com.viaversion.viaversion.api.type.types.metadata.MetadataType1_12;
 import java.util.List;
 
-public class Types1_12 {
+public final class Types1_12 {
 
     /**
      * Metadata type for 1.12
      */
-    public static final Type<Metadata> METADATA = new Metadata1_12Type();
+    public static final Type<Metadata> METADATA = new MetadataType1_12();
     /**
      * Metadata list type for 1.12
      */

api/src/main/java/com/viaversion/viaversion/api/type/types/version/Types1_13.java

@@ -26,8 +26,10 @@ import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaTypes1_13;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.minecraft.MetaListType;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkSectionType1_13;
-import com.viaversion.viaversion.api.type.types.minecraft.ParticleType;
+import com.viaversion.viaversion.api.type.types.metadata.MetaListType;
+import com.viaversion.viaversion.api.type.types.metadata.MetadataType;
+import com.viaversion.viaversion.api.type.types.misc.ParticleType;
 import java.util.List;
 
 public final class Types1_13 {

api/src/main/java/com/viaversion/viaversion/api/type/types/version/Types1_13_2.java

@@ -25,8 +25,9 @@ package com.viaversion.viaversion.api.type.types.version;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaTypes1_13_2;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.minecraft.MetaListType;
+import com.viaversion.viaversion.api.type.types.metadata.MetaListType;
-import com.viaversion.viaversion.api.type.types.minecraft.ParticleType;
+import com.viaversion.viaversion.api.type.types.metadata.MetadataType;
+import com.viaversion.viaversion.api.type.types.misc.ParticleType;
 import java.util.List;
 
 public final class Types1_13_2 {

api/src/main/java/com/viaversion/viaversion/api/type/types/version/Types1_14.java

@@ -25,8 +25,9 @@ package com.viaversion.viaversion.api.type.types.version;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaTypes1_14;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.minecraft.MetaListType;
+import com.viaversion.viaversion.api.type.types.metadata.MetaListType;
-import com.viaversion.viaversion.api.type.types.minecraft.ParticleType;
+import com.viaversion.viaversion.api.type.types.metadata.MetadataType;
+import com.viaversion.viaversion.api.type.types.misc.ParticleType;
 import java.util.List;
 
 public final class Types1_14 {

api/src/main/java/com/viaversion/viaversion/api/type/types/version/Types1_16.java

@@ -26,8 +26,10 @@ import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaTypes1_14;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.minecraft.MetaListType;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkSectionType1_16;
-import com.viaversion.viaversion.api.type.types.minecraft.ParticleType;
+import com.viaversion.viaversion.api.type.types.metadata.MetaListType;
+import com.viaversion.viaversion.api.type.types.metadata.MetadataType;
+import com.viaversion.viaversion.api.type.types.misc.ParticleType;
 import java.util.List;
 
 public final class Types1_16 {

api/src/main/java/com/viaversion/viaversion/api/type/types/version/Types1_17.java

@@ -25,8 +25,9 @@ package com.viaversion.viaversion.api.type.types.version;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaTypes1_14;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.minecraft.MetaListType;
+import com.viaversion.viaversion.api.type.types.metadata.MetaListType;
-import com.viaversion.viaversion.api.type.types.minecraft.ParticleType;
+import com.viaversion.viaversion.api.type.types.metadata.MetadataType;
+import com.viaversion.viaversion.api.type.types.misc.ParticleType;
 import java.util.List;
 
 public final class Types1_17 {

api/src/main/java/com/viaversion/viaversion/api/type/types/version/Types1_18.java

@@ -26,8 +26,10 @@ import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaTypes1_14;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.minecraft.MetaListType;
+import com.viaversion.viaversion.api.type.types.chunk.BlockEntityType1_18;
-import com.viaversion.viaversion.api.type.types.minecraft.ParticleType;
+import com.viaversion.viaversion.api.type.types.metadata.MetaListType;
+import com.viaversion.viaversion.api.type.types.metadata.MetadataType;
+import com.viaversion.viaversion.api.type.types.misc.ParticleType;
 import java.util.List;
 
 public final class Types1_18 {

api/src/main/java/com/viaversion/viaversion/api/type/types/version/Types1_19.java

@@ -25,8 +25,9 @@ package com.viaversion.viaversion.api.type.types.version;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaTypes1_19;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.minecraft.MetaListType;
+import com.viaversion.viaversion.api.type.types.metadata.MetaListType;
-import com.viaversion.viaversion.api.type.types.minecraft.ParticleType;
+import com.viaversion.viaversion.api.type.types.metadata.MetadataType;
+import com.viaversion.viaversion.api.type.types.misc.ParticleType;
 import java.util.List;
 
 public final class Types1_19 {