diff --git a/src/main/java/com/massivecraft/factions/Factions.java b/src/main/java/com/massivecraft/factions/Factions.java index 045de41f..55344e5c 100644 --- a/src/main/java/com/massivecraft/factions/Factions.java +++ b/src/main/java/com/massivecraft/factions/Factions.java @@ -40,14 +40,11 @@ import com.massivecraft.factions.mixin.PowerMixinDefault; import com.massivecraft.factions.task.TaskPlayerDataRemove; import com.massivecraft.factions.task.TaskEconLandReward; import com.massivecraft.factions.task.TaskPlayerPowerUpdate; -import com.massivecraft.factions.update.OldConfColls; import com.massivecraft.factions.update.UpdateUtil; import com.massivecraft.massivecore.Aspect; import com.massivecraft.massivecore.AspectColl; import com.massivecraft.massivecore.MassivePlugin; import com.massivecraft.massivecore.Multiverse; -import com.massivecraft.massivecore.store.Coll; -import com.massivecraft.massivecore.store.MStore; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.xlib.gson.Gson; import com.massivecraft.massivecore.xlib.gson.GsonBuilder; @@ -77,6 +74,12 @@ public class Factions extends MassivePlugin private CmdFactions outerCmdFactions; public CmdFactions getOuterCmdFactions() { return this.outerCmdFactions; } + // Aspects + // TODO: Remove in the future when the update has been removed. + private Aspect aspect; + public Aspect getAspect() { return this.aspect; } + public Multiverse getMultiverse() { return this.getAspect().getMultiverse(); } + // Database Initialized private boolean databaseInitialized; public boolean isDatabaseInitialized() { return this.databaseInitialized; } @@ -98,6 +101,14 @@ public class Factions extends MassivePlugin { if ( ! preEnable()) return; + // Initialize Aspects + this.aspect = AspectColl.get().get(Const.ASPECT, true); + this.aspect.register(); + this.aspect.setDesc( + "If the factions system even is enabled and how it's configured.", + "What factions exists and what players belong to them." + ); + // Register Faction accountId Extractor // TODO: Perhaps this should be placed in the econ integration somewhere? MUtil.registerExtractor(String.class, "accountId", ExtractorFactionAccountId.get());