add null check to ToolTier#get

closes #249 (cherry picked from commit 71c3966)
badasintended · Feb 15, 2024 · 430a033 · 430a033
1 parent 198f00e
commit 430a033
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/pluginHarvest/java/mcp/mobius/waila/plugin/harvest/provider/HarvestProvider.java b/src/pluginHarvest/java/mcp/mobius/waila/plugin/harvest/provider/HarvestProvider.java
@@ -151,7 +151,7 @@ public void onHandleTooltip(ITooltip tooltip, ICommonAccessor accessor, IPluginC
                     matches = tool.itemPredicate.test(heldStack);
                     if (highestTier != ToolTier.NONE && heldStack.getItem() instanceof TieredItem tiered) {
                         var heldTier = ToolTier.get(tiered.getTier());
-                        matches = matches && heldTier.isBetterThanOrEqualTo(highestTier);
+                        matches = matches && heldTier != null && heldTier.isBetterThanOrEqualTo(highestTier);
                     }
                 }
                 component = new ToolComponent(icon, matches);
@@ -201,7 +201,7 @@ private static MutableComponent getTierText(ToolTier highestTier, ItemStack held
             : Component.literal(String.valueOf(highestTier.index));
         if (heldStack.getItem() instanceof TieredItem tiered) {
             var heldTier = ToolTier.get(tiered.getTier());
-            tierText.withStyle(heldTier.isBetterThanOrEqualTo(highestTier) ? ChatFormatting.GREEN : ChatFormatting.RED);
+            tierText.withStyle(heldTier != null && heldTier.isBetterThanOrEqualTo(highestTier) ? ChatFormatting.GREEN : ChatFormatting.RED);
         } else {
             tierText.withStyle(ChatFormatting.RED);
         }

diff --git a/src/pluginHarvest/java/mcp/mobius/waila/plugin/harvest/tool/ToolTier.java b/src/pluginHarvest/java/mcp/mobius/waila/plugin/harvest/tool/ToolTier.java
@@ -71,6 +71,7 @@ public static Collection<ToolTier> all() {
         return TIERS.get().values();
     }
 
+    @Nullable
     public static ToolTier get(Tier tier) {
         return TIERS.get().get(tier);
     }