-
Notifications
You must be signed in to change notification settings - Fork 59
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Clean Up ModuleManager and remove unused parameter
- Loading branch information
Showing
18 changed files
with
162 additions
and
185 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,87 +1,34 @@ | ||
| package binnie.modules; | ||
|
|
||
| import java.io.File; | ||
| import java.util.LinkedHashSet; | ||
| import java.util.Set; | ||
|
|
||
| import net.minecraftforge.fml.common.Loader; | ||
| import net.minecraftforge.fml.common.event.FMLInitializationEvent; | ||
| import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; | ||
| import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; | ||
|
|
||
| import binnie.core.AbstractMod; | ||
|
|
||
| public abstract class BlankModuleContainer extends AbstractMod implements IModuleContainer { | ||
| protected Set<Module> loadedModules; | ||
| protected Set<Module> unloadedModules; | ||
| protected Set<String> enabledModules; | ||
| protected Set<String> disabledModules; | ||
| protected File configFolder; | ||
| public abstract class BlankModuleContainer extends AbstractMod { | ||
| protected final ModuleContainer container; | ||
|
|
||
| public BlankModuleContainer() { | ||
| super(); | ||
| this.loadedModules = new LinkedHashSet<>(); | ||
| this.unloadedModules = new LinkedHashSet<>(); | ||
| this.enabledModules = new LinkedHashSet<>(); | ||
| this.disabledModules = new LinkedHashSet<>(); | ||
| ModuleManager.register(this); | ||
| configFolder = new File(Loader.instance().getConfigDir(), "forestry/" + getModID()); | ||
| this.container = new ModuleContainer(getModID(), () -> isAvailable()); | ||
| ModuleManager.register(container); | ||
| } | ||
|
|
||
| @Override | ||
| protected void preInitModules(FMLPreInitializationEvent event) { | ||
| ModuleManager.runRegisterItemsAndBlocks(this); | ||
| ModuleManager.runPreInit(event, this); | ||
| container.runPreInit(event); | ||
| } | ||
|
|
||
| @Override | ||
| public void init(FMLInitializationEvent event) { | ||
| super.init(event); | ||
| ModuleManager.runInit(event, this); | ||
| container.runInit(event); | ||
| } | ||
|
|
||
| @Override | ||
| public void postInit(FMLPostInitializationEvent event) { | ||
| super.postInit(event); | ||
| ModuleManager.runPostInit(event, this); | ||
| } | ||
|
|
||
| public final boolean isModuleEnabled(String moduleUID){ | ||
| return enabledModules.contains(moduleUID); | ||
| } | ||
|
|
||
| @Override | ||
| public String getID() { | ||
| return getModID(); | ||
| } | ||
|
|
||
| @Override | ||
| public File getConfigFolder() { | ||
| return configFolder; | ||
| } | ||
|
|
||
| @Override | ||
| public Set<String> getEnabledModules() { | ||
| return enabledModules; | ||
| } | ||
|
|
||
| @Override | ||
| public void enableModule(String uid) { | ||
| enabledModules.add(uid); | ||
| } | ||
|
|
||
| @Override | ||
| public void disableModule(String uid) { | ||
| disabledModules.add(uid); | ||
| } | ||
|
|
||
| @Override | ||
| public Set<Module> getLoadedModules() { | ||
| return loadedModules; | ||
| } | ||
|
|
||
| @Override | ||
| public Set<Module> getUnloadedModules() { | ||
| return unloadedModules; | ||
| container.runPostInit(event); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.