mirror of
https://github.com/GTNewHorizons/NotEnoughEnergistics.git
synced 2026-11-18 03:15:03 +00:00
add fluid craft pattern terminal prioritize mode support (#23)
* Add fluid craft support * spotless apply * add fluid craft Pattern Terminal Ex prioritize mode support Co-authored-by: GlodBlock <[email protected]>
This commit is contained in:
1 parent
d0bfcf308c
commit
9fc9c2905b
2 files changed
+29
-3
No files matched your search
@@ -2,6 +2,8 @@ package com.github.vfyjxf.nee.processor;
|
||||
|
||||
import codechicken.nei.PositionedStack;
|
||||
import codechicken.nei.recipe.IRecipeHandler;
|
||||
import com.github.vfyjxf.nee.utils.GuiUtils;
|
||||
import com.glodblock.github.client.gui.GuiBaseFluidPatternTerminalEx;
|
||||
import gregtech.api.enums.ItemList;
|
||||
import gregtech.api.util.GT_Recipe;
|
||||
import gregtech.nei.GT_NEI_DefaultHandler.FixedPositionedStack;
|
||||
@@ -10,6 +12,7 @@ import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import javax.annotation.Nonnull;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
@@ -80,9 +83,28 @@ public class GregTech5RecipeProcessor implements IRecipeProcessor {
|
||||
public List<PositionedStack> getRecipeInput(IRecipeHandler recipe, int recipeIndex, String identifier) {
|
||||
List<PositionedStack> recipeInputs = new ArrayList<>();
|
||||
if (gtDefaultClz.isInstance(recipe) || gtAssLineClz.isInstance(recipe)) {
|
||||
recipeInputs.addAll(recipe.getIngredientStacks(recipeIndex));
|
||||
recipeInputs.removeIf(positionedStack ->
|
||||
getFluidFromDisplayStack(positionedStack.items[0]) != null || positionedStack.item.stackSize == 0);
|
||||
if (GuiUtils.isFluidCraftPatternTermEx(Minecraft.getMinecraft().currentScreen)) {
|
||||
boolean priority =
|
||||
((GuiBaseFluidPatternTerminalEx) Minecraft.getMinecraft().currentScreen).container.prioritize;
|
||||
if (priority) {
|
||||
for (PositionedStack ps : recipe.getIngredientStacks(recipeIndex)) {
|
||||
if (ps != null && getFluidFromDisplayStack(ps.item) != null) {
|
||||
recipeInputs.add(ps);
|
||||
}
|
||||
}
|
||||
for (PositionedStack ps : recipe.getIngredientStacks(recipeIndex)) {
|
||||
if (ps != null && getFluidFromDisplayStack(ps.item) == null) {
|
||||
recipeInputs.add(ps);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
recipeInputs.addAll(recipe.getIngredientStacks(recipeIndex));
|
||||
}
|
||||
} else {
|
||||
recipeInputs.addAll(recipe.getIngredientStacks(recipeIndex));
|
||||
recipeInputs.removeIf(positionedStack -> getFluidFromDisplayStack(positionedStack.items[0]) != null
|
||||
|| positionedStack.item.stackSize == 0);
|
||||
}
|
||||
if (!recipeInputs.isEmpty()) {
|
||||
ItemStack specialItem = recipeInputs.get(recipeInputs.size() - 1).items[0];
|
||||
if ((specialItem.isItemEqual(ItemList.Tool_DataStick.get(1))
|
||||
|
||||
@@ -85,6 +85,10 @@ public class GuiUtils {
|
||||
return guiScreen instanceof GuiCraftingTerm || isGuiWirelessCrafting(guiScreen);
|
||||
}
|
||||
|
||||
public static boolean isFluidCraftPatternTermEx(GuiScreen guiScreen) {
|
||||
return isFluidCraftModloaded && guiScreen instanceof GuiFluidPatternTerminalEx;
|
||||
}
|
||||
|
||||
public static boolean isFluidCraftPatternTerm(GuiScreen guiScreen) {
|
||||
return isFluidCraftModloaded
|
||||
&& (guiScreen instanceof GuiFluidPatternTerminal || guiScreen instanceof GuiFluidPatternTerminalEx);
|
||||
|
||||
Reference in new issue
Block a user