Skip to content

Commit 589abd7

Browse files
Su5eDSu5eD
committed
Add module declarations
1 parent 7b75ff2 commit 589abd7

25 files changed

+194
-30
lines changed

‎build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ subprojects { subProject ->
6363
manifest.attributes(
6464
'Git-Commit' : gradleutils.gitInfo.abbreviatedId,
6565
'Build-Number': "${subProject.version}",
66-
'Automatic-Module-Name' : "fml_${subProject.name.replace("-", "_")}",
6766
'FMLModType' : subProject.name.startsWith("language") ? 'LANGPROVIDER' : subProject.name == "events" ? 'GAMELIBRARY' : 'LIBRARY',
6867
'Specification-Title' : "FML${subProject.name}",
6968
'Specification-Vendor' : 'NeoForged',

‎core/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ dependencies {
66
api("net.neoforged:bus:${eventbus_version}")
77

88
implementation("commons-io:commons-io:${commons_io_version}")
9+
implementation("org.slf4j:slf4j-api:${slf4j_api_version}")
910
}

‎core/src/main/java/module-info.java

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
open module net.neoforged.fancymodloader.core {
2+
requires com.electronwill.nightconfig.core;
3+
requires com.electronwill.nightconfig.toml;
4+
requires com.google.common;
5+
requires com.google.gson;
6+
requires cpw.mods.modlauncher;
7+
requires java.net.http;
8+
requires logging;
9+
requires maven.artifact;
10+
requires net.neoforged.bus;
11+
requires net.neoforged.neoforgespi;
12+
requires net.neoforged.mergetool.api;
13+
requires net.neoforged.fancymodloader.loader;
14+
requires org.apache.commons.io;
15+
requires org.apache.logging.log4j;
16+
requires org.slf4j;
17+
requires static org.jetbrains.annotations;
18+
19+
exports net.neoforged.fml;
20+
exports net.neoforged.fml.config;
21+
exports net.neoforged.fml.event;
22+
exports net.neoforged.fml.util;
23+
exports net.neoforged.fml.util.thread;
24+
25+
uses net.neoforged.fml.IModStateProvider;
26+
uses net.neoforged.fml.IBindingsProvider;
27+
}

‎earlydisplay/src/main/java/module-info.java

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
open module net.neoforged.fancymodloader.earlydisplay {
2+
requires java.desktop;
3+
requires java.management;
4+
requires jdk.management;
5+
requires jopt.simple;
6+
requires net.neoforged.fancymodloader.loader;
7+
requires org.lwjgl.glfw;
8+
requires org.lwjgl.opengl;
9+
requires org.lwjgl.stb;
10+
requires org.lwjgl.tinyfd;
11+
requires org.slf4j;
12+
requires static org.jetbrains.annotations;
13+
14+
exports net.neoforged.fml.earlydisplay;
15+
16+
provides net.neoforged.fml.loading.ImmediateWindowProvider with
17+
net.neoforged.fml.earlydisplay.DisplayWindow;
18+
}

‎earlydisplay/src/main/resources/META-INF/services/net.neoforged.fml.loading.ImmediateWindowProvider

-1
This file was deleted.

‎events/src/main/java/module-info.java

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
open module net.neoforged.fancymodloader.events {
2+
requires net.neoforged.fancymodloader.core;
3+
requires net.neoforged.mergetool.api;
4+
requires net.neoforged.fancymodloader.loader;
5+
requires cpw.mods.modlauncher;
6+
requires net.neoforged.bus;
7+
8+
exports net.neoforged.fml.core;
9+
exports net.neoforged.fml.event.config;
10+
exports net.neoforged.fml.event.lifecycle;
11+
12+
provides net.neoforged.fml.IModStateProvider with
13+
net.neoforged.fml.core.ModStateProvider;
14+
}

‎languages/java/src/main/java/module-info.java

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
open module net.neoforged.fancymodloader.language.java {
2+
requires cpw.mods.modlauncher;
3+
requires cpw.mods.securejarhandler;
4+
requires net.neoforged.bus;
5+
requires net.neoforged.neoforgespi;
6+
requires net.neoforged.mergetool.api;
7+
requires net.neoforged.fancymodloader.core;
8+
requires net.neoforged.fancymodloader.loader;
9+
requires org.apache.logging.log4j;
10+
requires org.objectweb.asm;
11+
12+
exports net.neoforged.fml.common;
13+
exports net.neoforged.fml.javafmlmod;
14+
15+
provides net.neoforged.neoforgespi.language.IModLanguageProvider with
16+
net.neoforged.fml.javafmlmod.FMLJavaModLanguageProvider;
17+
}

‎languages/java/src/main/resources/META-INF/services/net.neoforged.neoforgespi.language.IModLanguageProvider

-1
This file was deleted.

‎languages/lowcode/src/main/java/module-info.java

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
open module net.neoforged.fancymodloader.language.lowcode {
2+
requires cpw.mods.modlauncher;
3+
requires logging;
4+
requires net.neoforged.bus;
5+
requires net.neoforged.neoforgespi;
6+
requires net.neoforged.fancymodloader.core;
7+
requires net.neoforged.fancymodloader.loader;
8+
requires org.apache.logging.log4j;
9+
requires org.slf4j;
10+
requires static org.jetbrains.annotations;
11+
12+
exports net.neoforged.fml.lowcodemod;
13+
14+
provides net.neoforged.neoforgespi.language.IModLanguageProvider with
15+
net.neoforged.fml.lowcodemod.LowCodeModLanguageProvider;
16+
}

‎languages/lowcode/src/main/resources/META-INF/services/net.neoforged.neoforgespi.language.IModLanguageProvider

-1
This file was deleted.

‎languages/minecraft/src/main/java/module-info.java

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
open module net.neoforged.fancymodloader.language.minecraft {
2+
requires net.neoforged.bus;
3+
requires net.neoforged.neoforgespi;
4+
requires net.neoforged.fancymodloader.core;
5+
requires org.apache.logging.log4j;
6+
requires static org.jetbrains.annotations;
7+
8+
exports net.neoforged.fml.mclanguageprovider;
9+
10+
provides net.neoforged.neoforgespi.language.IModLanguageProvider with
11+
net.neoforged.fml.mclanguageprovider.MinecraftModLanguageProvider;
12+
}

‎languages/minecraft/src/main/resources/META-INF/services/net.neoforged.neoforgespi.language.IModLanguageProvider

-1
This file was deleted.

‎loader/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ dependencies {
44
api("org.ow2.asm:asm:${asm_version}")
55
api("org.ow2.asm:asm-tree:${asm_version}")
66
api("org.ow2.asm:asm-commons:${asm_version}")
7+
api("org.ow2.asm:asm-analysis:${asm_version}")
8+
api("org.ow2.asm:asm-util:${asm_version}")
79
api(project(':spi'))
810
api("net.neoforged:mergetool:${mergetool_version}:api")
911
api("org.apache.logging.log4j:log4j-api:${log4j_version}")

‎loader/src/main/java/module-info.java

+71
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
open module net.neoforged.fancymodloader.loader {
2+
requires net.neoforged.accesstransformer;
3+
requires net.neoforged.accesstransformer.modlauncher;
4+
requires com.electronwill.nightconfig.core;
5+
requires com.google.common;
6+
requires com.google.gson;
7+
requires cpw.mods.modlauncher;
8+
requires cpw.mods.securejarhandler;
9+
requires JarJarSelector;
10+
requires logging;
11+
requires maven.artifact;
12+
requires net.neoforged.neoforgespi;
13+
requires net.neoforged.mergetool.api;
14+
requires org.apache.commons.lang3;
15+
requires org.apache.logging.log4j.core;
16+
requires org.apache.logging.log4j;
17+
requires org.objectweb.asm.commons;
18+
requires org.objectweb.asm.tree;
19+
requires org.objectweb.asm.tree.analysis;
20+
requires org.objectweb.asm.util;
21+
requires org.objectweb.asm;
22+
requires org.slf4j;
23+
requires org.spongepowered.mixin;
24+
requires terminalconsoleappender;
25+
requires static org.jetbrains.annotations;
26+
27+
exports net.neoforged.fml.common.asm;
28+
exports net.neoforged.fml.loading;
29+
exports net.neoforged.fml.loading.log4j;
30+
exports net.neoforged.fml.loading.moddiscovery;
31+
exports net.neoforged.fml.loading.progress;
32+
exports net.neoforged.fml.loading.targets;
33+
exports net.neoforged.fml.loading.toposort;
34+
exports net.neoforged.fml.server;
35+
36+
uses net.neoforged.neoforgespi.coremod.ICoreModProvider;
37+
uses net.neoforged.neoforgespi.language.IModLanguageProvider;
38+
uses net.neoforged.neoforgespi.locating.IModLocator;
39+
uses net.neoforged.neoforgespi.locating.IDependencyLocator;
40+
uses net.neoforged.fml.loading.ImmediateWindowProvider;
41+
42+
provides cpw.mods.modlauncher.api.ILaunchHandlerService with
43+
net.neoforged.fml.loading.targets.ForgeClientLaunchHandler,
44+
net.neoforged.fml.loading.targets.ForgeClientDevLaunchHandler,
45+
net.neoforged.fml.loading.targets.ForgeClientUserdevLaunchHandler,
46+
net.neoforged.fml.loading.targets.ForgeServerLaunchHandler,
47+
net.neoforged.fml.loading.targets.ForgeServerDevLaunchHandler,
48+
net.neoforged.fml.loading.targets.ForgeServerUserdevLaunchHandler,
49+
net.neoforged.fml.loading.targets.ForgeDataDevLaunchHandler,
50+
net.neoforged.fml.loading.targets.ForgeDataUserdevLaunchHandler;
51+
provides cpw.mods.modlauncher.api.INameMappingService with
52+
net.neoforged.fml.loading.MCPNamingService;
53+
provides cpw.mods.modlauncher.api.ITransformationService with
54+
net.neoforged.fml.loading.FMLServiceProvider;
55+
provides cpw.mods.modlauncher.serviceapi.ILaunchPluginService with
56+
net.neoforged.fml.loading.log4j.SLF4JFixerLaunchPluginService,
57+
net.neoforged.fml.common.asm.RuntimeDistCleaner,
58+
net.neoforged.fml.common.asm.RuntimeEnumExtender;
59+
provides cpw.mods.modlauncher.serviceapi.ITransformerDiscoveryService with
60+
net.neoforged.fml.loading.ModDirTransformerDiscoverer,
61+
net.neoforged.fml.loading.ClasspathTransformerDiscoverer;
62+
provides net.neoforged.neoforgespi.locating.IDependencyLocator with
63+
net.neoforged.fml.loading.moddiscovery.JarInJarDependencyLocator;
64+
provides net.neoforged.neoforgespi.locating.IModLocator with
65+
net.neoforged.fml.loading.moddiscovery.ModsFolderLocator,
66+
net.neoforged.fml.loading.moddiscovery.MavenDirectoryLocator,
67+
net.neoforged.fml.loading.moddiscovery.ExplodedDirectoryLocator,
68+
net.neoforged.fml.loading.moddiscovery.MinecraftLocator,
69+
net.neoforged.fml.loading.moddiscovery.ClasspathLocator,
70+
net.neoforged.fml.loading.moddiscovery.BuiltinGameLibraryLocator;
71+
}

‎loader/src/main/java/net/neoforged/fml/loading/targets/CommonLaunchHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void configureTransformationClassLoader(final ITransformingClassLoaderBui
5858

5959
protected String[] preLaunch(String[] arguments, ModuleLayer layer) {
6060
URI uri;
61-
try (var reader = layer.configuration().findModule("fml_loader").orElseThrow().reference().open()) {
61+
try (var reader = layer.configuration().findModule("net.neoforged.fancymodloader.loader").orElseThrow().reference().open()) {
6262
uri = reader.find("log4j2.xml").orElseThrow();
6363
} catch (IOException e) {
6464
throw new RuntimeException(e);

‎loader/src/main/java/net/neoforged/fml/loading/targets/FMLClientLaunchHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class FMLClientLaunchHandler extends CommonClientLaunchHandler {
1717

1818
@Override
1919
protected void processMCStream(VersionInfo versionInfo, Stream.Builder<Path> mc, Stream.Builder<List<Path>> mods) {
20-
var fmlonly = LibraryFinder.findPathForMaven("net.neoforged.fml", "fmlonly", "", "universal", versionInfo.mcAndFmlVersion());
20+
var fmlonly = LibraryFinder.findPathForMaven("net.neoforged.fancymodloader", "fmlonly", "", "universal", versionInfo.mcAndFmlVersion());
2121
mods.add(List.of(fmlonly));
2222
}
2323
}

‎loader/src/main/java/net/neoforged/fml/loading/targets/FMLServerLaunchHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class FMLServerLaunchHandler extends CommonServerLaunchHandler {
1717

1818
@Override
1919
protected void processMCStream(VersionInfo versionInfo, Stream.Builder<Path> mc, Stream.Builder<List<Path>> mods) {
20-
var fmlonly = LibraryFinder.findPathForMaven("net.neoforged.fml", "fmlonly", "", "universal", versionInfo.mcAndFmlVersion());
20+
var fmlonly = LibraryFinder.findPathForMaven("net.neoforged.fancymodloader", "fmlonly", "", "universal", versionInfo.mcAndFmlVersion());
2121
mods.add(List.of(fmlonly));
2222
}
2323
}

‎loader/src/main/resources/META-INF/services/cpw.mods.modlauncher.api.ILaunchHandlerService

-8
This file was deleted.

‎loader/src/main/resources/META-INF/services/cpw.mods.modlauncher.api.INameMappingService

-1
This file was deleted.

‎loader/src/main/resources/META-INF/services/cpw.mods.modlauncher.api.ITransformationService

-1
This file was deleted.

‎loader/src/main/resources/META-INF/services/cpw.mods.modlauncher.serviceapi.ILaunchPluginService

-3
This file was deleted.

‎loader/src/main/resources/META-INF/services/cpw.mods.modlauncher.serviceapi.ITransformerDiscoveryService

-2
This file was deleted.

‎loader/src/main/resources/META-INF/services/net.neoforged.neoforgespi.locating.IDependencyLocator

-1
This file was deleted.

‎loader/src/main/resources/META-INF/services/net.neoforged.neoforgespi.locating.IModLocator

-6
This file was deleted.

‎spi/src/main/java/module-info.java

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
open module net.neoforged.neoforgespi {
2+
requires maven.artifact;
3+
requires net.neoforged.mergetool.api;
4+
requires org.apache.logging.log4j;
5+
requires org.objectweb.asm;
6+
requires cpw.mods.securejarhandler;
7+
requires cpw.mods.modlauncher;
8+
9+
exports net.neoforged.neoforgespi;
10+
exports net.neoforged.neoforgespi.coremod;
11+
exports net.neoforged.neoforgespi.language;
12+
exports net.neoforged.neoforgespi.locating;
13+
}

0 commit comments

Comments
 (0)