Skip to content

Commit e6183a0

Browse files
committed
Add fix or 1.12.2 SIDE issue
1 parent a5d6c86 commit e6183a0

3 files changed

Lines changed: 26 additions & 2 deletions

File tree

src/main/java/net/minecraftforge/mcmaven/impl/repo/mcpconfig/MCPSide.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import net.minecraftforge.mcmaven.impl.repo.mcpconfig.MinecraftTasks.ArtifactFile;
88
import net.minecraftforge.mcmaven.impl.util.Artifact;
9+
import net.minecraftforge.mcmaven.impl.util.StupidHacks;
910
import net.minecraftforge.mcmaven.impl.util.Task;
1011

1112
import org.jetbrains.annotations.Nullable;
@@ -93,7 +94,7 @@ public List<Artifact> getMCPConfigLibraries() {
9394
var artifacts = new ArrayList<Artifact>();
9495

9596
for (var lib : this.mcp.getConfig().getLibraries(this.side)) {
96-
var artifact = Artifact.from(lib);
97+
var artifact = StupidHacks.fixLegacyTools(Artifact.from(lib));
9798
artifacts.add(artifact);
9899
}
99100

src/main/java/net/minecraftforge/mcmaven/impl/repo/mcpconfig/MCPTaskFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import net.minecraftforge.util.file.FileUtils;
4848
import net.minecraftforge.util.hash.HashStore;
4949
import net.minecraftforge.mcmaven.impl.util.ProcessUtils;
50+
import net.minecraftforge.mcmaven.impl.util.StupidHacks;
5051
import net.minecraftforge.mcmaven.impl.util.Task;
5152
import net.minecraftforge.mcmaven.impl.util.Util;
5253
import net.minecraftforge.srgutils.IMappingFile;
@@ -838,7 +839,7 @@ private static final boolean isDecompiler(String name, Artifact artifact) {
838839
private File execute(String name, List<TaskOrArg> jvmArgs, List<TaskOrArg> runArgs, MCPConfig.Function func, File log, File output) {
839840
// First download the tool
840841
var maven = new MavenCache("mcp-tools", func.repo, this.side.getMCP().getCache().root());
841-
var toolA = Artifact.from(func.version);
842+
var toolA = StupidHacks.fixLegacyTools(Artifact.from(func.version));
842843
var tool = maven.download(toolA);
843844

844845
var isDecompile = isDecompiler(name, toolA);
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/*
2+
* Copyright (c) Forge Development LLC and contributors
3+
* SPDX-License-Identifier: LGPL-2.1-only
4+
*/
5+
package net.minecraftforge.mcmaven.impl.util;
6+
7+
/*
8+
* Here be stupid hacks that help us support old versions,
9+
* I've decided to stick them all in one place so we can just call
10+
* a magic function and never have to actually look at these abominations.
11+
*/
12+
public class StupidHacks {
13+
14+
public static Artifact fixLegacyTools(Artifact artifact) {
15+
// Some MCPConfig versions reference a merge tool that has an invlaid 'BUKKIT' side.
16+
// This was fixed in 0.2.3.3 https://github.com/MinecraftForge/MergeTool/commit/e68e1b06ba87c68bc1a5c922395286b53a17dddf
17+
if ("net.minecraftforge".equals(artifact.getGroup()) && "mergetool".equals(artifact.getName()) && "0.2.3.2".equals(artifact.getVersion()))
18+
return artifact.withVersion("0.2.3.3");
19+
return artifact;
20+
}
21+
22+
}

0 commit comments

Comments
 (0)