Skip to content

Commit 2498845

Browse files
committed
Match module base name with maven group
1 parent 775f2f3 commit 2498845

File tree

10 files changed

+19
-19
lines changed

10 files changed

+19
-19
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
open module net.neoforged.fml.core {
1+
open module net.neoforged.fancymodloader.core {
22
requires com.electronwill.nightconfig.core;
33
requires com.electronwill.nightconfig.toml;
44
requires com.google.common;
@@ -10,7 +10,7 @@
1010
requires net.minecraftforge.eventbus;
1111
requires net.minecraftforge.forgespi;
1212
requires net.minecraftforge.mergetool.api;
13-
requires net.neoforged.fml.loader;
13+
requires net.neoforged.fancymodloader.loader;
1414
requires org.apache.commons.io;
1515
requires org.apache.logging.log4j;
1616
requires org.slf4j;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
open module net.neoforged.fml.earlydisplay {
1+
open module net.neoforged.fancymodloader.earlydisplay {
22
requires java.desktop;
33
requires java.management;
44
requires jdk.management;
55
requires jopt.simple;
6-
requires net.neoforged.fml.loader;
6+
requires net.neoforged.fancymodloader.loader;
77
requires org.lwjgl.glfw;
88
requires org.lwjgl.opengl;
99
requires org.lwjgl.stb;

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
open module net.neoforged.fml.events {
2-
requires net.neoforged.fml.core;
1+
open module net.neoforged.fancymodloader.events {
2+
requires net.neoforged.fancymodloader.core;
33
requires net.minecraftforge.mergetool.api;
4-
requires net.neoforged.fml.loader;
4+
requires net.neoforged.fancymodloader.loader;
55
requires cpw.mods.modlauncher;
66
requires net.minecraftforge.eventbus;
77

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
open module net.neoforged.fml.language.java {
1+
open module net.neoforged.fancymodloader.language.java {
22
requires cpw.mods.modlauncher;
33
requires cpw.mods.securejarhandler;
44
requires net.minecraftforge.eventbus;
55
requires net.minecraftforge.forgespi;
66
requires net.minecraftforge.mergetool.api;
7-
requires net.neoforged.fml.core;
8-
requires net.neoforged.fml.loader;
7+
requires net.neoforged.fancymodloader.core;
8+
requires net.neoforged.fancymodloader.loader;
99
requires org.apache.logging.log4j;
1010
requires org.objectweb.asm;
1111

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
open module net.neoforged.fml.language.lowcode {
1+
open module net.neoforged.fancymodloader.language.lowcode {
22
requires cpw.mods.modlauncher;
33
requires logging;
44
requires net.minecraftforge.eventbus;
55
requires net.minecraftforge.forgespi;
6-
requires net.neoforged.fml.core;
7-
requires net.neoforged.fml.loader;
6+
requires net.neoforged.fancymodloader.core;
7+
requires net.neoforged.fancymodloader.loader;
88
requires org.apache.logging.log4j;
99
requires org.slf4j;
1010

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
open module net.neoforged.fml.language.minecraft {
1+
open module net.neoforged.fancymodloader.language.minecraft {
22
requires net.minecraftforge.forgespi;
3-
requires net.neoforged.fml.core;
3+
requires net.neoforged.fancymodloader.core;
44
requires org.apache.logging.log4j;
55

66
exports net.minecraftforge.fml.mclanguageprovider;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
open module net.neoforged.fml.loader {
1+
open module net.neoforged.fancymodloader.loader {
22
requires accesstransformers;
33
requires com.electronwill.nightconfig.core;
44
requires com.google.common;

loader/src/main/java/net/minecraftforge/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("net.neoforged.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/minecraftforge/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/minecraftforge/fml/loading/targets/FMLServerLaunchHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class FMLServerLaunchHandler extends CommonServerLaunchHandler implements
1919

2020
@Override
2121
protected BiPredicate<String, String> processMCStream(VersionInfo versionInfo, Stream.Builder<Path> mc, BiPredicate<String, String> filter, Stream.Builder<List<Path>> mods) {
22-
var fmlonly = LibraryFinder.findPathForMaven("net.neoforged.fml", "fmlonly", "", "universal", versionInfo.mcAndFmlVersion());
22+
var fmlonly = LibraryFinder.findPathForMaven("net.neoforged.fancymodloader", "fmlonly", "", "universal", versionInfo.mcAndFmlVersion());
2323
mods.add(List.of(fmlonly));
2424
return filter;
2525
}

0 commit comments

Comments
 (0)