2 files changed, 33 insertions, 30 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 0f25481831..ec0e21c7bb 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -308,7 +308,6 @@ public final class ModItems {
 		//Start meta Item Generation
 		ItemsFoods.load();
 		
-		itemCustomBook = new ItemBaseBook();
 
 		try{
 
@@ -807,5 +806,7 @@ public final class ModItems {
 
 		//ItemBlockGtFrameBox = new ItemBlockGtFrameBox(ModBlocks.blockGtFrameSet1);
 		//GameRegistry.registerItem(ItemBlockGtFrameBox, "itemGtFrameBoxSet1");
+		
+		itemCustomBook = new ItemBaseBook();
 	}
 }
diff --git a/src/Java/gtPlusPlus/core/item/general/books/ItemBaseBook.java b/src/Java/gtPlusPlus/core/item/general/books/ItemBaseBook.java
index c7bf2e821e..5160ddd8ce 100644
--- a/src/Java/gtPlusPlus/core/item/general/books/ItemBaseBook.java
+++ b/src/Java/gtPlusPlus/core/item/general/books/ItemBaseBook.java
@@ -2,9 +2,12 @@ package gtPlusPlus.core.item.general.books;
 
 import java.util.List;
 
+import cpw.mods.fml.common.registry.GameRegistry;
+import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.handler.BookHandler;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.nbt.NBTUtils;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
@@ -17,35 +20,37 @@ public class ItemBaseBook extends ItemWritableBook{
 	public ItemBaseBook(){
 		this.setCreativeTab(AddToCreativeTab.tabMisc);
 		this.setMaxStackSize(1);
-		this.setNoRepair();
-		this.setMaxDamage(Short.MAX_VALUE);
 		this.setTextureName(CORE.MODID+":"+"itemBook");
+		this.setUnlocalizedName("itembookgt");
+		GameRegistry.registerItem(this, "bookGT");
+		GT_OreDictUnificator.registerOre("bookWritten", ItemUtils.getWildcardStack(this));
+		GT_OreDictUnificator.registerOre("craftingBook", ItemUtils.getWildcardStack(this));
+	
 	}
 
 	@Override
 	public void getSubItems(Item item, CreativeTabs tab, List list) {
-		for (int i = 0; i < Utils.getBookCount(); i ++) {
-			list.add(new ItemStack(item, 1, i));
+		for (int i = 0; i < BookHandler.mBookMap.size(); i ++) {
+			ItemStack bookstack = new ItemStack(item, 1, i);
+			NBTUtils.createIntegerTagCompound(bookstack, "stats", "mMeta", i);
+			NBTUtils.setString(bookstack, "title", BookHandler.mBookMap.get(i).mTitle);
+			list.add(bookstack);
 		}
 	}
 	
 	@Override
 	public String getItemStackDisplayName(final ItemStack tItem) {
-		if (NBTUtils.hasKey(tItem, "mMeta")){
-			return NBTUtils.getBookTitle(tItem);
+		if (NBTUtils.hasKey(tItem, "title")){
+			return NBTUtils.getString(tItem, "title");
 		}
+		NBTUtils.tryIterateNBTData(tItem);
 		return "GT++ Storybook";
 	}
 
 	@Override
-	public boolean isDamageable() {
-		return false;
-	}
-
-	@Override
 	public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) {
 		// TODO Auto-generated method stub
-		super.addInformation(p_77624_1_, p_77624_2_, p_77624_3_, p_77624_4_);
+		//super.addInformation(p_77624_1_, p_77624_2_, p_77624_3_, p_77624_4_);
 	}
 
 	@Override
@@ -54,26 +59,23 @@ public class ItemBaseBook extends ItemWritableBook{
 	}
 
 	@Override
-	public int getDamage(ItemStack stack) {
-		if (NBTUtils.hasKey(stack, "mMeta")){
-			return NBTUtils.getInteger(stack, "mMeta");
-		}
-		return 0;
-	}
-
-	@Override
-	public int getDisplayDamage(ItemStack stack) {
-		return 0;
-	}
-
-	@Override
 	public boolean showDurabilityBar(ItemStack stack) {
 		return false;
 	}
 
-	@Override
-	public void setDamage(ItemStack stack, int damage) {
-		NBTUtils.setInteger(stack, "mMeta", damage);
+	/*@Override
+	public int getDamage(ItemStack stack) {
+		try {
+		return NBTUtils.getIntegerTagCompound(stack, "stats", "mMeta");
+		}
+		catch (Throwable t) {
+			return 0;
+		}
 	}
 
+	@Override
+	public void setDamage(ItemStack stack, int damage) {
+		NBTUtils.createIntegerTagCompound(stack, "stats", "mMeta", damage);
+	}*/
+	
 }