fix: #294

Author: MichaelHillcox

.github/workflows/release.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 17
+      - name: Set up JDK
         uses: actions/setup-java@v2
         with:
           java-version: '21'

CHANGELOG.md

@@ -1,5 +1,5 @@
-## [86.0.0]
+## [21.0.1]
 
-### Changed
+### Fixed
 
-- Updated to 1.20.6 for NeoForge
+- Crashing when certain mods cause block names to comeback as null

build.gradle

@@ -133,7 +133,3 @@ sourceSets.each {
     it.output.resourcesDir = dir
     it.java.destinationDirectory = dir
 }
-
-tasks.register("idePostSync") {
-
-}

gradle.properties

@@ -8,7 +8,7 @@ neogradle.subsystems.parchment.mappingsVersion=2024.06.02
 
 
 mod_id=xray
-mod_version=21.0.0
+mod_version=21.0.1
 minecraft_version=1.21
 minecraft_version_range=[%base],1.21.1
 

src/main/java/pro/mikey/xray/Utils.java

@@ -1,6 +1,9 @@
 package pro.mikey.xray;
 
+import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.ItemStack;
+import org.jetbrains.annotations.Nullable;
 
 public class Utils {
     public static ResourceLocation rl(String path) {
@@ -10,4 +13,22 @@ public static ResourceLocation rl(String path) {
     public static ResourceLocation rlFull(String namespaceAndPath) {
         return ResourceLocation.tryParse(namespaceAndPath);
     }
+
+    public static Component safeItemStackName(ItemStack stack) {
+        try {
+            @Nullable var hoverName = stack.getHoverName();
+            if (hoverName != null) {
+                return hoverName;
+            }
+
+            var displayName = stack.getDisplayName();
+            if (displayName != null) {
+                return displayName;
+            }
+
+            return Component.translatable(stack.getDescriptionId());
+        } catch (Exception e) {
+            return Component.literal("Unknown...");
+        }
+    }
 }

src/main/java/pro/mikey/xray/gui/GuiSelectionScreen.java

@@ -97,7 +97,7 @@ public void init() {
 
             // Check if the hand item is a block or not
             if (!(handItem.getItem() instanceof BlockItem)) {
-                getMinecraft().player.displayClientMessage(Component.literal("[XRay] " + I18n.get("xray.message.invalid_hand", handItem.getHoverName().getString())), false);
+                getMinecraft().player.displayClientMessage(Component.literal("[XRay] " + I18n.get("xray.message.invalid_hand", Utils.safeItemStackName(handItem).getString())), false);
                 return;
             }
 

src/main/java/pro/mikey/xray/gui/manage/BlockListScreen.java

@@ -10,6 +10,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import pro.mikey.xray.ClientController;
+import pro.mikey.xray.Utils;
 import pro.mikey.xray.gui.GuiSelectionScreen;
 import pro.mikey.xray.gui.utils.GuiBase;
 import pro.mikey.xray.store.GameBlockStore;
@@ -62,10 +63,10 @@ private void reloadBlocks() {
             return;
 
         this.blockList.updateEntries(
-                search.getValue().length() == 0
+                search.getValue().isEmpty()
                         ? this.blocks
                         : this.blocks.stream()
-                        .filter(e -> e.getItemStack().getHoverName().getString().toLowerCase().contains(search.getValue().toLowerCase()))
+                        .filter(e -> Utils.safeItemStackName(e.getItemStack()).getString().toLowerCase().contains(search.getValue().toLowerCase()))
                         .collect(Collectors.toList())
         );
 

src/main/java/pro/mikey/xray/gui/manage/GuiEdit.java

@@ -8,6 +8,7 @@
 import net.neoforged.neoforge.client.gui.widget.ExtendedSlider;
 import org.apache.commons.lang3.tuple.Pair;
 import pro.mikey.xray.ClientController;
+import pro.mikey.xray.Utils;
 import pro.mikey.xray.gui.GuiSelectionScreen;
 import pro.mikey.xray.gui.utils.GuiBase;
 import pro.mikey.xray.utils.BlockData;
@@ -89,7 +90,7 @@ public void tick() {
 
     @Override
     public void renderExtra(GuiGraphics graphics, int x, int y, float partialTicks) {
-        graphics.drawString(font, this.block.getItemStack().getHoverName().getString(), getWidth() / 2 - 138, getHeight() / 2 - 90, 0xffffff);
+        graphics.drawString(font, Utils.safeItemStackName(this.block.getItemStack()).getString(), getWidth() / 2 - 138, getHeight() / 2 - 90, 0xffffff);
 
         oreName.render(graphics, x, y, partialTicks);