Fix client environment annotations not being applied to the client only jar when using split sources.

This commit is contained in:
modmuss50
2023-01-24 23:10:54 +00:00
parent 5094a8af86
commit f61afd865e

View File

@@ -29,6 +29,7 @@ import java.util.List;
import net.fabricmc.loom.api.mappings.layered.MappingsNamespace;
import net.fabricmc.loom.configuration.ConfigContext;
import net.fabricmc.loom.configuration.providers.minecraft.MergedMinecraftProvider;
import net.fabricmc.loom.configuration.providers.minecraft.MinecraftJar;
import net.fabricmc.loom.configuration.providers.minecraft.MinecraftProvider;
import net.fabricmc.loom.configuration.providers.minecraft.SingleJarEnvType;
import net.fabricmc.loom.configuration.providers.minecraft.SingleJarMinecraftProvider;
@@ -79,7 +80,11 @@ public abstract sealed class IntermediaryMinecraftProvider<M extends MinecraftPr
@Override
protected void configureRemapper(RemappedJars remappedJars, TinyRemapper.Builder tinyRemapperBuilder) {
if (remappedJars.outputJar().equals(getClientOnlyJar())) {
final MinecraftJar outputJar = remappedJars.outputJar();
assert !outputJar.isMerged();
if (outputJar.includesClient()) {
assert !outputJar.includesServer();
tinyRemapperBuilder.extraPostApplyVisitor(SidedClassVisitor.CLIENT);
}
}