1 files changed, 9 insertions, 12 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomItemNames.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomItemNames.java
index 4ecff508..5d410947 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomItemNames.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomItemNames.java
@@ -2,14 +2,12 @@ package me.xmrvizzy.skyblocker.skyblock.item;
 
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
-
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 import me.xmrvizzy.skyblocker.utils.Utils;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
-import net.minecraft.client.MinecraftClient;
 import net.minecraft.command.CommandRegistryAccess;
 import net.minecraft.command.argument.TextArgumentType;
 import net.minecraft.item.ItemStack;
@@ -17,11 +15,10 @@ import net.minecraft.nbt.NbtCompound;
 import net.minecraft.text.Text;
 
 public class CustomItemNames {
-
 	public static void init() {
 		ClientCommandRegistrationCallback.EVENT.register(CustomItemNames::registerCommands);
 	}
-	
+
 	private static void registerCommands(CommandDispatcher<FabricClientCommandSource> dispatcher, CommandRegistryAccess registryAccess) {
 		dispatcher.register(ClientCommandManager.literal("skyblocker")
 				.then(ClientCommandManager.literal("renameItem")
@@ -29,19 +26,19 @@ public class CustomItemNames {
 						.then(ClientCommandManager.argument("textComponent", TextArgumentType.text())
 								.executes(context -> renameItem(context.getSource(), context.getArgument("textComponent", Text.class))))));
 	}
-	
+
+	@SuppressWarnings("SameReturnValue")
 	private static int renameItem(FabricClientCommandSource source, Text text) {
-		MinecraftClient client = source.getClient();
-		ItemStack heldItem = client.player.getMainHandStack();
+		ItemStack heldItem = source.getPlayer().getMainHandStack();
 		NbtCompound nbt = (heldItem != null) ? heldItem.getNbt() : null;
-		
+
 		if (Utils.isOnSkyblock() && nbt != null && nbt.contains("ExtraAttributes")) {
 			NbtCompound extraAttributes = nbt.getCompound("ExtraAttributes");
-			String itemUuid =  extraAttributes.contains("uuid") ? extraAttributes.getString("uuid") : null;
-			
+			String itemUuid = extraAttributes.contains("uuid") ? extraAttributes.getString("uuid") : null;
+
 			if (itemUuid != null) {
 				Object2ObjectOpenHashMap<String, Text> customItemNames = SkyblockerConfig.get().general.customItemNames;
-				
+
 				if (text == null) {
 					if (customItemNames.containsKey(itemUuid)) {
 						//Remove custom item name when the text argument isn't passed
@@ -63,7 +60,7 @@ public class CustomItemNames {
 		} else {
 			source.sendError(Text.translatable("skyblocker.customItemNames.unableToSetName"));
 		}
-		
+
 		return Command.SINGLE_SUCCESS;
 	}
 }