diff options
3 files changed, 13 insertions, 7 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemListTab.java b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemListTab.java index 4109246d..89d41290 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemListTab.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemListTab.java @@ -72,14 +72,16 @@ public class ItemListTab extends ItemListWidget.TabContainerWidget { @Override public boolean mouseClicked(double mouseX, double mouseY, int button) { if (!visible) return false; - if (this.searchField.mouseClicked(mouseX, mouseY, button)) { + if (this.searchField.mouseClicked(mouseX, mouseY, button) && this.results != null) { this.results.closeRecipeView(); this.searchField.setFocused(true); return true; - } else { + } else if (results != null) { this.searchField.setFocused(false); - return this.results.mouseClicked(mouseX, mouseY, button); + this.results.mouseClicked(mouseX, mouseY, button); } + + return false; } @Override diff --git a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemRepository.java b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemRepository.java index b9e45af1..4dca91d6 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemRepository.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemRepository.java @@ -51,9 +51,13 @@ public class ItemRepository { } private static void loadItem(NEUItem item) { - ItemStack stack = ItemStackBuilder.fromNEUItem(item); - items.add(stack); - itemsMap.put(item.getSkyblockItemId(), stack); + try { + ItemStack stack = ItemStackBuilder.fromNEUItem(item); + items.add(stack); + itemsMap.put(item.getSkyblockItemId(), stack); + } catch (Exception e) { + LOGGER.error("[Skyblocker Item Repo Loader] Failed to load item, please report this! Skyblock Id: {}", item.getSkyblockItemId(), e); + } } private static void loadRecipes(NEUItem item) { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemStackBuilder.java b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemStackBuilder.java index f256ff9d..7eda7646 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemStackBuilder.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemStackBuilder.java @@ -41,7 +41,7 @@ public class ItemStackBuilder { List<Pair<String, String>> injectors = new ArrayList<>(petData(internalName)); String legacyId = item.getMinecraftItemId(); - Identifier itemId = Identifier.ofVanilla(ItemFixerUpper.convertItemId(legacyId, item.getDamage())); + Identifier itemId = Identifier.of(ItemFixerUpper.convertItemId(legacyId, item.getDamage())); ItemStack stack = new ItemStack(Registries.ITEM.get(itemId)); |