transform EnumBloodSource into a context object

src/api/java/de/teamlapen/vampirism/api/entity/player/vampire/IDrinkBloodContext.java

@@ -0,0 +1,59 @@
+package de.teamlapen.vampirism.api.entity.player.vampire;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.state.BlockState;
+
+import java.util.Optional;
+
+/**
+ * Context for {@link de.teamlapen.vampirism.api.entity.vampire.IVampire#drinkBlood(int, float, boolean, IDrinkBloodContext)}
+ */
+public interface IDrinkBloodContext {
+
+    /**
+     * @return The entity that is the source of the blood if the blood is obtained from an entity
+     */
+    Optional<LivingEntity> getEntity();
+
+    /**
+     * @return The itemstack that is the source of the blood if the blood is obtained from an item
+     */
+    Optional<ItemStack> getStack();
+
+    /**
+     * @return The blockstate that is the source of the blood if the blood is obtained from a block
+     */
+    Optional<BlockState> getBlockState();
+
+    /**
+     * @return The blockpos that is the source of the blood if the blood is obtained from a block
+     */
+    Optional<BlockPos> getBlockPos();
+
+    @Deprecated(forRemoval = true)
+    static IDrinkBloodContext none() {
+        return new IDrinkBloodContext() {
+            @Override
+            public Optional<LivingEntity> getEntity() {
+                return Optional.empty();
+            }
+
+            @Override
+            public Optional<ItemStack> getStack() {
+                return Optional.empty();
+            }
+
+            @Override
+            public Optional<BlockState> getBlockState() {
+                return Optional.empty();
+            }
+
+            @Override
+            public Optional<BlockPos> getBlockPos() {
+                return Optional.empty();
+            }
+        };
+    }
+}

src/api/java/de/teamlapen/vampirism/api/entity/vampire/IVampire.java

@@ -4,7 +4,7 @@
 import de.teamlapen.vampirism.api.VReference;
 import de.teamlapen.vampirism.api.entity.factions.IFaction;
 import de.teamlapen.vampirism.api.entity.factions.IFactionEntity;
-import de.teamlapen.vampirism.api.entity.player.vampire.EnumBloodSource;
+import de.teamlapen.vampirism.api.entity.player.vampire.IDrinkBloodContext;
 import net.minecraft.world.level.LevelAccessor;
 import org.jetbrains.annotations.NotNull;
 
