Mods don't need to explicitly read minecraft module

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

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/languages/java/src/main/java/net/minecraftforge/fml/javafmlmod/FMLModContainer.java b/languages/java/src/main/java/net/minecraftforge/fml/javafmlmod/FMLModContainer.java
@@ -50,8 +50,8 @@ public FMLModContainer(IModInfo info, String className, ModFileScanData modFileS
  try
  {
  var moduleName = info.getOwningFile().getFile().getSecureJar().moduleDataProvider().descriptor().name();
- var layer = gameLayer.findModule(moduleName).orElseThrow();
- modClass = Class.forName(layer, className);
+ var module = gameLayer.findModule(moduleName).orElseThrow();
+ modClass = Class.forName(module, className);
  LOGGER.trace(LOADING,"Loaded modclass {} with {}", modClass.getName(), modClass.getClassLoader());
  }
  catch (Throwable e)

diff --git a/loader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModJarMetadata.java b/loader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModJarMetadata.java
@@ -15,14 +15,14 @@
 import java.nio.file.Path;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Set;
 import java.util.function.BiPredicate;
 import java.util.function.Function;
 import java.util.function.Predicate;
 
 public final class ModJarMetadata implements JarMetadata {
  private static final String MODULE_INFO = "module-info.class";
  private static final String AUTOMATIC_MODULE_NAME = "Automatic-Module-Name";
- private static final String MINECRAFT_MODULE = "minecraft";
 
  private IModFile modFile;
  private ModuleDescriptor descriptor;
@@ -81,11 +81,9 @@ public ModuleDescriptor descriptor() {
  JarMetadata metadata = new ModuleJarMetadata(uri, secureJar.getPackages());
  ModuleDescriptor jarDescriptor = metadata.descriptor();
  // Convert descriptor to builder
- var builder = wrapDescriptor(jarDescriptor);
- // Use version from mod metadata
- builder.version(version());
- // Add readability edge on the minecraft module
- builder.requires(MINECRAFT_MODULE);
+ var builder = wrapDescriptor(jarDescriptor)
+ // Use version from mod metadata
+ .version(version());
  return builder.build();
  })
  // If the jar does not contain a module descriptor, we build one ourselves