diff --git a/build.gradle b/build.gradle
index 9694b8bf21..0529027fc6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,7 +46,7 @@ ext {
     MAPPING_CHANNEL = 'official'
     MAPPING_VERSION = '1.18.2'
     MC_VERSION = '1.18.2'
-    MCP_VERSION = '20220228.144236'
+    MCP_VERSION = '20220404.173914'
     SPI_VERSION = '4.0.10'
     ACCESSTRANSFORMERS_VERSION = '8.0.4'
     COREMODS_VERSION = '5.0.1'
diff --git a/src/main/java/net/minecraftforge/registries/DeferredRegister.java b/src/main/java/net/minecraftforge/registries/DeferredRegister.java
index 99f4796bd4..a459f95246 100644
--- a/src/main/java/net/minecraftforge/registries/DeferredRegister.java
+++ b/src/main/java/net/minecraftforge/registries/DeferredRegister.java
@@ -454,10 +454,10 @@ public class DeferredRegister<T>
         event.create(this.registryFactory.get(), this::onFill);
     }
 
-    @SuppressWarnings({ "unchecked", "removal" })
+    @SuppressWarnings({ "unchecked", "removal", "rawtypes" })
     private void vanillaRegister(VanillaRegisterEvent event)
     {
-        if (this.registryKey != null && event.vanillaRegistry.key() == this.registryKey)
+        if (this.registryKey != null && event.vanillaRegistry.key() == (ResourceKey)this.registryKey)
         {
             this.seenRegisterEvent = true;
             for (Entry<RegistryObject<T>, Supplier<? extends T>> e : entries.entrySet())