Merge pull request #995 from Nxer/acal

open acal recipe pool to NEI

Author: Nxer

src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/TST_AdvCircuitAssemblyLine.java

@@ -212,14 +212,13 @@ protected int getMaxParallelRecipes() {
 
     @Override
     public RecipeMap<?> getRecipeMap() {
-        // return BartWorksRecipeMaps.circuitAssemblyLineRecipes;
         return GTCMRecipe.advCircuitAssemblyLineRecipes;
     }
 
     @NotNull
     @Override
     public Collection<RecipeMap<?>> getAvailableRecipeMaps() {
-        return Arrays.asList(BartWorksRecipeMaps.circuitAssemblyLineRecipes);
+        return Arrays.asList(BartWorksRecipeMaps.circuitAssemblyLineRecipes, GTCMRecipe.advCircuitAssemblyLineRecipes);
     }
 
     @Override
@@ -371,8 +370,8 @@ protected MultiblockTooltipBuilder createTooltip() {
             // # Imprint circuit hatch
             // #zh_CN 压印电路仓
             // #tr Tooltip_AdvCircuitAssemblyLine.7
-            // # Any grate machine casing
-            // #zh_CN 任意格栅机械方块
+            // # Grate machine casing next to the controller
+            // #zh_CN 主机旁的格栅机械方块
             .addOtherStructurePart(
                 TextEnums.tr("Tooltip_AdvCircuitAssemblyLine.6"),
                 TextEnums.tr("Tooltip_AdvCircuitAssemblyLine.7"),

src/main/java/com/Nxer/TwistSpaceTechnology/common/recipeMap/GTCMRecipe.java

@@ -394,16 +394,15 @@ public class GTCMRecipe {
         .disableOptimize()
         .build();
 
-    // #tr tst.recipe.advCircuitAssemblyLineTrueRecipes
-    // # Adv Circuit Assembly Line (Hide recipe, report it in Issue)
-    // #zh_CN 进阶电路装配线(隐藏配方， 请在Issue中反馈)
+    // #tr tst.recipe.advCircuitAssemblyLineRecipes
+    // # Adv Circuit Assembly Line (Actual recipe pool at runtime)
+    // #zh_CN 进阶电路装配线(运行时实际配方池)
     public static final RecipeMap<RecipeMapBackend> advCircuitAssemblyLineRecipes = RecipeMapBuilder
         .of("tst.recipe.advCircuitAssemblyLineRecipes")
         .maxIO(6, 1, 1, 0)
         .minInputs(1, 1)
         .neiHandlerInfo(builder -> builder.setDisplayStack(GTCMItemList.AdvCircuitAssemblyLine.get(1)))
         .progressBar(GTUITextures.PROGRESSBAR_CIRCUIT_ASSEMBLER)
-        .disableRegisterNEI()
         .disableOptimize()
         .build();
 

src/main/resources/assets/gtnhcommunitymod/lang/en_US.lang

@@ -1934,7 +1934,7 @@ Tooltip_AdvCircuitAssemblyLine.4=Allows installation of crafting input buffer
 Tooltip_AdvCircuitAssemblyLine.5=Install imprint circuit hatch for more recipe support (more than one hatch is not allowed)
 textEndSides=Machine end
 Tooltip_AdvCircuitAssemblyLine.6=Imprint circuit hatch
-Tooltip_AdvCircuitAssemblyLine.7=Any grate machine casing
+Tooltip_AdvCircuitAssemblyLine.7=Grate machine casing next to the controller
 tile.MetaBlockCasing01.15.name=Swelegfyr Casing
 Tooltip_SwelegfyrCasing=§6Withstands the inferno!
 tile.MetaBlockCasing02.2.name=Iridium-Reinforced Neutronium Casing
@@ -2209,3 +2209,4 @@ GT5U.gui.text.infusioning=§aInfusioning
 GT5U.gui.text.infusion_complete=§aInfusion complete
 GT5U.gui.text.unknown_problem=§cUnknown problem
 GT5U.gui.text.insufficient_pedestals=§c(Right-click screwdriver to check again) Missing pedestals: %d
+tst.recipe.advCircuitAssemblyLineRecipes=Adv Circuit Assembly Line (Actual recipe pool at runtime)

src/main/resources/assets/gtnhcommunitymod/lang/zh_CN.lang

@@ -1934,7 +1934,7 @@ Tooltip_AdvCircuitAssemblyLine.4=允许使用样板输入总成
 Tooltip_AdvCircuitAssemblyLine.5=安装压印电路仓以获得更多配方支持 (只允许安装一个压印电路仓)
 textEndSides=机器末端
 Tooltip_AdvCircuitAssemblyLine.6=压印电路仓
-Tooltip_AdvCircuitAssemblyLine.7=任意格栅机械方块
+Tooltip_AdvCircuitAssemblyLine.7=主机旁的格栅机械方块
 tile.MetaBlockCasing01.15.name=熯焱机械方块
 Tooltip_SwelegfyrCasing=§6御火而生!
 tile.MetaBlockCasing02.2.name=铱强化中子机械方块
@@ -2209,3 +2209,4 @@ GT5U.gui.text.infusioning=§a正在注魔
 GT5U.gui.text.infusion_complete=§a注魔完成
 GT5U.gui.text.unknown_problem=§c未知问题
 GT5U.gui.text.insufficient_pedestals=§c(螺丝刀右键可重新检查) 基座缺少数量: %d
+tst.recipe.advCircuitAssemblyLineRecipes=进阶电路装配线(运行时实际配方池)