From 22db1965c7e4f2900724e74e9472076ac006727c Mon Sep 17 00:00:00 2001 From: Minecrell Date: Sat, 17 Dec 2016 21:56:10 +0100 Subject: [PATCH] Register Minecraft mod container in FML loader (#3414) --- .../net/minecraftforge/fml/common/Loader.java | 1 + .../fml/common/MinecraftDummyContainer.java | 21 ++++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraftforge/fml/common/Loader.java b/src/main/java/net/minecraftforge/fml/common/Loader.java index ae89569a7f..e85ff11b16 100644 --- a/src/main/java/net/minecraftforge/fml/common/Loader.java +++ b/src/main/java/net/minecraftforge/fml/common/Loader.java @@ -348,6 +348,7 @@ public class Loader { injectedContainers.addAll(additionalContainers); FMLLog.fine("Building injected Mod Containers %s", injectedContainers); + mods.add(minecraft); // Add in the MCP mod container mods.add(new InjectedModContainer(mcp,new File("minecraft.jar"))); for (String cont : injectedContainers) diff --git a/src/main/java/net/minecraftforge/fml/common/MinecraftDummyContainer.java b/src/main/java/net/minecraftforge/fml/common/MinecraftDummyContainer.java index e9d991cbe0..1bd63524c3 100644 --- a/src/main/java/net/minecraftforge/fml/common/MinecraftDummyContainer.java +++ b/src/main/java/net/minecraftforge/fml/common/MinecraftDummyContainer.java @@ -19,8 +19,10 @@ package net.minecraftforge.fml.common; +import java.io.File; import java.security.cert.Certificate; +import com.google.common.eventbus.EventBus; import net.minecraftforge.fml.common.versioning.VersionParser; import net.minecraftforge.fml.common.versioning.VersionRange; import net.minecraftforge.fml.relauncher.FMLLaunchHandler; @@ -33,12 +35,29 @@ public class MinecraftDummyContainer extends DummyModContainer public MinecraftDummyContainer(String actualMCVersion) { super(new ModMetadata()); - getMetadata().modId = "Minecraft"; + getMetadata().modId = "minecraft"; getMetadata().name = "Minecraft"; getMetadata().version = actualMCVersion; staticRange = VersionParser.parseRange("["+actualMCVersion+"]"); } + @Override + public boolean isImmutable() + { + return true; + } + + @Override + public File getSource() + { + return new File("minecraft.jar"); + } + + @Override + public boolean registerBus(EventBus bus, LoadController controller) + { + return true; + } public VersionRange getStaticVersionRange() {