@@ -24,27 +24,27 @@ public interface IVampire extends IFactionEntity {
      *
      * @param amt           In blood food unit, not mB. See {@link de.teamlapen.vampirism.api.VReference#FOOD_TO_FLUID_BLOOD} for conversion
      * @param saturationMod Similar to the food saturation modifier
-     * @param bloodSource   The type of blood source used. See {@link de.teamlapen.vampirism.api.entity.player.vampire.EnumBloodSource}
+     * @param drinkContext  The context where the blood is obtained from
      */
-    default void drinkBlood(int amt, float saturationMod, EnumBloodSource bloodSource) {
-        drinkBlood(amt, saturationMod, true, bloodSource);
+    default void drinkBlood(int amt, float saturationMod, IDrinkBloodContext drinkContext) {
+        drinkBlood(amt, saturationMod, true, drinkContext);
     }
 
     /**
-     * @deprecated Use {@link #drinkBlood(int, float, de.teamlapen.vampirism.api.entity.player.vampire.EnumBloodSource)}  instead
+     * @deprecated Use {@link #drinkBlood(int, float, de.teamlapen.vampirism.api.entity.player.vampire.IDrinkBloodContext)}  instead
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     default void drinkBlood(int amt, float saturationMod) {
-        drinkBlood(amt, saturationMod, true, EnumBloodSource.OTHER);
+        drinkBlood(amt, saturationMod, true, IDrinkBloodContext.none());
     }
 
 
     /**
-     * @deprecated Use {@link #drinkBlood(int, float, boolean, de.teamlapen.vampirism.api.entity.player.vampire.EnumBloodSource)} instead
+     * @deprecated Use {@link #drinkBlood(int, float, boolean, de.teamlapen.vampirism.api.entity.player.vampire.IDrinkBloodContext)} instead
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     default void drinkBlood(int amt, float saturationMod, boolean useRemaining) {
-        drinkBlood(amt, saturationMod, useRemaining, EnumBloodSource.OTHER);
+        drinkBlood(amt, saturationMod, useRemaining, IDrinkBloodContext.none());
     }
 
     /**
@@ -53,8 +53,9 @@ default void drinkBlood(int amt, float saturationMod, boolean useRemaining) {
      *
      * @param amt           In blood food unit, not mB. See {@link de.teamlapen.vampirism.api.VReference#FOOD_TO_FLUID_BLOOD} for conversion
      * @param saturationMod Similar to the food saturation modifier
+     * @param drinkContext  The context where the blood is obtained from
      */
-    void drinkBlood(int amt, float saturationMod, boolean useRemaining, EnumBloodSource bloodSource);
+    void drinkBlood(int amt, float saturationMod, boolean useRemaining, IDrinkBloodContext drinkContext);
 
     @NotNull
     @Override

src/api/java/de/teamlapen/vampirism/api/event/BloodDrinkEvent.java

@@ -1,9 +1,8 @@
 package de.teamlapen.vampirism.api.event;
 
-import de.teamlapen.vampirism.api.entity.player.vampire.EnumBloodSource;
+import de.teamlapen.vampirism.api.entity.player.vampire.IDrinkBloodContext;
 import de.teamlapen.vampirism.api.entity.player.vampire.IVampirePlayer;
 import de.teamlapen.vampirism.api.entity.vampire.IVampire;
-import net.minecraft.world.entity.LivingEntity;
 import net.minecraftforge.eventbus.api.Event;
 import org.jetbrains.annotations.NotNull;
 
@@ -14,10 +13,10 @@ public abstract class BloodDrinkEvent extends Event {
     private final IVampire vampire;
     private int amount;
     private float saturation;
-    private final EnumBloodSource bloodSource;
+    private final IDrinkBloodContext bloodSource;
 
 
-    private BloodDrinkEvent(@NotNull IVampire vampire, int amount, float saturation, EnumBloodSource bloodSource) {
+    private BloodDrinkEvent(@NotNull IVampire vampire, int amount, float saturation, IDrinkBloodContext bloodSource) {
         this.vampire = vampire;
         this.amount = amount;
         this.saturation = saturation;
@@ -46,7 +45,7 @@ public float getSaturation() {
     /**
      * @return The type of blood source that the blood was obtained from.
      */
-    public EnumBloodSource getBloodSource() {
+    public IDrinkBloodContext getBloodSource() {
         return this.bloodSource;
     }
 
@@ -65,38 +64,18 @@ public void setSaturationModifier(float saturation) {
         this.saturation = saturation;
     }
 
-    /**
-     * Posted whenever a Vampire Player feeds by biting another mob.
-     * This does not change the amount drained from the entity, meaning it only changes the amount of blood the vampire receives from biting.
-     */
-    public static class BiteFeedEvent extends BloodDrinkEvent {
-        private final LivingEntity target;
-        public BiteFeedEvent(@NotNull IVampirePlayer player, LivingEntity target, int amount, float saturation) {
-            super(player,amount, saturation, EnumBloodSource.BITE_FEED);
-            this.target = target;
-        }
-
-        /**
-         * @return The LivingEntity that is being bitten
-         */
-        @NotNull
-        public LivingEntity getTarget() {
-            return this.target;
-        }
-    }
-
     /**
      * Posted whenever a Vampire Player drinks blood, such as when drinking blood from a bottle, eating a human heart or biting another mob
      */
     public static class PlayerDrinkBloodEvent extends BloodDrinkEvent {
         private boolean useRemaining;
 
-        public PlayerDrinkBloodEvent(@NotNull IVampirePlayer player, int amount, float saturation, boolean useRemaining, EnumBloodSource bloodSource) {
+        public PlayerDrinkBloodEvent(@NotNull IVampirePlayer player, int amount, float saturation, boolean useRemaining, IDrinkBloodContext bloodSource) {
             super(player, amount, saturation, bloodSource);
             this.useRemaining = useRemaining;
         }
         /**
-         * @return Whether the remaining blood should be used, see {@link de.teamlapen.vampirism.api.entity.vampire.IVampire#drinkBlood(int, float, boolean, de.teamlapen.vampirism.api.entity.player.vampire.EnumBloodSource)}.
+         * @return Whether the remaining blood should be used, see {@link de.teamlapen.vampirism.api.entity.vampire.IVampire#drinkBlood(int, float, boolean, de.teamlapen.vampirism.api.entity.player.vampire.IDrinkBloodContext)}.
          */
         public boolean useRemaining() {
             return this.useRemaining;
@@ -109,19 +88,20 @@ public void setUseRemaining(boolean useRemaining) {
             this.useRemaining = useRemaining;
         }
     }
+
     /**
      * Posted whenever any non-player vampire entity drinks any blood at all.
      */
     public static class EntityDrinkBloodEvent extends BloodDrinkEvent {
 
         private boolean useRemaining;
 
-        public EntityDrinkBloodEvent(@NotNull IVampire vampire, int amount, float saturation, boolean useRemaining, EnumBloodSource bloodSource) {
+        public EntityDrinkBloodEvent(@NotNull IVampire vampire, int amount, float saturation, boolean useRemaining, IDrinkBloodContext bloodSource) {
             super(vampire, amount, saturation, bloodSource);
             this.useRemaining = useRemaining;
         }
         /**
-         * @return Whether the remaining blood should be used, see {@link de.teamlapen.vampirism.api.entity.vampire.IVampire#drinkBlood(int, float, boolean, de.teamlapen.vampirism.api.entity.player.vampire.EnumBloodSource)}.
+         * @return Whether the remaining blood should be used, see {@link de.teamlapen.vampirism.api.entity.vampire.IVampire#drinkBlood(int, float, boolean, de.teamlapen.vampirism.api.entity.player.vampire.IDrinkBloodContext)}.
          */
         public boolean useRemaining() {
             return this.useRemaining;

src/main/java/de/teamlapen/vampirism/blockentity/AltarInfusionBlockEntity.java

@@ -6,14 +6,14 @@
 import de.teamlapen.vampirism.VampirismMod;
 import de.teamlapen.vampirism.advancements.critereon.VampireActionCriterionTrigger;
 import de.teamlapen.vampirism.api.VReference;
-import de.teamlapen.vampirism.api.entity.player.vampire.EnumBloodSource;
 import de.teamlapen.vampirism.blocks.AltarPillarBlock;
 import de.teamlapen.vampirism.blocks.AltarTipBlock;
 import de.teamlapen.vampirism.core.*;
 import de.teamlapen.vampirism.entity.factions.FactionPlayerHandler;
 import de.teamlapen.vampirism.entity.player.VampirismPlayerAttributes;
 import de.teamlapen.vampirism.entity.player.vampire.VampireLeveling;
 import de.teamlapen.vampirism.entity.player.vampire.VampirePlayer;
+import de.teamlapen.vampirism.entity.vampire.DrinkBloodContext;
 import de.teamlapen.vampirism.inventory.AltarInfusionMenu;
 import de.teamlapen.vampirism.items.PureBloodItem;
 import de.teamlapen.vampirism.particle.FlyingBloodParticleOptions;
@@ -288,7 +288,7 @@ private void tickRitual() {
                     return;
                 }
                 handler.ifPresent(h -> h.setFactionLevel(VReference.VAMPIRE_FACTION, h.getCurrentLevel(VReference.VAMPIRE_FACTION) + 1));
-                VampirePlayer.getOpt(player).ifPresent(v -> v.drinkBlood(Integer.MAX_VALUE, 0, false, EnumBloodSource.OTHER));
+                VampirePlayer.getOpt(player).ifPresent(v -> v.drinkBlood(Integer.MAX_VALUE, 0, false, DrinkBloodContext.none()));
                 if (player instanceof ServerPlayer serverPlayer) {
                     ModAdvancements.TRIGGER_VAMPIRE_ACTION.trigger(serverPlayer, VampireActionCriterionTrigger.Action.PERFORM_RITUAL_INFUSION);
                 }

src/main/java/de/teamlapen/vampirism/blockentity/AltarInspirationBlockEntity.java

@@ -2,14 +2,14 @@
 
 import de.teamlapen.lib.lib.util.FluidTankWithListener;
 import de.teamlapen.vampirism.api.VReference;
-import de.teamlapen.vampirism.api.entity.player.vampire.EnumBloodSource;
 import de.teamlapen.vampirism.core.ModFluids;
 import de.teamlapen.vampirism.core.ModParticles;
 import de.teamlapen.vampirism.core.ModTiles;
 import de.teamlapen.vampirism.entity.factions.FactionPlayerHandler;
 import de.teamlapen.vampirism.entity.player.VampirismPlayerAttributes;
 import de.teamlapen.vampirism.entity.player.vampire.VampireLeveling;
 import de.teamlapen.vampirism.entity.player.vampire.VampirePlayer;
+import de.teamlapen.vampirism.entity.vampire.DrinkBloodContext;
 import de.teamlapen.vampirism.items.BloodBottleFluidHandler;
 import de.teamlapen.vampirism.particle.FlyingBloodEntityParticleOptions;
 import net.minecraft.core.BlockPos;
@@ -157,7 +157,7 @@ public static void serverTick(@NotNull Level level, @NotNull BlockPos pos, Block
                 ((InternalTank) blockEntity.tank).doDrain(blood, IFluidHandler.FluidAction.EXECUTE);
                 blockEntity.ritualPlayer.addEffect(new MobEffectInstance(MobEffects.REGENERATION, blockEntity.targetLevel * 10 * 20));
                 FactionPlayerHandler.getOpt(blockEntity.ritualPlayer).ifPresent(h -> h.setFactionLevel(VReference.VAMPIRE_FACTION, blockEntity.targetLevel));
-                VampirePlayer.getOpt(blockEntity.ritualPlayer).ifPresent(v -> v.drinkBlood(Integer.MAX_VALUE, 0, false, EnumBloodSource.OTHER));
+                VampirePlayer.getOpt(blockEntity.ritualPlayer).ifPresent(v -> v.drinkBlood(Integer.MAX_VALUE, 0, false, DrinkBloodContext.none()));
             }
         }
 

src/main/java/de/teamlapen/vampirism/command/BloodBarCommand.java

@@ -4,9 +4,9 @@
 import com.mojang.brigadier.arguments.IntegerArgumentType;
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import de.teamlapen.lib.lib.util.BasicCommand;
-import de.teamlapen.vampirism.api.entity.player.vampire.EnumBloodSource;
 import de.teamlapen.vampirism.entity.player.FactionBasePlayer;
 import de.teamlapen.vampirism.entity.player.vampire.VampirePlayer;
+import de.teamlapen.vampirism.entity.vampire.DrinkBloodContext;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
 import net.minecraft.commands.arguments.EntityArgument;
@@ -39,7 +39,7 @@ public class BloodBarCommand extends BasicCommand {
     private static int setBloodBar(int amount, @NotNull Collection<ServerPlayer> player) {
         player.stream().map(VampirePlayer::getOpt).filter(player1 -> player1.map(FactionBasePlayer::getLevel).orElse(0) > 0).forEach(player1 -> player1.ifPresent(vampire -> {
             vampire.useBlood(Integer.MAX_VALUE, true);
-            vampire.drinkBlood(amount, 0, false, EnumBloodSource.OTHER);
+            vampire.drinkBlood(amount, 0, false, DrinkBloodContext.none());
         }));
         return 0;
     }

src/main/java/de/teamlapen/vampirism/entity/ai/goals/BiteNearbyEntityVampireGoal.java

@@ -1,10 +1,10 @@
 package de.teamlapen.vampirism.entity.ai.goals;
 
 import de.teamlapen.vampirism.api.entity.IExtendedCreatureVampirism;
-import de.teamlapen.vampirism.api.entity.player.vampire.EnumBloodSource;
 import de.teamlapen.vampirism.api.entity.vampire.IVampireMob;
 import de.teamlapen.vampirism.core.ModSounds;
 import de.teamlapen.vampirism.entity.ExtendedCreature;
+import de.teamlapen.vampirism.entity.vampire.DrinkBloodContext;
 import net.minecraft.commands.arguments.EntityAnchorArgument;
 import net.minecraft.world.entity.EntitySelector;
 import net.minecraft.world.entity.Mob;
@@ -87,7 +87,7 @@ public void tick() {
             if (canFeed(creature)) {
                 int amount = creature.onBite(vampire);
                 vampire.playSound(ModSounds.VAMPIRE_BITE.get(), 1, 1);
-                vampire.drinkBlood(amount, creature.getBloodSaturation(), EnumBloodSource.BITE_FEED);
+                vampire.drinkBlood(amount, creature.getBloodSaturation(), new DrinkBloodContext(e));
             }
         }
     }

src/main/java/de/teamlapen/vampirism/entity/converted/ConvertedVillagerEntity.java

@@ -6,15 +6,16 @@
 import de.teamlapen.vampirism.REFERENCE;
 import de.teamlapen.vampirism.api.EnumStrength;
 import de.teamlapen.vampirism.api.entity.convertible.ICurableConvertedCreature;
-import de.teamlapen.vampirism.api.entity.player.vampire.EnumBloodSource;
 import de.teamlapen.vampirism.api.entity.player.vampire.IBloodStats;
+import de.teamlapen.vampirism.api.entity.player.vampire.IDrinkBloodContext;
 import de.teamlapen.vampirism.api.event.BloodDrinkEvent;
 import de.teamlapen.vampirism.blockentity.TotemBlockEntity;
 import de.teamlapen.vampirism.core.ModAdvancements;
 import de.teamlapen.vampirism.core.ModAi;
 import de.teamlapen.vampirism.core.ModVillage;
 import de.teamlapen.vampirism.entity.VampirismVillagerEntity;
 import de.teamlapen.vampirism.entity.player.vampire.VampirePlayer;
+import de.teamlapen.vampirism.entity.vampire.DrinkBloodContext;
 import de.teamlapen.vampirism.entity.villager.Trades;
 import de.teamlapen.vampirism.util.*;
 import net.minecraft.core.BlockPos;
@@ -148,9 +149,9 @@ public boolean doesResistGarlic(EnumStrength strength) {
 
     @Override
     public boolean doHurtTarget(@NotNull Entity entity) {
-        if (!level().isClientSide && wantsBlood() && entity instanceof Player && !Helper.isHunter(entity) && !UtilLib.canReallySee((LivingEntity) entity, this, true)) {
-            int amt = VampirePlayer.getOpt((Player) entity).map(vampire -> vampire.onBite(this)).orElse(0);
-            drinkBlood(amt, IBloodStats.MEDIUM_SATURATION, EnumBloodSource.BITE_FEED);
+        if (!level().isClientSide && wantsBlood() && entity instanceof Player player && !Helper.isHunter(player) && !UtilLib.canReallySee(player, this, true)) {
+            int amt = VampirePlayer.getOpt(player).map(vampire -> vampire.onBite(this)).orElse(0);
+            drinkBlood(amt, IBloodStats.MEDIUM_SATURATION, new DrinkBloodContext(player));
             return true;
         }
         return super.doHurtTarget(entity);
@@ -167,8 +168,8 @@ public boolean doHurtTarget(@NotNull Entity entity) {
     }
 
     @Override
-    public void drinkBlood(int amt, float saturationMod, boolean useRemaining, EnumBloodSource bloodSource) {
-        BloodDrinkEvent.@NotNull EntityDrinkBloodEvent event = VampirismEventFactory.fireVampireDrinkBlood(this, amt, saturationMod, useRemaining, bloodSource);
+    public void drinkBlood(int amt, float saturationMod, boolean useRemaining, IDrinkBloodContext drinkContext) {
+        BloodDrinkEvent.@NotNull EntityDrinkBloodEvent event = VampirismEventFactory.fireVampireDrinkBlood(this, amt, saturationMod, useRemaining, drinkContext);
         this.addEffect(new MobEffectInstance(MobEffects.REGENERATION, event.getAmount() * 20));
         bloodTimer = -1200 - random.nextInt(1200);
     }

src/main/java/de/teamlapen/vampirism/entity/converted/CurableConvertedCreature.java

@@ -5,7 +5,7 @@
 import de.teamlapen.vampirism.api.VReference;
 import de.teamlapen.vampirism.api.VampirismAPI;
 import de.teamlapen.vampirism.api.entity.convertible.ICurableConvertedCreature;
-import de.teamlapen.vampirism.api.entity.player.vampire.EnumBloodSource;
+import de.teamlapen.vampirism.api.entity.player.vampire.IDrinkBloodContext;
 import de.teamlapen.vampirism.api.event.BloodDrinkEvent;
 import de.teamlapen.vampirism.api.items.IVampireFinisher;
 import de.teamlapen.vampirism.core.ModAttributes;
@@ -90,8 +90,8 @@ default InteractionResult mobInteractC(@NotNull Player player, @NotNull Interact
     }
 
     @Override
-    default void drinkBlood(int amt, float saturationMod, boolean useRemaining, EnumBloodSource bloodSource) {
-        BloodDrinkEvent.@NotNull EntityDrinkBloodEvent event = VampirismEventFactory.fireVampireDrinkBlood(this, amt, saturationMod, useRemaining, bloodSource);
+    default void drinkBlood(int amt, float saturationMod, boolean useRemaining, IDrinkBloodContext drinkContext) {
+        BloodDrinkEvent.@NotNull EntityDrinkBloodEvent event = VampirismEventFactory.fireVampireDrinkBlood(this, amt, saturationMod, useRemaining, drinkContext);
         ((PathfinderMob) this).addEffect(new MobEffectInstance(MobEffects.REGENERATION, event.getAmount() * 20));
     }