R3944Realms/CarryOn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added possibility for scripts to override certain pickup checks. Closes #853

Browse Source
This commit is contained in:
Tschipp 2025-12-29 16:25:14 +01:00
parent f147e801cc
commit 47910dbf61
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Common/src/main/java/tschipp/carryon/common/carry/PickupHandler.java
View File

@ -102,6 +102,9 @@ public class PickupHandler {
nbt = output.buildResult(); 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())) if(!ListHandler.isPermitted(state.getBlock()))
return false; return false;
@ -109,10 +112,10 @@ public class PickupHandler {
if(hasPropertyType(state, DoorBlock.HALF)) if(hasPropertyType(state, DoorBlock.HALF))
return false; 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; return false;
if(blockEntity == null && !Constants.COMMON_CONFIG.settings.pickupAllBlocks) if(!overrideChecks && (blockEntity == null && !Constants.COMMON_CONFIG.settings.pickupAllBlocks))
return false; return false;
//Check if TE is locked //Check if TE is locked
@ -133,7 +136,6 @@ public class PickupHandler {
if(!doPickup) if(!doPickup)
return false; return false;
Optional<CarryOnScript> result = ScriptManager.inspectBlock(state, level, pos, nbt);
if(result.isPresent()) if(result.isPresent())
{ {
CarryOnScript script = result.get(); 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)) if(!ListHandler.isPermitted(entity))
{ {
//We can pick up baby animals even if the grown up animal is blacklisted. //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; return false;
} }
//Non-Creative only guards //Non-Creative only guards
if(!player.isCreative()) 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; return false;
if(Constants.COMMON_CONFIG.settings.maxEntityHeight < entity.getBbHeight() || Constants.COMMON_CONFIG.settings.maxEntityWidth < entity.getBbWidth()) 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); CarryOnData carry = CarryOnDataManager.getCarryData(player);
Optional<CarryOnScript> result = ScriptManager.inspectEntity(entity);
if(result.isPresent()) if(result.isPresent())
{ {
CarryOnScript script = result.get(); CarryOnScript script = result.get();

8
Common/src/main/java/tschipp/carryon/common/scripting/CarryOnScript.java
View File

@ -39,12 +39,13 @@ public record CarryOnScript(
ScriptObject scriptObject, ScriptObject scriptObject,
ScriptConditions scriptConditions, ScriptConditions scriptConditions,
ScriptRender scriptRender, ScriptRender scriptRender,
ScriptEffects scriptEffects) ScriptEffects scriptEffects,
boolean overrideChecks)
{ {
public boolean isValid() 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() public boolean isBlock()
@ -63,7 +64,8 @@ public record CarryOnScript(
ScriptObject.CODEC.fieldOf("object").forGetter(CarryOnScript::scriptObject), ScriptObject.CODEC.fieldOf("object").forGetter(CarryOnScript::scriptObject),
ScriptConditions.CODEC.optionalFieldOf("conditions", ScriptConditions.EMPTY).forGetter(CarryOnScript::scriptConditions), ScriptConditions.CODEC.optionalFieldOf("conditions", ScriptConditions.EMPTY).forGetter(CarryOnScript::scriptConditions),
ScriptRender.CODEC.optionalFieldOf("render", ScriptRender.EMPTY).forGetter(CarryOnScript::scriptRender), 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) ).apply(instance, CarryOnScript::new)
); );