Skip to content

feat: Allow fabric loader to remap intermediary mods to runtime namespace outside development #1062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

feat: Allow fabric loader to remap intermediary mods to runtime namespace outside development #1062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d29f84
feat: allow deobfuscating the game jar to a custom namespace in inter…
AlexProgrammerDE Jul 5, 2025
42c5164
fix: remove duplicate conditions, print correct error messages
AlexProgrammerDE Jul 5, 2025
b5a3b8a
feat: allow enabling runtime md remapping using system properties
AlexProgrammerDE Jul 5, 2025
8981931
fix: change log messages to be shorter & clearer
AlexProgrammerDE Jul 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/net/fabricmc/loader/impl/FabricLoaderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ public void load() {
}

private void setup() throws ModResolutionException {
boolean remapRegularMods = isDevelopmentEnvironment();
boolean remapRegularMods = FabricLauncherBase.getLauncher().isRemapMods();
VersionOverrides versionOverrides = new VersionOverrides();
DependencyOverrides depOverrides = new DependencyOverrides(configDir);

Expand Down
12 changes: 6 additions & 6 deletions src/main/java/net/fabricmc/loader/impl/game/GameProviderHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,15 +157,17 @@ public static final class FindResult {
private static boolean emittedInfo = false;

public static Map<String, Path> deobfuscate(Map<String, Path> inputFileMap, String sourceNamespace, String gameId, String gameVersion, Path gameDir, FabricLauncher launcher) {
Log.debug(LogCategory.GAME_REMAP, "Requesting deobfuscation of %s", inputFileMap);
return deobfuscate(inputFileMap, sourceNamespace, launcher.getMappingConfiguration().getRuntimeNamespace(), gameId, gameVersion, gameDir, launcher);
}

MappingConfiguration mappingConfig = launcher.getMappingConfiguration();
String targetNamespace = mappingConfig.getRuntimeNamespace();
public static Map<String, Path> deobfuscate(Map<String, Path> inputFileMap, String sourceNamespace, String targetNamespace, String gameId, String gameVersion, Path gameDir, FabricLauncher launcher) {
Log.debug(LogCategory.GAME_REMAP, "Requesting deobfuscation of %s", inputFileMap);

if (sourceNamespace.equals(targetNamespace)) {
return inputFileMap;
}

MappingConfiguration mappingConfig = launcher.getMappingConfiguration();
if (!mappingConfig.matches(gameId, gameVersion)) {
String mappingsGameId = mappingConfig.getGameId();
String mappingsGameVersion = mappingConfig.getGameVersion();
Expand All @@ -180,9 +182,7 @@ public static Map<String, Path> deobfuscate(Map<String, Path> inputFileMap, Stri

List<String> namespaces = mappingConfig.getNamespaces();

if (namespaces == null
|| !namespaces.contains(sourceNamespace)
|| !namespaces.contains(targetNamespace)) {
if (namespaces == null) {
Log.debug(LogCategory.GAME_REMAP, "No mappings, using input files");
return inputFileMap;
}
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/net/fabricmc/loader/impl/launch/FabricLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ public interface FabricLauncher {

boolean isDevelopment();

boolean isRemapMods();

String getEntrypoint();

String getDefaultRuntimeNamespace();
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/net/fabricmc/loader/impl/launch/FabricLauncherBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,14 @@ public final boolean isDevelopment() {
return IS_DEVELOPMENT;
}

@Override
public final boolean isRemapMods() {
String ret = System.getProperty(SystemProperties.REMAP_MODS);
if (ret != null) return SystemProperties.isSet(SystemProperties.REMAP_MODS);

return IS_DEVELOPMENT;
}

@Override
public MappingConfiguration getMappingConfiguration() {
return mappingConfiguration;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/fabricmc/loader/impl/launch/FabricMixinBootstrap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public static void init(EnvType side, FabricLoaderImpl loader) {

MixinBootstrap.init();

if (FabricLauncherBase.getLauncher().isDevelopment()) {
if (FabricLauncherBase.getLauncher().isRemapMods()) {
MappingConfiguration mappingConfiguration = FabricLauncherBase.getLauncher().getMappingConfiguration();
MappingTree mappings = mappingConfiguration.getMappings();
final String modNs = MappingConfiguration.INTERMEDIARY_NAMESPACE;
Expand All @@ -76,9 +76,9 @@ public static void init(EnvType side, FabricLoaderImpl loader) {
try {
MixinIntermediaryDevRemapper remapper = new MixinIntermediaryDevRemapper(mappings, modNs, runtimeNs);
MixinEnvironment.getDefaultEnvironment().getRemappers().add(remapper);
Log.info(LogCategory.MIXIN, "Loaded Fabric development mappings for mixin remapper!");
Log.info(LogCategory.MIXIN, "Loaded Fabric mappings for mixin remapper!");
} catch (Exception e) {
Log.error(LogCategory.MIXIN, "Fabric development environment setup error - the game will probably crash soon!", e);
Log.error(LogCategory.MIXIN, "Fabric mixin remapper setup error - the game will probably crash soon!", e);
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/net/fabricmc/loader/impl/util/SystemProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ public final class SystemProperties {
public static final String GAME_MAPPING_NAMESPACE = "fabric.gameMappingNamespace";
// mapping namespace to use at runtime, defaults to named if DEVELOPMENT is set or intermediary otherwise
public static final String RUNTIME_MAPPING_NAMESPACE = "fabric.runtimeMappingNamespace";
// remaps mods to the runtime mapping namespace, defaults to true if DEVELOPMENT is set or false otherwise
public static final String REMAP_MODS = "fabric.remapMods";
// skips the embedded MC game provider, letting ServiceLoader-provided ones take over
public static final String SKIP_MC_PROVIDER = "fabric.skipMcProvider";
// game jar paths for common/client/server, replaces lookup from class path if present, env specific takes precedence
Expand Down