Altitude/fishing_event
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added missing SellType npc

Browse Source
This commit is contained in:
Teriuihi 2023-09-22 02:21:21 +02:00
parent 1c0bd3f037
commit c19f30b0e5
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/alttd/fishingevent/config/Config.java
View File

@ -5,6 +5,7 @@ import com.alttd.fishingevent.npc.NPC;
import com.alttd.fishingevent.npc.NPCManager; import com.alttd.fishingevent.npc.NPCManager;
import com.alttd.fishingevent.npc.NPCType; import com.alttd.fishingevent.npc.NPCType;
import com.alttd.fishingevent.npc.types.PrizeNPC; 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.TutorialNPC;
import com.alttd.fishingevent.npc.types.UpgradeNPC; import com.alttd.fishingevent.npc.types.UpgradeNPC;
import com.alttd.fishingevent.objects.EnchantmentData; 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) { private static void loadNPC(NPCCreateData npcCreateData, String npcPrefix, String key) {
List<Material> materials = getMaterials(npcPrefix);
if (materials == null) {
config.logger.severe("No final quest materials found");
return;
}
NPCType type; NPCType type;
String stringType = config.getString(npcPrefix, "type", NPCType.NONE.name()); String stringType = config.getString(npcPrefix, "type", NPCType.NONE.name());
try { try {
@ -149,6 +145,13 @@ public class Config extends AbstractConfig {
prizes.get() prizes.get()
); );
} }
case SELL -> {
npc = new SellNPC(
config.fishingEvent,
config.logger,
npcCreateData
);
}
default -> { default -> {
config.logger.warning("Found NPC Type NONE, please set a valid type"); config.logger.warning("Found NPC Type NONE, please set a valid type");
return; return;
@ -238,20 +241,6 @@ public class Config extends AbstractConfig {
return Optional.of(prizes); return Optional.of(prizes);
} }
private static List<Material> getMaterials(String npcPrefix) {
List<String> materialStringList = config.getStringList(npcPrefix, "final-quest-requirements", List.of("DIRT"));
List<Material> 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) { private static @Nullable Material getMaterial(String npcPrefix, String materialLocation) {
ConfigurationSection configurationSection = config.getConfigurationSection(npcPrefix); ConfigurationSection configurationSection = config.getConfigurationSection(npcPrefix);
String materialString = configurationSection.getString(materialLocation); String materialString = configurationSection.getString(materialLocation);