Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import net.fabricmc.loom.task.service.ClientEntriesService;
import net.fabricmc.loom.task.service.JarManifestService;
import net.fabricmc.loom.util.Constants;
import net.fabricmc.loom.util.gradle.GradleUtils;
import net.fabricmc.loom.util.gradle.SourceSetHelper;
import net.fabricmc.loom.util.service.ScopedServiceFactory;

Expand Down Expand Up @@ -83,15 +84,17 @@ public void configure() {

extension.getUnmappedModCollection().from(project.getTasks().named(JavaPlugin.JAR_TASK_NAME));

if (extension.isForge()) {
if (PropertyUtil.getAndFinalize(extension.getForge().getConvertAccessWideners())) {
extension.getForge().convertAccessWideners(project.getTasks().named(JavaPlugin.JAR_TASK_NAME, Jar.class), settings -> {
settings.getAccessWideners().addAll(Aw2At.getForgeAtAccessWideners(project));
});
}
GradleUtils.afterSuccessfulEvaluation(project, () -> {
if (extension.isForge()) {
if (PropertyUtil.getAndFinalize(extension.getForge().getConvertAccessWideners())) {
extension.getForge().convertAccessWideners(project.getTasks().named(JavaPlugin.JAR_TASK_NAME, Jar.class), settings -> {
settings.getAccessWideners().addAll(Aw2At.getForgeAtAccessWideners(project));
});
}

ModBuildExtensions.addMixinConfigsToDefaultJarManifest(project);
}
ModBuildExtensions.addMixinConfigsToDefaultJarManifest(project);
}
});
}

private List<String> getClientOnlyEntries() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,14 @@

package net.fabricmc.loom.test.integration.forge

import java.util.jar.Manifest

import spock.lang.Specification
import spock.lang.Unroll

import net.fabricmc.loom.test.util.GradleProjectTestTrait
import net.fabricmc.loom.util.Constants
import net.fabricmc.loom.util.ZipUtils

import static net.fabricmc.loom.test.LoomTestConstants.DEFAULT_GRADLE
import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
Expand All @@ -51,6 +55,10 @@ class Forge261Test extends Specification implements GradleProjectTestTrait {
then:
result.task(":build").outcome == SUCCESS

def main = gradle.getOutputFile("fabric-example-mod-1.0.0.jar").toPath()
def manifest = new Manifest(new ByteArrayInputStream(ZipUtils.unpack(main, "META-INF/MANIFEST.MF")))
manifest.getMainAttributes().getValue(Constants.Forge.MIXIN_CONFIGS_MANIFEST_KEY) == "test.mixins.json"

where:
mcVersion | forgeVersion
'26.1' | '62.0.9'
Expand Down
6 changes: 6 additions & 0 deletions src/test/resources/projects/forge/261/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ group = project.maven_group
def mcVersion = "@MCVERSION@"
def forgeVersion = "@FORGEVERSION@"

loom {
forge {
mixinConfigs "test.mixins.json"
}
}

dependencies {
minecraft "com.mojang:minecraft:$mcVersion"
forge "net.minecraftforge:forge:$mcVersion-$forgeVersion"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"required": true,
"minVersion": "0.8",
"package": "com.example.mixin",
"compatibilityLevel": "JAVA_21",
"mixins": [
],
"injectors": {
"defaultRequire": 1
}
}
Loading