mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-08-29 13:20:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

load addons in separate method

Browse Source
This commit is contained in:
dfsek
2022-01-02 01:25:33 -07:00
parent b4a4d7e377
commit 3fd5aaf56c
1 changed files with 56 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/implementation/base/src/main/java/com/dfsek/terra/AbstractPlatform.java
+19 -13
View File
@@ -121,7 +121,6 @@ public abstract class AbstractPlatform implements Platform {
logger.error("Error loading config.yml resource from jar", e); logger.error("Error loading config.yml resource from jar", e);
} }
config.load(this); // load config.yml config.load(this); // load config.yml
if(config.dumpDefaultConfig()) { if(config.dumpDefaultConfig()) {
@@ -134,6 +133,23 @@ public abstract class AbstractPlatform implements Platform {
profiler.start(); profiler.start();
} }
InternalAddon internalAddon = loadAddons();
eventManager.getHandler(FunctionalEventHandler.class)
.register(internalAddon, PlatformInitializationEvent.class)
.then(event -> {
logger.info("Loading config packs...");
configRegistry.loadAll(this);
logger.info("Loaded packs.");
})
.global();
logger.info("Terra addons successfully loaded.");
logger.info("Finished initialization.");
}
protected InternalAddon loadAddons() {
List<BaseAddon> addonList = new ArrayList<>(); List<BaseAddon> addonList = new ArrayList<>();
InternalAddon internalAddon = new InternalAddon(); InternalAddon internalAddon = new InternalAddon();
@@ -156,6 +172,7 @@ public abstract class AbstractPlatform implements Platform {
bootstrapAddon.loadAddons(addonsFolder, getClass().getClassLoader()) bootstrapAddon.loadAddons(addonsFolder, getClass().getClassLoader())
.forEach(addonList::add); .forEach(addonList::add);
}); });
addonList.sort(Comparator.comparing(StringIdentifiable::getID)); addonList.sort(Comparator.comparing(StringIdentifiable::getID));
if(logger.isInfoEnabled()) { if(logger.isInfoEnabled()) {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
@@ -184,18 +201,7 @@ public abstract class AbstractPlatform implements Platform {
} }
}); });
eventManager.getHandler(FunctionalEventHandler.class) return internalAddon;
.register(internalAddon, PlatformInitializationEvent.class)
.then(event -> {
logger.info("Loading config packs...");
configRegistry.loadAll(this);
logger.info("Loaded packs.");
})
.global();
logger.info("Terra addons successfully loaded.");
logger.info("Finished initialization.");
} }
protected void dumpResources() { protected void dumpResources() {