From ecebe75f333eff0f60d1afa15ea10c97dcde4fc7 Mon Sep 17 00:00:00 2001
From: AEon - Tobias <angryAEon@icloud.com>
Date: Wed, 8 Aug 2018 02:51:46 +0200
Subject: [PATCH] Third stage of "Dagger of Sacrifice"-glow (#1389)

* Added Soul Fray check.
Sacrificial dagger now glows even more if you're fully prepared!
Added NBT field for maximum incense altar bonus from the last incense altar the player has encountered.
(There is a case in which the dagger glows even if the player is not at maximum incense bonus:
 The player must have been at maximum incense bonus and then gone into the vincinity of a stronger incense altar.
 The maximum incense bonus data field only updates once the maximum bonus has been reached for efficiency.)

* Multiplayer fixed.

* Fixed weirdness that occurred during a phase I don't remember.
---
 .../item/ItemSacrificialDagger.java           | 30 +++++++++++++------
 .../WayofTime/bloodmagic/util/Constants.java  |  2 ++
 .../bloodmagic/util/helper/IncenseHelper.java | 24 +++++++++++++++
 .../util/helper/PlayerSacrificeHelper.java    |  5 +++-
 4 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java
index 6dc81125..5410758f 100644
--- a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java
+++ b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java
@@ -8,10 +8,7 @@ import WayofTime.bloodmagic.item.types.ISubItem;
 import WayofTime.bloodmagic.tile.TileAltar;
 import WayofTime.bloodmagic.util.Constants;
 import WayofTime.bloodmagic.util.DamageSourceBloodMagic;
-import WayofTime.bloodmagic.util.helper.NBTHelper;
-import WayofTime.bloodmagic.util.helper.PlayerHelper;
-import WayofTime.bloodmagic.util.helper.PlayerSacrificeHelper;
-import WayofTime.bloodmagic.util.helper.TextHelper;
+import WayofTime.bloodmagic.util.helper.*;
 import net.minecraft.client.renderer.ItemMeshDefinition;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.client.util.ITooltipFlag;
@@ -56,7 +53,8 @@ public class ItemSacrificialDagger extends ItemEnum<ItemSacrificialDagger.Dagger
     @Override
     public void onPlayerStoppedUsing(ItemStack stack, World worldIn, EntityLivingBase entityLiving, int timeLeft) {
         if (entityLiving instanceof EntityPlayer && !entityLiving.getEntityWorld().isRemote)
-            PlayerSacrificeHelper.sacrificePlayerHealth((EntityPlayer) entityLiving);
+            if(PlayerSacrificeHelper.sacrificePlayerHealth((EntityPlayer) entityLiving))
+                IncenseHelper.setHasMaxIncense(stack, (EntityPlayer) entityLiving, false);
     }
 
     @Override
@@ -120,10 +118,10 @@ public class ItemSacrificialDagger extends ItemEnum<ItemSacrificialDagger.Dagger
         for (int l = 0; l < 8; ++l)
             world.spawnParticle(EnumParticleTypes.REDSTONE, posX + Math.random() - Math.random(), posY + Math.random() - Math.random(), posZ + Math.random() - Math.random(), 0, 0, 0);
 
-        if (!world.isRemote && PlayerHelper.isFakePlayer(player))
+        if (!world.isRemote && PlayerHelper.isFakePlayer(player) || player.isPotionActive(PlayerSacrificeHelper.soulFrayId))
             return super.onItemRightClick(world, player, hand);
 
-        // TODO - Check if SoulFray is active
+
         PlayerSacrificeHelper.findAndFillAltar(world, player, lpAdded, false);
 
         return super.onItemRightClick(world, player, hand);
@@ -131,8 +129,16 @@ public class ItemSacrificialDagger extends ItemEnum<ItemSacrificialDagger.Dagger
 
     @Override
     public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5) {
-        if (!world.isRemote && entity instanceof EntityPlayer)
-            this.setUseForSacrifice(stack, this.isPlayerPreparedForSacrifice(world, (EntityPlayer) entity));
+        if (!world.isRemote && entity instanceof EntityPlayer) {
+            boolean prepared = this.isPlayerPreparedForSacrifice(world, (EntityPlayer) entity);
+            this.setUseForSacrifice(stack, prepared);
+            if(IncenseHelper.getHasMaxIncense(stack) && !prepared)
+                IncenseHelper.setHasMaxIncense(stack, (EntityPlayer) entity, false);
+            if(prepared) {
+                boolean isMax = IncenseHelper.getMaxIncense((EntityPlayer) entity) == IncenseHelper.getCurrentIncense((EntityPlayer) entity);
+                IncenseHelper.setHasMaxIncense(stack, (EntityPlayer) entity, isMax);
+            }
+        }
     }
 
     public boolean isPlayerPreparedForSacrifice(World world, EntityPlayer player) {
@@ -171,6 +177,12 @@ public class ItemSacrificialDagger extends ItemEnum<ItemSacrificialDagger.Dagger
         variants.accept("type=ceremonial");
     }
 
