Fix guide item crash when no ID is attached (#29)

Author: shartte

docs/docs/changelog.md

@@ -1,6 +1,10 @@
 
 # Changelog
 
+## 2.3.1
+
+- Fixes a crash with the generic guide item if it has no guide id attached
+
 ## 2.3.0
 
 - GuideME is now published on Maven Central instead of Modmaven

src/main/java/guideme/internal/item/GuideItem.java

@@ -13,6 +13,7 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.level.Level;
+import org.jetbrains.annotations.Nullable;
 
 public class GuideItem extends Item {
     public static final ResourceLocation ID = GuideME.makeId("guide");
@@ -26,30 +27,34 @@ public GuideItem(Properties properties) {
 
     @Override
     public Component getName(ItemStack stack) {
-        var guideId = stack.get(GuideME.GUIDE_ID_COMPONENT);
-        var name = GuideMEProxy.instance().getGuideDisplayName(guideId);
-        if (name != null) {
-            return name;
+        var guideId = getGuideId(stack);
+        if (guideId != null) {
+            var name = GuideMEProxy.instance().getGuideDisplayName(guideId);
+            if (name != null) {
+                return name;
+            }
         }
         return super.getName(stack);
     }
 
     @Override
     public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> lines,
             TooltipFlag tooltipFlag) {
-        var guideId = stack.get(GuideME.GUIDE_ID_COMPONENT);
-        GuideMEProxy.instance().addGuideTooltip(
-                guideId,
-                context,
-                lines,
-                tooltipFlag);
+        var guideId = getGuideId(stack);
+        if (guideId != null) {
+            GuideMEProxy.instance().addGuideTooltip(
+                    guideId,
+                    context,
+                    lines,
+                    tooltipFlag);
+        }
     }
 
     @Override
     public InteractionResultHolder<ItemStack> use(Level level, Player player, InteractionHand hand) {
         var stack = player.getItemInHand(hand);
 
-        var guideId = player.getItemInHand(hand).get(GuideME.GUIDE_ID_COMPONENT);
+        var guideId = getGuideId(player.getItemInHand(hand));
 
         if (level.isClientSide) {
             if (guideId == null) {
@@ -61,4 +66,9 @@ public InteractionResultHolder<ItemStack> use(Level level, Player player, Intera
 
         return InteractionResultHolder.success(stack);
     }
+
+    @Nullable
+    public static ResourceLocation getGuideId(ItemStack stack) {
+        return stack.get(GuideME.GUIDE_ID_COMPONENT);
+    }
 }

src/main/java/guideme/internal/item/GuideItemDispatchUnbakedModel.java

@@ -2,7 +2,6 @@
 
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
-import guideme.internal.GuideME;
 import guideme.internal.GuideRegistry;
 import java.util.function.Function;
 import net.minecraft.client.multiplayer.ClientLevel;
@@ -43,7 +42,7 @@ public BakedModel load(ResourceLocation modelId) {
             @Override
             public @Nullable BakedModel resolve(BakedModel model, ItemStack stack, @Nullable ClientLevel level,
                     @Nullable LivingEntity entity, int seed) {
-                var guideId = stack.get(GuideME.GUIDE_ID_COMPONENT);
+                var guideId = GuideItem.getGuideId(stack);
                 if (guideId != null) {
                     var guide = GuideRegistry.getById(guideId);
                     if (guide != null && guide.getItemSettings().itemModel().isPresent()) {