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

Merge pull request #2693 from Adubbz/1.9

Browse source 
Fixed mismatched registry names and mod ids
This commit is contained in:
LexManos 2016-04-02 23:04:15 -07:00
commit fc57d5e6c6
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/net/minecraftforge/fml/common/registry/IForgeRegistryEntry.java
View file

@ -57,7 +57,7 @@ public interface IForgeRegistryEntry<V>
String oldPrefix = index == -1 ? "" : name.substring(0, index); String oldPrefix = index == -1 ? "" : name.substring(0, index);
name = index == -1 ? name : name.substring(index + 1); name = index == -1 ? name : name.substring(index + 1);
ModContainer mc = Loader.instance().activeModContainer(); ModContainer mc = Loader.instance().activeModContainer();
String prefix = mc == null || (mc instanceof InjectedModContainer && ((InjectedModContainer)mc).wrappedContainer instanceof FMLContainer) ? "minecraft" : mc.getModId(); String prefix = mc == null || (mc instanceof InjectedModContainer && ((InjectedModContainer)mc).wrappedContainer instanceof FMLContainer) ? "minecraft" : mc.getModId().toLowerCase();
if (!oldPrefix.equals(prefix) && oldPrefix.length() > 0) if (!oldPrefix.equals(prefix) && oldPrefix.length() > 0)
{ {
FMLLog.bigWarning("Dangerous alternative prefix %s for name %s, invalid registry invocation/invalid name?", oldPrefix, name); FMLLog.bigWarning("Dangerous alternative prefix %s for name %s, invalid registry invocation/invalid name?", oldPrefix, name);