diff --git a/src/main/java/com/glodblock/github/nei/NEI_FC_Config.java b/src/main/java/com/glodblock/github/nei/NEI_FC_Config.java index 72e95c8a..28a811d1 100644 --- a/src/main/java/com/glodblock/github/nei/NEI_FC_Config.java +++ b/src/main/java/com/glodblock/github/nei/NEI_FC_Config.java @@ -6,6 +6,7 @@ import codechicken.nei.api.IConfigureNEI; import com.glodblock.github.FluidCraft; import com.glodblock.github.client.gui.*; import com.glodblock.github.nei.recipes.FluidRecipe; +import com.glodblock.github.util.ModAndClassUtil; public class NEI_FC_Config implements IConfigureNEI { @@ -13,6 +14,14 @@ public class NEI_FC_Config implements IConfigureNEI { public void loadConfig() { API.registerNEIGuiHandler(new NEIGuiHandler()); API.addSearchProvider(new NEIItemFilter()); + + if (ModAndClassUtil.AVARITIA) { + API.registerGuiOverlay(GuiFluidPatternWireless.class, "extreme", null); + API.registerGuiOverlay(GuiFluidPatternExWireless.class, "extreme", null); + API.registerGuiOverlay(GuiFluidPatternTerminal.class, "extreme", null); + API.registerGuiOverlay(GuiFluidPatternTerminalEx.class, "extreme", null); + } + for (String identifier : FluidRecipe.getSupportRecipes()) { // that NEE handlers take priority if (!API.hasGuiOverlayHandler(GuiFluidCraftingWireless.class, identifier)) { diff --git a/src/main/java/com/glodblock/github/nei/recipes/DefaultExtractorLoader.java b/src/main/java/com/glodblock/github/nei/recipes/DefaultExtractorLoader.java index 7f7e0ea3..5e83468c 100644 --- a/src/main/java/com/glodblock/github/nei/recipes/DefaultExtractorLoader.java +++ b/src/main/java/com/glodblock/github/nei/recipes/DefaultExtractorLoader.java @@ -50,6 +50,10 @@ public class DefaultExtractorLoader implements Runnable { FluidRecipe.addRecipeMap("EnderIOVat", new EnderIORecipeExtractor()); } + if (ModAndClassUtil.AVARITIA) { + FluidRecipe.addRecipeMap("extreme", new AvaritiaRecipeExtractor()); + } + if (ModAndClassUtil.FTR) { // GTNH FluidRecipe.addRecipeMap("forestry.bottler", new ForestryRecipeExtractor(new NEIHandlerBottler())); diff --git a/src/main/java/com/glodblock/github/nei/recipes/extractor/AvaritiaRecipeExtractor.java b/src/main/java/com/glodblock/github/nei/recipes/extractor/AvaritiaRecipeExtractor.java new file mode 100644 index 00000000..304dac8f --- /dev/null +++ b/src/main/java/com/glodblock/github/nei/recipes/extractor/AvaritiaRecipeExtractor.java @@ -0,0 +1,36 @@ +package com.glodblock.github.nei.recipes.extractor; + +import java.util.List; + +import codechicken.nei.PositionedStack; +import codechicken.nei.recipe.IRecipeHandler; + +import com.glodblock.github.nei.NEIUtils; +import com.glodblock.github.nei.object.IRecipeExtractor; +import com.glodblock.github.nei.object.OrderStack; + +public class AvaritiaRecipeExtractor implements IRecipeExtractor { + + public AvaritiaRecipeExtractor() {} + + @Override + public List> getInputIngredients(List rawInputs, IRecipeHandler recipe, int index) { + return getInputIngredients(rawInputs); + } + + @Override + public List> getOutputIngredients(List rawOutputs, IRecipeHandler recipe, + int index) { + return getOutputIngredients(rawOutputs); + } + + @Override + public List> getInputIngredients(List rawInputs) { + return NEIUtils.compress(ExtractorUtil.packItemStack(rawInputs)); + } + + @Override + public List> getOutputIngredients(List rawOutputs) { + return ExtractorUtil.packItemStack(rawOutputs); + } +} diff --git a/src/main/java/com/glodblock/github/util/ModAndClassUtil.java b/src/main/java/com/glodblock/github/util/ModAndClassUtil.java index ea96a0d0..e915f7fb 100644 --- a/src/main/java/com/glodblock/github/util/ModAndClassUtil.java +++ b/src/main/java/com/glodblock/github/util/ModAndClassUtil.java @@ -25,6 +25,7 @@ public final class ModAndClassUtil { public static boolean COFH = false; public static boolean GTPP = false; public static boolean WAILA = false; + public static boolean AVARITIA = false; public static boolean isV2; public static boolean isDoubleButton; public static boolean isSaveText; @@ -130,5 +131,6 @@ public final class ModAndClassUtil { if (Loader.isModLoaded("CoFHCore")) COFH = true; if (Loader.isModLoaded("miscutils")) GTPP = true; if (Loader.isModLoaded("Waila")) WAILA = true; + if (Loader.isModLoaded("Avaritia")) AVARITIA = true; } }