From 16eae2bd5871be2ffedac3c0d41c01b02a08086e Mon Sep 17 00:00:00 2001 From: YouHaveTrouble Date: Tue, 29 Oct 2024 20:08:02 +0100 Subject: [PATCH] allow enchants to support specific items along with item sets --- .../enchantio/EnchantioConfig.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/me/youhavetrouble/enchantio/EnchantioConfig.java b/src/main/java/me/youhavetrouble/enchantio/EnchantioConfig.java index e5f9913..71a3e0b 100644 --- a/src/main/java/me/youhavetrouble/enchantio/EnchantioConfig.java +++ b/src/main/java/me/youhavetrouble/enchantio/EnchantioConfig.java @@ -310,16 +310,22 @@ public class EnchantioConfig { if (itemTag == null) continue; if (itemTag.startsWith("#")) { itemTag = itemTag.substring(1); - } else { - logger.warning("Only item tags are supported for now, item tags need to begin with #"); + try { + Key key = Key.key(itemTag); + TagKey tagKey = ItemTypeTagKeys.create(key); + TagEntry tagEntry = TagEntry.tagEntry(tagKey); + supportedItemTags.add(tagEntry); + } catch (IllegalArgumentException e) { + logger.warning("Failed to create tag entry for " + itemTag); + } continue; } try { Key key = Key.key(itemTag); - TagKey tagKey = ItemTypeTagKeys.create(key); - TagEntry tagEntry = TagEntry.tagEntry(tagKey); + TypedKey typedKey = TypedKey.create(RegistryKey.ITEM, key); + TagEntry tagEntry = TagEntry.valueEntry(typedKey); supportedItemTags.add(tagEntry); - } catch (IllegalArgumentException e) { + } catch (IllegalArgumentException | NullPointerException e) { logger.warning("Failed to create tag entry for " + itemTag); } }