Bump MaterialLib to 0.24.0-mu

dependencies.gradle

@@ -32,4 +32,5 @@ dependencies {
     compileOnlyApi('com.github.GTNewHorizons:Angelica:2.2.10:api') {transitive = false}
     compileOnly("com.github.GTNewHorizons:Hodgepodge:2.7.196:dev")
     compileOnly('curse.maven:automagy-222153:2285272')
+    compileOnly('com.ruling_0:MaterialLib:0.24.0-mu:dev')
 }

repositories.gradle

@@ -1,4 +1,5 @@
 // Add any additional repositories for your dependencies here
 
 repositories {
+    mavenLocal()
 }

src/main/java/crazypants/enderio/EnderIO.java

@@ -133,6 +133,7 @@ import crazypants.enderio.machine.painter.BlockPaintedWall;
 import crazypants.enderio.machine.painter.BlockPainter;
 import crazypants.enderio.machine.painter.PaintSourceValidator;
 import crazypants.enderio.machine.ranged.RangeEntity;
+import crazypants.enderio.machine.recipe.RecipeConfigParser;
 import crazypants.enderio.machine.reservoir.BlockReservoir;
 import crazypants.enderio.machine.slicensplice.BlockSliceAndSplice;
 import crazypants.enderio.machine.slicensplice.SliceAndSpliceRecipeManager;
@@ -766,6 +767,7 @@ public class EnderIO {
         FarmersRegistry.addFarmers();
         SoulBinderRecipeManager.getInstance().addDefaultRecipes();
         PaintSourceValidator.instance.loadConfig();
+        RecipeConfigParser.logMaterialLibSummary();
 
         if (fluidXpJuice == null) { // should have been registered by open blocks
             fluidXpJuice = FluidRegistry.getFluid(getXPJuiceName());

src/main/java/crazypants/enderio/machine/recipe/MaterialLibStacks.java

@@ -0,0 +1,17 @@
+package crazypants.enderio.machine.recipe;
+
+import net.minecraft.item.ItemStack;
+
+import com.ruling_0.materiallib.api.StackResolver;
+
+/// Resolves the stack a `modID="ml"` config entry names. The only EnderIO class referencing MaterialLib types, so
+/// the soft dependency classloads only behind a `Loader.isModLoaded` check.
+final class MaterialLibStacks {
+
+    private MaterialLibStacks() {}
+
+    /// The stack of the named material in the named shape, or null when the pair resolves to nothing.
+    static ItemStack getStack(String materialName, String shapeToken, int stackSize) {
+        return StackResolver.getStack(materialName, shapeToken, stackSize);
+    }
+}

src/main/java/crazypants/enderio/machine/recipe/RecipeConfigParser.java

@@ -28,6 +28,7 @@ import org.xml.sax.helpers.DefaultHandler;
 
 import com.enderio.core.common.util.OreDictionaryHelper;
 
+import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.registry.GameRegistry;
 import crazypants.enderio.Log;
 import crazypants.enderio.machine.crusher.CrusherRecipeManager;
@@ -63,6 +64,14 @@ public class RecipeConfigParser extends DefaultHandler {
     public static final String AT_EXP = "exp";
     public static final String AT_ALLOW_MISSING = "allowMissing";
 
+    /// The `modID` under which an `itemName` of the form `<material>:<shape>` names a MaterialLib stack.
+    private static final String MOD_ID_ML = "ml";
+
+    private static final String MATERIAL_LIB_MODID = "materiallib";
+
+    private static int materialLibResolved = 0;
+    private static int materialLibInvalid = 0;
+
     // Log prefix
     private static final String LP = "RecipeParser: ";
 
@@ -423,7 +432,11 @@ public class RecipeConfigParser extends DefaultHandler {
         String modId = getStringValue(AT_MOD_ID, attributes, null);
         String name = getStringValue(AT_ITEM_NAME, attributes, null);
 
-        if (modId != null && name != null) {
+        if (MOD_ID_ML.equals(modId)) {
+            res = getMaterialLibStack(name, stackSize);
+            // A MaterialLib stack carries its material in the metadata, so itemMeta="*" cannot apply.
+            useMeta = true;
+        } else if (modId != null && name != null) {
 
             Item i = GameRegistry.findItem(modId, name);
             if (i != null) {
@@ -447,6 +460,39 @@ public class RecipeConfigParser extends DefaultHandler {
                 getIntValue(AT_SLOT, attributes, -1));
     }
 
+    /// The stack `itemName` names, or null when MaterialLib is absent, the name is malformed, or the pair resolves
+    /// to nothing.
+    private static ItemStack getMaterialLibStack(String itemName, int stackSize) {
+        if (itemName == null || !Loader.isModLoaded(MATERIAL_LIB_MODID)) {
+            return null;
+        }
+        String[] parts = itemName.split(":", -1);
+        if (parts.length != 2 || parts[0].isEmpty() || parts[1].isEmpty()) {
+            Log.warn(LP + "Malformed MaterialLib reference \"" + itemName + "\", expected <material>:<shape>");
+            materialLibInvalid++;
+            return null;
+        }
+        ItemStack res = MaterialLibStacks.getStack(parts[0], parts[1], stackSize);
+        if (res == null) {
+            materialLibInvalid++;
+        } else {
+            materialLibResolved++;
+        }
+        return res;
+    }
+
+    /// Logs how many MaterialLib references the recipe configs named. Call once config loading has finished.
+    public static void logMaterialLibSummary() {
+        if (materialLibResolved + materialLibInvalid > 0) {
+            Log.info(
+                    LP + "Resolved "
+                            + materialLibResolved
+                            + " MaterialLib entries ("
+                            + materialLibInvalid
+                            + " invalid)");
+        }
+    }
+
     public static boolean getBooleanValue(String qName, Attributes attributes, boolean def) {
         String val = attributes.getValue(qName);
         if (val == null) {