Fix

Author: TheRandomLabs

src/main/java/com/therandomlabs/randomlib/config/ResourceLocationTypeAdapter.java

@@ -10,34 +10,33 @@
 import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.LoaderState;
 
-public final class ResourceLocationTypeAdapter<V> implements TRLTypeAdapter {
-	private final Class<V> registryEntryClass;
-	private final CompatForgeRegistry<V> registry;
+public final class ResourceLocationTypeAdapter implements TRLTypeAdapter {
+	private final Class<?> registryEntryClass;
+	private final CompatForgeRegistry<?> registry;
 	private final boolean isArray;
 
-	public ResourceLocationTypeAdapter(Class<V> registryEntryClass, boolean isArray) {
+	public ResourceLocationTypeAdapter(Class<?> registryEntryClass, boolean isArray) {
 		this.registryEntryClass = registryEntryClass;
 		registry = CompatForgeRegistry.findRegistry(registryEntryClass);
 		this.isArray = isArray;
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
 	public Object getValue(Property property) {
 		if(isArray) {
 			final String[] array = property.getStringList();
-			final List<V> values = new ArrayList<>(array.length);
+			final List<Object> values = new ArrayList<>(array.length);
 
 			for(String element : array) {
-				final V object =
+				final Object object =
 						registry.getValue(new ResourceLocation(element.replaceAll("\\s", "")));
 
 				if(object != null) {
 					values.add(object);
 				}
 			}
 
-			return values.toArray((V[]) Array.newInstance(registryEntryClass, 0));
+			return values.toArray((Object[]) Array.newInstance(registryEntryClass, 0));
 		}
 
 		final String location = property.getString();
@@ -46,7 +45,7 @@ public Object getValue(Property property) {
 			return null;
 		}
 
-		final V object = registry.getValue(new ResourceLocation(location.replaceAll("\\s", "")));
+		final Object object = registry.getValue(new ResourceLocation(location.replaceAll("\\s", "")));
 		return object == null ?
 				registry.getValue(new ResourceLocation(property.getDefault())) : object;
 	}

src/main/java/com/therandomlabs/randomlib/config/TRLTypeAdapters.java

@@ -13,8 +13,8 @@
 import com.google.common.primitives.Ints;
 import com.google.common.primitives.Longs;
 import com.google.common.primitives.Shorts;
+import com.therandomlabs.randomlib.CompatForgeRegistryEntry;
 import net.minecraftforge.common.config.Property;
-import net.minecraftforge.registries.IForgeRegistryEntry;
 
 public final class TRLTypeAdapters {
 	private static final Map<Class<?>, TRLTypeAdapter> ADAPTERS = new HashMap<>();
@@ -680,22 +680,23 @@ public boolean isArray() {
 		});
 	}
 
-	@SuppressWarnings("unchecked")
 	public static TRLTypeAdapter get(Class<?> clazz) {
 		final TRLTypeAdapter adapter = ADAPTERS.get(clazz);
 
 		if(adapter != null) {
 			return adapter;
 		}
 
-		if(IForgeRegistryEntry.class.isAssignableFrom(clazz)) {
-			register((Class<? extends IForgeRegistryEntry>) clazz);
-		} else if(IForgeRegistryEntry[].class.isAssignableFrom(clazz)) {
-			register((
-					Class<? extends IForgeRegistryEntry>) clazz.getComponentType()
-			);
+		if(CompatForgeRegistryEntry.CLASS.isAssignableFrom(clazz)) {
+			register(clazz);
 		} else {
-			return null;
+			final Class<?> componentType = clazz.getComponentType();
+
+			if(CompatForgeRegistryEntry.CLASS.isAssignableFrom(componentType)) {
+				register(componentType);
+			} else {
+				return null;
+			}
 		}
 
 		return ADAPTERS.get(clazz);
@@ -710,11 +711,11 @@ public static void register(Class<?> clazz1, Class<?> clazz2, TRLTypeAdapter ada
 		register(clazz2, adapter);
 	}
 
-	public static <V extends IForgeRegistryEntry<V>> void register(Class<V> registryEntryClass) {
-		register(registryEntryClass, new ResourceLocationTypeAdapter<>(registryEntryClass, false));
+	public static void register(Class<?> registryEntryClass) {
+		register(registryEntryClass, new ResourceLocationTypeAdapter(registryEntryClass, false));
 		register(
 				Array.newInstance(registryEntryClass, 0).getClass(),
-				new ResourceLocationTypeAdapter<>(registryEntryClass, true)
+				new ResourceLocationTypeAdapter(registryEntryClass, true)
 		);
 	}
 }