Skip to content

Commit 4cd84cb

Browse files
committed
fixed GradleStart for patcher plugin
1 parent a2c33c7 commit 4cd84cb

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

src/main/java/net/minecraftforge/gradle/patcher/PatcherPlugin.java

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -420,26 +420,26 @@ protected void createProject(PatcherProject patcher)
420420

421421
Object delayedRemapped = delayedFile(projectString(JAR_PROJECT_REMAPPED, patcher));
422422

423-
ExtractTask extract = makeTask(projectString(TASK_PROJECT_EXTRACT_SRC, patcher), ExtractTask.class);
423+
ExtractTask extractSrc = makeTask(projectString(TASK_PROJECT_EXTRACT_SRC, patcher), ExtractTask.class);
424424
{
425-
extract.from(delayedRemapped);
426-
extract.into(subWorkspace(patcher.getCapName() + DIR_EXTRACTED_SRC));
427-
extract.include("*.java", "**/*.java");
428-
extract.setDoesCache(false);
429-
extract.dependsOn(remapTask, TASK_GEN_PROJECTS);
425+
extractSrc.from(delayedRemapped);
426+
extractSrc.into(subWorkspace(patcher.getCapName() + DIR_EXTRACTED_SRC));
427+
extractSrc.include("*.java", "**/*.java");
428+
extractSrc.setDoesCache(false);
429+
extractSrc.dependsOn(remapTask, TASK_GEN_PROJECTS);
430430
}
431431

432-
extract = makeTask(projectString(TASK_PROJECT_EXTRACT_RES, patcher), ExtractTask.class);
432+
ExtractTask extractRes = makeTask(projectString(TASK_PROJECT_EXTRACT_RES, patcher), ExtractTask.class);
433433
{
434-
extract.from(delayedRemapped);
435-
extract.into(subWorkspace(patcher.getCapName() + DIR_EXTRACTED_RES));
436-
extract.exclude("*.java", "**/*.java");
437-
extract.setDoesCache(false);
438-
extract.dependsOn(remapTask, TASK_GEN_PROJECTS);
434+
extractRes.from(delayedRemapped);
435+
extractRes.into(subWorkspace(patcher.getCapName() + DIR_EXTRACTED_RES));
436+
extractRes.exclude("*.java", "**/*.java");
437+
extractRes.setDoesCache(false);
438+
extractRes.dependsOn(remapTask, TASK_GEN_PROJECTS);
439439
}
440440

441441
Task setupTask = makeTask(projectString(TASK_PROJECT_SETUP, patcher));
442-
setupTask.dependsOn(projectString(TASK_PROJECT_EXTRACT_SRC, patcher), projectString(TASK_PROJECT_EXTRACT_RES, patcher));
442+
setupTask.dependsOn(extractSrc, extractRes);
443443

444444
// Run config generation, not necessary unless its actual dev
445445

@@ -520,6 +520,9 @@ protected void createProject(PatcherProject patcher)
520520
Task setupDevTask = makeTask(projectString(TASK_PROJECT_SETUP_DEV, patcher));
521521
setupDevTask.dependsOn(setupTask, makeStart, TASK_GEN_IDES);
522522
setupDevTask.dependsOn(eclipseRunClient, eclipseRunServer, ideaRunClient, ideaRunServer);
523+
524+
// fixe starts bieng created after the IDE thing
525+
project.getTasks().getByName(TASK_GEN_IDES).mustRunAfter(makeStart);
523526

524527
/// TASKS THAT ARN'T PART OF THE SETUP
525528

0 commit comments

Comments
 (0)