2 files changed, 209 insertions, 209 deletions

diff --git a/src/main/java/com/anthonyhilyard/iceberg/registry/AutoRegistry.java b/src/main/java/com/anthonyhilyard/iceberg/registry/AutoRegistry.java
index 59803ae..ddf43f0 100644
--- a/src/main/java/com/anthonyhilyard/iceberg/registry/AutoRegistry.java
+++ b/src/main/java/com/anthonyhilyard/iceberg/registry/AutoRegistry.java
@@ -1,178 +1,178 @@
-package com.anthonyhilyard.iceberg.registry;
-
-import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.sounds.SoundEvent;
-import net.minecraftforge.event.RegistryEvent;
-import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import net.minecraftforge.registries.ForgeRegistries;
-import net.minecraftforge.registries.IForgeRegistry;
-import net.minecraftforge.registries.IForgeRegistryEntry;
-import net.minecraftforge.event.entity.EntityAttributeCreationEvent;
-
-/**
- * Extend this class to have all registerable fields be automatically registered in Forge.  Easy.  (Just no renderers.)
- */
-public abstract class AutoRegistry
-{
-	protected static String MODID = null;
-
-	private static boolean entityCreationRegistered = false;
-
-	private static Map<EntityType<?>, Supplier<AttributeSupplier.Builder>> entityAttributes = new HashMap<>();
-
-	private static Map<String, EntityType<? extends Entity>> registeredEntityTypes = new HashMap<>();
-
-	public static void init(String ModID)
-	{
-		MODID = ModID;
-	}
-
-	@SuppressWarnings("unchecked")
-	protected AutoRegistry()
-	{
-		try
-		{
-			// Iterate through every built-in Forge registry...
-			for (Field field : ForgeRegistries.class.getDeclaredFields())
-			{
-				Object fieldObj = field.get(null);
-				if (fieldObj instanceof IForgeRegistry)
-				{
-					// Grab the registry's supertype and add a generic listener for registry events.
-					Class<IForgeRegistryEntry<?>> clazz = (Class<IForgeRegistryEntry<?>>)((IForgeRegistry<?>)fieldObj).getRegistrySuperType();
-					FMLJavaModLoadingContext.get().getModEventBus().addGenericListener(clazz, (Consumer<RegistryEvent.Register<? extends IForgeRegistryEntry<?>>>)(e) -> registerAllOfType(clazz, e) );
-				}
-			}
-		}
-		catch (Exception e)
-		{
-			throw new RuntimeException(e);
-		}
-	}
-
-	public static boolean isEntityTypeRegistered(String name)
-	{
-		return registeredEntityTypes.containsKey(name);
-	}
-
-	@SuppressWarnings("unchecked")
-	public static <T extends Entity> EntityType<T> getEntityType(String name)
-	{
-		return (EntityType<T>) registeredEntityTypes.getOrDefault(name, null);
-	}
-
-	@SuppressWarnings("unchecked")
-	private final <T extends IForgeRegistryEntry<T>> void registerAllOfType(Class<IForgeRegistryEntry<?>> type, RegistryEvent.Register<T> event)
-	{
-		try
-		{
-			// Loop through all fields we've declared and register them.
-			for (Field field : this.getClass().getDeclaredFields())
-			{
-				// Grab the field and check if it is a Forge registry-compatible type.
-				Object obj = field.get(this);
-				if (type.isAssignableFrom(obj.getClass()))
-				{
-					// If this is an entity type field and we haven't already registered for the entity creation event, do so now.
-					if (obj instanceof EntityType && !entityCreationRegistered)
-					{
-						FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onEntityCreation);
-						entityCreationRegistered = true;
-					}
-
-					// If this field has a registry name, register it now.
-					T entry = (T)obj;
-					if (entry != null && entry.getRegistryName() != null)
-					{
-						event.getRegistry().register(entry);
-					}
-				}
-			}
-		}
-		catch (Exception e)
-		{
-			throw new RuntimeException(e);
-		}
-	}
-
-	protected static <T extends Entity> EntityType<T> registerEntity(String name, EntityType.Builder<T> builder)
-	{
-		return registerEntity(name, builder, (Supplier<AttributeSupplier.Builder>)null);
-	}
-
-	@SuppressWarnings("unchecked")
-	protected static <T extends Entity> EntityType<T> registerEntity(String name, EntityType.Builder<T> builder, Supplier<AttributeSupplier.Builder> attributes)
-	{
-		if (MODID == null)
-		{
-			throw new RuntimeException("AutoRegistry was not initialized with mod id!");
-		}
-
-		// Build the entity type.
-		ResourceLocation resourceLocation = new ResourceLocation(MODID, name);
-		EntityType<T> entityType = (EntityType<T>) builder.build(name).setRegistryName(resourceLocation);
-
-		// Add this entity type to the registered hashmap.
-		registeredEntityTypes.put(name, entityType);
-
-		// Store mob attributes if provided.  These will be added in the attribute creation event below.
-		if (attributes != null)
-		{
-			entityAttributes.put(entityType, attributes);
-		}
-
-		return entityType;
-	}
-
-	protected static SoundEvent registerSound(String name)
-	{
-		if (MODID == null)
-		{
-			throw new RuntimeException("AutoRegistry was not initialized with mod id!");
-		}
-
-		ResourceLocation resourceLocation = new ResourceLocation(MODID, name);
-		return new SoundEvent(resourceLocation).setRegistryName(resourceLocation);
-	}
-
-	@SuppressWarnings("unchecked")
-	private void onEntityCreation(EntityAttributeCreationEvent event)
-	{
-		for (Field field : this.getClass().getDeclaredFields())
-		{
-			try
-			{
-				// Grab the field and check if it is a Forge registry-compatible type.
-				Object obj = field.get(this);
-				if (EntityType.class.isAssignableFrom(obj.getClass()) && entityAttributes.containsKey(obj))
-				{
-					EntityType<? extends LivingEntity> entityType = (EntityType<? extends LivingEntity>) obj;
-					if (entityType != null)
-					{
-						event.put(entityType, entityAttributes.get(obj).get().build());
-					}
-				}
-			}
-			catch (ClassCastException e)
-			{
-				// The class cast exception likely just means that we tried to convert an EntityType with generic type
-				// parameter of something other than a LivingEntity subclass.  This is fine, so continue.
-				continue;
-			}
-			catch (IllegalAccessException e)
-			{
-				throw new RuntimeException(e);
-			}
-		}
-	}
-}
\ No newline at end of file
+// package com.anthonyhilyard.iceberg.registry;
+
+// import java.lang.reflect.Field;
+// import java.util.HashMap;
+// import java.util.Map;
+// import java.util.function.Consumer;
+// import java.util.function.Supplier;
+
+// import net.minecraft.world.entity.Entity;
+// import net.minecraft.world.entity.EntityType;
+// import net.minecraft.world.entity.LivingEntity;
+// import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
+// import net.minecraft.resources.ResourceLocation;
+// import net.minecraft.sounds.SoundEvent;
+// import net.minecraftforge.event.RegistryEvent;
+// import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+// import net.minecraftforge.registries.ForgeRegistries;
+// import net.minecraftforge.registries.IForgeRegistry;
+// import net.minecraftforge.registries.IForgeRegistryEntry;
+// import net.minecraftforge.event.entity.EntityAttributeCreationEvent;
+
+// /**
+//  * Extend this class to have all registerable fields be automatically registered in Forge.  Easy.  (Just no renderers.)
+//  */
+// public abstract class AutoRegistry
+// {
+// 	protected static String MODID = null;
+
+// 	private static boolean entityCreationRegistered = false;
+
+// 	private static Map<EntityType<?>, Supplier<AttributeSupplier.Builder>> entityAttributes = new HashMap<>();
+
+// 	private static Map<String, EntityType<? extends Entity>> registeredEntityTypes = new HashMap<>();
+
+// 	public static void init(String ModID)
+// 	{
+// 		MODID = ModID;
+// 	}
+
+// 	@SuppressWarnings("unchecked")
+// 	protected AutoRegistry()
+// 	{
+// 		try
+// 		{
+// 			// Iterate through every built-in Forge registry...
+// 			for (Field field : ForgeRegistries.class.getDeclaredFields())
+// 			{
+// 				Object fieldObj = field.get(null);
+// 				if (fieldObj instanceof IForgeRegistry)
+// 				{
+// 					// Grab the registry's supertype and add a generic listener for registry events.
+// 					Class<?> clazz = (Class<?>)((IForgeRegistry<?>)fieldObj).//.getRegistrySuperType();
+// 					FMLJavaModLoadingContext.get().getModEventBus().addGenericListener(clazz, (Consumer<RegistryEvent.Register<? extends IForgeRegistryEntry<?>>>)(e) -> registerAllOfType(clazz, e) );
+// 				}
+// 			}
+// 		}
+// 		catch (Exception e)
+// 		{
+// 			throw new RuntimeException(e);
+// 		}
+// 	}
+
+// 	public static boolean isEntityTypeRegistered(String name)
+// 	{
+// 		return registeredEntityTypes.containsKey(name);
+// 	}
+
+// 	@SuppressWarnings("unchecked")
+// 	public static <T extends Entity> EntityType<T> getEntityType(String name)
+// 	{
+// 		return (EntityType<T>) registeredEntityTypes.getOrDefault(name, null);
+// 	}
+
+// 	@SuppressWarnings("unchecked")
+// 	private final <T extends IForgeRegistryEntry<T>> void registerAllOfType(Class<IForgeRegistryEntry<?>> type, RegistryEvent.Register<T> event)
+// 	{
+// 		try
+// 		{
+// 			// Loop through all fields we've declared and register them.
+// 			for (Field field : this.getClass().getDeclaredFields())
+// 			{
+// 				// Grab the field and check if it is a Forge registry-compatible type.
+// 				Object obj = field.get(this);
+// 				if (type.isAssignableFrom(obj.getClass()))
+// 				{
+// 					// If this is an entity type field and we haven't already registered for the entity creation event, do so now.
+// 					if (obj instanceof EntityType && !entityCreationRegistered)
+// 					{
+// 						FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onEntityCreation);
+// 						entityCreationRegistered = true;
+// 					}
+
+// 					// If this field has a registry name, register it now.
+// 					T entry = (T)obj;
+// 					if (entry != null && entry.getRegistryName() != null)
+// 					{
+// 						event.getRegistry().register(entry);
+// 					}
+// 				}
+// 			}
+// 		}
+// 		catch (Exception e)
+// 		{
+// 			throw new RuntimeException(e);
+// 		}
+// 	}
+
+// 	protected static <T extends Entity> EntityType<T> registerEntity(String name, EntityType.Builder<T> builder)
+// 	{
+// 		return registerEntity(name, builder, (Supplier<AttributeSupplier.Builder>)null);
+// 	}
+
+// 	@SuppressWarnings("unchecked")
+// 	protected static <T extends Entity> EntityType<T> registerEntity(String name, EntityType.Builder<T> builder, Supplier<AttributeSupplier.Builder> attributes)
+// 	{
+// 		if (MODID == null)
+// 		{
+// 			throw new RuntimeException("AutoRegistry was not initialized with mod id!");
+// 		}
+
+// 		// Build the entity type.
+// 		ResourceLocation resourceLocation = new ResourceLocation(MODID, name);
+// 		EntityType<T> entityType = (EntityType<T>) builder.build(name).setRegistryName(resourceLocation);
+
+// 		// Add this entity type to the registered hashmap.
+// 		registeredEntityTypes.put(name, entityType);
+
+// 		// Store mob attributes if provided.  These will be added in the attribute creation event below.
+// 		if (attributes != null)
+// 		{
+// 			entityAttributes.put(entityType, attributes);
+// 		}
+
+// 		return entityType;
+// 	}
+
+// 	protected static SoundEvent registerSound(String name)
+// 	{
+// 		if (MODID == null)
+// 		{
+// 			throw new RuntimeException("AutoRegistry was not initialized with mod id!");
+// 		}
+
+// 		ResourceLocation resourceLocation = new ResourceLocation(MODID, name);
+// 		return new SoundEvent(resourceLocation).setRegistryName(resourceLocation);
+// 	}
+
+// 	@SuppressWarnings("unchecked")
+// 	private void onEntityCreation(EntityAttributeCreationEvent event)
+// 	{
+// 		for (Field field : this.getClass().getDeclaredFields())
+// 		{
+// 			try
+// 			{
+// 				// Grab the field and check if it is a Forge registry-compatible type.
+// 				Object obj = field.get(this);
+// 				if (EntityType.class.isAssignableFrom(obj.getClass()) && entityAttributes.containsKey(obj))
+// 				{
+// 					EntityType<? extends LivingEntity> entityType = (EntityType<? extends LivingEntity>) obj;
+// 					if (entityType != null)
+// 					{
+// 						event.put(entityType, entityAttributes.get(obj).get().build());
+// 					}
+// 				}
+// 			}
+// 			catch (ClassCastException e)
+// 			{
+// 				// The class cast exception likely just means that we tried to convert an EntityType with generic type
+// 				// parameter of something other than a LivingEntity subclass.  This is fine, so continue.
+// 				continue;
+// 			}
+// 			catch (IllegalAccessException e)
+// 			{
+// 				throw new RuntimeException(e);
+// 			}
+// 		}
+// 	}
+// }
\ No newline at end of file
diff --git a/src/main/java/com/anthonyhilyard/iceberg/registry/RendererRegistrar.java b/src/main/java/com/anthonyhilyard/iceberg/registry/RendererRegistrar.java
index 1b0a053..89d096a 100644
--- a/src/main/java/com/anthonyhilyard/iceberg/registry/RendererRegistrar.java
+++ b/src/main/java/com/anthonyhilyard/iceberg/registry/RendererRegistrar.java
@@ -1,36 +1,36 @@
-package com.anthonyhilyard.iceberg.registry;
+// package com.anthonyhilyard.iceberg.registry;
 
