From d33f24ff33ea1b6e281378bacf4911465dafc071 Mon Sep 17 00:00:00 2001 From: LexManos Date: Mon, 4 Apr 2022 18:02:20 -0700 Subject: [PATCH] Fix compiler error in eclipse, bump MCPConfig for FF/Record fix. --- build.gradle | 2 +- .../java/net/minecraftforge/registries/DeferredRegister.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 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, Supplier> e : entries.entrySet())