mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-06-18 14:50:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean up addon registry initialization

Browse Source
This commit is contained in:
dfsek
2021-07-24 20:11:04 -07:00
parent 22aa03cd51
commit 074528003b
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/implementation/src/main/java/com/dfsek/terra/AbstractTerraPlugin.java
+4 -7
View File
@@ -54,13 +54,7 @@ public abstract class AbstractTerraPlugin implements TerraPlugin {
private final CommandManager manager = new TerraCommandManager(this); private final CommandManager manager = new TerraCommandManager(this);
private final AddonRegistry addonRegistry = Construct.construct(() -> { private final AddonRegistry addonRegistry;
Optional<TerraAddon> addon = getPlatformAddon();
AddonRegistry registry = addon.map(terraAddon -> new AddonRegistry(terraAddon, this)).orElseGet(() -> new AddonRegistry(this));
InternalAddon internalAddon = new InternalAddon(this);
registry.register(internalAddon);
return registry;
});
public AbstractTerraPlugin() { public AbstractTerraPlugin() {
@@ -76,6 +70,9 @@ public abstract class AbstractTerraPlugin implements TerraPlugin {
profiler.start(); profiler.start();
} }
addonRegistry = getPlatformAddon().map(terraAddon -> new AddonRegistry(terraAddon, this)).orElseGet(() -> new AddonRegistry(this));
addonRegistry.register(new InternalAddon(this));
if(!addonRegistry.loadAll(getClass().getClassLoader())) { // load all addons if(!addonRegistry.loadAll(getClass().getClassLoader())) { // load all addons
throw new IllegalStateException("Failed to load addons. Please correct addon installations to continue."); throw new IllegalStateException("Failed to load addons. Please correct addon installations to continue.");
} }