keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Make userdev parse out the classifier for the Forge jar that is on the classpath. 

Should fix debugging Minecraft at dev time.
This commit is contained in:
LexManos 2019-03-06 12:06:49 -08:00
parent 230d69b772
commit 7bd7b059c4
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/net/minecraftforge/fml/network/FMLHandshakeMessages.java
View File

@ -219,7 +219,6 @@ public class FMLHandshakeMessages
}
public static S2CRegistry decode(final PacketBuffer buffer) {
System.out.println("Readable: " + buffer.readableBytes());
ResourceLocation name = buffer.readResourceLocation();
ForgeRegistry.Snapshot snapshot = null;
if (buffer.readBoolean())

10
src/userdev/java/net/minecraftforge/userdev/FMLUserdevLaunchProvider.java
View File

@ -71,7 +71,15 @@ public abstract class FMLUserdevLaunchProvider extends FMLCommonLaunchHandler {
final String fjpath = fjroot.toString();
LOGGER.debug(CORE, "Injecting forge as mod {} from maven path {}", userdevVersion, fjpath);
mavenRoots.add(fjpath);
mods.add(forgeGroup+":forge:"+userdevVersion);
String classifier = "";
if (forgeJar.getFileName().endsWith(".jar")) {
if (!("forge-" + userdevVersion + ".jar").equals(forgeJar.getFileName().toString())) {
String suffix = forgeJar.getFileName().toString().substring(userdevVersion.length() + 7); //"forge-" + version + "-"
suffix = suffix.substring(0, suffix.length() - 4); // Remove ".jar"
}
}
mods.add(forgeGroup+":forge:"+userdevVersion + classifier);
try {
final Enumeration<URL> resources = ClassLoader.getSystemClassLoader().getResources("META-INF/mods.toml");