log tool material origin if solving tier failed

Author: deirn

src/main/java/mcp/mobius/waila/service/ApiService.java

@@ -152,11 +152,11 @@ public <T> IInstanceRegistry<T> createInstanceRegistry(boolean reversed) {
 
     @Override
     public List<ToolMaterial> getTiers() {
-        return MixinService.TOOL_MATERIALS.stream()
+        return MixinService.TOOL_MATERIALS.keySet().stream()
             .filter(it -> {
                 //noinspection ConstantValue
                 if (it.incorrectBlocksForDrops() == null) {
-                    LOG.warn("Found tier of class [{}] with null inverse tag, skipping", it.getClass().getName());
+                    LOG.warn("Found tier created on class [{}] with null inverse tag, skipping", MixinService.TOOL_MATERIALS.get(it).getName());
                     return false;
                 }
                 return true;
@@ -191,12 +191,15 @@ public List<ToolMaterial> getTiers() {
                         The comparison is based on the assumption that lower tier's incorrect block tag contains all entries from higher tier's tag.
                         This was fine for Vanilla, but might be not match modded behavior.
                         Please open an issue at {}
-                        Tag [{}] contains:
+                        Tag [{}] created on class [{}] contains:
                         \t[{}]
-                        Tag [{}] contains:
+                        Tag [{}] created on class [{}] contains:
                         \t[{}]
                         """,
-                    tag1.location(), tag2.location(), Waila.ISSUE_URL, tag1.location(), blocks1str, tag2.location(), blocks2str);
+                    tag1.location(), tag2.location(),
+                    Waila.ISSUE_URL,
+                    tag1.location(), MixinService.TOOL_MATERIALS.get(tier1).getName(), blocks1str,
+                    tag2.location(), MixinService.TOOL_MATERIALS.get(tier2).getName(), blocks2str);
                 return 0;
             }).toList();
     }

src/main/java/mcp/mobius/waila/service/MixinService.java

@@ -1,7 +1,7 @@
 package mcp.mobius.waila.service;
 
-import java.util.LinkedHashSet;
-import java.util.Set;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 import mcp.mobius.waila.WailaClient;
 import mcp.mobius.waila.config.JsonConfig;
@@ -13,7 +13,7 @@
 
 public class MixinService implements IMixinService {
 
-    public static final Set<ToolMaterial> TOOL_MATERIALS = new LinkedHashSet<>();
+    public static final Map<ToolMaterial, Class<?>> TOOL_MATERIALS = new LinkedHashMap<>();
 
     @Override
     public void attachRegistryFilter(RegistryAccess registryAccess) {
@@ -26,8 +26,8 @@ public void onServerLogin() {
     }
 
     @Override
-    public void addToolMaterialInstance(ToolMaterial material) {
-        TOOL_MATERIALS.add(material);
+    public void addToolMaterialInstance(ToolMaterial material, Class<?> caller) {
+        TOOL_MATERIALS.put(material, caller);
     }
 
     @Override

src/mixin/java/mcp/mobius/waila/mixed/IMixinService.java

@@ -12,7 +12,7 @@ public interface IMixinService {
 
     void onServerLogin();
 
-    void addToolMaterialInstance(ToolMaterial material);
+    void addToolMaterialInstance(ToolMaterial material, Class<?> caller);
 
     void onLanguageReloaded();
 

src/mixin/java/mcp/mobius/waila/mixin/ToolMaterialMixin.java

@@ -2,17 +2,23 @@
 
 import mcp.mobius.waila.mixed.IMixinService;
 import net.minecraft.world.item.ToolMaterial;
+import org.jspecify.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ToolMaterial.class)
 public class ToolMaterialMixin {
 
+    @Unique
+    private static @Nullable StackWalker wthit_stackWalker;
+
     @Inject(method = "<init>", at = @At("TAIL"))
     private void wthit_init(CallbackInfo ci) {
-        IMixinService.INSTANCE.addToolMaterialInstance((ToolMaterial) (Object) this);
+        if (wthit_stackWalker == null) wthit_stackWalker = StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE);
+        IMixinService.INSTANCE.addToolMaterialInstance((ToolMaterial) (Object) this, wthit_stackWalker.getCallerClass());
     }
 
 }