Merge remote-tracking branch 'origin/master' into mu

dependencies.gradle

@@ -12,6 +12,7 @@ dependencies {
 
     compileOnly('maven.modrinth:forge-essentials:7.5.1')
     compileOnly('com.cardinalstar.cubicchunks:CubicChunks1710:v0.1.14-alpha:dev')
+    compileOnly('com.ruling_0:MaterialLib:0.24.0-mu:dev')
 
     antlr('org.antlr:antlr4:4.13.2')
     shadowImplementation('org.antlr:antlr4-runtime:4.13.2')

repositories.gradle

@@ -1,6 +1,7 @@
 // Add any additional repositories for your dependencies here
 
 repositories {
+    mavenLocal()
     maven {
         name = "Modrinth"
         url = "https://api.modrinth.com/maven"

src/main/java/codechicken/nei/NEIModContainer.java

@@ -14,11 +14,13 @@ import com.google.common.eventbus.Subscribe;
 
 import codechicken.core.CommonUtils;
 import codechicken.core.launch.CodeChickenCorePlugin;
+import codechicken.nei.api.API;
 import codechicken.nei.api.IConfigureNEI;
 import codechicken.nei.asm.NEICorePlugin;
 import codechicken.nei.config.IMCHandler;
 import codechicken.nei.guihook.HideousLinkedList;
 import codechicken.nei.recipe.GuiRecipeTab;
+import codechicken.nei.recipe.stackinfo.MaterialLibStackStringifyHandler;
 import cpw.mods.fml.client.FMLFileResourcePack;
 import cpw.mods.fml.client.FMLFolderResourcePack;
 import cpw.mods.fml.common.DummyModContainer;
@@ -114,6 +116,10 @@ public class NEIModContainer extends DummyModContainer {
             IMCForNEI.IMCSender();
         }
         ServerHandler.load();
+
+        if (Loader.isModLoaded("materiallib")) {
+            API.registerStackStringifyHandler(new MaterialLibStackStringifyHandler());
+        }
     }
 
     @Subscribe

src/main/java/codechicken/nei/SubsetWidget.java

@@ -9,6 +9,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -541,14 +542,22 @@ public class SubsetWidget extends Button implements ItemFilterProvider {
             return;
         }
 
+        final AtomicInteger resolved = new AtomicInteger();
+        final AtomicInteger invalid = new AtomicInteger();
+
         Stream.of(dir.listFiles()).filter(file -> !file.isDirectory()).forEach(file -> {
             ClientHandler.loadSettingsFile(
                     "subsets/" + file.getName(),
-                    lines -> parseFile(file.getName(), lines.collect(Collectors.toList())));
+                    lines -> parseFile(file.getName(), lines.collect(Collectors.toList()), resolved, invalid));
         });
+
+        if (resolved.get() + invalid.get() > 0) {
+            NEIClientConfig.logger.info("Resolved {} MaterialLib entries ({} invalid)", resolved.get(), invalid.get());
+        }
     }
 
-    private static void parseFile(String resource, List<String> itemStrings) {
+    private static void parseFile(String resource, List<String> itemStrings, AtomicInteger resolved,
+            AtomicInteger invalid) {
         final JsonParser parser = new JsonParser();
         final int dotIndex = resource.lastIndexOf('.');
         final String subsetNamespace = dotIndex > 0 ? resource.substring(0, dotIndex) : resource;
@@ -578,7 +587,13 @@ public class SubsetWidget extends Button implements ItemFilterProvider {
                     final NBTBase nbt = NBTJson.toNbt(parser.parse(itemStr));
 
                     if (nbt instanceof NBTTagCompound tag) {
-                        ((ItemStackSet) processedTag.filter).add(StackInfo.loadFromNBT(tag));
+                        final ItemStack stack = StackInfo.loadFromNBT(tag);
+
+                        if (tag.getString("strId").startsWith(StackInfo.MATERIALLIB_PREFIX)) {
+                            (stack != null ? resolved : invalid).incrementAndGet();
+                        }
+
+                        ((ItemStackSet) processedTag.filter).add(stack);
                     } else {
                         throw new IllegalArgumentException(
                                 "Expected NBTTagCompound but got " + nbt.getClass().getSimpleName());

src/main/java/codechicken/nei/recipe/StackInfo.java

@@ -28,6 +28,10 @@ import codechicken.nei.util.NBTHelper;
 
 public class StackInfo {
 
+    /// Prefix of the MaterialLib reference form `ml:<MaterialName>:<shapeToken>`, which config entries carry in
+    /// place of an id and metadata.
+    public static final String MATERIALLIB_PREFIX = "ml:";
+
     private static final FluidStack NULL_FLUID = new FluidStack(FluidRegistry.WATER, 0);
     public static final List<IStackStringifyHandler> stackStringifyHandlers = new ArrayList<>();
     private static final Map<String, HashMap<String, String[]>> guidfilters = new HashMap<>();

src/main/java/codechicken/nei/recipe/stackinfo/MaterialLibStackStringifyHandler.java

@@ -0,0 +1,43 @@
+package codechicken.nei.recipe.stackinfo;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
+import com.ruling_0.materiallib.api.StackResolver;
+
+import codechicken.nei.api.IStackStringifyHandler;
+import codechicken.nei.recipe.StackInfo;
+
+/// Resolves config entries written in the MaterialLib reference form `ml:<MaterialName>:<shapeToken>` (see
+/// [StackInfo#MATERIALLIB_PREFIX]) through [StackResolver], so an entry keeps naming the same item across sessions
+/// that renumber item metadata. The resolved stack carries the metadata MaterialLib currently assigns, ignoring any
+/// `Damage` on the entry. Entries in any other form are left to the other handlers.
+///
+/// Registered only behind a `Loader.isModLoaded("materiallib")` gate, so this class never classloads without
+/// MaterialLib present.
+public class MaterialLibStackStringifyHandler implements IStackStringifyHandler {
+
+    @Override
+    public ItemStack convertNBTToItemStack(NBTTagCompound nbtTag) {
+        final String strId = nbtTag.getString("strId");
+
+        if (!strId.startsWith(StackInfo.MATERIALLIB_PREFIX)) {
+            return null;
+        }
+
+        final String[] parts = strId.split(":");
+
+        if (parts.length != 3) {
+            return null;
+        }
+
+        final ItemStack stack = StackResolver.getStack(parts[1], parts[2], nbtTag.getInteger("Count"));
+
+        if (stack != null && nbtTag.hasKey("tag")) {
+            stack.setTagCompound((NBTTagCompound) nbtTag.getCompoundTag("tag").copy());
+        }
+
+        return stack;
+    }
+
+}