Match module base name with maven group

neoforged · Sep 26, 2023 · 2498845 · 2498845
1 parent 775f2f3
commit 2498845
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 19 deletions.
diff --git a/core/src/main/java/module-info.java b/core/src/main/java/module-info.java
@@ -1,4 +1,4 @@
-open module net.neoforged.fml.core {
+open module net.neoforged.fancymodloader.core {
  requires com.electronwill.nightconfig.core;
  requires com.electronwill.nightconfig.toml;
  requires com.google.common;
@@ -10,7 +10,7 @@
  requires net.minecraftforge.eventbus;
  requires net.minecraftforge.forgespi;
  requires net.minecraftforge.mergetool.api;
- requires net.neoforged.fml.loader;
+ requires net.neoforged.fancymodloader.loader;
  requires org.apache.commons.io;
  requires org.apache.logging.log4j;
  requires org.slf4j;

diff --git a/earlydisplay/src/main/java/module-info.java b/earlydisplay/src/main/java/module-info.java
@@ -1,9 +1,9 @@
-open module net.neoforged.fml.earlydisplay {
+open module net.neoforged.fancymodloader.earlydisplay {
  requires java.desktop;
  requires java.management;
  requires jdk.management;
  requires jopt.simple;
- requires net.neoforged.fml.loader;
+ requires net.neoforged.fancymodloader.loader;
  requires org.lwjgl.glfw;
  requires org.lwjgl.opengl;
  requires org.lwjgl.stb;

diff --git a/events/src/main/java/module-info.java b/events/src/main/java/module-info.java
@@ -1,7 +1,7 @@
-open module net.neoforged.fml.events {
- requires net.neoforged.fml.core;
+open module net.neoforged.fancymodloader.events {
+ requires net.neoforged.fancymodloader.core;
  requires net.minecraftforge.mergetool.api;
- requires net.neoforged.fml.loader;
+ requires net.neoforged.fancymodloader.loader;
  requires cpw.mods.modlauncher;
  requires net.minecraftforge.eventbus;
 

diff --git a/languages/java/src/main/java/module-info.java b/languages/java/src/main/java/module-info.java
@@ -1,11 +1,11 @@
-open module net.neoforged.fml.language.java {
+open module net.neoforged.fancymodloader.language.java {
  requires cpw.mods.modlauncher;
  requires cpw.mods.securejarhandler;
  requires net.minecraftforge.eventbus;
  requires net.minecraftforge.forgespi;
  requires net.minecraftforge.mergetool.api;
- requires net.neoforged.fml.core;
- requires net.neoforged.fml.loader;
+ requires net.neoforged.fancymodloader.core;
+ requires net.neoforged.fancymodloader.loader;
  requires org.apache.logging.log4j;
  requires org.objectweb.asm;
 

diff --git a/languages/lowcode/src/main/java/module-info.java b/languages/lowcode/src/main/java/module-info.java
@@ -1,10 +1,10 @@
-open module net.neoforged.fml.language.lowcode {
+open module net.neoforged.fancymodloader.language.lowcode {
  requires cpw.mods.modlauncher;
  requires logging;
  requires net.minecraftforge.eventbus;
  requires net.minecraftforge.forgespi;
- requires net.neoforged.fml.core;
- requires net.neoforged.fml.loader;
+ requires net.neoforged.fancymodloader.core;
+ requires net.neoforged.fancymodloader.loader;
  requires org.apache.logging.log4j;
  requires org.slf4j;
 

diff --git a/languages/minecraft/src/main/java/module-info.java b/languages/minecraft/src/main/java/module-info.java
@@ -1,6 +1,6 @@
-open module net.neoforged.fml.language.minecraft {
+open module net.neoforged.fancymodloader.language.minecraft {
  requires net.minecraftforge.forgespi;
- requires net.neoforged.fml.core;
+ requires net.neoforged.fancymodloader.core;
  requires org.apache.logging.log4j;
 
  exports net.minecraftforge.fml.mclanguageprovider;

diff --git a/loader/src/main/java/module-info.java b/loader/src/main/java/module-info.java
@@ -1,4 +1,4 @@
-open module net.neoforged.fml.loader {
+open module net.neoforged.fancymodloader.loader {
  requires accesstransformers;
  requires com.electronwill.nightconfig.core;
  requires com.google.common;

diff --git a/loader/src/main/java/net/minecraftforge/fml/loading/targets/CommonLaunchHandler.java b/loader/src/main/java/net/minecraftforge/fml/loading/targets/CommonLaunchHandler.java
@@ -58,7 +58,7 @@ public void configureTransformationClassLoader(final ITransformingClassLoaderBui
 
  protected String[] preLaunch(String[] arguments, ModuleLayer layer) {
  URI uri;
- try (var reader = layer.configuration().findModule("net.neoforged.fml.loader").orElseThrow().reference().open()) {
+ try (var reader = layer.configuration().findModule("net.neoforged.fancymodloader.loader").orElseThrow().reference().open()) {
  uri = reader.find("log4j2.xml").orElseThrow();
  } catch (IOException e) {
  throw new RuntimeException(e);

diff --git a/loader/src/main/java/net/minecraftforge/fml/loading/targets/FMLClientLaunchHandler.java b/loader/src/main/java/net/minecraftforge/fml/loading/targets/FMLClientLaunchHandler.java
@@ -17,7 +17,7 @@ public class FMLClientLaunchHandler extends CommonClientLaunchHandler {
 
  @Override
  protected void processMCStream(VersionInfo versionInfo, Stream.Builder<Path> mc, Stream.Builder<List<Path>> mods) {
- var fmlonly = LibraryFinder.findPathForMaven("net.neoforged.fml", "fmlonly", "", "universal", versionInfo.mcAndFmlVersion());
+ var fmlonly = LibraryFinder.findPathForMaven("net.neoforged.fancymodloader", "fmlonly", "", "universal", versionInfo.mcAndFmlVersion());
  mods.add(List.of(fmlonly));
  }
 }
diff --git a/loader/src/main/java/net/minecraftforge/fml/loading/targets/FMLServerLaunchHandler.java b/loader/src/main/java/net/minecraftforge/fml/loading/targets/FMLServerLaunchHandler.java
@@ -19,7 +19,7 @@ public class FMLServerLaunchHandler extends CommonServerLaunchHandler implements
 
  @Override
  protected BiPredicate<String, String> processMCStream(VersionInfo versionInfo, Stream.Builder<Path> mc, BiPredicate<String, String> filter, Stream.Builder<List<Path>> mods) {
- var fmlonly = LibraryFinder.findPathForMaven("net.neoforged.fml", "fmlonly", "", "universal", versionInfo.mcAndFmlVersion());
+ var fmlonly = LibraryFinder.findPathForMaven("net.neoforged.fancymodloader", "fmlonly", "", "universal", versionInfo.mcAndFmlVersion());
  mods.add(List.of(fmlonly));
  return filter;
  }