From 4b7b84b031b4524abbb1bdcc3613211f2fd4ccac Mon Sep 17 00:00:00 2001 From: PLASMAchicken Date: Fri, 26 Dec 2025 19:31:41 +0100 Subject: [PATCH] Restore NEIModContainer public plugins field (#829) --- src/main/java/codechicken/nei/NEIClientConfig.java | 1 + src/main/java/codechicken/nei/NEIModContainer.java | 6 ++++++ .../java/codechicken/nei/guihook/HideousLinkedList.java | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/codechicken/nei/NEIClientConfig.java b/src/main/java/codechicken/nei/NEIClientConfig.java index da2b449a..5363c00e 100644 --- a/src/main/java/codechicken/nei/NEIClientConfig.java +++ b/src/main/java/codechicken/nei/NEIClientConfig.java @@ -986,6 +986,7 @@ public class NEIClientConfig { try { IConfigureNEI config = (IConfigureNEI) clazz.getConstructor().newInstance(); config.loadConfig(); + NEIModContainer.plugins.add(config); logger.debug("Loaded {}", clazz.getName()); } catch (Throwable e) { logger.error("Failed to Load {}", clazz.getName(), e); diff --git a/src/main/java/codechicken/nei/NEIModContainer.java b/src/main/java/codechicken/nei/NEIModContainer.java index ee6827c7..6529720f 100644 --- a/src/main/java/codechicken/nei/NEIModContainer.java +++ b/src/main/java/codechicken/nei/NEIModContainer.java @@ -4,16 +4,20 @@ import java.io.File; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; +import java.util.LinkedList; import java.util.List; import java.util.Set; +import java.util.concurrent.CopyOnWriteArrayList; import com.google.common.eventbus.EventBus; import com.google.common.eventbus.Subscribe; import codechicken.core.CommonUtils; import codechicken.core.launch.CodeChickenCorePlugin; +import codechicken.nei.api.IConfigureNEI; import codechicken.nei.asm.NEICorePlugin; import codechicken.nei.config.IMCHandler; +import codechicken.nei.guihook.HideousLinkedList; import codechicken.nei.recipe.GuiRecipeTab; import cpw.mods.fml.client.FMLFileResourcePack; import cpw.mods.fml.client.FMLFolderResourcePack; @@ -35,6 +39,8 @@ import cpw.mods.fml.common.versioning.VersionRange; @SuppressWarnings("UnstableApiUsage") public class NEIModContainer extends DummyModContainer { + public static final LinkedList plugins = new HideousLinkedList<>(new CopyOnWriteArrayList<>()); + private static boolean gregTech5Loaded; private static boolean gtnhLibLoaded; diff --git a/src/main/java/codechicken/nei/guihook/HideousLinkedList.java b/src/main/java/codechicken/nei/guihook/HideousLinkedList.java index 5f106a29..2907bd4c 100644 --- a/src/main/java/codechicken/nei/guihook/HideousLinkedList.java +++ b/src/main/java/codechicken/nei/guihook/HideousLinkedList.java @@ -19,12 +19,12 @@ import java.util.stream.Stream; * * @param */ -final class HideousLinkedList extends LinkedList { +public final class HideousLinkedList extends LinkedList { private static final long serialVersionUID = -8504433551965776915L; private final List backing; - HideousLinkedList(List backing) { + public HideousLinkedList(List backing) { this.backing = backing; }