Skip to content

Commit 775f2f3

Browse files
committed
Mods don't need to explicitly read minecraft module
1 parent 18b2a23 commit 775f2f3

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

languages/java/src/main/java/net/minecraftforge/fml/javafmlmod/FMLModContainer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ public FMLModContainer(IModInfo info, String className, ModFileScanData modFileS
5050
try
5151
{
5252
var moduleName = info.getOwningFile().getFile().getSecureJar().moduleDataProvider().descriptor().name();
53-
var layer = gameLayer.findModule(moduleName).orElseThrow();
54-
modClass = Class.forName(layer, className);
53+
var module = gameLayer.findModule(moduleName).orElseThrow();
54+
modClass = Class.forName(module, className);
5555
LOGGER.trace(LOADING,"Loaded modclass {} with {}", modClass.getName(), modClass.getClassLoader());
5656
}
5757
catch (Throwable e)

loader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModJarMetadata.java

+4-6
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
import java.nio.file.Path;
1616
import java.util.Objects;
1717
import java.util.Optional;
18+
import java.util.Set;
1819
import java.util.function.BiPredicate;
1920
import java.util.function.Function;
2021
import java.util.function.Predicate;
2122

2223
public final class ModJarMetadata implements JarMetadata {
2324
private static final String MODULE_INFO = "module-info.class";
2425
private static final String AUTOMATIC_MODULE_NAME = "Automatic-Module-Name";
25-
private static final String MINECRAFT_MODULE = "minecraft";
2626

2727
private IModFile modFile;
2828
private ModuleDescriptor descriptor;
@@ -81,11 +81,9 @@ public ModuleDescriptor descriptor() {
8181
JarMetadata metadata = new ModuleJarMetadata(uri, secureJar.getPackages());
8282
ModuleDescriptor jarDescriptor = metadata.descriptor();
8383
// Convert descriptor to builder
84-
var builder = wrapDescriptor(jarDescriptor);
85-
// Use version from mod metadata
86-
builder.version(version());
87-
// Add readability edge on the minecraft module
88-
builder.requires(MINECRAFT_MODULE);
84+
var builder = wrapDescriptor(jarDescriptor)
85+
// Use version from mod metadata
86+
.version(version());
8987
return builder.build();
9088
})
9189
// If the jar does not contain a module descriptor, we build one ourselves

0 commit comments

Comments
 (0)