From a607a48719c96ba8f4a70bca18e1512786c8ce1f Mon Sep 17 00:00:00 2001 From: LexManos Date: Thu, 11 Feb 2016 16:25:25 -0800 Subject: [PATCH] Fixed Block/Item.setRegistryName printing a incorrect warning when used. Closes #2398 --- patches/minecraft/net/minecraft/block/Block.java.patch | 2 +- patches/minecraft/net/minecraft/item/Item.java.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/minecraft/net/minecraft/block/Block.java.patch b/patches/minecraft/net/minecraft/block/Block.java.patch index a646bb15e0..a6ac908842 100644 --- a/patches/minecraft/net/minecraft/block/Block.java.patch +++ b/patches/minecraft/net/minecraft/block/Block.java.patch @@ -1277,7 +1277,7 @@ + String prefix = mc == null ? "minecraft" : mc.getModId(); + 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; + } + this.registryName = new ResourceLocation(prefix, name); diff --git a/patches/minecraft/net/minecraft/item/Item.java.patch b/patches/minecraft/net/minecraft/item/Item.java.patch index 5cbccdaf94..9bbc3ff944 100644 --- a/patches/minecraft/net/minecraft/item/Item.java.patch +++ b/patches/minecraft/net/minecraft/item/Item.java.patch @@ -684,7 +684,7 @@ + String prefix = mc == null ? "minecraft" : mc.getModId(); + 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; + } + this.registryName = new ResourceLocation(prefix, name);