diff --git a/MODSRC/vazkii/botania/client/core/helper/IconHelper.java b/MODSRC/vazkii/botania/client/core/helper/IconHelper.java index a0d608c22..d732e9813 100644 --- a/MODSRC/vazkii/botania/client/core/helper/IconHelper.java +++ b/MODSRC/vazkii/botania/client/core/helper/IconHelper.java @@ -24,12 +24,8 @@ public final class IconHelper { return ir.registerIcon(LibResources.PREFIX_MOD + name); } - public static IIcon forNameRaw(IIconRegister ir, String name) { - return ir.registerIcon(name); - } - public static IIcon forBlock(IIconRegister ir, Block block) { - return forNameRaw(ir, block.getUnlocalizedName().replaceAll("tile.", "")); + return forName(ir, block.getUnlocalizedName().replaceAll("tile.", "")); } public static IIcon forBlock(IIconRegister ir, Block block, int i) { @@ -37,11 +33,11 @@ public final class IconHelper { } public static IIcon forBlock(IIconRegister ir, Block block, String s) { - return forNameRaw(ir, block.getUnlocalizedName().replaceAll("tile.", "") + s); + return forName(ir, block.getUnlocalizedName().replaceAll("tile.", "") + s); } public static IIcon forItem(IIconRegister ir, Item item) { - return forNameRaw(ir, item.getUnlocalizedName().replaceAll("item.", "")); + return forName(ir, item.getUnlocalizedName().replaceAll("item.", "")); } public static IIcon forItem(IIconRegister ir, Item item, int i) { @@ -49,7 +45,7 @@ public final class IconHelper { } public static IIcon forItem(IIconRegister ir, Item item, String s) { - return forNameRaw(ir, item.getUnlocalizedName().replaceAll("item.", "") + s); + return forName(ir, item.getUnlocalizedName().replaceAll("item.", "") + s); } } \ No newline at end of file diff --git a/MODSRC/vazkii/botania/common/Botania.java b/MODSRC/vazkii/botania/common/Botania.java index 1ab08d1fb..fef14a9b2 100644 --- a/MODSRC/vazkii/botania/common/Botania.java +++ b/MODSRC/vazkii/botania/common/Botania.java @@ -11,6 +11,7 @@ */ package vazkii.botania.common; +import vazkii.botania.common.core.handler.AliasHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.proxy.CommonProxy; import vazkii.botania.common.lib.LibMisc; @@ -19,6 +20,7 @@ import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLMissingMappingsEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStoppingEvent; @@ -45,11 +47,15 @@ public class Botania { @EventHandler public void postInit(FMLPostInitializationEvent event) { proxy.postInit(event); - // Corruption.init(); } @EventHandler public void serverStopping(FMLServerStoppingEvent event) { ManaNetworkHandler.instance.clear(); } + + @EventHandler + public void missingMappings(FMLMissingMappingsEvent event) { + AliasHandler.onMissingMappings(event); + } } diff --git a/MODSRC/vazkii/botania/common/block/BlockMod.java b/MODSRC/vazkii/botania/common/block/BlockMod.java index 8bc4ab1c5..0309cac83 100644 --- a/MODSRC/vazkii/botania/common/block/BlockMod.java +++ b/MODSRC/vazkii/botania/common/block/BlockMod.java @@ -16,6 +16,7 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.BotaniaCreativeTab; +import vazkii.botania.common.item.block.ItemBlockMod; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -31,10 +32,10 @@ public class BlockMod extends Block { @Override public Block setBlockName(String par1Str) { if(shouldRegisterInNameSet()) - GameRegistry.registerBlock(this, par1Str); + GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); return super.setBlockName(par1Str); } - + protected boolean shouldRegisterInNameSet() { return true; } diff --git a/MODSRC/vazkii/botania/common/block/BlockModContainer.java b/MODSRC/vazkii/botania/common/block/BlockModContainer.java index 2b87de23e..b26b44d12 100644 --- a/MODSRC/vazkii/botania/common/block/BlockModContainer.java +++ b/MODSRC/vazkii/botania/common/block/BlockModContainer.java @@ -19,6 +19,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.BotaniaCreativeTab; +import vazkii.botania.common.item.block.ItemBlockMod; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -34,7 +35,7 @@ public abstract class BlockModContainer extends BlockConta @Override public Block setBlockName(String par1Str) { if(shouldRegisterInNameSet()) - GameRegistry.registerBlock(this, par1Str); + GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); return super.setBlockName(par1Str); } diff --git a/MODSRC/vazkii/botania/common/core/handler/AliasHandler.java b/MODSRC/vazkii/botania/common/core/handler/AliasHandler.java new file mode 100644 index 000000000..41e3f91fb --- /dev/null +++ b/MODSRC/vazkii/botania/common/core/handler/AliasHandler.java @@ -0,0 +1,79 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [May 16, 2014, 6:24:12 PM (GMT)] + */ +package vazkii.botania.common.core.handler; + +import java.lang.reflect.Field; +import java.util.List; + +import org.apache.logging.log4j.Level; + +import net.minecraft.block.Block; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.item.ModItems; +import cpw.mods.fml.common.FMLLog; +import cpw.mods.fml.common.event.FMLMissingMappingsEvent; +import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.registry.GameRegistry.Type; + +public final class AliasHandler { + + public static void onMissingMappings(FMLMissingMappingsEvent event) { + List mappings = event.get(); + for(MissingMapping mapping : mappings) { + FMLLog.getLogger().log(Level.INFO, String.format("[Botania] Found an old mapping - %s, remapping.", mapping.name)); + String name = mapping.name.substring(LibResources.PREFIX_MOD.length() * 2); + + if(mapping.type == Type.ITEM) + remapItem(mapping, getItem(name)); + else remapBlock(mapping, getBlock(name)); + } + } + + private static void remapItem(MissingMapping mapping, Item item) { + if(item != null) + mapping.remap(item); + } + + private static void remapBlock(MissingMapping mapping, Block block) { + if(block != null) + mapping.remap(block); + } + + private static Item getItem(String name) { + for(Object o : Item.itemRegistry.getKeys()) { + Item i = (Item) Item.itemRegistry.getObject(o); + if(i.getUnlocalizedName().substring("item.".length()).equals(name)) + return i; + } + + System.out.println("WOOOOOOOOOOOOOOOOOOW WE FOUND A NULL"); + System.out.println("NULL: " + name); + return null; + } + + private static Block getBlock(String name) { + for(Object o : Block.blockRegistry.getKeys()) { + Block b = (Block) Block.blockRegistry.getObject(o); + if(b.getUnlocalizedName().substring("tile.".length()).equals(name)) + return b; + } + + System.out.println("WOOOOOOOOOOOOOOOOOOW WE FOUND A NULL"); + System.out.println("NULL: " + name); + return null; + } + +} diff --git a/MODSRC/vazkii/botania/common/item/ItemLens.java b/MODSRC/vazkii/botania/common/item/ItemLens.java index dcb97232d..718a2ff14 100644 --- a/MODSRC/vazkii/botania/common/item/ItemLens.java +++ b/MODSRC/vazkii/botania/common/item/ItemLens.java @@ -88,7 +88,7 @@ public class ItemLens extends ItemMod implements ILens { ringIcons = new IIcon[SUBTYPES]; for(int i = 0; i < ringIcons.length; i++) - ringIcons[i] = IconHelper.forNameRaw(par1IconRegister, LibItemNames.LENS_NAMES[i]); + ringIcons[i] = IconHelper.forName(par1IconRegister, LibItemNames.LENS_NAMES[i]); } @Override diff --git a/MODSRC/vazkii/botania/common/item/ItemManaCookie.java b/MODSRC/vazkii/botania/common/item/ItemManaCookie.java index 69d8a7ef8..0793038cf 100644 --- a/MODSRC/vazkii/botania/common/item/ItemManaCookie.java +++ b/MODSRC/vazkii/botania/common/item/ItemManaCookie.java @@ -14,8 +14,10 @@ package vazkii.botania.common.item; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; +import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibItemNames; import cpw.mods.fml.common.registry.GameRegistry; @@ -36,6 +38,11 @@ public class ItemManaCookie extends ItemFood { GameRegistry.registerItem(this, par1Str); return super.setUnlocalizedName(par1Str); } + + @Override + public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); + } @Override @SideOnly(Side.CLIENT) diff --git a/MODSRC/vazkii/botania/common/item/ItemManaResource.java b/MODSRC/vazkii/botania/common/item/ItemManaResource.java index 1f03c7a15..6250cce29 100644 --- a/MODSRC/vazkii/botania/common/item/ItemManaResource.java +++ b/MODSRC/vazkii/botania/common/item/ItemManaResource.java @@ -44,7 +44,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent { public void registerIcons(IIconRegister par1IconRegister) { icons = new IIcon[types]; for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forNameRaw(par1IconRegister, LibItemNames.MANA_RESOURCE_NAMES[i]); + icons[i] = IconHelper.forName(par1IconRegister, LibItemNames.MANA_RESOURCE_NAMES[i]); } @Override diff --git a/MODSRC/vazkii/botania/common/item/ItemMod.java b/MODSRC/vazkii/botania/common/item/ItemMod.java index 9796c3f58..1f70b2da7 100644 --- a/MODSRC/vazkii/botania/common/item/ItemMod.java +++ b/MODSRC/vazkii/botania/common/item/ItemMod.java @@ -13,7 +13,9 @@ package vazkii.botania.common.item; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -31,6 +33,11 @@ public class ItemMod extends Item { GameRegistry.registerItem(this, par1Str); return super.setUnlocalizedName(par1Str); } + + @Override + public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); + } @Override @SideOnly(Side.CLIENT) diff --git a/MODSRC/vazkii/botania/common/item/block/ItemBlockMod.java b/MODSRC/vazkii/botania/common/item/block/ItemBlockMod.java new file mode 100644 index 000000000..cba98319e --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/block/ItemBlockMod.java @@ -0,0 +1,30 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [May 16, 2014, 7:00:36 PM (GMT)] + */ +package vazkii.botania.common.item.block; + +import vazkii.botania.client.lib.LibResources; +import net.minecraft.block.Block; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; + +public class ItemBlockMod extends ItemBlock { + + public ItemBlockMod(Block block) { + super(block); + } + + @Override + public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("tile.", "tile." + LibResources.PREFIX_MOD); + } + +} diff --git a/MODSRC/vazkii/botania/common/item/block/ItemBlockPool.java b/MODSRC/vazkii/botania/common/item/block/ItemBlockPool.java index 191e82e34..6b7647972 100644 --- a/MODSRC/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/MODSRC/vazkii/botania/common/item/block/ItemBlockPool.java @@ -13,6 +13,7 @@ package vazkii.botania.common.item.block; import java.util.List; +import vazkii.botania.client.lib.LibResources; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -23,7 +24,7 @@ public class ItemBlockPool extends ItemBlockWithMetadataAndName { public ItemBlockPool(Block par2Block) { super(par2Block); } - + @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { if(par1ItemStack.getItemDamage() == 1) diff --git a/MODSRC/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/MODSRC/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index dba2e40f4..2013dc90f 100644 --- a/MODSRC/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/MODSRC/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -15,7 +15,6 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; @@ -24,12 +23,13 @@ import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.IRecipeKeyProvider; import vazkii.botania.api.subtile.SubTileEntity; +import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibBlockNames; -public class ItemBlockSpecialFlower extends ItemBlock implements IRecipeKeyProvider { +public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyProvider { public ItemBlockSpecialFlower(Block block1) { super(block1); @@ -66,7 +66,7 @@ public class ItemBlockSpecialFlower extends ItemBlock implements IRecipeKeyProvi @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - String refUnlocalized = "tile." + LibBlockNames.SPECIAL_FLOWER_PREFIX + getType(par1ItemStack) + ".reference"; + String refUnlocalized = "tile." + LibResources.PREFIX_MOD + LibBlockNames.SPECIAL_FLOWER_PREFIX + getType(par1ItemStack) + ".reference"; String refLocalized = StatCollector.translateToLocal(refUnlocalized); if(!refLocalized.equals(refUnlocalized)) par3List.add(EnumChatFormatting.ITALIC + refLocalized); diff --git a/MODSRC/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java b/MODSRC/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java index 2bb12a2e1..043f4dbd7 100644 --- a/MODSRC/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java +++ b/MODSRC/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java @@ -11,6 +11,7 @@ */ package vazkii.botania.common.item.block; +import vazkii.botania.client.lib.LibResources; import net.minecraft.block.Block; import net.minecraft.item.ItemBlockWithMetadata; import net.minecraft.item.ItemStack; @@ -20,6 +21,11 @@ public class ItemBlockWithMetadataAndName extends ItemBlockWithMetadata { public ItemBlockWithMetadataAndName(Block par2Block) { super(par2Block, par2Block); } + + @Override + public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("tile.", "tile." + LibResources.PREFIX_MOD); + } @Override public String getUnlocalizedName(ItemStack par1ItemStack) { diff --git a/MODSRC/vazkii/botania/common/item/equipment/armor/ItemManasteelArmor.java b/MODSRC/vazkii/botania/common/item/equipment/armor/ItemManasteelArmor.java index 373a20dff..6aeed8d93 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/armor/ItemManasteelArmor.java +++ b/MODSRC/vazkii/botania/common/item/equipment/armor/ItemManasteelArmor.java @@ -49,6 +49,11 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor { GameRegistry.registerItem(this, par1Str); return super.setUnlocalizedName(par1Str); } + + @Override + public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); + } @Override @SideOnly(Side.CLIENT) diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelAxe.java b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelAxe.java index 1f21a1244..2ee067eaf 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelAxe.java +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelAxe.java @@ -20,6 +20,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; @@ -43,6 +44,11 @@ public class ItemManasteelAxe extends ItemAxe { return super.setUnlocalizedName(par1Str); } + @Override + public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); + } + @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister par1IconRegister) { diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelPick.java b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelPick.java index 920df324b..1fd604bba 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelPick.java +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelPick.java @@ -20,6 +20,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; @@ -43,6 +44,11 @@ public class ItemManasteelPick extends ItemPickaxe { return super.setUnlocalizedName(par1Str); } + @Override + public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); + } + @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister par1IconRegister) { diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelShears.java b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelShears.java index 539efff0a..15865bd7e 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelShears.java +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelShears.java @@ -27,6 +27,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraftforge.common.IShearable; import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; @@ -49,6 +50,11 @@ public class ItemManasteelShears extends ItemShears { return super.setUnlocalizedName(par1Str); } + @Override + public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); + } + @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister par1IconRegister) { diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelShovel.java b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelShovel.java index 0f56d26cd..5d66c7815 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelShovel.java +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelShovel.java @@ -20,6 +20,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; @@ -42,6 +43,11 @@ public class ItemManasteelShovel extends ItemSpade { GameRegistry.registerItem(this, par1Str); return super.setUnlocalizedName(par1Str); } + + @Override + public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); + } @Override @SideOnly(Side.CLIENT) diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelSword.java b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelSword.java index 6c5d1fad3..9557dbd11 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelSword.java +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelSword.java @@ -21,6 +21,7 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; @@ -50,6 +51,11 @@ public class ItemManasteelSword extends ItemSword { return super.setUnlocalizedName(par1Str); } + @Override + public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { + return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); + } + @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister par1IconRegister) { diff --git a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java index 4659f1dd4..c563061de 100644 --- a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java @@ -15,28 +15,28 @@ import vazkii.botania.client.lib.LibResources; public final class LibBlockNames { - public static final String FLOWER = LibResources.PREFIX_MOD + "flower"; - public static final String ALTAR = LibResources.PREFIX_MOD + "altar"; - public static final String SPECIAL_FLOWER = LibResources.PREFIX_MOD + "specialFlower"; - public static final String LIVING_ROCK = LibResources.PREFIX_MOD + "livingrock"; - public static final String LIVING_WOOD = LibResources.PREFIX_MOD + "livingwood"; - public static final String SPREADER = LibResources.PREFIX_MOD + "spreader"; - public static final String POOL = LibResources.PREFIX_MOD + "pool"; - public static final String RUNE_ALTAR = LibResources.PREFIX_MOD + "runeAltar"; - public static final String UNSTABLE_BLOCK = LibResources.PREFIX_MOD + "unstableBlock"; - public static final String PYLON = LibResources.PREFIX_MOD + "pylon"; - public static final String PISTON_RELAY = LibResources.PREFIX_MOD + "pistonRelay"; - public static final String DISTRIBUTOR = LibResources.PREFIX_MOD + "distributor"; - public static final String MANA_BEACON = LibResources.PREFIX_MOD + "manaBeacon"; - public static final String MANA_VOID = LibResources.PREFIX_MOD + "manaVoid"; - public static final String MANA_DETECTOR = LibResources.PREFIX_MOD + "manaDetector"; - public static final String ENCHANTER = LibResources.PREFIX_MOD + "enchanter"; - public static final String TURNTABLE = LibResources.PREFIX_MOD + "turntable"; - public static final String TINY_PLANET = LibResources.PREFIX_MOD + "tinyPlanetBlock"; - public static final String ALCHEMY_CATALYST = LibResources.PREFIX_MOD + "alchemyCatalyst"; - public static final String OPEN_CRATE = LibResources.PREFIX_MOD + "openCrate"; - public static final String FOREST_EYE = LibResources.PREFIX_MOD + "forestEye"; - public static final String STORAGE = LibResources.PREFIX_MOD + "storage"; + public static final String FLOWER = "flower"; + public static final String ALTAR = "altar"; + public static final String SPECIAL_FLOWER = "specialFlower"; + public static final String LIVING_ROCK = "livingrock"; + public static final String LIVING_WOOD = "livingwood"; + public static final String SPREADER = "spreader"; + public static final String POOL = "pool"; + public static final String RUNE_ALTAR = "runeAltar"; + public static final String UNSTABLE_BLOCK = "unstableBlock"; + public static final String PYLON = "pylon"; + public static final String PISTON_RELAY = "pistonRelay"; + public static final String DISTRIBUTOR = "distributor"; + public static final String MANA_BEACON = "manaBeacon"; + public static final String MANA_VOID = "manaVoid"; + public static final String MANA_DETECTOR = "manaDetector"; + public static final String ENCHANTER = "enchanter"; + public static final String TURNTABLE = "turntable"; + public static final String TINY_PLANET = "tinyPlanetBlock"; + public static final String ALCHEMY_CATALYST = "alchemyCatalyst"; + public static final String OPEN_CRATE = "openCrate"; + public static final String FOREST_EYE = "forestEye"; + public static final String STORAGE = "storage"; public static final String SPECIAL_FLOWER_PREFIX = FLOWER + "."; diff --git a/MODSRC/vazkii/botania/common/lib/LibItemNames.java b/MODSRC/vazkii/botania/common/lib/LibItemNames.java index 984dc9ab9..d5324a2aa 100644 --- a/MODSRC/vazkii/botania/common/lib/LibItemNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibItemNames.java @@ -15,72 +15,72 @@ import vazkii.botania.client.lib.LibResources; public final class LibItemNames { - public static final String LEXICON = LibResources.PREFIX_MOD + "lexicon"; - public static final String PETAL = LibResources.PREFIX_MOD + "petal"; - public static final String DYE = LibResources.PREFIX_MOD + "dye"; - public static final String PESTLE_AND_MORTAR = LibResources.PREFIX_MOD + "pestleAndMortar"; - public static final String TWIG_WAND = LibResources.PREFIX_MOD + "twigWand"; - public static final String MANA_RESOURCE = LibResources.PREFIX_MOD + "manaResource"; - public static final String LENS = LibResources.PREFIX_MOD + "lens"; - public static final String MANA_PETAL = LibResources.PREFIX_MOD + "manaPetal"; - public static final String RUNE = LibResources.PREFIX_MOD + "rune"; - public static final String SIGNAL_FLARE = LibResources.PREFIX_MOD + "signalFlare"; - public static final String MANA_TABLET = LibResources.PREFIX_MOD + "manaTablet"; - public static final String MANA_GUN = LibResources.PREFIX_MOD + "manaGun"; - public static final String MANA_COOKIE = LibResources.PREFIX_MOD + "manaCookie"; - public static final String FERTILIZER = LibResources.PREFIX_MOD + "fertilizer"; - public static final String GRASS_SEEDS = LibResources.PREFIX_MOD + "grassSeeds"; - public static final String DIRT_ROD = LibResources.PREFIX_MOD + "dirtRod"; - public static final String TERRAFORM_ROD = LibResources.PREFIX_MOD + "terraformRod"; - public static final String MANA_MIRROR = LibResources.PREFIX_MOD + "manaMirror"; - public static final String MANASTEEL_HELM = LibResources.PREFIX_MOD + "manasteelHelm"; - public static final String MANASTEEL_CHEST = LibResources.PREFIX_MOD + "manasteelChest"; - public static final String MANASTEEL_LEGS = LibResources.PREFIX_MOD + "manasteelLegs"; - public static final String MANASTEEL_BOOTS = LibResources.PREFIX_MOD + "manasteelBoots"; - public static final String MANASTEEL_PICK = LibResources.PREFIX_MOD + "manasteelPick"; - public static final String MANASTEEL_SHOVEL = LibResources.PREFIX_MOD + "manasteelShovel"; - public static final String MANASTEEL_AXE = LibResources.PREFIX_MOD + "manasteelAxe"; - public static final String MANASTEEL_SWORD = LibResources.PREFIX_MOD + "manasteelSword"; - public static final String MANASTEEL_SHEARS = LibResources.PREFIX_MOD + "manasteelShears"; - public static final String GRASS_HORN = LibResources.PREFIX_MOD + "grassHorn"; - public static final String TERRASTEEL_HELM = LibResources.PREFIX_MOD + "terrasteelHelm"; - public static final String TERRASTEEL_CHEST = LibResources.PREFIX_MOD + "terrasteelChest"; - public static final String TERRASTEEL_LEGS = LibResources.PREFIX_MOD + "terrasteelLegs"; - public static final String TERRASTEEL_BOOTS = LibResources.PREFIX_MOD + "terrasteelBoots"; - public static final String TERRA_SWORD = LibResources.PREFIX_MOD + "terraSword"; - public static final String TINY_PLANET = LibResources.PREFIX_MOD + "tinyPlanet"; - public static final String MANA_RING = LibResources.PREFIX_MOD + "manaRing"; - public static final String AURA_RING = LibResources.PREFIX_MOD + "auraRing"; - public static final String MANA_RING_GREATER = LibResources.PREFIX_MOD + "manaRingGreater"; - public static final String AURA_RING_GREATER = LibResources.PREFIX_MOD + "auraRingGreater"; - public static final String TRAVEL_BELT = LibResources.PREFIX_MOD + "travelBelt"; - public static final String KNOCKBACK_BELT = LibResources.PREFIX_MOD + "knockbackBelt"; - public static final String ICE_PENDANT = LibResources.PREFIX_MOD + "icePendant"; - public static final String LAVA_PENDANT = LibResources.PREFIX_MOD + "lavaPendant"; - public static final String GOLDEN_LAUREL = LibResources.PREFIX_MOD + "goldenLaurel"; + public static final String LEXICON = "lexicon"; + public static final String PETAL = "petal"; + public static final String DYE = "dye"; + public static final String PESTLE_AND_MORTAR = "pestleAndMortar"; + public static final String TWIG_WAND = "twigWand"; + public static final String MANA_RESOURCE = "manaResource"; + public static final String LENS = "lens"; + public static final String MANA_PETAL = "manaPetal"; + public static final String RUNE = "rune"; + public static final String SIGNAL_FLARE = "signalFlare"; + public static final String MANA_TABLET = "manaTablet"; + public static final String MANA_GUN = "manaGun"; + public static final String MANA_COOKIE = "manaCookie"; + public static final String FERTILIZER = "fertilizer"; + public static final String GRASS_SEEDS = "grassSeeds"; + public static final String DIRT_ROD = "dirtRod"; + public static final String TERRAFORM_ROD = "terraformRod"; + public static final String MANA_MIRROR = "manaMirror"; + public static final String MANASTEEL_HELM = "manasteelHelm"; + public static final String MANASTEEL_CHEST = "manasteelChest"; + public static final String MANASTEEL_LEGS = "manasteelLegs"; + public static final String MANASTEEL_BOOTS = "manasteelBoots"; + public static final String MANASTEEL_PICK = "manasteelPick"; + public static final String MANASTEEL_SHOVEL = "manasteelShovel"; + public static final String MANASTEEL_AXE = "manasteelAxe"; + public static final String MANASTEEL_SWORD = "manasteelSword"; + public static final String MANASTEEL_SHEARS = "manasteelShears"; + public static final String GRASS_HORN = "grassHorn"; + public static final String TERRASTEEL_HELM = "terrasteelHelm"; + public static final String TERRASTEEL_CHEST = "terrasteelChest"; + public static final String TERRASTEEL_LEGS = "terrasteelLegs"; + public static final String TERRASTEEL_BOOTS = "terrasteelBoots"; + public static final String TERRA_SWORD = "terraSword"; + public static final String TINY_PLANET = "tinyPlanet"; + public static final String MANA_RING = "manaRing"; + public static final String AURA_RING = "auraRing"; + public static final String MANA_RING_GREATER = "manaRingGreater"; + public static final String AURA_RING_GREATER = "auraRingGreater"; + public static final String TRAVEL_BELT = "travelBelt"; + public static final String KNOCKBACK_BELT = "knockbackBelt"; + public static final String ICE_PENDANT = "icePendant"; + public static final String LAVA_PENDANT = "lavaPendant"; + public static final String GOLDEN_LAUREL = "goldenLaurel"; public static final String[] LENS_NAMES = new String[] { - LibResources.PREFIX_MOD + "lensNormal", - LibResources.PREFIX_MOD + "lensSpeed", - LibResources.PREFIX_MOD + "lensPower", - LibResources.PREFIX_MOD + "lensTime", - LibResources.PREFIX_MOD + "lensEfficiency", - LibResources.PREFIX_MOD + "lensBounce", - LibResources.PREFIX_MOD + "lensGravity", - LibResources.PREFIX_MOD + "lensMine", - LibResources.PREFIX_MOD + "lensDamage", - LibResources.PREFIX_MOD + "lensPhantom", - LibResources.PREFIX_MOD + "lensMagnet", - LibResources.PREFIX_MOD + "lensExplosive" + "lensNormal", + "lensSpeed", + "lensPower", + "lensTime", + "lensEfficiency", + "lensBounce", + "lensGravity", + "lensMine", + "lensDamage", + "lensPhantom", + "lensMagnet", + "lensExplosive" }; public static final String[] MANA_RESOURCE_NAMES = new String[] { - LibResources.PREFIX_MOD + "manasteel", - LibResources.PREFIX_MOD + "manaPearl", - LibResources.PREFIX_MOD + "manaDiamond", - LibResources.PREFIX_MOD + "livingwoodTwig", - LibResources.PREFIX_MOD + "terrasteel", - LibResources.PREFIX_MOD + "lifeEssence", - LibResources.PREFIX_MOD + "redstoneRoot" + "manasteel", + "manaPearl", + "manaDiamond", + "livingwoodTwig", + "terrasteel", + "lifeEssence", + "redstoneRoot" }; }