From 074528003bfa0672491b0406cca0921488fe1185 Mon Sep 17 00:00:00 2001 From: dfsek Date: Sat, 24 Jul 2021 20:11:04 -0700 Subject: [PATCH] clean up addon registry initialization --- .../java/com/dfsek/terra/AbstractTerraPlugin.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/common/implementation/src/main/java/com/dfsek/terra/AbstractTerraPlugin.java b/common/implementation/src/main/java/com/dfsek/terra/AbstractTerraPlugin.java index 0c56cf6cf..492cb3095 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/AbstractTerraPlugin.java +++ b/common/implementation/src/main/java/com/dfsek/terra/AbstractTerraPlugin.java @@ -54,13 +54,7 @@ public abstract class AbstractTerraPlugin implements TerraPlugin { private final CommandManager manager = new TerraCommandManager(this); - private final AddonRegistry addonRegistry = Construct.construct(() -> { - Optional 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; - }); + private final AddonRegistry addonRegistry; public AbstractTerraPlugin() { @@ -76,6 +70,9 @@ public abstract class AbstractTerraPlugin implements TerraPlugin { 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 throw new IllegalStateException("Failed to load addons. Please correct addon installations to continue."); }