From eb5e5b4b42fdca26d2a104e4dc1e6a3ea3051a7b Mon Sep 17 00:00:00 2001
From: LexManos <LexManos@gmail.com>
Date: Tue, 22 Mar 2016 02:14:16 -0700
Subject: [PATCH] More cleanup.

---
 .../common/registry/FMLControlledNamespacedRegistry.java    | 4 ++--
 .../minecraftforge/fml/common/registry/IForgeRegistry.java  | 2 +-
 .../fml/common/registry/PersistentRegistryManager.java      | 4 ++--
 .../fml/common/registry/VillagerRegistry.java               | 6 ++----
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java b/src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java
index 5a383dd193..320b880452 100644
--- a/src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java
+++ b/src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java
@@ -30,7 +30,7 @@ import net.minecraftforge.fml.common.FMLLog;
 import net.minecraftforge.fml.common.functions.GenericIterableFactory;
 import net.minecraftforge.fml.common.registry.RegistryDelegate.Delegate;
 
-public class FMLControlledNamespacedRegistry<I extends IForgeRegistryEntry> extends RegistryNamespacedDefaultedByKey<ResourceLocation, I> implements IForgeRegistry<I>
+public class FMLControlledNamespacedRegistry<I extends IForgeRegistryEntry<I>> extends RegistryNamespacedDefaultedByKey<ResourceLocation, I> implements IForgeRegistry<I>
 {
     public static final boolean DEBUG = Boolean.parseBoolean(System.getProperty("fml.debugRegistryEntries", "false"));
     private final Class<I> superType;
@@ -675,7 +675,7 @@ public class FMLControlledNamespacedRegistry<I extends IForgeRegistryEntry> exte
     }
 
     @SuppressWarnings("unchecked")
-    public <T extends IForgeRegistryEntry> FMLControlledNamespacedRegistry<T> asType(Class<? extends T> type)
+    public <T extends IForgeRegistryEntry<T>> FMLControlledNamespacedRegistry<T> asType(Class<? extends T> type)
     {
         return (FMLControlledNamespacedRegistry<T>)this;
     }
diff --git a/src/main/java/net/minecraftforge/fml/common/registry/IForgeRegistry.java b/src/main/java/net/minecraftforge/fml/common/registry/IForgeRegistry.java
index 80279df414..049773e4c2 100644
--- a/src/main/java/net/minecraftforge/fml/common/registry/IForgeRegistry.java
+++ b/src/main/java/net/minecraftforge/fml/common/registry/IForgeRegistry.java
@@ -6,7 +6,7 @@ import java.util.Set;
 
 import net.minecraft.util.ResourceLocation;
 
-public interface IForgeRegistry<V extends IForgeRegistryEntry> extends Iterable<V>
+public interface IForgeRegistry<V extends IForgeRegistryEntry<V>> extends Iterable<V>
 {
     void register(V value);
 
diff --git a/src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java b/src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java
index 65029c5a28..6d3a2c39f5 100644
--- a/src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java
+++ b/src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java
@@ -55,12 +55,12 @@ public class PersistentRegistryManager
         }
 
         @SuppressWarnings("unchecked")
-        private <T extends IForgeRegistryEntry<?>> FMLControlledNamespacedRegistry<T> getRegistry(ResourceLocation key, Class<T> regType)
+        private <T extends IForgeRegistryEntry<T>> FMLControlledNamespacedRegistry<T> getRegistry(ResourceLocation key, Class<T> regType)
         {
             return (FMLControlledNamespacedRegistry<T>)registries.get(key);
         }
 
-        private <T extends IForgeRegistryEntry<?>> FMLControlledNamespacedRegistry<T> getOrShallowCopyRegistry(ResourceLocation key, Class<T> regType, FMLControlledNamespacedRegistry<T> other)
+        private <T extends IForgeRegistryEntry<T>> FMLControlledNamespacedRegistry<T> getOrShallowCopyRegistry(ResourceLocation key, Class<T> regType, FMLControlledNamespacedRegistry<T> other)
         {
             if (!registries.containsKey(key))
             {
diff --git a/src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java b/src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java
index 37abb566e3..d7d049fda0 100644
--- a/src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java
+++ b/src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java
@@ -250,7 +250,7 @@ public class VillagerRegistry
         }
     }
 
-    public static class VillagerProfession extends IForgeRegistryEntry.Impl
+    public static class VillagerProfession extends IForgeRegistryEntry.Impl<VillagerProfession>
     {
         private ResourceLocation name;
         private ResourceLocation texture;
@@ -316,9 +316,7 @@ public class VillagerRegistry
     public static void setRandomProfession(EntityVillager entity, Random rand)
     {
         Set<ResourceLocation> entries = INSTANCE.professions.getKeys();
-        int prof = rand.nextInt(entries.size());
-        //TODO: Grab id range from internal registry
-        entity.setProfession(rand.nextInt(5));
+        entity.setProfession(rand.nextInt(entries.size()));
     }
 
     //TODO: Figure out a good generic system for this. Put on hold for Patches.