From 000313ee9af971a48d9eec617fefb8cee774bd18 Mon Sep 17 00:00:00 2001
From: Marco Neuhaus <mneuhaus44@gmail.com>
Date: Mon, 11 Nov 2019 12:29:51 +0100
Subject: [PATCH] move particle type

---
 .../api/minecraft/metadata/types/MetaType1_14.java         | 4 ++--
 .../src/main/java/us/myles/ViaVersion/api/type/Type.java   | 3 ---
 .../myles/ViaVersion/api/type/types/version/Types1_14.java | 7 +++++++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/common/src/main/java/us/myles/ViaVersion/api/minecraft/metadata/types/MetaType1_14.java b/common/src/main/java/us/myles/ViaVersion/api/minecraft/metadata/types/MetaType1_14.java
index 013ee97e3..e268c6555 100644
--- a/common/src/main/java/us/myles/ViaVersion/api/minecraft/metadata/types/MetaType1_14.java
+++ b/common/src/main/java/us/myles/ViaVersion/api/minecraft/metadata/types/MetaType1_14.java
@@ -4,7 +4,7 @@ import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import us.myles.ViaVersion.api.minecraft.metadata.MetaType;
 import us.myles.ViaVersion.api.type.Type;
-import us.myles.ViaVersion.protocols.protocol1_13_2to1_13_1.Protocol1_13_2To1_13_1;
+import us.myles.ViaVersion.api.type.types.version.Types1_14;
 
 @RequiredArgsConstructor
 @Getter
@@ -24,7 +24,7 @@ public enum MetaType1_14 implements MetaType {
     OptUUID(12, Type.OPTIONAL_UUID),
     BlockID(13, Type.VAR_INT),
     NBTTag(14, Type.NBT),
-    PARTICLE(15, Type.PARTICLE_1_14),
+    PARTICLE(15, Types1_14.PARTICLE),
     VillagerData(16, Type.VILLAGER_DATA),
     OptVarInt(17, Type.OPTIONAL_VAR_INT),
     Pose(18, Type.VAR_INT),
diff --git a/common/src/main/java/us/myles/ViaVersion/api/type/Type.java b/common/src/main/java/us/myles/ViaVersion/api/type/Type.java
index 2262d7c05..25c6cd0ab 100644
--- a/common/src/main/java/us/myles/ViaVersion/api/type/Type.java
+++ b/common/src/main/java/us/myles/ViaVersion/api/type/Type.java
@@ -7,7 +7,6 @@ import us.myles.ViaVersion.api.minecraft.*;
 import us.myles.ViaVersion.api.minecraft.item.Item;
 import us.myles.ViaVersion.api.type.types.*;
 import us.myles.ViaVersion.api.type.types.minecraft.*;
-import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.data.Particle;
 
 import java.util.UUID;
 
@@ -77,8 +76,6 @@ public abstract class Type<T> implements ByteBufReader<T>, ByteBufWriter<T> {
 
     public static final Type<VillagerData> VILLAGER_DATA = new VillagerDataType();
 
-    public static final Type<Particle> PARTICLE_1_14 = new Particle1_14Type();
-
     /* 1.13 Flat Item (no data) */
     public static final Type<Item> FLAT_ITEM = new FlatItemType();
     public static final Type<Item> FLAT_VAR_INT_ITEM = new FlatVarIntItemType();
diff --git a/common/src/main/java/us/myles/ViaVersion/api/type/types/version/Types1_14.java b/common/src/main/java/us/myles/ViaVersion/api/type/types/version/Types1_14.java
index 161e78c9e..14238aa5b 100644
--- a/common/src/main/java/us/myles/ViaVersion/api/type/types/version/Types1_14.java
+++ b/common/src/main/java/us/myles/ViaVersion/api/type/types/version/Types1_14.java
@@ -2,6 +2,8 @@ package us.myles.ViaVersion.api.type.types.version;
 
 import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
 import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.types.minecraft.Particle1_14Type;
+import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.data.Particle;
 
 import java.util.List;
 
@@ -15,4 +17,9 @@ public class Types1_14 {
      * Metadata type for 1.14
      */
     public static final Type<Metadata> METADATA = new Metadata1_14Type();
+
+    /**
+     * Particle type for 1.14
+     */
+    public static final Type<Particle> PARTICLE = new Particle1_14Type();
 }