Skip to content

Fix conflicting resource conditions in 1.20.1 #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Su5eD merged 1 commit into from
Mar 10, 2025
Merged

Fix conflicting resource conditions in 1.20.1 #204

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...i-v1/src/main/java/net/fabricmc/fabric/api/resource/conditions/v1/ResourceConditions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ public static Predicate<JsonObject> get(Identifier identifier) {
* <p>If an exception is thrown during condition testing, it will be caught and logged, and false will be returned.
*/
public static boolean objectMatchesConditions(JsonObject object) {
if (JsonHelper.hasArray(object, "conditions")) return true;
Copy link
Author

@ThexXTURBOXx ThexXTURBOXx Mar 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not 100% sure whether there is a better way to reference "conditions". I couldn't find a constant which contains this string in Forge's source code, so I hardcoded it here for now... Is there something?

try {
JsonArray conditions = JsonHelper.getArray(object, CONDITIONS_KEY, null);

Expand Down