$ Fix crashes related to client side calls from the server side.

- Removed RFTools additions.

2 files changed, 17 insertions, 4 deletions

diff --git a/src/Java/gtPlusPlus/core/item/bauble/ModularBauble.java b/src/Java/gtPlusPlus/core/item/bauble/ModularBauble.java
index 0e7df1703c..de12a77c27 100644
--- a/src/Java/gtPlusPlus/core/item/bauble/ModularBauble.java
+++ b/src/Java/gtPlusPlus/core/item/bauble/ModularBauble.java
@@ -36,7 +36,6 @@ public class ModularBauble extends BaseBauble {
 	private IIcon mTextureRing;
 	@SideOnly(Side.CLIENT)
 	private IIcon mTextureBelt;
-	@SideOnly(Side.CLIENT)
 	private IIcon iconArray[] = new IIcon[3];
 	@SideOnly(Side.CLIENT)
 	private IIcon mfallback;
@@ -342,6 +341,7 @@ public class ModularBauble extends BaseBauble {
 	}*/
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public IIcon getIconFromDamage(int meta) {
 		if (meta < this.iconArray.length && this.iconArray[meta] != null){
 			return this.iconArray[meta];
diff --git a/src/Java/gtPlusPlus/core/item/general/books/ItemBaseBook.java b/src/Java/gtPlusPlus/core/item/general/books/ItemBaseBook.java
index 8c4a262c32..fe0405d175 100644
--- a/src/Java/gtPlusPlus/core/item/general/books/ItemBaseBook.java
+++ b/src/Java/gtPlusPlus/core/item/general/books/ItemBaseBook.java
@@ -2,18 +2,21 @@ package gtPlusPlus.core.item.general.books;
 
 import static gtPlusPlus.core.handler.BookHandler.mBookMap;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
 import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
 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.client.Minecraft;
+import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.GuiScreenBook;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
@@ -96,6 +99,7 @@ public class ItemBaseBook extends ItemWritableBook{
 	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public ItemStack onItemRightClick(ItemStack item, World world, EntityPlayer player) {
 		//player.displayGUIBook(item);
 		int i = item.getItemDamage();
@@ -106,7 +110,16 @@ public class ItemBaseBook extends ItemWritableBook{
 				mBookMap.get(i).mPages);
 		
 		if (player.worldObj.isRemote){
-			Minecraft.getMinecraft().displayGuiScreen(new GuiScreenBook(player, bookstack, false));
+			try {
+				Class<?> clazz = Class.forName("net.minecraft.client.gui.GuiScreenBook");
+				Constructor<?> ctor = clazz.getConstructor(EntityPlayer.class, ItemStack.class, boolean.class);
+				Object object = ctor.newInstance(new Object[] { player, bookstack, false });
+				Minecraft.getMinecraft().displayGuiScreen((GuiScreen) object);
+			} catch (ClassNotFoundException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+			//Minecraft.getMinecraft().displayGuiScreen(new GuiScreenBook(player, bookstack, false));
 		}
         return item;
 	}