-import java.util.HashMap;
-import java.util.Map;
+// import java.util.HashMap;
+// import java.util.Map;
 
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.client.renderer.entity.EntityRendererProvider;
-import net.minecraftforge.client.event.EntityRenderersEvent;
+// import net.minecraft.world.entity.Entity;
+// import net.minecraft.world.entity.EntityType;
+// import net.minecraft.client.renderer.entity.EntityRendererProvider;
+// import net.minecraftforge.client.event.EntityRenderersEvent;
 
-public abstract class RendererRegistrar
-{
-	private static Map<EntityType<? extends Entity>, EntityRendererProvider<?>> entityRenderers = new HashMap<>();
+// public abstract class RendererRegistrar
+// {
+// 	private static Map<EntityType<? extends Entity>, EntityRendererProvider<?>> entityRenderers = new HashMap<>();
 
-	protected static <T extends Entity> void registerRenderer(String name, EntityRendererProvider<T> rendererProvider)
-	{
-		if (AutoRegistry.isEntityTypeRegistered(name))
-		{
-			// Store this renderer provider.
-			entityRenderers.put(AutoRegistry.getEntityType(name), rendererProvider);
-		}
-		else
-		{
-			throw new RuntimeException("Tried to register a renderer for an unregistered entity type!  Make sure you register renderers after entities.");
-		}
-	}
+// 	protected static <T extends Entity> void registerRenderer(String name, EntityRendererProvider<T> rendererProvider)
+// 	{
+// 		if (AutoRegistry.isEntityTypeRegistered(name))
+// 		{
+// 			// Store this renderer provider.
+// 			entityRenderers.put(AutoRegistry.getEntityType(name), rendererProvider);
+// 		}
+// 		else
+// 		{
+// 			throw new RuntimeException("Tried to register a renderer for an unregistered entity type!  Make sure you register renderers after entities.");
+// 		}
+// 	}
 
-	@SuppressWarnings({"unchecked", "unused"})
-	private <T extends Entity> void onEntityCreation(EntityRenderersEvent.RegisterRenderers event)
-	{
-		for (EntityType<? extends Entity> entityType : entityRenderers.keySet())
-		{
-			event.registerEntityRenderer((EntityType<T>)entityType, (EntityRendererProvider<T>)entityRenderers.get(entityType));
-		}
-	}
-}
+// 	@SuppressWarnings({"unchecked", "unused"})
+// 	private <T extends Entity> void onEntityCreation(EntityRenderersEvent.RegisterRenderers event)
+// 	{
+// 		for (EntityType<? extends Entity> entityType : entityRenderers.keySet())
+// 		{
+// 			event.registerEntityRenderer((EntityType<T>)entityType, (EntityRendererProvider<T>)entityRenderers.get(entityType));
+// 		}
+// 	}
+// }