Skip to content

Commit 38a52a9

Browse files
committed
Fix Eclipse runs not generating
Had this stashed and forgot to re-apply it later. My bad.
1 parent a1127b4 commit 38a52a9

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

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

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ abstract class SlimeLauncherEclipseConfiguration extends DefaultTask implements
8181

8282
protected abstract @InputFile RegularFileProperty getMetadataZip();
8383

84-
protected abstract @InputFile RegularFileProperty getRunsJson();
85-
8684
protected abstract @Inject ObjectFactory getObjects();
8785

8886
protected abstract @Inject ProviderFactory getProviders();
@@ -114,18 +112,7 @@ protected void exec() {
114112
MapProperty<String, String> environment;
115113
DirectoryProperty workingDir;
116114

117-
//region Launcher Metadata Inheritance
118-
Map<String, RunConfig> configs = Map.of();
119-
try {
120-
configs = JsonData.fromJson(
121-
this.getRunsJson().getAsFile().get(),
122-
new TypeToken<>() { }
123-
);
124-
} catch (JsonIOException e) {
125-
// continue
126-
}
127-
128-
var options = ((SlimeLauncherOptionsInternal) this.getOptions().get()).inherit(configs, this.getSourceSetName().get());
115+
var options = ((SlimeLauncherOptionsInternal) this.getOptions().get()).inherit(Map.of(), this.getSourceSetName().get());
129116

130117
args = new ArrayList<>(options.getArgs().getOrElse(List.of()));
131118
jvmArgs = new ArrayList<>(options.getJvmArgs().getOrElse(List.of()));

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ public static TaskProvider<SlimeLauncherExec> register(Project project, SourceSe
6868
.minus(sourceSetOutputs)
6969
.plus(eclipseOutputs);
7070

71+
task.getSourceSetName().set(sourceSet.getName());
72+
7173
var caches = task.getObjects().directoryProperty().value(task.globalCaches().dir("slime-launcher/cache/%s".formatted(version)));
7274
task.getCacheDir().set(caches.map(task.problems.ensureFileLocation()));
7375
task.getMetadataZip().set(metadataZip);

0 commit comments

Comments
 (0)