From 47910dbf61ba833980b696d8cf63db8be834e7af Mon Sep 17 00:00:00 2001
From: Tschipp <11649893+Tschipp@users.noreply.github.com>
Date: Mon, 29 Dec 2025 16:25:14 +0100
Subject: [PATCH] Added possibility for scripts to override certain pickup
 checks. Closes #853

---
 .../carryon/common/carry/PickupHandler.java      | 16 ++++++++++------
 .../carryon/common/scripting/CarryOnScript.java  |  8 +++++---
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Common/src/main/java/tschipp/carryon/common/carry/PickupHandler.java b/Common/src/main/java/tschipp/carryon/common/carry/PickupHandler.java
index c87b1fe..b712b96 100644
--- a/Common/src/main/java/tschipp/carryon/common/carry/PickupHandler.java
+++ b/Common/src/main/java/tschipp/carryon/common/carry/PickupHandler.java
@@ -102,6 +102,9 @@ public class PickupHandler {
             nbt = output.buildResult();
         }
 
+        Optional<CarryOnScript> result =  ScriptManager.inspectBlock(state, level, pos, nbt);
+        boolean overrideChecks = result.map(CarryOnScript::overrideChecks).orElse(false);
+
         if(!ListHandler.isPermitted(state.getBlock()))
             return false;
 
@@ -109,10 +112,10 @@ public class PickupHandler {
         if(hasPropertyType(state, DoorBlock.HALF))
             return false;
 
-        if(state.getDestroySpeed(level, pos) == -1 && !player.isCreative() && !Constants.COMMON_CONFIG.settings.pickupUnbreakableBlocks)
+        if(!overrideChecks && (state.getDestroySpeed(level, pos) == -1 && !player.isCreative() && !Constants.COMMON_CONFIG.settings.pickupUnbreakableBlocks))
             return false;
 
-        if(blockEntity == null && !Constants.COMMON_CONFIG.settings.pickupAllBlocks)
+        if(!overrideChecks && (blockEntity == null && !Constants.COMMON_CONFIG.settings.pickupAllBlocks))
             return false;
 
         //Check if TE is locked
@@ -133,7 +136,6 @@ public class PickupHandler {
         if(!doPickup)
             return false;
 
-        Optional<CarryOnScript> result =  ScriptManager.inspectBlock(state, level, pos, nbt);
         if(result.isPresent())
         {
             CarryOnScript script = result.get();
@@ -184,17 +186,20 @@ public class PickupHandler {
             }
         }
 
+        Optional<CarryOnScript> result =  ScriptManager.inspectEntity(entity);
+        boolean overrideChecks = result.map(CarryOnScript::overrideChecks).orElse(false);
+
         if(!ListHandler.isPermitted(entity))
         {
             //We can pick up baby animals even if the grown up animal is blacklisted.
-            if(!(entity instanceof AgeableMob ageableMob && Constants.COMMON_CONFIG.settings.allowBabies && (ageableMob.getAge() < 0 || ageableMob.isBaby())))
+            if(!overrideChecks && (!(entity instanceof AgeableMob ageableMob && Constants.COMMON_CONFIG.settings.allowBabies && (ageableMob.getAge() < 0 || ageableMob.isBaby()))))
                 return false;
         }
 
         //Non-Creative only guards
         if(!player.isCreative())
         {
-            if(!Constants.COMMON_CONFIG.settings.pickupHostileMobs && entity.getType().getCategory() == MobCategory.MONSTER)
+            if(!overrideChecks && (!Constants.COMMON_CONFIG.settings.pickupHostileMobs && entity.getType().getCategory() == MobCategory.MONSTER))
                 return false;
 
             if(Constants.COMMON_CONFIG.settings.maxEntityHeight < entity.getBbHeight() || Constants.COMMON_CONFIG.settings.maxEntityWidth < entity.getBbWidth())
@@ -214,7 +219,6 @@ public class PickupHandler {
 
         CarryOnData carry = CarryOnDataManager.getCarryData(player);
 
-        Optional<CarryOnScript> result =  ScriptManager.inspectEntity(entity);
         if(result.isPresent())
         {
             CarryOnScript script = result.get();
diff --git a/Common/src/main/java/tschipp/carryon/common/scripting/CarryOnScript.java b/Common/src/main/java/tschipp/carryon/common/scripting/CarryOnScript.java
index ed1d5c6..fa320e5 100644
--- a/Common/src/main/java/tschipp/carryon/common/scripting/CarryOnScript.java
+++ b/Common/src/main/java/tschipp/carryon/common/scripting/CarryOnScript.java
@@ -39,12 +39,13 @@ public record CarryOnScript(
 		ScriptObject scriptObject,
 		ScriptConditions scriptConditions,
 		ScriptRender scriptRender,
-		ScriptEffects scriptEffects)
+		ScriptEffects scriptEffects,
+		boolean overrideChecks)
 {
 
 	public boolean isValid()
 	{
-		return (isBlock() ^ isEntity()) && (scriptConditions != ScriptConditions.EMPTY || scriptRender != ScriptRender.EMPTY || scriptEffects != ScriptEffects.EMPTY);
+		return (isBlock() ^ isEntity()) && (scriptConditions != ScriptConditions.EMPTY || scriptRender != ScriptRender.EMPTY || scriptEffects != ScriptEffects.EMPTY || overrideChecks);
 	}
 
 	public boolean isBlock()
@@ -63,7 +64,8 @@ public record CarryOnScript(
 					ScriptObject.CODEC.fieldOf("object").forGetter(CarryOnScript::scriptObject),
 					ScriptConditions.CODEC.optionalFieldOf("conditions", ScriptConditions.EMPTY).forGetter(CarryOnScript::scriptConditions),
 					ScriptRender.CODEC.optionalFieldOf("render", ScriptRender.EMPTY).forGetter(CarryOnScript::scriptRender),
-					ScriptEffects.CODEC.optionalFieldOf("effects", ScriptEffects.EMPTY).forGetter(CarryOnScript::scriptEffects)
+					ScriptEffects.CODEC.optionalFieldOf("effects", ScriptEffects.EMPTY).forGetter(CarryOnScript::scriptEffects),
+					Codec.BOOL.optionalFieldOf("override_checks", false).forGetter(CarryOnScript::overrideChecks)
 			).apply(instance, CarryOnScript::new)
 	);