diff --git a/build.gradle b/build.gradle index 2c5cb43ecc..d7e60ead10 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,7 @@ ext { MAPPING_VERSION = '1.19' MC_VERSION = '1.19' MCP_VERSION = '20220607.102129' - SPI_VERSION = '4.0.10' + SPI_VERSION = '5.0.0' ACCESSTRANSFORMERS_VERSION = '8.0.4' COREMODS_VERSION = '5.0.1' EVENTBUS_VERSION = '5.0.3' diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/LanguageLoadingProvider.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/LanguageLoadingProvider.java index da4ef9cdd4..1c225599da 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/LanguageLoadingProvider.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/LanguageLoadingProvider.java @@ -134,7 +134,7 @@ public class LanguageLoadingProvider } public IModLanguageProvider findLanguage(ModFile mf, String modLoader, VersionRange modLoaderVersion) { - final String languageFileName = mf.getLocator() instanceof ExplodedDirectoryLocator ? "in-development" : mf.getFileName(); + final String languageFileName = mf.getProvider() instanceof ExplodedDirectoryLocator ? "in-development" : mf.getFileName(); final ModLanguageWrapper mlw = languageProviderMap.get(modLoader); if (mlw == null) { LOGGER.error(LOADING,"Missing language {} version {} wanted by {}", modLoader, modLoaderVersion, languageFileName); diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/ModSorter.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/ModSorter.java index 0332596f3f..1e705ba693 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/ModSorter.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/ModSorter.java @@ -148,7 +148,7 @@ public class ModSorter systemMods.add("minecraft"); // Find mod file from MinecraftLocator to define the system mods modFiles.stream() - .filter(modFile -> modFile.getLocator().getClass() == MinecraftLocator.class) + .filter(modFile -> modFile.getProvider().getClass() == MinecraftLocator.class) .map(ModFile::getSecureJar) .map(SecureJar::getManifest) .map(Manifest::getMainAttributes) diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModDiscoverer.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModDiscoverer.java index 746b78c08a..db90d1881c 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModDiscoverer.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModDiscoverer.java @@ -53,7 +53,7 @@ public class ModDiscoverer { LOGGER.debug(LogMarkers.SCAN,"Trying locator {}", locator); var modFiles = locator.scanMods(); for (IModFile mf : modFiles) { - LOGGER.info(LogMarkers.SCAN, "Found mod file {} of type {} with locator {}", mf.getFileName(), mf.getType(), mf.getLocator()); + LOGGER.info(LogMarkers.SCAN, "Found mod file {} of type {} with provider {}", mf.getFileName(), mf.getType(), mf.getProvider()); StartupMessageManager.modLoaderConsumer().ifPresent(c->c.accept("Found mod file "+mf.getFileName()+" of type "+mf.getType())); } loadedFiles.addAll(modFiles); diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFile.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFile.java index d88d99900b..d7fef5beff 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFile.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFile.java @@ -16,7 +16,7 @@ import net.minecraftforge.forgespi.language.IModInfo; import net.minecraftforge.forgespi.language.IModLanguageProvider; import net.minecraftforge.forgespi.language.ModFileScanData; import net.minecraftforge.forgespi.locating.IModFile; -import net.minecraftforge.forgespi.locating.IModLocator; +import net.minecraftforge.forgespi.locating.IModProvider; import net.minecraftforge.forgespi.locating.ModFileFactory; import org.slf4j.Logger; @@ -52,7 +52,7 @@ public class ModFile implements IModFile { private final SecureJar jar; private final Type modFileType; private final Manifest manifest; - private final IModLocator locator; + private final IModProvider provider; private IModFileInfo modFileInfo; private ModFileScanData fileModFileScanData; private CompletableFuture futureScanResult; @@ -62,8 +62,8 @@ public class ModFile implements IModFile { static final Attributes.Name TYPE = new Attributes.Name("FMLModType"); private SecureJar.Status securityStatus; - public ModFile(final SecureJar jar, final IModLocator locator, final ModFileFactory.ModFileInfoParser parser) { - this.locator = locator; + public ModFile(final SecureJar jar, final IModProvider provider, final ModFileFactory.ModFileInfoParser parser) { + this.provider = provider; this.jar = jar; this.parser = parser; @@ -123,7 +123,7 @@ public class ModFile implements IModFile { } public void scanFile(Consumer pathConsumer) { - locator.scanFile(this, pathConsumer); + provider.scanFile(this, pathConsumer); } public void setFutureScanResult(CompletableFuture future) { @@ -188,8 +188,8 @@ public class ModFile implements IModFile { } @Override - public IModLocator getLocator() { - return locator; + public IModProvider getProvider() { + return this.provider; } @Override diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModInfo.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModInfo.java index 7c7f82c99e..9f8e293801 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModInfo.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModInfo.java @@ -45,6 +45,7 @@ public class ModInfo implements IModInfo, IConfigurable private final List dependencies; private final Map properties; private final IConfigurable config; + private final Optional modUrl; public ModInfo(final ModFileInfo owningFile, final IConfigurable config) { @@ -86,6 +87,9 @@ public class ModInfo implements IModInfo, IConfigurable this.properties = ownFile.map(mfi -> mfi.>getConfigElement("modproperties", this.modId) .orElse(Collections.emptyMap())) .orElse(Collections.emptyMap()); + + this.modUrl = config.getConfigElement("modUrl") + .map(StringUtils::toURL); } @Override @@ -162,6 +166,11 @@ public class ModInfo implements IModInfo, IConfigurable return null; } + @Override + public Optional getModURL() { + return modUrl; + } + class ModVersion implements net.minecraftforge.forgespi.language.IModInfo.ModVersion { private IModInfo owner; private final String modId; @@ -169,6 +178,7 @@ public class ModInfo implements IModInfo, IConfigurable private final boolean mandatory; private final Ordering ordering; private final DependencySide side; + private Optional referralUrl; public ModVersion(final IModInfo owner, final IConfigurable config) { this.owner = owner; @@ -185,6 +195,8 @@ public class ModInfo implements IModInfo, IConfigurable this.side = config.getConfigElement("side") .map(DependencySide::valueOf) .orElse(DependencySide.BOTH); + this.referralUrl = config.getConfigElement("referralUrl") + .map(StringUtils::toURL); } @@ -229,6 +241,11 @@ public class ModInfo implements IModInfo, IConfigurable { return owner; } + + @Override + public Optional getReferralURL() { + return referralUrl; + } } } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModValidator.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModValidator.java index d9dd34cff6..a830ce0f85 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModValidator.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModValidator.java @@ -53,7 +53,7 @@ public class ModValidator { for (Iterator iterator = mods.iterator(); iterator.hasNext(); ) { ModFile mod = iterator.next(); - if (!mod.getLocator().isValid(mod) || !mod.identifyMods()) { + if (!mod.getProvider().isValid(mod) || !mod.identifyMods()) { LOGGER.warn(LogMarkers.SCAN, "File {} has been ignored - it is invalid", mod.getFilePath()); iterator.remove(); brokenFiles.add(mod); diff --git a/src/main/java/net/minecraftforge/server/command/ModListCommand.java b/src/main/java/net/minecraftforge/server/command/ModListCommand.java index f8e9f14249..713ff07c4a 100644 --- a/src/main/java/net/minecraftforge/server/command/ModListCommand.java +++ b/src/main/java/net/minecraftforge/server/command/ModListCommand.java @@ -24,7 +24,7 @@ class ModListCommand { ModList.get().applyForEachModFile(modFile -> // locator - filename : firstmod (version) - numberofmods\n String.format(Locale.ROOT, "%s %s : %s (%s) - %d", - modFile.getLocator().name().replace(' ', '_'), + modFile.getProvider().name().replace(' ', '_'), modFile.getFileName(), modFile.getModInfos().get(0).getModId(), modFile.getModInfos().get(0).getVersion(),