Compare commits

...
Author SHA1 Message Date
MalTeeez 962754ee10 Create handlers for Fusion Crafting (DE-), Techguns and some missing NC recipes (#372)
* Add Fusion Crafting catalyst.csv

* Add Fusion Crafter handler.csv

* Add Techguns handlers & some missing NuclearCraft handlers

* Add Techguns catalysts & some missing NuclearCraft catalysts

* Fix typo

* Add heights to handlers and fix typo

* Small height increase

* Group NC catalysts

* Group NC handlers
2023-04-28 08:24:58 +02:00
Jason Mitchell 0e34840c21 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
2023-04-16 21:22:09 +02:00
4 changed files with 50 additions and 0 deletions

No files matched your search

@@ -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<String> 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());
}
@@ -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<String> 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<String, List<ItemStack>> entry : catalystsRemoverFromAPI.entrySet()) {
String handlerID = entry.getKey();
if (recipeCatalystMap.containsKey(handlerID)) {
@@ -547,6 +547,9 @@ 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,,,,,,
@@ -1412,3 +1415,10 @@ 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
550 nc.crafting.nei.ElectrolyserRecipeHandler NuclearCraft:electrolyserIdle NuclearCraft TRUE
551 nc.crafting.nei.CrusherRecipeHandler NuclearCraft:crusherIdle NuclearCraft TRUE
552 nc.crafting.nei.ElectricCrusherRecipeHandler NuclearCraft:electricCrusherIdle NuclearCraft TRUE
553 ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_Smoker etfuturum:smoker etfuturum TRUE not working well
554 ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_BlastFurnace etfuturum:blast_furnace etfuturum TRUE not working well
555 connor135246.campfirebackport.client.compat.nei.NEICampfireRecipeHandler campfirebackport:campfire campfirebackport TRUE
1415 Reika.ChromatiCraft.ModInterface.NEI.EnchantDecompHandler ChromatiCraft:chromaticraft_item_placer:69 ChromatiCraft TRUE
1416 Reika.ChromatiCraft.ModInterface.NEI.FabricatorHandler ChromatiCraft:chromaticraft_item_placer:23 ChromatiCraft TRUE
1417 tonius.neiintegration.mods.bigreactors.RecipeHandlerCyaniteReprocessor BigReactors:BRDevice:0 BigReactors TRUE
1418 ru.nanolive.draconicplus.common.fusioncrafting.nei.FusionCraftingNEI draconicplus:fusionCraftingCore draconicplus TRUE
1419 techguns.nei.TechgunsFabricatorNEIRecipeHandler Techguns:machineMultiBlock:4 Techguns TRUE
1420 techguns.nei.TechgunsReactionChamberNEIRecipeHandler Techguns:machineMultiBlock:1 Techguns TRUE
1421 techguns.nei.TechgunsChemLabNEIRecipeHandler Techguns:basicMachine:4 Techguns TRUE
1422 techguns.nei.TechgunsAmmoPressNEIRecipeHandler Techguns:basicMachine:0 Techguns TRUE
1423 techguns.nei.TechgunsMetalPressNEIRecipeHandler Techguns:basicMachine:1 Techguns TRUE
1424 techguns.nei.TechgunsChargingStationNEIRecipeHandler Techguns:basicMachine:9 Techguns TRUE
@@ -496,6 +496,9 @@ 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,,,,,,
@@ -571,3 +574,10 @@ 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
499 nc.crafting.nei.ElectrolyserRecipeHandler NuclearCraft NuclearCraft:electrolyserIdle NuclearCraft TRUE 65 4
500 nc.crafting.nei.CrusherRecipeHandler NuclearCraft NuclearCraft:crusherIdle NuclearCraft TRUE 65 4
501 nc.crafting.nei.ElectricCrusherRecipeHandler NuclearCraft NuclearCraft:electricCrusherIdle NuclearCraft TRUE 65 4
502 ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_Smoker EtFuturum Requiem etfuturum:lit_smoker etfuturum TRUE 65 166 5
503 ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_BlastFurnace EtFuturum Requiem etfuturum:lit_blast_furnace etfuturum TRUE 65 166 5
504 connor135246.campfirebackport.client.compat.nei.NEICampfireRecipeHandler Campfire Backport campfirebackport:campfire campfirebackport TRUE 65 166 5
574 Reika.ChromatiCraft.ModInterface.NEI.FabricatorHandler ChromatiCraft ChromatiCraft:chromaticraft_item_placer:23 ChromatiCraft TRUE
575 Reika.ChromatiCraft.ModInterface.NEI.PlantDustHandler ChromatiCraft ChromatiCraft:chromaticraft_block_decoflower:0 ChromatiCraft TRUE 3 Anything other than 3 high tiling looks wrong
576 tonius.neiintegration.mods.bigreactors.RecipeHandlerCyaniteReprocessor Big Reactors BigReactors:BRDevice:0 BigReactors TRUE
577 ru.nanolive.draconicplus.common.fusioncrafting.nei.FusionCraftingNEI Draconic Plus draconicplus:fusionCraftingCore draconicplus TRUE 115 2
578 techguns.nei.TechgunsFabricatorNEIRecipeHandler Techguns Techguns:machineMultiBlock:4 Techguns TRUE 70 3
579 techguns.nei.TechgunsReactionChamberNEIRecipeHandler Techguns Techguns:machineMultiBlock:1 Techguns TRUE 70 3
580 techguns.nei.TechgunsChemLabNEIRecipeHandler Techguns Techguns:basicMachine:4 Techguns TRUE 70 3
581 techguns.nei.TechgunsAmmoPressNEIRecipeHandler Techguns Techguns:basicMachine:0 Techguns TRUE 75 3
582 techguns.nei.TechgunsMetalPressNEIRecipeHandler Techguns Techguns:basicMachine:1 Techguns TRUE 75 3
583 techguns.nei.TechgunsChargingStationNEIRecipeHandler Techguns Techguns:basicMachine:9 Techguns TRUE 65 3