Switch to using PERSISTED_NBT_TAG for players

Should fix all duped book problems

Author: tterrag1098

src/main/java/modpacktweaks/ModpackTweaks.java

@@ -8,7 +8,6 @@
 import modpacktweaks.client.gui.GuiHelper;
 import modpacktweaks.command.CommandMT;
 import modpacktweaks.config.ConfigurationHandler;
-import modpacktweaks.event.ModEventHandler;
 import modpacktweaks.event.PlayerTracker;
 import modpacktweaks.item.ModItems;
 import modpacktweaks.lib.Reference;
@@ -42,7 +41,6 @@ public class ModpackTweaks
 	@SidedProxy(clientSide = "modpacktweaks.proxy.ClientProxy", serverSide = "modpacktweaks.proxy.CommonProxy")
 	public static CommonProxy proxy;
 
-	public static ModEventHandler eventHandler;
 	public static PlayerTracker playerTracker;
 
 	public static final Logger logger = Logger.getLogger("ModpackTweaks");
@@ -87,8 +85,6 @@ public void preInit(FMLPreInitializationEvent event)
 	@EventHandler
 	public void init(FMLInitializationEvent event)
 	{
-		eventHandler = new ModEventHandler();
-		MinecraftForge.EVENT_BUS.register(eventHandler);
 		ModItems.registerRecipes();
 	}
 

src/main/java/modpacktweaks/event/ModEventHandler.java

@@ -10,11 +10,8 @@
 import modpacktweaks.client.gui.UpdateGui;
 import modpacktweaks.config.ConfigurationHandler;
 import net.minecraft.client.gui.GuiMainMenu;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.client.event.GuiOpenEvent;
 import net.minecraftforge.event.ForgeSubscribe;
-import net.minecraftforge.event.entity.living.LivingDeathEvent;
 
 import com.google.common.collect.ImmutableList;
 
@@ -24,7 +21,6 @@
 
 public class ModEventHandler
 {
-	public static boolean NBTValOnDeath;
 	private String name, version, acronym;
 
 	public boolean shouldLoadGUI;
@@ -140,28 +136,4 @@ else if (s.contains("Forge") && !s.contains(":"))
 			ModpackTweaks.logger.log(Level.WARNING, "Reflection error, " + acronym + " watermark will not be shown");
 		}
 	}
-
-	@ForgeSubscribe
-	public void onLivingDeath(LivingDeathEvent event)
-	{
-		if (event.entityLiving instanceof EntityPlayer)
-		{
-			savePlayerNBT((EntityPlayer) event.entityLiving);
-		}
-	}
-
-	private void savePlayerNBT(EntityPlayer player)
-	{
-		ModpackTweaks.logger.log(Level.INFO, "getting NBT");
-
-		NBTValOnDeath = player.getEntityData().getCompoundTag("modpacktweaks").getBoolean("hasBook");
-	}
-
-	public NBTTagCompound getTag(EntityPlayer entity, boolean useClassVal)
-	{
-		NBTTagCompound tag = new NBTTagCompound();
-		tag.setBoolean("hasBook", useClassVal ? NBTValOnDeath : true);
-
-		return tag;
-	}
 }

src/main/java/modpacktweaks/event/PlayerTracker.java

@@ -27,25 +27,22 @@ public void onPlayerLogout(EntityPlayer player)
 	@Override
 	public void onPlayerChangedDimension(EntityPlayer player)
 	{
-		ModEventHandler.NBTValOnDeath = player.getEntityData().getCompoundTag("modpacktweaks").getBoolean("hasBook");
+		// Do Nothing
 	}
 
 	@Override
 	public void onPlayerRespawn(EntityPlayer player)
 	{
-		ModpackTweaks.logger.log(Level.INFO, "adding NBT: " + ModEventHandler.NBTValOnDeath);
-		player.getEntityData().setTag("modpacktweaks", ModpackTweaks.eventHandler.getTag(player, true));
-		
-		addBook(player);
+		// Do Nothing
 	}
 
 	private boolean addBook(EntityPlayer player)
 	{
-		if (player != null && ConfigurationHandler.doSpawnBook && !player.getEntityData().getCompoundTag("modpacktweaks").getBoolean("hasBook") && !player.worldObj.isRemote)
+		if (player != null && ConfigurationHandler.doSpawnBook && !player.getEntityData().getCompoundTag(EntityPlayer.PERSISTED_NBT_TAG).getBoolean("MT:hasBook") && !player.worldObj.isRemote)
 		{
 			ModpackTweaks.logger.log(Level.INFO, "Adding book");
 
-			player.getEntityData().setTag("modpacktweaks", ModpackTweaks.eventHandler.getTag(player, false));
+			player.getEntityData().getCompoundTag(EntityPlayer.PERSISTED_NBT_TAG).setBoolean("MT:hasBook", true);
 
 			ItemStack stack = ModItems.book.getGuide();
 			player.inventory.addItemStackToInventory(stack);