From 0e34840c21d8c24f8ede3c122abafe04ab2a696e Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sun, 16 Apr 2023 12:22:09 -0700 Subject: [PATCH] More robust IMC handling (#371) * Complain if IMC adds a handler/catalyst for a handlerID that doesn't exist. * Look at the right maps this time * Don't show matches, only misses --- .../codechicken/nei/recipe/GuiRecipeTab.java | 14 ++++++++++++++ .../codechicken/nei/recipe/RecipeCatalysts.java | 16 ++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/src/main/java/codechicken/nei/recipe/GuiRecipeTab.java b/src/main/java/codechicken/nei/recipe/GuiRecipeTab.java index e6ae7fa4..7cff4a68 100644 --- a/src/main/java/codechicken/nei/recipe/GuiRecipeTab.java +++ b/src/main/java/codechicken/nei/recipe/GuiRecipeTab.java @@ -282,6 +282,20 @@ public abstract class GuiRecipeTab extends Widget { handlerMap.keySet().removeAll(handlerRemoverFromIMC); handlerMap.putAll(handlerAdderFromIMC); + if (!handlerAdderFromIMC.isEmpty()) { + // If we're getting an IMC message, it probably means it should match + Set handlerIds = new HashSet<>(handlerMap.keySet()); + handlerAdderFromIMC.keySet().forEach(handlerName -> { + if (!handlerIds.contains(handlerName)) { + NEIClientConfig.logger.warn("Could not find a registered handlerID that matches " + handlerName); + handlerIds.forEach(handler -> { + if (handler.equalsIgnoreCase(handlerName)) { + NEIClientConfig.logger.warn(" -- Did you mean: " + handler); + } + }); + } + }); + } NEIClientConfig.logger.info("Sending {}", NEIRegisterHandlerInfosEvent.class.getSimpleName()); MinecraftForge.EVENT_BUS.post(new NEIRegisterHandlerInfosEvent()); } diff --git a/src/main/java/codechicken/nei/recipe/RecipeCatalysts.java b/src/main/java/codechicken/nei/recipe/RecipeCatalysts.java index ae3650d1..5c7afea2 100644 --- a/src/main/java/codechicken/nei/recipe/RecipeCatalysts.java +++ b/src/main/java/codechicken/nei/recipe/RecipeCatalysts.java @@ -13,8 +13,10 @@ import java.nio.channels.ReadableByteChannel; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; import net.minecraft.item.ItemStack; @@ -227,6 +229,20 @@ public class RecipeCatalysts { } } + if (!catalystsAdderFromIMC.isEmpty()) { + // If we're getting an IMC message, it probably means it should match + Set handlerIds = new HashSet<>(GuiRecipeTab.handlerMap.keySet()); + catalystsAdderFromIMC.keySet().forEach(handlerName -> { + if (!handlerIds.contains(handlerName)) { + NEIClientConfig.logger.warn("Could not find a registered handlerID that matches " + handlerName); + handlerIds.forEach(handler -> { + if (handler.equalsIgnoreCase(handlerName)) { + NEIClientConfig.logger.warn(" -- Did you mean: " + handler); + } + }); + } + }); + } for (Map.Entry> entry : catalystsRemoverFromAPI.entrySet()) { String handlerID = entry.getKey(); if (recipeCatalystMap.containsKey(handlerID)) {