log tool material origin if solving tier failed

Author: deirn

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

@@ -161,7 +161,8 @@ public List<Tier> getTiers() {
 
                 //noinspection ConstantValue
                 if (tier.getIncorrectBlocksForDrops() == null) {
-                    LOG.warn("Found tier of class [{}] with null inverse tag, skipping", tier.getClass().getName());
+                    LOG.warn("Found tier created on class [{}] with null inverse tag, skipping",
+                        MixinService.TIERS.getOrDefault(tier, tier.getClass()).getName());
                     continue;
                 }
 
@@ -201,25 +202,28 @@ public List<Tier> 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.TIERS.getOrDefault(tier1, tier1.getClass()).getName(), blocks1str,
+                    tag2.location(), MixinService.TIERS.getOrDefault(tier2, tier2.getClass()).getName(), blocks2str);
                 return 0;
             }).toList();
     }
 
     public static String concatBlocks(HolderSet<Block> set) {
-       return String.join("\n\t", set.stream()
-           .map(it -> it
-               .unwrapKey()
-               .orElseThrow()
-               .location()
-               .toString())
-           .sorted()
-           .toList());
+        return String.join("\n\t", set.stream()
+            .map(it -> it
+                .unwrapKey()
+                .orElseThrow()
+                .location()
+                .toString())
+            .sorted()
+            .toList());
     }
 
     @Override

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

@@ -1,5 +1,8 @@
 package mcp.mobius.waila.service;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 import mcp.mobius.waila.WailaClient;
 import mcp.mobius.waila.config.JsonConfig;
 import mcp.mobius.waila.config.PluginConfig;
@@ -9,9 +12,12 @@
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.core.RegistryAccess;
+import net.minecraft.world.item.Tier;
 
 public class MixinService implements IMixinService {
 
+    public static final Map<Tier, Class<?>> TIERS = new LinkedHashMap<>();
+
     @Override
     public void attachRegistryFilter(RegistryAccess registryAccess) {
         RegistryFilter.attach(registryAccess);
@@ -27,6 +33,11 @@ public void onGuiRender(GuiGraphics ctx, DeltaTracker delta) {
         TooltipRenderer.render(ctx, delta);
     }
 
+    @Override
+    public void addTierInstance(Tier tier, Class<?> caller) {
+        TIERS.put(tier, caller);
+    }
+
     @Override
     public void onLanguageReloaded() {
         JsonConfig.reloadAllInstances();

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

@@ -4,6 +4,7 @@
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.core.RegistryAccess;
+import net.minecraft.world.item.Tier;
 
 public interface IMixinService {
 
@@ -15,6 +16,8 @@ public interface IMixinService {
 
     void onGuiRender(GuiGraphics ctx, DeltaTracker delta);
 
+    void addTierInstance(Tier tier, Class<?> caller);
+
     void onLanguageReloaded();
 
 }

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

@@ -0,0 +1,29 @@
+package mcp.mobius.waila.mixin;
+
+import mcp.mobius.waila.mixed.IMixinService;
+import net.minecraft.world.item.Tier;
+import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
+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;
+
+@Pseudo
+@Mixin(targets = {
+    "net.neoforged.neoforge.common.SimpleTier",
+    "net.minecraftforge.common.ForgeTier",
+})
+public class SimpleTierMixin {
+
+    @Unique
+    private static @Nullable StackWalker wthit_stackWalker;
+
+    @Inject(method = "<init>", at = @At("TAIL"))
+    private void wthit_init(CallbackInfo ci) {
+        if (wthit_stackWalker == null) wthit_stackWalker = StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE);
+        IMixinService.INSTANCE.addTierInstance((Tier) this, wthit_stackWalker.getCallerClass());
+    }
+
+}

src/resources/resources/wthit.mixins.json

@@ -17,7 +17,8 @@
     "LecternBlockEntityAccess",
     "NoteBlockAccess",
     "ReloadableServerResourcesMixin",
-    "ShearableBlocksMixin"
+    "ShearableBlocksMixin",
+    "SimpleTierMixin"
   ],
   "client"            : [
     "BossHealthOverlayAccess",