Skip to content

Commit 8b5b597

Browse files
committed
Move notch MCPConfig back to SpecialSource for now
This is simply for maximum compatibility and is something internal that can be changed at a later date Signed-off-by: SizableShrimp <[email protected]>
1 parent 7b7deee commit 8b5b597

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

src/common/java/net/minecraftforge/gradle/common/util/RunConfig.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
import groovy.lang.Closure;
1414
import groovy.lang.GroovyObjectSupport;
1515
import groovy.util.MapEntry;
16+
import org.jetbrains.annotations.ApiStatus;
17+
1618
import java.io.File;
1719
import java.io.Serializable;
1820
import java.util.ArrayList;
@@ -91,10 +93,12 @@ public final String getTaskName() {
9193
return taskName;
9294
}
9395

96+
@ApiStatus.Internal
9497
public final String getPrepareTaskName() {
9598
return "prepare" + Utils.capitalize(this.getTaskName());
9699
}
97100

101+
@ApiStatus.Internal
98102
public final String getPrepareCompileTaskName() {
99103
return "prepare" + Utils.capitalize(this.getTaskName()) + "Compile";
100104
}

src/userdev/java/net/minecraftforge/gradle/userdev/MinecraftUserRepo.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -831,6 +831,10 @@ private File findBinpatched(final Set<String> packages) throws IOException {
831831
debug(" Renaming injected jar");
832832
//Remap to SRG names
833833
RenameJar rename = createTask("renameJar", RenameJar.class);
834+
// TODO: Switch away from SpecialSource when we properly pass in the libraries from the Minecraft jar/pom
835+
// rename.getLibraries().from(minecraftLibs);
836+
rename.getTool().set(Utils.SPECIALSOURCE);
837+
rename.getArgs().addAll("--in-jar", "{input}", "--out-jar", "{output}", "--srg-in", "{mappings}");
834838
rename.setHasLog(false);
835839
rename.getInput().set(merged);
836840
rename.getOutput().set(srged);

0 commit comments

Comments
 (0)