Some more stuffs. ObjectHolder's replacement?

This commit is contained in:
cpw authored and LexManos committed 2018-09-05 11:58:31 -07:00
1 parent baa9dfe55a
commit 06b16aaa19
47 files changed
+987 -269

No files matched your search

@@ -32,6 +32,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.ServiceLoader;
import java.util.function.Consumer;
import java.util.stream.Stream;
import static net.minecraftforge.fml.Logging.CORE;
@@ -43,6 +44,11 @@ public class LanguageLoadingProvider
private final ServiceLoader<IModLanguageProvider> serviceLoader;
private final Map<String, ModLanguageWrapper> languageProviderMap = new HashMap<>();
public void forEach(final Consumer<IModLanguageProvider> consumer)
{
languageProviders.forEach(consumer);
}
private static class ModLanguageWrapper {
private final IModLanguageProvider modLanguageProvider;
private final ArtifactVersion version;
@@ -38,7 +38,8 @@ import java.util.function.Function;
import java.util.stream.Collectors;
/**
* Master list of all mods
* Master list of all mods <em>in the loading context. This class cannot refer outside the
* loading package</em>
*/
public class LoadingModList
{
@@ -47,8 +48,6 @@ public class LoadingModList
private final List<ModInfo> sortedList;
private final Map<String, ModFileInfo> fileById;
private BackgroundScanHandler scanner;
private List<ModContainer> mods;
private Map<String, ModContainer> indexedMods;
private LoadingModList(final List<ModFile> modFiles, final List<ModInfo> sortedList)
{
@@ -106,30 +105,6 @@ public class LoadingModList
return this.fileById.get(modid);
}
public void dispatchLifeCycleEvent(LifecycleEventProvider.LifecycleEvent lifecycleEvent) {
this.mods.parallelStream().forEach(m->m.transitionState(lifecycleEvent));
final List<ModContainer> erroredContainers = this.mods.stream().filter(m -> m.getCurrentState() == ModLoadingStage.ERROR).collect(Collectors.toList());
if (!erroredContainers.isEmpty()) {
throw new RuntimeException("Errored containers found!");
}
}
public void setLoadedMods(final List<ModContainer> modContainers)
{
this.mods = modContainers;
this.indexedMods = modContainers.stream().collect(Collectors.toMap(ModContainer::getModId, Function.identity()));
}
public Optional<Object> getModObjectById(String modId)
{
return getModContainerById(modId).map(ModContainer::getMod);
}
public Optional<? extends ModContainer> getModContainerById(String modId)
{
return Optional.ofNullable(this.indexedMods.get(modId));
}
public List<ModInfo> getMods()
{
return this.sortedList;