Compare commits

..
7 changed files with 20 additions and 36 deletions

No files matched your search

+1 -1
View File
@@ -12,7 +12,7 @@ If you have issues with NEI outside of the GTNH modpack you may report them in t
- Uses a parallel stream to search the item list over multiple cores, resulting in 2-6x faster searches on average
- Loads the recipe handlers in parallel
* A textbox for search with most of the features you'd expect - moving forward, backwards, selection, etc
* Bookmarks! Are you in the process of crafting? Bookmark it using either 'A' or configure your own key.
* Bookmarks! What are you in the process of crafting? Bookmark it using either 'A' or configure your own key.
* Toggle bookmark pane. Default shortcut key `B`. Item Subsets menu is only available if bookmarks are not visible.
* Utility/Cheat buttons line up and wrap based on GUI size
* ItemList is no longer regenerated from the ItemRegistry on every inventory load
@@ -276,11 +276,7 @@ public class ClientHandler {
if (!NEIClientConfig.isEnabled()) return;
/*
* NEI plugins are loaded in a separate thread. Make sure loading them has finished otherwise a CME might
* occur in KeyManager if a plugin calls API.addKeyBind() during initialization.
*/
if (NEIClientConfig.isLoaded()) KeyManager.tickKeyStates();
KeyManager.tickKeyStates();
NEIController.updateUnlimitedItems(mc.thePlayer.inventory);
if (mc.currentScreen == null) NEIController.processCreativeCycling(mc.thePlayer.inventory);
@@ -472,6 +472,8 @@ public class NEIClientConfig {
NEIController.load();
RecipeCatalysts.loadCatalystInfo();
configLoaded = true;
new Thread("NEI Plugin Loader") {
@Override
@@ -494,7 +496,6 @@ public class NEIClientConfig {
}
MinecraftForge.EVENT_BUS.post(new NEIConfigsLoadedEvent());
configLoaded = true;
}
}.start();
ItemSorter.loadConfig();
@@ -596,10 +597,6 @@ public class NEIClientConfig {
return enabledOverride && getBooleanSetting("inventory.widgetsenabled");
}
public static boolean isLoaded() {
return configLoaded;
}
public static boolean loadHandlersFromJar() {
return !getBooleanSetting("tools.handler_load_from_config");
}
@@ -11,6 +11,8 @@ import java.nio.channels.Channels;
import java.nio.channels.FileChannel;
import java.nio.channels.ReadableByteChannel;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.item.ItemStack;
@@ -284,8 +286,12 @@ public abstract class GuiRecipeTab extends Widget {
if (!handlerAdderFromIMC.isEmpty()) {
// If we're getting an IMC message, it probably means it should match
Set<String> handlerIds = new HashSet<>(handlerMap.keySet());
handlerAdderFromIMC.keySet().forEach(handlerName -> {
Set<String> handlerIds = Stream
.concat(
GuiCraftingRecipe.serialCraftingHandlers.stream(),
GuiCraftingRecipe.craftinghandlers.stream())
.map(ICraftingHandler::getHandlerId).collect(Collectors.toSet());
handlerAdderFromIMC.keySet().stream().forEach(handlerName -> {
if (!handlerIds.contains(handlerName)) {
NEIClientConfig.logger.warn("Could not find a registered handlerID that matches " + handlerName);
handlerIds.forEach(handler -> {
@@ -13,10 +13,11 @@ 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 java.util.stream.Collectors;
import java.util.stream.Stream;
import net.minecraft.item.ItemStack;
@@ -231,8 +232,12 @@ public class RecipeCatalysts {
if (!catalystsAdderFromIMC.isEmpty()) {
// If we're getting an IMC message, it probably means it should match
Set<String> handlerIds = new HashSet<>(GuiRecipeTab.handlerMap.keySet());
catalystsAdderFromIMC.keySet().forEach(handlerName -> {
Set<String> handlerIds = Stream
.concat(
GuiCraftingRecipe.serialCraftingHandlers.stream(),
GuiCraftingRecipe.craftinghandlers.stream())
.map(ICraftingHandler::getHandlerId).collect(Collectors.toSet());
catalystsAdderFromIMC.keySet().stream().forEach(handlerName -> {
if (!handlerIds.contains(handlerName)) {
NEIClientConfig.logger.warn("Could not find a registered handlerID that matches " + handlerName);
handlerIds.forEach(handler -> {
@@ -547,9 +547,6 @@ nc.crafting.nei.FissionRecipeHandler,NuclearCraft:fissionReactorGraphiteIdle,,Nu
nc.crafting.nei.FissionSteamRecipeHandler,NuclearCraft:fissionReactorSteamIdle,,NuclearCraft,TRUE,,,,,,
nc.crafting.nei.FusionRecipeHandler,NuclearCraft:fusionReactor,,NuclearCraft,TRUE,,,,,,
nc.crafting.nei.FusionSteamRecipeHandler,NuclearCraft:fusionReactorSteam,,NuclearCraft,TRUE,,,,,,
nc.crafting.nei.ElectrolyserRecipeHandler,NuclearCraft:electrolyserIdle,,NuclearCraft,TRUE,,,,,,
nc.crafting.nei.CrusherRecipeHandler,NuclearCraft:crusherIdle,,NuclearCraft,TRUE,,,,,,
nc.crafting.nei.ElectricCrusherRecipeHandler,NuclearCraft:electricCrusherIdle,,NuclearCraft,TRUE,,,,,,
ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_Smoker,etfuturum:smoker,,etfuturum,TRUE,,,,,,not working well
ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_BlastFurnace,etfuturum:blast_furnace,,etfuturum,TRUE,,,,,,not working well
connor135246.campfirebackport.client.compat.nei.NEICampfireRecipeHandler,campfirebackport:campfire,,campfirebackport,TRUE,,,,,,
@@ -1415,10 +1412,3 @@ Reika.ChromatiCraft.ModInterface.NEI.GlowFireHandler,ChromatiCraft:chromaticraft
Reika.ChromatiCraft.ModInterface.NEI.EnchantDecompHandler,ChromatiCraft:chromaticraft_item_placer:69,,ChromatiCraft,TRUE,,,,,,
Reika.ChromatiCraft.ModInterface.NEI.FabricatorHandler,ChromatiCraft:chromaticraft_item_placer:23,,ChromatiCraft,TRUE,,,,,,
tonius.neiintegration.mods.bigreactors.RecipeHandlerCyaniteReprocessor,BigReactors:BRDevice:0,,BigReactors,TRUE,,,,,,
ru.nanolive.draconicplus.common.fusioncrafting.nei.FusionCraftingNEI,draconicplus:fusionCraftingCore,,draconicplus,TRUE,,,,,,
techguns.nei.TechgunsFabricatorNEIRecipeHandler,Techguns:machineMultiBlock:4,,Techguns,TRUE,,,,,,
techguns.nei.TechgunsReactionChamberNEIRecipeHandler,Techguns:machineMultiBlock:1,,Techguns,TRUE,,,,,,
techguns.nei.TechgunsChemLabNEIRecipeHandler,Techguns:basicMachine:4,,Techguns,TRUE,,,,,,
techguns.nei.TechgunsAmmoPressNEIRecipeHandler,Techguns:basicMachine:0,,Techguns,TRUE,,,,,,
techguns.nei.TechgunsMetalPressNEIRecipeHandler,Techguns:basicMachine:1,,Techguns,TRUE,,,,,,
techguns.nei.TechgunsChargingStationNEIRecipeHandler,Techguns:basicMachine:9,,Techguns,TRUE,,,,,,
1 handler itemName nbtInfo modId modRequired excludedModId priority minVersion maxVersion forceClassName itemNotes
547 nc.crafting.nei.FissionSteamRecipeHandler NuclearCraft:fissionReactorSteamIdle NuclearCraft TRUE
548 nc.crafting.nei.FusionRecipeHandler NuclearCraft:fusionReactor NuclearCraft TRUE
549 nc.crafting.nei.FusionSteamRecipeHandler NuclearCraft:fusionReactorSteam NuclearCraft TRUE
nc.crafting.nei.ElectrolyserRecipeHandler NuclearCraft:electrolyserIdle NuclearCraft TRUE
nc.crafting.nei.CrusherRecipeHandler NuclearCraft:crusherIdle NuclearCraft TRUE
nc.crafting.nei.ElectricCrusherRecipeHandler NuclearCraft:electricCrusherIdle NuclearCraft TRUE
550 ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_Smoker etfuturum:smoker etfuturum TRUE not working well
551 ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_BlastFurnace etfuturum:blast_furnace etfuturum TRUE not working well
552 connor135246.campfirebackport.client.compat.nei.NEICampfireRecipeHandler campfirebackport:campfire campfirebackport TRUE
1412 Reika.ChromatiCraft.ModInterface.NEI.EnchantDecompHandler ChromatiCraft:chromaticraft_item_placer:69 ChromatiCraft TRUE
1413 Reika.ChromatiCraft.ModInterface.NEI.FabricatorHandler ChromatiCraft:chromaticraft_item_placer:23 ChromatiCraft TRUE
1414 tonius.neiintegration.mods.bigreactors.RecipeHandlerCyaniteReprocessor BigReactors:BRDevice:0 BigReactors TRUE
ru.nanolive.draconicplus.common.fusioncrafting.nei.FusionCraftingNEI draconicplus:fusionCraftingCore draconicplus TRUE
techguns.nei.TechgunsFabricatorNEIRecipeHandler Techguns:machineMultiBlock:4 Techguns TRUE
techguns.nei.TechgunsReactionChamberNEIRecipeHandler Techguns:machineMultiBlock:1 Techguns TRUE
techguns.nei.TechgunsChemLabNEIRecipeHandler Techguns:basicMachine:4 Techguns TRUE
techguns.nei.TechgunsAmmoPressNEIRecipeHandler Techguns:basicMachine:0 Techguns TRUE
techguns.nei.TechgunsMetalPressNEIRecipeHandler Techguns:basicMachine:1 Techguns TRUE
techguns.nei.TechgunsChargingStationNEIRecipeHandler Techguns:basicMachine:9 Techguns TRUE
@@ -496,9 +496,6 @@ nc.crafting.nei.FissionRecipeHandler,NuclearCraft,NuclearCraft:fissionReactorGra
nc.crafting.nei.FissionSteamRecipeHandler,NuclearCraft,NuclearCraft:fissionReactorSteamIdle,,NuclearCraft,TRUE,,,,,,,,,,,
nc.crafting.nei.FusionRecipeHandler,NuclearCraft,NuclearCraft:fusionReactor,,NuclearCraft,TRUE,,,,,,,,,,,
nc.crafting.nei.FusionSteamRecipeHandler,NuclearCraft,NuclearCraft:fusionReactorSteam,,NuclearCraft,TRUE,,,,,,,,,,,
nc.crafting.nei.ElectrolyserRecipeHandler,NuclearCraft,NuclearCraft:electrolyserIdle,,NuclearCraft,TRUE,,,65,,4,,,,,,
nc.crafting.nei.CrusherRecipeHandler,NuclearCraft,NuclearCraft:crusherIdle,,NuclearCraft,TRUE,,,65,,4,,,,,,
nc.crafting.nei.ElectricCrusherRecipeHandler,NuclearCraft,NuclearCraft:electricCrusherIdle,,NuclearCraft,TRUE,,,65,,4,,,,,,
ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_Smoker,EtFuturum Requiem,etfuturum:lit_smoker,,etfuturum,TRUE,,,65,166,5,,,,,,
ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_BlastFurnace,EtFuturum Requiem,etfuturum:lit_blast_furnace,,etfuturum,TRUE,,,65,166,5,,,,,,
connor135246.campfirebackport.client.compat.nei.NEICampfireRecipeHandler,Campfire Backport,campfirebackport:campfire,,campfirebackport,TRUE,,,65,166,5,,,,,,
@@ -574,10 +571,3 @@ Reika.ChromatiCraft.ModInterface.NEI.EnchantDecompHandler,ChromatiCraft,Chromati
Reika.ChromatiCraft.ModInterface.NEI.FabricatorHandler,ChromatiCraft,ChromatiCraft:chromaticraft_item_placer:23,,ChromatiCraft,TRUE,,,,,,,,,,,
Reika.ChromatiCraft.ModInterface.NEI.PlantDustHandler,ChromatiCraft,ChromatiCraft:chromaticraft_block_decoflower:0,,ChromatiCraft,TRUE,,,,,3,,,,,,Anything other than 3 high tiling looks wrong
tonius.neiintegration.mods.bigreactors.RecipeHandlerCyaniteReprocessor,Big Reactors,BigReactors:BRDevice:0,,BigReactors,TRUE,,,,,,,,,,,
ru.nanolive.draconicplus.common.fusioncrafting.nei.FusionCraftingNEI,Draconic Plus,draconicplus:fusionCraftingCore,,draconicplus,TRUE,,,115,,2,,,,,,
techguns.nei.TechgunsFabricatorNEIRecipeHandler,Techguns,Techguns:machineMultiBlock:4,,Techguns,TRUE,,,70,,3,,,,,,
techguns.nei.TechgunsReactionChamberNEIRecipeHandler,Techguns,Techguns:machineMultiBlock:1,,Techguns,TRUE,,,70,,3,,,,,,
techguns.nei.TechgunsChemLabNEIRecipeHandler,Techguns,Techguns:basicMachine:4,,Techguns,TRUE,,,70,,3,,,,,,
techguns.nei.TechgunsAmmoPressNEIRecipeHandler,Techguns,Techguns:basicMachine:0,,Techguns,TRUE,,,75,,3,,,,,,
techguns.nei.TechgunsMetalPressNEIRecipeHandler,Techguns,Techguns:basicMachine:1,,Techguns,TRUE,,,75,,3,,,,,,
techguns.nei.TechgunsChargingStationNEIRecipeHandler,Techguns,Techguns:basicMachine:9,,Techguns,TRUE,,,65,,3,,,,,,
1 handler modName itemName nbtInfo modId modRequired excludedModId yShift handlerHeight handlerWidth maxRecipesPerPage imageResource imageX imageY imageWidth imageHeight itemNotes
496 nc.crafting.nei.FissionSteamRecipeHandler NuclearCraft NuclearCraft:fissionReactorSteamIdle NuclearCraft TRUE
497 nc.crafting.nei.FusionRecipeHandler NuclearCraft NuclearCraft:fusionReactor NuclearCraft TRUE
498 nc.crafting.nei.FusionSteamRecipeHandler NuclearCraft NuclearCraft:fusionReactorSteam NuclearCraft TRUE
nc.crafting.nei.ElectrolyserRecipeHandler NuclearCraft NuclearCraft:electrolyserIdle NuclearCraft TRUE 65 4
nc.crafting.nei.CrusherRecipeHandler NuclearCraft NuclearCraft:crusherIdle NuclearCraft TRUE 65 4
nc.crafting.nei.ElectricCrusherRecipeHandler NuclearCraft NuclearCraft:electricCrusherIdle NuclearCraft TRUE 65 4
499 ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_Smoker EtFuturum Requiem etfuturum:lit_smoker etfuturum TRUE 65 166 5
500 ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_BlastFurnace EtFuturum Requiem etfuturum:lit_blast_furnace etfuturum TRUE 65 166 5
501 connor135246.campfirebackport.client.compat.nei.NEICampfireRecipeHandler Campfire Backport campfirebackport:campfire campfirebackport TRUE 65 166 5
571 Reika.ChromatiCraft.ModInterface.NEI.FabricatorHandler ChromatiCraft ChromatiCraft:chromaticraft_item_placer:23 ChromatiCraft TRUE
572 Reika.ChromatiCraft.ModInterface.NEI.PlantDustHandler ChromatiCraft ChromatiCraft:chromaticraft_block_decoflower:0 ChromatiCraft TRUE 3 Anything other than 3 high tiling looks wrong
573 tonius.neiintegration.mods.bigreactors.RecipeHandlerCyaniteReprocessor Big Reactors BigReactors:BRDevice:0 BigReactors TRUE
ru.nanolive.draconicplus.common.fusioncrafting.nei.FusionCraftingNEI Draconic Plus draconicplus:fusionCraftingCore draconicplus TRUE 115 2
techguns.nei.TechgunsFabricatorNEIRecipeHandler Techguns Techguns:machineMultiBlock:4 Techguns TRUE 70 3
techguns.nei.TechgunsReactionChamberNEIRecipeHandler Techguns Techguns:machineMultiBlock:1 Techguns TRUE 70 3
techguns.nei.TechgunsChemLabNEIRecipeHandler Techguns Techguns:basicMachine:4 Techguns TRUE 70 3
techguns.nei.TechgunsAmmoPressNEIRecipeHandler Techguns Techguns:basicMachine:0 Techguns TRUE 75 3
techguns.nei.TechgunsMetalPressNEIRecipeHandler Techguns Techguns:basicMachine:1 Techguns TRUE 75 3
techguns.nei.TechgunsChargingStationNEIRecipeHandler Techguns Techguns:basicMachine:9 Techguns TRUE 65 3