From 430a033e70fc6eed89a837bb26cb086f0a1dfd19 Mon Sep 17 00:00:00 2001 From: deirn Date: Thu, 15 Feb 2024 08:09:21 +0700 Subject: [PATCH] add null check to `ToolTier#get` closes #249 (cherry picked from commit 71c3966f3adc8450a6653ed1f2a8e26d62e255d0) --- .../mobius/waila/plugin/harvest/provider/HarvestProvider.java | 4 ++-- .../java/mcp/mobius/waila/plugin/harvest/tool/ToolTier.java | 1 + 2 files changed, 3 insertions(+), 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 index 706a8ffd1..699171d2c 100644 --- 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 index 1c6aa419f..442e90180 100644 --- 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 all() { return TIERS.get().values(); } + @Nullable public static ToolTier get(Tier tier) { return TIERS.get().get(tier); }