From 72a8be020475298b3197364fe2af055c0c91c3c2 Mon Sep 17 00:00:00 2001 From: Wilhelm Schuster Date: Sat, 1 Jul 2023 17:57:21 +0200 Subject: [PATCH] Add support for modId, modRequired, and excludedModId to registerCatalyst IMC message --- src/main/java/codechicken/nei/config/IMCHandler.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/codechicken/nei/config/IMCHandler.java b/src/main/java/codechicken/nei/config/IMCHandler.java index 22c361b8..e8b21bb3 100644 --- a/src/main/java/codechicken/nei/config/IMCHandler.java +++ b/src/main/java/codechicken/nei/config/IMCHandler.java @@ -135,6 +135,13 @@ public class IMCHandler { NEIClientConfig.logger.warn("Missing handlerID for registerCatalystInfo!"); return; } + final String modId = tag.hasKey("modId") ? tag.getString("modId") : null; + final boolean requiresMod = tag.getBoolean("modRequired"); + final String excludedModId = tag.hasKey("excludedModId") ? tag.getString("excludedModId") : null; + + if (requiresMod && modId != null && !Loader.isModLoaded(modId)) return; + if (excludedModId != null && Loader.isModLoaded(excludedModId)) return; + final String itemName = tag.getString("itemName"); final String nbtInfo = tag.hasKey("nbtInfo") ? tag.getString("nbtInfo") : null; if (itemName.isEmpty()) { @@ -170,7 +177,7 @@ public class IMCHandler { final String itemName = tag.getString("itemName"); final String nbtInfo = tag.hasKey("nbtInfo") ? tag.getString("nbtInfo") : null; if (itemName.isEmpty()) { - NEIClientConfig.logger.warn(String.format("Missing itemName for registerCatalystInfo in `%s`!", handlerID)); + NEIClientConfig.logger.warn(String.format("Missing itemName for removeCatalystInfo in `%s`!", handlerID)); return; } final ItemStack itemStack = NEIServerUtils.getModdedItem(itemName, nbtInfo);