diff --git a/README.md b/README.md index 37c6dbd..3235b12 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ This mod removes that functionality and allows the player to use NEI's transfer - Combine like stacks in processing patterns. - Support Processing Pattern Terminal(16 -> 4 mode). - Allow you to add item blackList and item priority list, if item in them, it will not be transferred / transfer it first.(use /nee RecipeProcessor to get RecipeProcessor and identifier in log) -- Allow you to add mod priority list,if it's the mod's item,it will be use first. +- Allow you to add mod priority list,if the mod's has this item,it will be use first. ## Compatible Modslist as followed: diff --git a/gradle.properties b/gradle.properties index 4173fd6..9ec5db7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.daemon=false mc_version=1.7.10 nei_version=2.1.6-GTNH ae2_version=rv3-beta-52-GTNH -mod_version=1.2.4 +mod_version=1.2.5 forge_version=10.13.4.1614 mod_group=com.github.vfyjxf.neenergistics mod_id=neenergistics diff --git a/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHandler.java b/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHandler.java index 8949d42..804443e 100644 --- a/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHandler.java +++ b/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHandler.java @@ -75,10 +75,9 @@ public class NEECraftingHandler implements IOverlayHandler { } for (PositionedStack positionedStack : tInputs) { - ItemStack currentStack = positionedStack.item; - currentStack.stackSize = positionedStack.items[0].stackSize; - + ItemStack currentStack = positionedStack.items[0]; ItemStack preferModItem = ItemUtils.getPreferModItem(positionedStack.items); + if (preferModItem != null) { currentStack = preferModItem; } @@ -138,7 +137,7 @@ public class NEECraftingHandler implements IOverlayHandler { } private void knowledgeInscriberHandler(GuiContainer firstGui, IRecipeHandler recipe, int recipeIndex) { - Class knowledgeInscriberClz = null; + Class knowledgeInscriberClz; try { knowledgeInscriberClz = Class.forName("thaumicenergistics.client.gui.GuiKnowledgeInscriber"); } catch (ClassNotFoundException e) { diff --git a/src/main/java/com/github/vfyjxf/nee/processor/RecipeProcessor.java b/src/main/java/com/github/vfyjxf/nee/processor/RecipeProcessor.java index 3176a31..530216b 100644 --- a/src/main/java/com/github/vfyjxf/nee/processor/RecipeProcessor.java +++ b/src/main/java/com/github/vfyjxf/nee/processor/RecipeProcessor.java @@ -58,6 +58,10 @@ public class RecipeProcessor { NotEnoughEnergistics.logger.info("Found BloodMagic, install BloodMagic support"); recipeProcessors.add(new BloodMagicRecipeProcessor()); } + if(Loader.isModLoaded("BuildCraft|Compat")){ + NotEnoughEnergistics.logger.info("Found BuildCraft-Compat, install BuildCraft-Compat support"); + recipeProcessors.add(new BuildCraftRecipeProcessor()); + } if (Loader.isModLoaded("appliedenergistics2")) { NotEnoughEnergistics.logger.info("Applied Energistics 2 will not be supported"); }