drop mm jei support

Author: GlodBlock

build.gradle

@@ -47,7 +47,6 @@ repositories {
 dependencies {
     deobfCompile 'curse.maven:jei-238222:4538010' //jei
     deobfCompile 'curse.maven:packagedauto-308380:2977147' // 1.0.3.14
-    deobfCompile 'curse.maven:modular-machinery-270790:2761302' // 1.11.1
     deobfCompile 'curse.maven:codechicken-lib-1-8-242818:2779848' //ccl
     deobfCompile 'curse.maven:gregtech-ce-unofficial-557242:5121638' // gt
     deobfCompile 'curse.maven:ae2-extended-life-570458:5378163' //pae2

src/main/java/com/glodblock/github/integration/jei/ExtraExtractors.java

@@ -4,7 +4,6 @@
 import com.glodblock.github.integration.dynamistics.FluidCraftPatternPlugin;
 import com.glodblock.github.integration.dynamistics.FluidPatternCategory;
 import com.glodblock.github.integration.dynamistics.FluidPatternPlugin;
-import com.glodblock.github.integration.jei.interfaces.IngredientExtractor;
 import com.glodblock.github.loader.FCBlocks;
 import com.glodblock.github.util.ModAndClassUtil;
 import eutros.dynamistics.helper.ItemHelper;
@@ -16,8 +15,6 @@
 import mezz.jei.api.recipe.IRecipeCategoryRegistration;
 import mezz.jei.config.Constants;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fml.common.Loader;
 
 import javax.annotation.Nonnull;
 
@@ -38,12 +35,6 @@ public void registerCategories(@Nonnull IRecipeCategoryRegistration registry) {
 
     @Override
     public void register(@Nonnull IModRegistry registry) {
-        IngredientExtractor<FluidStack> extModMach = Loader.isModLoaded("modularmachinery")
-                ? new ModMachHybridFluidStackExtractor(registry) : null;
-        if (ModAndClassUtil.GAS && extModMach != null) {
-            RecipeTransferBuilder.setGasExtractor(new ExtraGasExtractors(new ModMachHybridGasStackExtractor(registry)));
-        }
-        RecipeTransferBuilder.setExtractor(new ExtraExtractors(extModMach));
         registry.getRecipeTransferRegistry().addRecipeTransferHandler(
                 new FluidPatternEncoderRecipeTransferHandler(), Constants.UNIVERSAL_RECIPE_TRANSFER_UID);
         registry.getRecipeTransferRegistry().addRecipeTransferHandler(

src/main/java/com/glodblock/github/integration/jei/ExtraGasExtractors.java

@@ -24,8 +24,6 @@
 
 public class RecipeTransferBuilder {
 
-    private static ExtraExtractors extractor = null;
-    private static ExtraGasExtractors extractorGas = null;
     private static final int MAX_ITEMS = 16;
     private static Field fRecipeLayout_recipeWrapper;
 
@@ -62,22 +60,6 @@ public RecipeTransferBuilder(IRecipeLayout recipe) {
         this.split();
     }
 
-    public static void setExtractor(ExtraExtractors extractor) {
-        RecipeTransferBuilder.extractor = extractor;
-    }
-
-    public static void setGasExtractor(ExtraGasExtractors extractor) {
-        RecipeTransferBuilder.extractorGas = extractor;
-    }
-
-    public static ExtraExtractors getExtractor() {
-        return extractor;
-    }
-
-    public static ExtraGasExtractors getGasExtractor() {
-        return extractorGas;
-    }
-
     private void split() {
         for (int index : this.recipe.getItemStacks().getGuiIngredients().keySet()) {
             IGuiIngredient<ItemStack> ing = this.recipe.getItemStacks().getGuiIngredients().get(index);
@@ -118,28 +100,6 @@ private void split() {
                 }
             }
         }
-        if (extractor != null) {
-            extractor.extractFluids(this.recipe).forEach(
-                    ing -> {
-                        if (ing.isInput()) {
-                            this.fluidIn.add(ing.getIngredient());
-                        } else {
-                            this.fluidOut.add(ing.getIngredient());
-                        }
-                    }
-            );
-        }
-        if (extractorGas != null) {
-            extractorGas.extractGases(this.recipe).forEach(
-                    ing -> {
-                        if (ing.isInput()) {
-                            this.gasIn.add(ing.getIngredient());
-                        } else {
-                            this.gasOut.add(ing.getIngredient());
-                        }
-                    }
-            );
-        }
     }
 
     private void setItemIn(int offset) {

src/main/java/com/glodblock/github/integration/jei/FCJeiPlugin.java

@@ -2,17 +2,12 @@
 
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.common.item.fake.FakeFluids;
-import com.glodblock.github.integration.jei.RecipeTransferBuilder;
-import com.glodblock.github.integration.jei.WrappedIngredient;
-import com.glodblock.github.integration.mek.FakeGases;
 import com.glodblock.github.loader.FCBlocks;
-import com.glodblock.github.util.ModAndClassUtil;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import it.unimi.dsi.fastutil.ints.IntSet;
 import it.unimi.dsi.fastutil.ints.IntSets;
-import mekanism.api.gas.GasStack;
 import mezz.jei.api.gui.IGuiIngredient;
 import mezz.jei.api.gui.IRecipeLayout;
 import net.minecraft.item.ItemStack;
@@ -27,7 +22,6 @@
 import thelm.packagedauto.integration.jei.PackagedAutoJEIPlugin;
 
 import java.awt.*;
-import java.util.Iterator;
 import java.util.List;
 
 public class RecipeTypeFluidProcessing implements IRecipeType {
@@ -138,34 +132,6 @@ public Int2ObjectMap<ItemStack> getRecipeTransferMap(IRecipeLayout recipeLayout,
                 }
             }
         }
-        Iterator<WrappedIngredient<FluidStack>> iter = RecipeTransferBuilder.getExtractor().extractFluids(recipeLayout).iterator();
-        while (iter.hasNext()) {
-            WrappedIngredient<FluidStack> ing = iter.next();
-            if (ing.isInput()) {
-                if (ndxCrafting < NUM_SLOTS_CRAFT) {
-                    tfrs.put(ndxCrafting++, FakeFluids.packFluid2Packet(ing.getIngredient()));
-                }
-            } else {
-                if (ndxOutput < NUM_SLOTS_OUT) {
-                    tfrs.put(NUM_SLOTS_CRAFT + ndxOutput++, FakeFluids.packFluid2Packet(ing.getIngredient()));
-                }
-            }
-        }
-        if (ModAndClassUtil.GAS) {
-            Iterator<WrappedIngredient<GasStack>> iterGas = RecipeTransferBuilder.getGasExtractor().extractGases(recipeLayout).iterator();
-            while (iterGas.hasNext()) {
-                WrappedIngredient<GasStack> ing = iterGas.next();
-                if (ing.isInput()) {
-                    if (ndxCrafting < NUM_SLOTS_CRAFT) {
-                        tfrs.put(ndxCrafting++, FakeGases.packGas2Packet(ing.getIngredient()));
-                    }
-                } else {
-                    if (ndxOutput < NUM_SLOTS_OUT) {
-                        tfrs.put(NUM_SLOTS_CRAFT + ndxOutput++, FakeGases.packGas2Packet(ing.getIngredient()));
-                    }
-                }
-            }
-        }
         return tfrs;
     }