diff --git a/build.gradle b/build.gradle index d085d742ea..c2ca3fed7b 100644 --- a/build.gradle +++ b/build.gradle @@ -427,7 +427,7 @@ def sharedFmlonlyForge = { Project prj -> } // SecureJarHandler bootstrap values. - run.property 'ignoreList', prj.configurations.moduleonly.files.collect {it.name.replaceAll(/([-_]([.\d]*\d+)|\.jar$)/, '') }.join(',') + ",client-extra,fmlcore,javafmllanguage,mclanguage,${prj.name}-" + run.property 'ignoreList', prj.configurations.moduleonly.files.collect {it.name.replaceAll(/([-_]([.\d]*\d+)|\.jar$)/, '') }.join(',') + ",client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,${prj.name}-" // FIXME: Without this jna doesn't work at runtime. Someone figure out why please? run.property 'mergeModules', 'jna-5.10.0.jar,jna-platform-5.10.0.jar,java-objc-bridge-1.0.0.jar' if (userdevRuns.contains(run)) { @@ -541,7 +541,7 @@ project(':fmlonly') { ext { MCP_ARTIFACT = project(':mcp').mcp.config.get() - PACKED_DEPS = [':fmlcore:jar', ':fmlloader:jar', ':javafmllanguage:jar', ':mclanguage:jar'] + PACKED_DEPS = [':fmlcore:jar', ':fmlloader:jar', ':javafmllanguage:jar', ':lowcodelanguage:jar', ':mclanguage:jar'] MAVEN_PATH = "${group.replace('.', '/')}/${project.name}/${VERSION}" } @@ -570,6 +570,7 @@ project(':fmlonly') { implementation project(':fmlcore') implementation project(':fmlloader') implementation project(':javafmllanguage') + implementation project(':lowcodelanguage') implementation project(':mclanguage') runtimeOnly "cpw.mods:bootstraplauncher:${BOOTSTRAPLAUNCHER_VERSION}" } @@ -896,7 +897,7 @@ project(':forge') { // Essentially, the same as the old, except dropping the first number, and the builds are no longer unique. MCP_ARTIFACT = project(':mcp').mcp.config.get() VERSION_JSON = project(':mcp').file('build/mcp/downloadJson/version.json') - PACKED_DEPS = [':fmlcore:jar', ':fmlloader:jar', ':javafmllanguage:jar', ':mclanguage:jar'] + PACKED_DEPS = [':fmlcore:jar', ':fmlloader:jar', ':javafmllanguage:jar', ':lowcodelanguage:jar', ':mclanguage:jar'] MAVEN_PATH = "${group.replace('.', '/')}/${project.name}/${VERSION}" } @@ -917,6 +918,7 @@ project(':forge') { implementation project(':fmlcore') implementation project(':fmlloader') implementation project(':javafmllanguage') + implementation project(':lowcodelanguage') implementation project(':mclanguage') runtimeOnly "cpw.mods:bootstraplauncher:${BOOTSTRAPLAUNCHER_VERSION}" } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonClientLaunchHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonClientLaunchHandler.java index 5112ee9987..3db4ff71a4 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonClientLaunchHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonClientLaunchHandler.java @@ -45,9 +45,10 @@ public abstract class CommonClientLaunchHandler extends CommonLaunchHandler { var fmlcore = LibraryFinder.findPathForMaven(vers.forgeGroup(), "fmlcore", "", "", vers.mcAndForgeVersion()); var javafmllang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "javafmllanguage", "", "", vers.mcAndForgeVersion()); + var lowcodelang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "lowcodelanguage", "", "", vers.mcAndForgeVersion()); var mclang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "mclanguage", "", "", vers.mcAndForgeVersion()); - return new LocatedPaths(mcstream.build().toList(), (a,b) -> true, modstream.build().toList(), List.of(fmlcore, javafmllang, mclang)); + return new LocatedPaths(mcstream.build().toList(), (a,b) -> true, modstream.build().toList(), List.of(fmlcore, javafmllang, lowcodelang, mclang)); } protected abstract void processMCStream(VersionInfo versionInfo, Stream.Builder mc, Stream.Builder> mods); diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonDevLaunchHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonDevLaunchHandler.java index c070938ccf..29991886c1 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonDevLaunchHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonDevLaunchHandler.java @@ -80,7 +80,7 @@ public abstract class CommonDevLaunchHandler extends CommonLaunchHandler { protected List getFmlStuff(String[] classpath) { // We also want the FML things, fmlcore, javafmllanguage, mclanguage, I don't like hard coding these, but hey whatever works for now. return Arrays.stream(classpath) - .filter(e -> e.contains("fmlcore") || e.contains("javafmllanguage") || e.contains("mclanguage")) + .filter(e -> e.contains("fmlcore") || e.contains("javafmllanguage") || e.contains("lowcodelanguage") || e.contains("mclanguage")) .map(Paths::get) .toList(); } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonServerLaunchHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonServerLaunchHandler.java index e5bb9132c6..01b763a558 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonServerLaunchHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonServerLaunchHandler.java @@ -55,9 +55,10 @@ public abstract class CommonServerLaunchHandler extends CommonLaunchHandler { var fmlcore = LibraryFinder.findPathForMaven(vers.forgeGroup(), "fmlcore", "", "", vers.mcAndForgeVersion()); var javafmllang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "javafmllanguage", "", "", vers.mcAndForgeVersion()); + var lowcodelang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "lowcodelanguage", "", "", vers.mcAndForgeVersion()); var mclang = LibraryFinder.findPathForMaven(vers.forgeGroup(), "mclanguage", "", "", vers.mcAndForgeVersion()); - return new LocatedPaths(mcstream.build().toList(), filter, modstream.build().toList(), List.of(fmlcore, javafmllang, mclang)); + return new LocatedPaths(mcstream.build().toList(), filter, modstream.build().toList(), List.of(fmlcore, javafmllang, lowcodelang, mclang)); } protected abstract BiPredicate processMCStream(VersionInfo versionInfo, Stream.Builder mc, BiPredicate filter, Stream.Builder> mods); diff --git a/lowcodelanguage/build.gradle b/lowcodelanguage/build.gradle new file mode 100644 index 0000000000..3191e8f2e2 --- /dev/null +++ b/lowcodelanguage/build.gradle @@ -0,0 +1,60 @@ +plugins { + id 'com.github.ben-manes.versions' + id 'org.javamodularity.moduleplugin' version '1.8.3' apply false + id 'org.cadixdev.licenser' +} +apply plugin: 'java-library' +apply plugin: 'jacoco' +apply plugin: 'org.javamodularity.moduleplugin' + +dependencyUpdates.rejectVersionIf { isNonStable(it.candidate.version) } + +java.withSourcesJar() + +dependencies { + compileOnly('org.jetbrains:annotations:21.0.1') + implementation(project(':fmlloader')) + implementation(project(':fmlcore')) +} + +ext { + MANIFESTS = [ + '': [ + 'FMLModType': 'LANGPROVIDER', + 'Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"), + 'Git-Commit': GIT_INFO.abbreviatedId, + 'Git-Branch': GIT_INFO.branch, + 'Build-Number': "${System.getenv('BUILD_NUMBER')?:0}", + ] as LinkedHashMap, + 'net/minecraftforge/fml/loading/': [ + 'Specification-Title': 'FMLLoader', + 'Specification-Vendor': 'Forge Development LLC', + 'Specification-Version': '1', + 'Implementation-Title': 'FML Loader', + 'Implementation-Version': '1.0', + 'Implementation-Vendor': 'Forge' + ] as LinkedHashMap + ] +} + +jar.doFirst { + MANIFESTS.each { pkg, values -> + if (pkg == '') + manifest.attributes(values) + else + manifest.attributes(values, pkg) + } +} + +tasks.withType(JavaCompile) { + options.compilerArgs << '-Xlint:unchecked' +} + +license { + header = rootProject.file('LICENSE-header.txt') + include 'net/minecraftforge/' +} + +publishing.publications.mavenJava(MavenPublication) { + from components.java +} \ No newline at end of file diff --git a/lowcodelanguage/src/main/java/net/minecraftforge/fml/lowcodemod/LowCodeModContainer.java b/lowcodelanguage/src/main/java/net/minecraftforge/fml/lowcodemod/LowCodeModContainer.java new file mode 100644 index 0000000000..8e90f05ff5 --- /dev/null +++ b/lowcodelanguage/src/main/java/net/minecraftforge/fml/lowcodemod/LowCodeModContainer.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) Forge Development LLC and contributors + * SPDX-License-Identifier: LGPL-2.1-only + */ + +package net.minecraftforge.fml.lowcodemod; + +import net.minecraftforge.eventbus.api.Event; +import net.minecraftforge.fml.IExtensionPoint; +import net.minecraftforge.fml.ModContainer; +import net.minecraftforge.fml.event.IModBusEvent; +import net.minecraftforge.forgespi.language.IModInfo; +import net.minecraftforge.forgespi.language.ModFileScanData; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.util.Objects; + +import static net.minecraftforge.fml.loading.LogMarkers.LOADING; + +public class LowCodeModContainer extends ModContainer +{ + private static final Logger LOGGER = LogManager.getLogger(); + private final ModFileScanData scanResults; + private Object modInstance; + + public LowCodeModContainer(IModInfo info, ModFileScanData modFileScanResults, ModuleLayer gameLayer) + { + super(info); + LOGGER.debug(LOADING, "Creating LowCodeModContainer for {}", info.getModId()); + this.scanResults = modFileScanResults; + this.modInstance = new Object(); + this.contextExtension = () -> null; + this.extensionPoints.remove(IExtensionPoint.DisplayTest.class); + } + + @Override + public boolean matches(Object mod) + { + return mod == modInstance; + } + + @Override + public Object getMod() + { + return modInstance; + } + + @Override + protected void acceptEvent(final T e) + { + } +} diff --git a/lowcodelanguage/src/main/java/net/minecraftforge/fml/lowcodemod/LowCodeModLanguageProvider.java b/lowcodelanguage/src/main/java/net/minecraftforge/fml/lowcodemod/LowCodeModLanguageProvider.java new file mode 100644 index 0000000000..075c82fb8e --- /dev/null +++ b/lowcodelanguage/src/main/java/net/minecraftforge/fml/lowcodemod/LowCodeModLanguageProvider.java @@ -0,0 +1,86 @@ +/* + * Copyright (c) Forge Development LLC and contributors + * SPDX-License-Identifier: LGPL-2.1-only + */ + +package net.minecraftforge.fml.lowcodemod; + +import cpw.mods.modlauncher.api.LamdbaExceptionUtils; +import net.minecraftforge.fml.ModLoadingException; +import net.minecraftforge.fml.ModLoadingStage; +import net.minecraftforge.forgespi.language.ILifecycleEvent; +import net.minecraftforge.forgespi.language.IModLanguageProvider; +import net.minecraftforge.forgespi.language.IModInfo; +import net.minecraftforge.forgespi.language.ModFileScanData; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.util.Map; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.function.Supplier; +import java.util.stream.Collectors; + +import static net.minecraftforge.fml.Logging.LOADING; + +public class LowCodeModLanguageProvider implements IModLanguageProvider +{ + private record LowCodeModTarget(String modId) implements IModLanguageProvider.IModLanguageLoader + { + private static final Logger LOGGER = LogManager.getLogger(); + + @SuppressWarnings("unchecked") + @Override + public T loadMod(final IModInfo info, final ModFileScanData modFileScanResults, ModuleLayer gameLayer) + { + // This language class is loaded in the system level classloader - before the game even starts + // So we must treat container construction as an arms length operation, and load the container + // in the classloader of the game - the context classloader is appropriate here. + try { + final Class fmlContainer = Class.forName("net.minecraftforge.fml.lowcodemod.LowCodeModContainer", true, Thread.currentThread().getContextClassLoader()); + LOGGER.debug(LOADING, "Loading LowCodeModContainer from classloader {} - got {}", Thread.currentThread().getContextClassLoader(), fmlContainer.getClassLoader()); + final Constructor constructor = fmlContainer.getConstructor(IModInfo.class, ModFileScanData.class, ModuleLayer.class); + return (T) constructor.newInstance(info, modFileScanResults, gameLayer); + } catch (InvocationTargetException e) { + LOGGER.fatal(LOADING, "Failed to build mod", e); + if (e.getTargetException() instanceof ModLoadingException mle) { + throw mle; + } else { + throw new ModLoadingException(info, ModLoadingStage.CONSTRUCT, "fml.modloading.failedtoloadmodclass", e); + } + } catch (NoSuchMethodException | ClassNotFoundException | InstantiationException | IllegalAccessException e) { + LOGGER.fatal(LOADING, "Unable to load FMLModContainer, wut?", e); + final Class mle = (Class) LamdbaExceptionUtils.uncheck(() -> Class.forName("net.minecraftforge.fml.ModLoadingException", true, Thread.currentThread().getContextClassLoader())); + final Class mls = (Class) LamdbaExceptionUtils.uncheck(() -> Class.forName("net.minecraftforge.fml.ModLoadingStage", true, Thread.currentThread().getContextClassLoader())); + throw LamdbaExceptionUtils.uncheck(() -> LamdbaExceptionUtils.uncheck(() -> mle.getConstructor(IModInfo.class, mls, String.class, Throwable.class)).newInstance(info, Enum.valueOf(mls, "CONSTRUCT"), "fml.modloading.failedtoloadmodclass", e)); + } + } + } + + @Override + public String name() + { + return "lowcodefml"; + } + + @Override + public Consumer getFileVisitor() + { + return scanResult -> + { + final Map modTargetMap = scanResult.getIModInfoData().stream() + .flatMap(fi->fi.getMods().stream()) + .map(IModInfo::getModId) + .map(LowCodeModTarget::new) + .collect(Collectors.toMap(LowCodeModTarget::modId, Function.identity(), (a, b)->a)); + scanResult.addLanguageLoader(modTargetMap); + }; + } + + @Override + public > void consumeLifecycleEvent(final Supplier consumeEvent) + { + } +} diff --git a/lowcodelanguage/src/main/resources/META-INF/services/net.minecraftforge.forgespi.language.IModLanguageProvider b/lowcodelanguage/src/main/resources/META-INF/services/net.minecraftforge.forgespi.language.IModLanguageProvider new file mode 100644 index 0000000000..e7928fe9de --- /dev/null +++ b/lowcodelanguage/src/main/resources/META-INF/services/net.minecraftforge.forgespi.language.IModLanguageProvider @@ -0,0 +1 @@ +net.minecraftforge.fml.lowcodemod.LowCodeModLanguageProvider diff --git a/settings.gradle b/settings.gradle index 4273784394..57fcacb65a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,6 +11,7 @@ include 'fmlloader' include 'fmlcore' include 'mclanguage' include 'javafmllanguage' +include 'lowcodelanguage' include ':mcp' include ':clean'