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

Fixed Block/Item.setRegistryName printing a incorrect warning when used. Closes #2398

Browse source
This commit is contained in:
LexManos 2016-02-11 16:25:25 -08:00
parent a9ea634141
commit a607a48719
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
patches/minecraft/net/minecraft/block/Block.java.patch
View file

@ -1277,7 +1277,7 @@
+ String prefix = mc == null ? "minecraft" : mc.getModId(); + String prefix = mc == null ? "minecraft" : mc.getModId();
+ if (!oldPrefix.equals(prefix) && oldPrefix.length() > 0) + if (!oldPrefix.equals(prefix) && oldPrefix.length() > 0)
+ { + {
+ net.minecraftforge.fml.common.FMLLog.bigWarning("Dangerous alternative prefix %s for name %s, invalid registry invocation/invalid name?", name.substring(0, index), name); + net.minecraftforge.fml.common.FMLLog.bigWarning("Dangerous alternative prefix %s for name %s, invalid registry invocation/invalid name?", oldPrefix, name);
+ prefix = oldPrefix; + prefix = oldPrefix;
+ } + }
+ this.registryName = new ResourceLocation(prefix, name); + this.registryName = new ResourceLocation(prefix, name);

2
patches/minecraft/net/minecraft/item/Item.java.patch
View file

@ -684,7 +684,7 @@
+ String prefix = mc == null ? "minecraft" : mc.getModId(); + String prefix = mc == null ? "minecraft" : mc.getModId();
+ if (!oldPrefix.equals(prefix) && oldPrefix.length() > 0) + if (!oldPrefix.equals(prefix) && oldPrefix.length() > 0)
+ { + {
+ net.minecraftforge.fml.common.FMLLog.bigWarning("Dangerous alternative prefix %s for name %s, invalid registry invocation/invalid name?", name.substring(0, index), name); + net.minecraftforge.fml.common.FMLLog.bigWarning("Dangerous alternative prefix %s for name %s, invalid registry invocation/invalid name?", oldPrefix, name);
+ prefix = oldPrefix; + prefix = oldPrefix;
+ } + }
+ this.registryName = new ResourceLocation(prefix, name); + this.registryName = new ResourceLocation(prefix, name);