Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename and clean up MapleSkillbookInformationProvider

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:49:57 +02:00
parent a4d3f17efb
commit ca4bcd80d1
3 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/server/Server.java
View File

@@ -56,7 +56,7 @@ import net.server.world.World;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import server.CashShop.CashItemFactory;
import server.MapleSkillbookInformationProvider;
import server.SkillbookInformationProvider;
import server.ThreadManager;
import server.TimerManager;
import server.expeditions.ExpeditionBossLog;
@@ -840,7 +840,7 @@ public class Server {
futures.add(initExecutor.submit(() -> SkillFactory.loadAllSkills()));
futures.add(initExecutor.submit(() -> CashItemFactory.loadAllCashItems()));
futures.add(initExecutor.submit(() -> Quest.loadAllQuests()));
futures.add(initExecutor.submit(() -> MapleSkillbookInformationProvider.loadAllSkillbookInformation()));
futures.add(initExecutor.submit(() -> SkillbookInformationProvider.loadAllSkillbookInformation()));
futures.add(initExecutor.submit(() -> PlayerNPCFactory.loadFactoryMetadata()));
TimeZone.setDefault(TimeZone.getTimeZone(YamlConfig.config.server.TIMEZONE));

6
src/main/java/scripting/npc/NPCConversationManager.java
View File

@@ -43,7 +43,7 @@ import provider.DataProviderFactory;
import provider.wz.WZFiles;
import scripting.AbstractPlayerInteraction;
import server.*;
import server.MapleSkillbookInformationProvider.SkillBookEntry;
import server.SkillbookInformationProvider.SkillBookEntry;
import server.events.gm.Event;
import server.expeditions.Expedition;
import server.expeditions.ExpeditionType;
@@ -572,7 +572,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
public Object[] getAvailableSkillBooks() {
List<Integer> ret = ItemInformationProvider.getInstance().usableSkillBooks(this.getPlayer());
ret.addAll(MapleSkillbookInformationProvider.getTeachableSkills(this.getPlayer()));
ret.addAll(SkillbookInformationProvider.getTeachableSkills(this.getPlayer()));
return ret.toArray();
}
@@ -582,7 +582,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
}
public String getSkillBookInfo(int itemid) {
SkillBookEntry sbe = MapleSkillbookInformationProvider.getSkillbookAvailability(itemid);
SkillBookEntry sbe = SkillbookInformationProvider.getSkillbookAvailability(itemid);
switch (sbe) {
case UNAVAILABLE:
return "";

8
src/main/java/server/MapleSkillbookInformationProvider.java → src/main/java/server/SkillbookInformationProvider.java
View File

@@ -38,14 +38,13 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
*
* @author RonanLana
*/
/**
* Only used in 1 script that gives players information about where skillbooks can be found
*/
public class MapleSkillbookInformationProvider {
public class SkillbookInformationProvider {
private static volatile Map<Integer, SkillBookEntry> foundSkillbooks = new HashMap<>();
public enum SkillBookEntry {
@@ -65,7 +64,7 @@ public class MapleSkillbookInformationProvider {
loadedSkillbooks.putAll(fetchSkillbooksFromQuests());
loadedSkillbooks.putAll(fetchSkillbooksFromReactors());
loadedSkillbooks.putAll(fetchSkillbooksFromScripts());
MapleSkillbookInformationProvider.foundSkillbooks = loadedSkillbooks;
SkillbookInformationProvider.foundSkillbooks = loadedSkillbooks;
}
private static boolean is4thJobSkill(int itemid) {
@@ -226,7 +225,8 @@ public class MapleSkillbookInformationProvider {
} finally {
scanner.close();
}
} catch (NoSuchElementException e) {}
} catch (NoSuchElementException e) {
}
return text;
}