diff --git a/dependencies.gradle b/dependencies.gradle index c56067be..4272dc5a 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -12,7 +12,6 @@ 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.9.0-mu:dev') antlr('org.antlr:antlr4:4.13.2') diff --git a/src/main/java/codechicken/nei/SubsetWidget.java b/src/main/java/codechicken/nei/SubsetWidget.java index e84da7aa..c5bed90a 100644 --- a/src/main/java/codechicken/nei/SubsetWidget.java +++ b/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; @@ -537,8 +538,8 @@ public class SubsetWidget extends Button implements ItemFilterProvider { return; } - final int[] resolved = new int[1]; - final int[] invalid = new int[1]; + final AtomicInteger resolved = new AtomicInteger(); + final AtomicInteger invalid = new AtomicInteger(); Stream.of(dir.listFiles()).filter(file -> !file.isDirectory()).forEach(file -> { ClientHandler.loadSettingsFile( @@ -546,13 +547,13 @@ public class SubsetWidget extends Button implements ItemFilterProvider { lines -> parseFile(file.getName(), lines.collect(Collectors.toList()), resolved, invalid)); }); - if (resolved[0] + invalid[0] > 0) { - NEIClientConfig.logger - .info("NotEnoughItems: resolved {} MaterialLib entries ({} invalid)", resolved[0], invalid[0]); + if (resolved.get() + invalid.get() > 0) { + NEIClientConfig.logger.info("Resolved {} MaterialLib entries ({} invalid)", resolved.get(), invalid.get()); } } - private static void parseFile(String resource, List itemStrings, int[] resolved, int[] invalid) { + private static void parseFile(String resource, List 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; @@ -585,11 +586,7 @@ public class SubsetWidget extends Button implements ItemFilterProvider { final ItemStack stack = StackInfo.loadFromNBT(tag); if (tag.getString("strId").startsWith(StackInfo.MATERIALLIB_PREFIX)) { - if (stack != null) { - resolved[0]++; - } else { - invalid[0]++; - } + (stack != null ? resolved : invalid).incrementAndGet(); } ((ItemStackSet) processedTag.filter).add(stack); diff --git a/src/main/java/codechicken/nei/recipe/StackInfo.java b/src/main/java/codechicken/nei/recipe/StackInfo.java index 79159b63..eb4d0c71 100644 --- a/src/main/java/codechicken/nei/recipe/StackInfo.java +++ b/src/main/java/codechicken/nei/recipe/StackInfo.java @@ -27,8 +27,8 @@ import codechicken.nei.util.NBTHelper; public class StackInfo { - /// Prefix of the stable MaterialLib reference form `ml::`, which config entries carry - /// in place of an id and metadata. + /// Prefix of the MaterialLib reference form `ml::`, 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); diff --git a/src/main/java/codechicken/nei/recipe/stackinfo/MaterialLibStackStringifyHandler.java b/src/main/java/codechicken/nei/recipe/stackinfo/MaterialLibStackStringifyHandler.java index 469d3427..7994b0ad 100644 --- a/src/main/java/codechicken/nei/recipe/stackinfo/MaterialLibStackStringifyHandler.java +++ b/src/main/java/codechicken/nei/recipe/stackinfo/MaterialLibStackStringifyHandler.java @@ -8,15 +8,13 @@ import com.ruling_0.materiallib.api.StackResolver; import codechicken.nei.api.IStackStringifyHandler; import codechicken.nei.recipe.StackInfo; -/// Reads config entries written in the stable MaterialLib reference form -/// `ml::` (see [StackInfo#MATERIALLIB_PREFIX]) and resolves them against the registries, -/// so an entry keeps naming the same item across sessions that hand out different metadata. +/// Resolves config entries written in the MaterialLib reference form `ml::` (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. /// -/// The resolved stack carries the metadata MaterialLib currently assigns, overriding any `Damage` the entry -/// carries alongside the id. -/// -/// This is the only class in NotEnoughItems that references the MaterialLib API, and every reference to it is -/// gated on `Loader.isModLoaded("materiallib")` so it never classloads without MaterialLib present. +/// Registered only behind a `Loader.isModLoaded("materiallib")` gate, so this class never classloads without +/// MaterialLib present. public class MaterialLibStackStringifyHandler implements IStackStringifyHandler { @Override