Merge branch '1.12.2' into 1.12.2-dev

src/main/java/electroblob/wizardry/registry/WizardryBlocks.java

@@ -53,7 +53,7 @@ public final class WizardryBlocks {
 	 */
 	public static void registerBlock(IForgeRegistry<Block> registry, String name, Block block){
 		block.setRegistryName(Wizardry.MODID, name);
-		block.setUnlocalizedName(block.getRegistryName().toString());
+		block.setTranslationKey(block.getRegistryName().toString());
 		registry.register(block);
 	}
 

src/main/java/electroblob/wizardry/registry/WizardryItems.java

@@ -335,7 +335,7 @@ public final class WizardryItems {
 	// It now makes sense to have the name first, since it's shorter than an entire item declaration.
 	public static void registerItem(IForgeRegistry<Item> registry, String name, Item item, boolean setTabIcon){
 		item.setRegistryName(Wizardry.MODID, name);
-		item.setUnlocalizedName(item.getRegistryName().toString());
+		item.setTranslationKey(item.getRegistryName().toString());
 		registry.register(item);
 
 		if(setTabIcon && item.getCreativeTab() instanceof CreativeTabSorted){

src/main/java/electroblob/wizardry/registry/WizardryTabs.java

@@ -31,7 +31,7 @@ public final class WizardryTabs {
 
 		@Override
 		@SideOnly(Side.CLIENT)
-		public ItemStack getTabIconItem(){
+		public ItemStack createIcon(){
 			return new ItemStack(WizardryItems.wizard_handbook);
 		}
 
@@ -47,7 +47,7 @@ public final class WizardryTabs {
 
 		@Override
 		@SideOnly(Side.CLIENT)
-		public ItemStack getTabIconItem(){
+		public ItemStack createIcon(){
 			return new ItemStack(WizardryItems.spell_book);
 		}