Revert unnecessarily breaking changes to converters

Fixes #394

modules/API/src/main/java/com/comphenix/protocol/reflect/EquivalentConverter.java

@@ -23,7 +23,25 @@ package com.comphenix.protocol.reflect;
  * @author Kristian
  * @param <T> The specific type.
  */
-public interface EquivalentConverter<T> extends SpecificConverter<T>, GenericConverter<T> {
+public interface EquivalentConverter<T> {
+	/**
+	 * Retrieve a copy of the generic type from a specific type.
+	 * <p>
+	 * This is usually a native net.minecraft.server type in Minecraft.
+	 * @param specific - the specific type we need to copy.
+	 * @return A copy of the specific type.
+	 */
+	Object getGeneric(T specific);
+
+	/**
+	 * Retrieve a copy of the specific type using an instance of the generic type.
+	 * <p>
+	 * This is usually a wrapper type in the Bukkit API or ProtocolLib API.
+	 * @param generic - the generic type.
+	 * @return The new specific type.
+	 */
+	T getSpecific(Object generic);
+
 	/**
 	 * Due to type erasure, we need to explicitly keep a reference to the specific type.
 	 * @return The specific type.

modules/API/src/main/java/com/comphenix/protocol/reflect/GenericConverter.java

@@ -1,33 +0,0 @@
-/**
- *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
- *  Copyright (C) 2017 Dan Mulloy
- *
- *  This program is free software; you can redistribute it and/or modify it under the terms of the
- *  GNU General Public License as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with this program;
- *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- *  02111-1307 USA
- */
-package com.comphenix.protocol.reflect;
-
-/**
- * Converts specific objects into generic objects.
- * @author Dan
- * @param <T> Specific type
- */
-public interface GenericConverter<T> {
-	/**
-	 * Retrieve a copy of the generic type from a specific type.
-	 * <p>
-	 * This is usually a native net.minecraft.server type in Minecraft.
-	 * @param specific - the specific type we need to copy.
-	 * @return A copy of the specific type.
-	 */
-	Object getGeneric(T specific);
-}

modules/API/src/main/java/com/comphenix/protocol/reflect/SpecificConverter.java

@@ -1,33 +0,0 @@
-/**
- *  ProtocolLib - Bukkit server library that allows access to the Minecraft protocol.
- *  Copyright (C) 2017 Dan Mulloy
- *
- *  This program is free software; you can redistribute it and/or modify it under the terms of the
- *  GNU General Public License as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with this program;
- *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- *  02111-1307 USA
- */
-package com.comphenix.protocol.reflect;
-
-/**
- * Converts generic objects into specific objects.
- * @author Dan
- * @param <T> The specific type
- */
-public interface SpecificConverter<T> {
-	/**
-	 * Retrieve a copy of the specific type using an instance of the generic type.
-	 * <p>
-	 * This is usually a wrapper type in the Bukkit API or ProtocolLib API.
-	 * @param generic - the generic type.
-	 * @return The new specific type.
-	 */
-	T getSpecific(Object generic);
-}

modules/ProtocolLib/src/test/java/com/comphenix/protocol/MinecraftVersionTest.java

@@ -23,6 +23,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
+import com.comphenix.protocol.utility.MinecraftProtocolVersion;
 import com.comphenix.protocol.utility.MinecraftVersion;
 
 public class MinecraftVersionTest {