Fix Barrier Placeholders (#1949)

Author: Alex33856

src/main/java/de/hysky/skyblocker/skyblock/ItemPickupWidget.java

@@ -9,6 +9,7 @@
 import de.hysky.skyblocker.skyblock.tabhud.widget.ComponentBasedWidget;
 import de.hysky.skyblocker.skyblock.tabhud.widget.component.SeparatorComponent;
 import de.hysky.skyblocker.utils.Formatters;
+import de.hysky.skyblocker.utils.ItemUtils;
 import de.hysky.skyblocker.utils.Location;
 import de.hysky.skyblocker.utils.NEURepoManager;
 import de.hysky.skyblocker.utils.scheduler.Scheduler;
@@ -22,6 +23,8 @@
 import net.minecraft.network.chat.HoverEvent;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
+import org.jspecify.annotations.Nullable;
+
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -61,13 +64,13 @@ public static ItemPickupWidget getInstance() {
 	 * Searches the NEU REPO for the item linked to the name
 	 */
 	private static ItemStack getItem(String itemName) {
-		if (NEURepoManager.isLoading() || !ItemRepository.filesImported()) return new ItemStack(Items.BARRIER);
+		if (NEURepoManager.isLoading() || !ItemRepository.filesImported()) return ItemUtils.getNamedPlaceholder(itemName);
 		return NEURepoManager.getItemByName(itemName)
 				.stream()
 				.findFirst()
 				.map(NEUItem::getSkyblockItemId)
 				.map(ItemRepository::getItemStack)
-				.orElseGet(() -> new ItemStack(Items.BARRIER));
+				.orElseGet(() -> ItemUtils.getNamedPlaceholder(itemName));
 	}
 
 	/**
@@ -190,7 +193,7 @@ public void updateContent() {
 	 * @param entry ChangeData to check
 	 * @return formatted name from ChangeData
 	 */
-	private String checkNextItem(ChangeData entry) {
+	private @Nullable String checkNextItem(ChangeData entry) {
 		//check the item has not expired
 		if (entry.lastChange + SkyblockerConfigManager.get().uiAndVisuals.itemPickup.lifeTime * 1000L < System.currentTimeMillis()) {
 			return null;

src/main/java/de/hysky/skyblocker/skyblock/garden/visitor/VisitorHelper.java

@@ -41,7 +41,6 @@
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
 
 public class VisitorHelper extends AbstractWidget {
 	private static final Set<Visitor> activeVisitors = new HashSet<>();
@@ -56,7 +55,6 @@ public class VisitorHelper extends AbstractWidget {
 	private static final int ICON_SIZE = 16;
 	private static final int LINE_HEIGHT = 3;
 	private static final int PADDING = 4;
-	private static final ItemStack BARRIER = new ItemStack(Items.BARRIER);
 	private static final Object2LongMap<Component> copiedTimestamps = new Object2LongOpenHashMap<>();
 
 	// Used to prevent adding the visitor again after the player clicks accept or refuse.
@@ -154,14 +152,14 @@ private static void updateItems() {
 	private static ItemStack getCachedItem(String itemName) {
 		String cleanName = ChatFormatting.stripFormatting(itemName);
 		return cachedItems.computeIfAbsent(cleanName, name -> {
-			if (NEURepoManager.isLoading() || !ItemRepository.filesImported()) return null;
+			if (NEURepoManager.isLoading() || !ItemRepository.filesImported()) return ItemUtils.getNamedPlaceholder(itemName);
 
 			return NEURepoManager.getItemByName(itemName)
 					.stream()
 					.findFirst()
 					.map(NEUItem::getSkyblockItemId)
 					.map(ItemRepository::getItemStack)
-					.orElse(BARRIER);
+					.orElseGet(() -> ItemUtils.getNamedPlaceholder(itemName));
 		});
 	}
 
@@ -204,15 +202,13 @@ public void renderWidget(GuiGraphics context, int mouseX, int mouseY, float delt
 			int yPosition = y + index * (LINE_HEIGHT + textRenderer.lineHeight);
 
 			ItemStack cachedStack = getCachedItem(itemName.getString());
-			if (cachedStack != null) {
-				context.pose().pushMatrix();
-				context.pose().translate(iconX, yPosition + (float) textRenderer.lineHeight / 2 - ICON_SIZE * 0.95f / 2);
-				context.pose().scale(0.95f, 0.95f);
-				context.renderItem(cachedStack, 0, 0);
-				context.pose().popMatrix();
-			}
+			context.pose().pushMatrix();
+			context.pose().translate(iconX, yPosition + (float) textRenderer.lineHeight / 2 - ICON_SIZE * 0.95f / 2);
+			context.pose().scale(0.95f, 0.95f);
+			context.renderItem(cachedStack, 0, 0);
+			context.pose().popMatrix();
 
-			MutableComponent name = cachedStack != null ? cachedStack.getHoverName().copy() : itemName.copy();
+			MutableComponent name = cachedStack.getHoverName().copy();
 			MutableComponent itemText = SkyblockerConfigManager.get().farming.visitorHelper.showStacksInVisitorHelper && totalAmount >= 64
 					? name.append(" x" + (totalAmount / 64) + " stacks + " + (totalAmount % 64))
 					: name.append(" x" + totalAmount);

src/main/java/de/hysky/skyblocker/utils/ItemUtils.java

@@ -635,4 +635,13 @@ public static SkyblockItemRarity getItemRarity(ItemStack stack) {
 			return info.item().isPresent() && info.item().get().equals("PET_ITEM_TIER_BOOST") ? info.rarity().next() : info.rarity();
 		}
 	}
+
+	/**
+	 * Gets a placeholder Barrier {@link ItemStack}, used to display items that could not be found in the item repository.
+	 */
+	public static ItemStack getNamedPlaceholder(String itemName) {
+		ItemStack stack = new ItemStack(Items.BARRIER);
+		stack.set(DataComponents.CUSTOM_NAME, Component.literal(itemName));
+		return stack;
+	}
 }