Skip to content

Commit 3dcecb6

Browse files
committed
Fix issues preventing importing the project in eclipse
1 parent 80512f6 commit 3dcecb6

File tree

3 files changed

+18
-8
lines changed

3 files changed

+18
-8
lines changed

src/main/groovy/net/minecraftforge/forgedev/ForgeDevExtension.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import net.minecraftforge.gradleutils.shared.Closures;
2929
import org.gradle.api.Action;
3030
import org.gradle.api.Project;
31+
import org.gradle.api.artifacts.Configuration;
3132
import org.gradle.api.artifacts.ExternalModuleDependency;
3233
import org.gradle.api.artifacts.ModuleIdentifier;
3334
import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
@@ -95,6 +96,11 @@ public DirectoryProperty getMavenizerRepo() {
9596
return this.mavenizerRepo;
9697
}
9798

99+
private Configuration minecraftDepsConfiguration;
100+
public Configuration getMinecraftConfiguration() {
101+
return this.minecraftDepsConfiguration;
102+
}
103+
98104
private void setup(ForgeDevPlugin plugin, Project project) {
99105
var tasks = project.getTasks();
100106

@@ -114,7 +120,7 @@ private void setup(ForgeDevPlugin plugin, Project project) {
114120
var downloadClientMappings = tasks.register("downloadClientMappings", DownloadMappings.class, task -> task.getSide().set("client"));
115121
var downloadServerMappings = tasks.register("downloadServerMappings", DownloadMappings.class, task -> task.getSide().set("server"));
116122

117-
var minecraftDepsConfiguration = project.getConfigurations().detachedConfiguration();
123+
minecraftDepsConfiguration = project.getConfigurations().detachedConfiguration();
118124
var mappingsConfiguration = project.getConfigurations().detachedConfiguration();
119125

120126
var applyPatches = tasks.register("applyPatches", ApplyPatches.class, task -> {

src/main/groovy/net/minecraftforge/forgedev/legacy/tasks/CheckForgeJarCompatibility.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.gradle.api.file.RegularFileProperty;
2020
import org.gradle.api.specs.Spec;
2121
import org.gradle.api.tasks.Input;
22+
import org.gradle.api.tasks.InputFile;
2223
import org.gradle.api.tasks.Optional;
2324
import org.gradle.api.tasks.OutputFile;
2425
import org.gradle.api.tasks.TaskAction;
@@ -31,14 +32,16 @@
3132
import java.nio.file.StandardCopyOption;
3233

3334
public class CheckForgeJarCompatibility {
35+
private static final String TASK_NAME = "checkJarCompatibility";
36+
3437
public static TaskProvider<CheckJarCompatibility> register(Project project, String minecraftVersion, Action<? super CheckJarCompatibility> action) {
35-
if (project.getTasks().getNames().contains("setupCheckJarCompatibility"))
36-
throw new IllegalStateException("Cannot register setupCheckJarCompatibility more than once");
38+
if (project.getTasks().getNames().contains(TASK_NAME))
39+
throw new IllegalStateException("Cannot register " + TASK_NAME + " more than once");
3740

3841
var baseForgeVersion = project.getObjects().property(String.class).value(project.getProviders().of(LatestForgeVersion.class, LatestForgeVersion.parameters(project, minecraftVersion)));
3942
Spec<? super Task> baseForgeVersionOnlyIf = t -> baseForgeVersion.isPresent();
40-
var baseForgeUserdev = project.getLayout().getBuildDirectory().file(project.provider(() -> "setupCheckJarCompatibility/forge-" + baseForgeVersion.getOrElse("null") + "-userdev.jar"));
41-
var baseForgeUniversal = project.getLayout().getBuildDirectory().file(project.provider(() -> "setupCheckJarCompatibility/forge-" + baseForgeVersion.getOrElse("null") + "-universal.jar"));
43+
var baseForgeUserdev = project.getLayout().getBuildDirectory().file(project.provider(() -> TASK_NAME + "/forge-" + baseForgeVersion.getOrElse("null") + "-userdev.jar"));
44+
var baseForgeUniversal = project.getLayout().getBuildDirectory().file(project.provider(() -> TASK_NAME + "/forge-" + baseForgeVersion.getOrElse("null") + "-universal.jar"));
4245

4346
var downloadBaseForgeUserdev = project.getTasks().register("downloadBaseForgeUserdev", Download.class, task -> {
4447
task.setDescription("Sets up JAR compatibility checking by downloading the latest available UserDev.");
@@ -87,7 +90,7 @@ public static TaskProvider<CheckJarCompatibility> register(Project project, Stri
8790
});
8891

8992
var reobfJar = project.getTasks().named("reobfJar", LegacyReobfuscateJar.class);
90-
var checkJarCompatibility = project.getTasks().register("checkJarCompatibility", CheckJarCompatibility.class, task -> {
93+
var checkJarCompatibility = project.getTasks().register(TASK_NAME, CheckJarCompatibility.class, task -> {
9194
var rawJoinedJarSrg = task.getProject().getTasks().named("rawJoinedJarSrg", MavenizerRawArtifact.class);
9295

9396
task.setGroup(LifecycleBasePlugin.VERIFICATION_GROUP);
@@ -105,7 +108,7 @@ public static TaskProvider<CheckJarCompatibility> register(Project project, Stri
105108
}
106109

107110
static abstract class UserdevBinPatches extends DefaultTask {
108-
protected abstract @Input @Optional RegularFileProperty getBaseForgeUserdev();
111+
protected abstract @InputFile @Optional RegularFileProperty getBaseForgeUserdev();
109112

110113
abstract @OutputFile RegularFileProperty getBaseBinPatchesOutput();
111114

src/main/groovy/net/minecraftforge/forgedev/tasks/launcher/SlimeLauncherOptionsImpl.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,8 @@ private SlimeLauncherOptionsInternal inherit(SlimeLauncherOptionsInternal target
321321

322322
target.systemProperties(child.getSystemProperties().getOrElse(Map.of()));
323323

324-
target.getWorkingDir().set(child.getWorkingDir());
324+
if (child.getWorkingDir().isPresent())
325+
target.getWorkingDir().set(child.getWorkingDir());
325326
}
326327

327328
return target;

0 commit comments

Comments
 (0)