diff --git a/src/main/java/com/alttd/fishingevent/config/Config.java b/src/main/java/com/alttd/fishingevent/config/Config.java index a09cbf0..31f2d32 100644 --- a/src/main/java/com/alttd/fishingevent/config/Config.java +++ b/src/main/java/com/alttd/fishingevent/config/Config.java @@ -5,6 +5,7 @@ import com.alttd.fishingevent.npc.NPC; import com.alttd.fishingevent.npc.NPCManager; import com.alttd.fishingevent.npc.NPCType; import com.alttd.fishingevent.npc.types.PrizeNPC; +import com.alttd.fishingevent.npc.types.SellNPC; import com.alttd.fishingevent.npc.types.TutorialNPC; import com.alttd.fishingevent.npc.types.UpgradeNPC; import com.alttd.fishingevent.objects.EnchantmentData; @@ -100,11 +101,6 @@ public class Config extends AbstractConfig { } private static void loadNPC(NPCCreateData npcCreateData, String npcPrefix, String key) { - List materials = getMaterials(npcPrefix); - if (materials == null) { - config.logger.severe("No final quest materials found"); - return; - } NPCType type; String stringType = config.getString(npcPrefix, "type", NPCType.NONE.name()); try { @@ -149,6 +145,13 @@ public class Config extends AbstractConfig { prizes.get() ); } + case SELL -> { + npc = new SellNPC( + config.fishingEvent, + config.logger, + npcCreateData + ); + } default -> { config.logger.warning("Found NPC Type NONE, please set a valid type"); return; @@ -238,20 +241,6 @@ public class Config extends AbstractConfig { return Optional.of(prizes); } - private static List getMaterials(String npcPrefix) { - List materialStringList = config.getStringList(npcPrefix, "final-quest-requirements", List.of("DIRT")); - List materials = new ArrayList<>(); - for (String materialString : materialStringList) { - try { - materials.add(Material.getMaterial(materialString.toUpperCase())); - } catch (Exception ignored) { - config.logger.warning("Invalid material [%] for [%]", materialString, npcPrefix); - return null; - } - } - return materials; - } - private static @Nullable Material getMaterial(String npcPrefix, String materialLocation) { ConfigurationSection configurationSection = config.getConfigurationSection(npcPrefix); String materialString = configurationSection.getString(materialLocation);