+    @Override
+    public boolean hasEffect(ItemStack stack)
+    {
+        return IncenseHelper.getHasMaxIncense(stack) || super.hasEffect(stack);
+    }
+
     public enum DaggerType implements ISubItem {
 
         NORMAL,
diff --git a/src/main/java/WayofTime/bloodmagic/util/Constants.java b/src/main/java/WayofTime/bloodmagic/util/Constants.java
index fd678307..b368bf9c 100644
--- a/src/main/java/WayofTime/bloodmagic/util/Constants.java
+++ b/src/main/java/WayofTime/bloodmagic/util/Constants.java
@@ -32,6 +32,8 @@ public class Constants
         public static final String DIRECTION = "direction";
         public static final String REAGENT_TANKS = "reagentTanks";
         public static final String CURRENT_INCENSE = "BM:CurrentIncense";
+        public static final String MAX_INCENSE = "BM:MaxIncenseFromLastAltar";
+        public static final String HAS_MAX_INCENSE = "BM:CurrentIsMaxIncense";
         public static final String CURRENT_PURITY = "BM:CurrentPurity";
         public static final String EMPTY = "Empty";
         public static final String OUTPUT_AMOUNT = "outputAmount";
diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/IncenseHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/IncenseHelper.java
index 40071726..559690ee 100644
--- a/src/main/java/WayofTime/bloodmagic/util/helper/IncenseHelper.java
+++ b/src/main/java/WayofTime/bloodmagic/util/helper/IncenseHelper.java
@@ -2,9 +2,11 @@ package WayofTime.bloodmagic.util.helper;
 
 import WayofTime.bloodmagic.util.Constants;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
 public class IncenseHelper {
+
     public static double getCurrentIncense(EntityPlayer player) {
         NBTTagCompound data = player.getEntityData();
         if (data.hasKey(Constants.NBT.CURRENT_INCENSE)) {
@@ -18,4 +20,26 @@ public class IncenseHelper {
         NBTTagCompound data = player.getEntityData();
         data.setDouble(Constants.NBT.CURRENT_INCENSE, amount);
     }
+
+    public static void setMaxIncense(EntityPlayer player, double amount){
+        NBTTagCompound data = player.getEntityData();
+        data.setDouble(Constants.NBT.MAX_INCENSE, amount);
+    }
+
+    public static double getMaxIncense(EntityPlayer player) {
+        NBTTagCompound data = player.getEntityData();
+        if (data.hasKey(Constants.NBT.MAX_INCENSE)) {
+            return data.getDouble(Constants.NBT.MAX_INCENSE);
+        }
+        return 0;
+    }
+
+    public static void setHasMaxIncense(ItemStack stack, EntityPlayer player, boolean isMax) {
+        stack = NBTHelper.checkNBT(stack);
+        stack.getTagCompound().setBoolean(Constants.NBT.HAS_MAX_INCENSE, isMax);
+    }
+    public static boolean getHasMaxIncense(ItemStack stack) {
+        stack = NBTHelper.checkNBT(stack);
+        return stack.getTagCompound().getBoolean(Constants.NBT.HAS_MAX_INCENSE);
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/PlayerSacrificeHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/PlayerSacrificeHelper.java
index 4aec71d4..1fc54b05 100644
--- a/src/main/java/WayofTime/bloodmagic/util/helper/PlayerSacrificeHelper.java
+++ b/src/main/java/WayofTime/bloodmagic/util/helper/PlayerSacrificeHelper.java
@@ -2,8 +2,8 @@ package WayofTime.bloodmagic.util.helper;
 
 import WayofTime.bloodmagic.ConfigHandler;
 import WayofTime.bloodmagic.altar.IBloodAltar;
-import WayofTime.bloodmagic.event.SacrificeKnifeUsedEvent;
 import WayofTime.bloodmagic.core.RegistrarBloodMagic;
+import WayofTime.bloodmagic.event.SacrificeKnifeUsedEvent;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.potion.Potion;
@@ -35,6 +35,9 @@ public class PlayerSacrificeHelper {
         amount = amount + Math.min(increment, incenseAddition - amount);
         setPlayerIncense(player, amount);
 
+        if(amount == incenseAddition) {
+            IncenseHelper.setMaxIncense(player, incenseAddition);
+        }
         // System.out.println("Amount of incense: " + amount + ", Increment: " +
         // increment);