feat: ✨ Updated feeding upgrade to not eat ominous bottles and added support for drinking ominous bottles in Alchemy upgrade

Author: P3pp3rF1y

gradle.properties

@@ -13,7 +13,7 @@ loader_version_range=[4,)
 mod_id=sophisticatedcore
 mod_name=Sophisticated Core
 mod_license=All Rights Reserved
-mod_version=1.3.55
+mod_version=1.3.56
 mod_group_id=sophisticatedcore
 mod_authors=P3pp3rF1y
 mod_description=A library / shared functionality mod for Sophisticated Storage and Backpacks

src/main/java/net/p3pp3rf1y/sophisticatedcore/upgrades/alchemy/AlchemyUpgradeWrapper.java

@@ -216,6 +216,12 @@ public static void addItemDefinition(AlchemyItemDefinition itemDefinition) {
 	}
 
 	static {
+		addItemDefinition(new AlchemyItemDefinition(stack -> stack.getItem() == Items.OMINOUS_BOTTLE, stack -> AlchemyCondition.ALWAYS,
+				(le, potionStack, matchAllEffects, matchEffectAmplifier) -> !le.hasEffect(MobEffects.BAD_OMEN),
+				(stack, filter, matchAllEffects, matchEffectDuration, matchEffectAmplifier) -> stack.getItem() == Items.OMINOUS_BOTTLE,
+				ItemStack::getUseDuration,
+				(stack, livingEntity) -> stack.getItem().finishUsingItem(stack, livingEntity.level(), livingEntity)
+		));
 		addItemDefinition(new AlchemyItemDefinition(stack -> stack.getItem() == Items.SPLASH_POTION, AlchemyUpgradeWrapper::getDefaultConditionForPotion,
 				AlchemyUpgradeWrapper::shouldApplyPotionEffectsTo, AlchemyUpgradeWrapper::stackPotionEffectsMatch,
 				(stack, livingEntity) -> {

src/main/java/net/p3pp3rf1y/sophisticatedcore/upgrades/feeding/FeedingUpgradeWrapper.java

@@ -9,6 +9,7 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.food.FoodProperties;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.AABB;
 import net.neoforged.neoforge.capabilities.Capabilities;
@@ -107,6 +108,10 @@ private boolean tryFeedingStack(Level level, int hungerLevel, Player player, Int
 	}
 
 	private static boolean isEdible(ItemStack stack, LivingEntity player) {
+		if (stack.getItem() == Items.OMINOUS_BOTTLE) {
+			return false; // Don't eat ominous bottle at all
+		}
+
 		FoodProperties foodProperties = stack.getItem().getFoodProperties(stack, player);
 		return foodProperties != null && foodProperties.nutrition() >= 1;
 	}