mirror of
https://github.com/GTNewHorizons/NotEnoughItems.git
synced 2026-11-20 04:09:45 +00:00
Merge remote-tracking branch 'slprime/extend_subset_widget' into dev
# Conflicts: # src/main/java/codechicken/nei/ItemPanel.java # src/main/java/codechicken/nei/guihook/GuiContainerManager.java
This commit is contained in:
16 files changed
+905
-673
No files matched your search
@@ -43,13 +43,11 @@ import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
|
||||
import codechicken.lib.gui.GuiDraw;
|
||||
import codechicken.nei.ItemList;
|
||||
import codechicken.nei.ItemStackSet;
|
||||
import codechicken.nei.NEIClientConfig;
|
||||
import codechicken.nei.NEIClientUtils;
|
||||
import codechicken.nei.NEIModContainer;
|
||||
import codechicken.nei.SearchField;
|
||||
import codechicken.nei.recipe.StackInfo;
|
||||
import codechicken.nei.search.TooltipFilter;
|
||||
import codechicken.nei.util.ReadableNumberConverter;
|
||||
import codechicken.nei.util.RenderTooltipEventHelper;
|
||||
|
||||
@@ -60,8 +58,7 @@ public class GuiContainerManager {
|
||||
@Override
|
||||
public void onResourceManagerReload(IResourceManager p_110549_1_) {
|
||||
renderingErrorItems.clear();
|
||||
TooltipFilter.populateSearchMap();
|
||||
SearchField.searchParser.clearCache();
|
||||
ItemList.loadItems.restart();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -422,9 +419,9 @@ public class GuiContainerManager {
|
||||
|
||||
public GuiContainerManager(GuiContainer screen) {
|
||||
window = screen;
|
||||
if (screen instanceof IContainerTooltipHandler) {
|
||||
if (screen instanceof IContainerTooltipHandler tooltipHandler) {
|
||||
instanceTooltipHandlers = Collections.synchronizedList(new LinkedList<>());
|
||||
instanceTooltipHandlers.add((IContainerTooltipHandler) screen);
|
||||
instanceTooltipHandlers.add(tooltipHandler);
|
||||
instanceTooltipHandlers.addAll(tooltipHandlers);
|
||||
} else instanceTooltipHandlers = tooltipHandlers;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user