From b99453d568ec7189997e78f47289be24e9d4df1d Mon Sep 17 00:00:00 2001
From: Barteks2x <Barteks2x@gmail.com>
Date: Fri, 19 Jul 2019 12:06:16 +0200
Subject: [PATCH] Fix RegistryObject when used with generic registry entry
 classes

---
 src/main/java/net/minecraftforge/fml/RegistryObject.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/minecraftforge/fml/RegistryObject.java b/src/main/java/net/minecraftforge/fml/RegistryObject.java
index c1f8304bb..3a2f31475 100644
--- a/src/main/java/net/minecraftforge/fml/RegistryObject.java
+++ b/src/main/java/net/minecraftforge/fml/RegistryObject.java
@@ -39,7 +39,7 @@ public final class RegistryObject<T extends ForgeRegistryEntry<? super T>>
     private T value;
     private boolean searched;
 
-    public static <T extends ForgeRegistryEntry<T>, U extends T> RegistryObject<U> of(final String name, Supplier<Class<T>> registryType) {
+    public static <T extends ForgeRegistryEntry<T>, U extends T> RegistryObject<U> of(final String name, Supplier<Class<? super T>> registryType) {
         return new RegistryObject<>(name, registryType);
     }
 
@@ -57,12 +57,12 @@ public final class RegistryObject<T extends ForgeRegistryEntry<? super T>>
         this.owningRegistry = null;
     }
 
-    private <V extends ForgeRegistryEntry<V>> RegistryObject(String name, Supplier<Class<V>> registryType)
+    private <V extends ForgeRegistryEntry<V>> RegistryObject(String name, Supplier<Class<? super V>> registryType)
     {
         this.name = name;
         IForgeRegistry<V> registry;
         try {
-            registry = RegistryManager.ACTIVE.getRegistry(registryType.get());
+            registry = RegistryManager.ACTIVE.<V>getRegistry(registryType.get());
         } catch (Throwable t) {
             registry = null;
         }