infiniteserver/fabric
1
0
Fork 0
forked from FabricMC/fabric
Code Pull requests Activity

Support loading a single resource condition instead of array ()

Browse source 
* Support loading a single condition instead of array

* Remove extra space

* Use LIST_CODEC field instead of CODEC.listOf()

Co-authored-by: Juuz <6596629+Juuxel@users.noreply.github.com>

---------

Co-authored-by: Juuz <6596629+Juuxel@users.noreply.github.com>
(cherry picked from commit 83154f1bcb)
This commit is contained in:
Apollo 2024-05-07 11:04:14 -07:00 • committed by modmuss50
parent 1c4a86e83a
commit 690fe0d575
3 changed files with 9 additions and 10 deletions
fabric-resource-conditions-api-v1/src
main/java/net/fabricmc/fabric
api/resource/conditions/v1
ResourceCondition.java
impl/resource/conditions
ResourceConditionsImpl.java
testmod/resources/data/fabric-resource-conditions-api-v1-testmod/predicates
loaded.json

4
fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/api/resource/conditions/v1/ResourceCondition.java
View file

@ -38,6 +38,10 @@ public interface ResourceCondition {
* A codec for a list of conditions.
*/
Codec<List<ResourceCondition>> LIST_CODEC = CODEC.listOf();
/**
* A codec for parsing load conditions. Can either be an array of conditions or a single condition.
*/
Codec<ResourceCondition> CONDITION_CODEC = Codec.withAlternative(CODEC, LIST_CODEC, conditions -> ResourceConditions.and(conditions.toArray(new ResourceCondition[0])));
/**
* @return the type of the condition

4
fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/ResourceConditionsImpl.java
View file

@ -65,10 +65,10 @@ public final class ResourceConditionsImpl implements ModInitializer {
boolean debugLogEnabled = ResourceConditionsImpl.LOGGER.isDebugEnabled();
if (obj.has(ResourceConditions.CONDITIONS_KEY)) {
DataResult<List<ResourceCondition>> conditions = ResourceCondition.LIST_CODEC.parse(JsonOps.INSTANCE, obj.get(ResourceConditions.CONDITIONS_KEY));
DataResult<ResourceCondition> conditions = ResourceCondition.CONDITION_CODEC.parse(JsonOps.INSTANCE, obj.get(ResourceConditions.CONDITIONS_KEY));
if (conditions.isSuccess()) {
boolean matched = ResourceConditionsImpl.conditionsMet(conditions.getOrThrow(), registryLookup, true);
boolean matched = conditions.getOrThrow().test(registryLookup);
if (debugLogEnabled) {
String verdict = matched ? "Allowed" : "Rejected";

11
fabric-resource-conditions-api-v1/src/testmod/resources/data/fabric-resource-conditions-api-v1-testmod/predicates/loaded.json
View file

@ -4,12 +4,7 @@
"predicate": {
"type": "minecraft:pig"
},
"fabric:load_conditions": [
{
"condition": "fabric:all_mods_loaded",
"values": [
"fabric-resource-conditions-api-v1"
]
}
]
"fabric:load_conditions": {
"condition": "fabric:true"
}
}