diff --git a/src/main/java/com/github/vfyjxf/nee/nei/NEEPatternTerminalHandler.java b/src/main/java/com/github/vfyjxf/nee/nei/NEEPatternTerminalHandler.java index 1eed001..926b52b 100644 --- a/src/main/java/com/github/vfyjxf/nee/nei/NEEPatternTerminalHandler.java +++ b/src/main/java/com/github/vfyjxf/nee/nei/NEEPatternTerminalHandler.java @@ -66,8 +66,9 @@ public class NEEPatternTerminalHandler implements IOverlayHandler { NEENetworkHandler.getInstance().sendToServer(packRecipe(handler, recipeIndex, multiplier)); - if (Loader.isModLoaded(ModIDs.FC) && GuiUtils.isFluidCraftPatternTermEx(gui)) { - fluidCraftOverlayRecipe(gui, handler, recipeIndex, multiplier); + if (Loader.isModLoaded(ModIDs.FC) + && (GuiUtils.isFluidCraftPatternTermEx(gui) || GuiUtils.isFluidCraftPatternTerm(gui))) { + fluidCraftOverlayRecipe(gui, handler, recipeIndex); } return 0; @@ -86,9 +87,8 @@ public class NEEPatternTerminalHandler implements IOverlayHandler { } @Optional.Method(modid = ModIDs.FC) - private void fluidCraftOverlayRecipe(GuiContainer firstGui, IRecipeHandler recipe, int recipeIndex, - int multiplier) { - FluidPatternTerminalRecipeTransferHandler.INSTANCE.transferRecipe(firstGui, recipe, recipeIndex, multiplier); + private void fluidCraftOverlayRecipe(GuiContainer firstGui, IRecipeHandler recipe, int recipeIndex) { + FluidPatternTerminalRecipeTransferHandler.INSTANCE.overlayRecipe(firstGui, recipe, recipeIndex, true); } private PacketNEIPatternRecipe packRecipe(IRecipeHandler recipe, int recipeIndex, int multiplier) { diff --git a/src/main/java/com/github/vfyjxf/nee/utils/GuiUtils.java b/src/main/java/com/github/vfyjxf/nee/utils/GuiUtils.java index e8aed39..3f42af6 100644 --- a/src/main/java/com/github/vfyjxf/nee/utils/GuiUtils.java +++ b/src/main/java/com/github/vfyjxf/nee/utils/GuiUtils.java @@ -68,6 +68,10 @@ public class GuiUtils { return isFluidCraftModloaded && guiScreen instanceof GuiFluidPatternTerminalEx; } + public static boolean isFluidCraftPatternTerm(GuiScreen guiScreen) { + return isFluidCraftModloaded && guiScreen instanceof GuiFluidPatternTerminal; + } + public static boolean isPatternTerm(GuiScreen guiScreen) { return guiScreen instanceof GuiPatternTerm || guiScreen instanceof GuiPatternTermEx || isFluidCraftModloaded && (guiScreen instanceof GuiFluidPatternTerminal