Skip to content

Commit 02599a0

Browse files
committed
resources should be injected into the sourcejar
1 parent facd67c commit 02599a0

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

src/main/java/net/minecraftforge/gradle/user/patcherUser/PatcherUserBasePlugin.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import net.minecraftforge.gradle.tasks.ExtractConfigTask;
2424
import net.minecraftforge.gradle.tasks.PatchSourcesTask;
2525
import net.minecraftforge.gradle.tasks.RemapSources;
26-
import net.minecraftforge.gradle.user.TaskRecompileMc;
2726
import net.minecraftforge.gradle.user.TaskSingleReobf;
2827
import net.minecraftforge.gradle.user.UserBaseExtension;
2928
import net.minecraftforge.gradle.user.UserBasePlugin;
@@ -104,7 +103,8 @@ public Boolean call()
104103

105104
PatchSourcesTask patch = makeTask(TASK_PATCH, PatchSourcesTask.class);
106105
patch.setPatches(delayedFile(ZIP_UD_PATCHES));
107-
patch.addInject(delayedFile(ZIP_UD_SRC)); // not injecting the resources just yet, do that after recompile
106+
patch.addInject(delayedFile(ZIP_UD_SRC));
107+
patch.addInject(delayedFile(ZIP_UD_RES)); // injecting teh resources too... the src jar needs them afterall.
108108
patch.setFailOnError(true);
109109
patch.setMakeRejects(false);
110110
patch.setPatchStrip(1);
@@ -115,9 +115,6 @@ public Boolean call()
115115
RemapSources remap = (RemapSources) project.getTasks().getByName(TASK_REMAP);
116116
remap.setInJar(patchedJar);
117117
remap.dependsOn(patch);
118-
119-
TaskRecompileMc recomp = (TaskRecompileMc) project.getTasks().getByName(TASK_RECOMPILE);
120-
recomp.setInResources(delayedFile(ZIP_UD_RES));
121118
}
122119

123120
// setup reobf

0 commit comments

Comments
 (0)