amy/almostunified
1
0
Fork 0
mirror of https://github.com/AlmostReliable/almostunified.git synced 2024-11-24 08:37:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix crash on empty recipe JSONs

Browse source
This commit is contained in:
rlnt 2024-10-23 22:36:50 +02:00
parent 0d41ce5184
commit ba06760073
No known key found for this signature in database
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -3,7 +3,8 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
## Unreleased ## Unreleased
- /
- fixed crash on empty recipe JSONs
## [1.2.1] - 2024-10-22 ## [1.2.1] - 2024-10-22

8
Common/src/main/java/com/almostreliable/unified/unification/recipe/RecipeLink.java
View file

@ -32,13 +32,13 @@ public final class RecipeLink implements RecipeData {
@Nullable @Nullable
public static RecipeLink of(ResourceLocation id, JsonObject originalRecipe) { public static RecipeLink of(ResourceLocation id, JsonObject originalRecipe) {
ResourceLocation type = ResourceLocation.tryParse(originalRecipe.get("type").getAsString()); try {
if (type == null) { ResourceLocation type = ResourceLocation.parse(originalRecipe.get("type").getAsString());
return new RecipeLink(id, originalRecipe, type);
} catch (Exception e) {
AlmostUnifiedCommon.LOGGER.warn("Could not detect recipe type for recipe '{}', skipping.", id); AlmostUnifiedCommon.LOGGER.warn("Could not detect recipe type for recipe '{}', skipping.", id);
return null; return null;
} }
return new RecipeLink(id, originalRecipe, type);
} }
public static RecipeLink ofOrThrow(ResourceLocation id, JsonObject originalRecipe) { public static RecipeLink ofOrThrow(ResourceLocation id, JsonObject originalRecipe) {

1
Common/src/main/java/com/almostreliable/unified/unification/recipe/RecipeTransformer.java
View file

@ -112,6 +112,7 @@ public class RecipeTransformer {
return recipes return recipes
.entrySet() .entrySet()
.stream() .stream()
.filter(entry -> entry.getValue() instanceof JsonObject jsonObject && !jsonObject.isEmpty())
.map(entry -> RecipeLink.of(entry.getKey(), entry.getValue().getAsJsonObject())) .map(entry -> RecipeLink.of(entry.getKey(), entry.getValue().getAsJsonObject()))
.filter(Objects::nonNull) .filter(Objects::nonNull)
.sorted(Comparator.comparing(entry -> entry.getId().toString())) .sorted(Comparator.comparing(entry -> entry.getId().toString()))