Fix crash

Author: Tomate0613

src/main/java/net/modfest/scatteredshards/command/ItemCommand.java

@@ -11,15 +11,21 @@
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import net.modfest.scatteredshards.ScatteredShards;
+import net.modfest.scatteredshards.api.ScatteredShardsAPI;
+import net.modfest.scatteredshards.api.ShardLibrary;
+import net.modfest.scatteredshards.api.shard.Shard;
 import net.modfest.scatteredshards.item.ShardItem;
 
 public class ItemCommand {
 
 	public static int item(CommandContext<ServerCommandSource> ctx) throws CommandSyntaxException {
 		ServerPlayerEntity player = ctx.getSource().getPlayerOrThrow();
 		Identifier shardId = ctx.getArgument("shard_id", Identifier.class);
+		ShardLibrary library = ScatteredShardsAPI.getServerLibrary();
 
-		ItemStack stack = ShardItem.createShardItem(shardId);
+		var name = library.shards().get(shardId).map(Shard::name).orElse(null);
+
+		ItemStack stack = ShardItem.createShardItem(shardId, name);
 
 		player.getInventory().offerOrDrop(stack);
 

src/main/java/net/modfest/scatteredshards/item/ShardItem.java

@@ -1,17 +1,15 @@
 package net.modfest.scatteredshards.item;
 
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.tooltip.TooltipType;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
-import net.minecraft.util.Hand;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.TypedActionResult;
 import net.minecraft.world.World;
 import net.modfest.scatteredshards.ScatteredShardsContent;
 import net.modfest.scatteredshards.api.ScatteredShardsAPI;
@@ -33,9 +31,10 @@ public ShardItem(Settings settings) {
 	 *
 	 * @return the shard item
 	 */
-	public static ItemStack createShardItem(Identifier shardId) {
+	public static ItemStack createShardItem(Identifier shardId, Text name) {
 		ItemStack stack = new ItemStack(ScatteredShardsContent.SHARD_ITEM);
 		stack.set(ScatteredShardsContent.SHARD_ID_COMPONENT, shardId);
+		stack.set(DataComponentTypes.ITEM_NAME, name);
 
 		return stack;
 	}
@@ -76,22 +75,4 @@ public void appendTooltip(ItemStack stack, TooltipContext context, List<Text> to
 		tooltip.add(shardTypeDesc);
 		tooltip.add(Text.translatable("item.scattered_shards.shard_item.description").formatted(Formatting.GRAY));
 	}
-
-	@Override
-	public Text getName(ItemStack stack) {
-		Identifier id = stack.get(ScatteredShardsContent.SHARD_ID_COMPONENT);
-
-		if (id == null) {
-			return getName();
-		}
-
-		ShardLibrary library = ScatteredShardsAPI.getClientLibrary();
-		Optional<Shard> shard = library.shards().get(id);
-
-		if (shard.isEmpty()) {
-			return getName();
-		}
-
-		return shard.get().name();
-	}
 }