mirror of
https://github.com/AlmostReliable/almostunified.git
synced 2024-11-14 11:15:23 -05:00
Compare commits
8 commits
fd4bd6a460
...
0a83fbec10
Author | SHA1 | Date | |
---|---|---|---|
|
0a83fbec10 | ||
|
3dbc624aeb | ||
|
09c6b9895c | ||
|
ba06760073 | ||
|
0d41ce5184 | ||
|
d8b4afd57f | ||
|
54529f60b1 | ||
|
1f33027062 |
6 changed files with 40 additions and 10 deletions
13
CHANGELOG.md
13
CHANGELOG.md
|
@ -3,8 +3,17 @@
|
|||
All notable changes to this project will be documented in this file.
|
||||
|
||||
## Unreleased
|
||||
- /
|
||||
|
||||
- added better logging for cases where items are assigned to multiple unification tags
|
||||
## [1.2.2] - 2024-10-23
|
||||
|
||||
- fixed crash on empty recipe JSONs
|
||||
|
||||
## [1.2.1] - 2024-10-22
|
||||
|
||||
- added logging for cases where items are assigned to multiple unification tags
|
||||
- added logging for cases where the recipe type can't be found
|
||||
- added skipping logic for recipes with invalid recipe types
|
||||
- added Turkish translation ([#102](https://github.com/AlmostReliable/almostunified/pull/102))
|
||||
- fixed crash when runtime isn't loaded ([#101](https://github.com/AlmostReliable/almostunified/issues/101))
|
||||
- fixed newly created custom tags not being considered for unification
|
||||
|
@ -35,6 +44,8 @@ All notable changes to this project will be documented in this file.
|
|||
Initial 1.21.1 port.
|
||||
|
||||
<!-- Versions -->
|
||||
[1.2.2]: https://github.com/AlmostReliable/almostunified/releases/tag/v1.21.1-1.2.2
|
||||
[1.2.1]: https://github.com/AlmostReliable/almostunified/releases/tag/v1.21.1-1.2.1
|
||||
[1.2.0]: https://github.com/AlmostReliable/almostunified/releases/tag/v1.21.1-1.2.0
|
||||
[1.1.0]: https://github.com/AlmostReliable/almostunified/releases/tag/v1.21.1-1.1.0
|
||||
[1.0.0]: https://github.com/AlmostReliable/almostunified/releases/tag/v1.21.1-1.0.0
|
||||
|
|
|
@ -28,7 +28,7 @@ public class RecipeJsonImpl implements RecipeJson {
|
|||
try {
|
||||
return ResourceLocation.parse(json.get("type").getAsString());
|
||||
} catch (Exception e) {
|
||||
throw new IllegalArgumentException("could not detect recipe type");
|
||||
throw new IllegalArgumentException("could not detect recipe type for recipe " + id);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -2,6 +2,7 @@ package com.almostreliable.unified.unification.recipe;
|
|||
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
|
||||
import com.almostreliable.unified.AlmostUnifiedCommon;
|
||||
import com.almostreliable.unified.api.unification.recipe.RecipeData;
|
||||
import com.almostreliable.unified.utils.JsonCompare;
|
||||
|
||||
|
@ -17,7 +18,7 @@ import java.util.Map;
|
|||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class RecipeLink implements RecipeData {
|
||||
public final class RecipeLink implements RecipeData {
|
||||
/**
|
||||
* This cache is an optimization to avoid creating many ResourceLocations for just a few different types.
|
||||
* Having fewer ResourceLocation instances can greatly speed up equality checking when these are used as map keys.
|
||||
|
@ -30,15 +31,30 @@ public class RecipeLink implements RecipeData {
|
|||
@Nullable private DuplicateLink duplicateLink;
|
||||
@Nullable private JsonObject unifiedRecipe;
|
||||
|
||||
public RecipeLink(ResourceLocation id, JsonObject originalRecipe) {
|
||||
private RecipeLink(ResourceLocation id, JsonObject originalRecipe, ResourceLocation type) {
|
||||
this.id = id;
|
||||
this.originalRecipe = originalRecipe;
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
public static RecipeLink of(ResourceLocation id, JsonObject originalRecipe) {
|
||||
try {
|
||||
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);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static RecipeLink ofOrThrow(ResourceLocation id, JsonObject originalRecipe) {
|
||||
try {
|
||||
String typeString = originalRecipe.get("type").getAsString();
|
||||
this.type = PARSED_TYPE_CACHE.computeIfAbsent(typeString, ResourceLocation::parse);
|
||||
ResourceLocation type = PARSED_TYPE_CACHE.computeIfAbsent(typeString, ResourceLocation::parse);
|
||||
return new RecipeLink(id, originalRecipe, type);
|
||||
} catch (Exception e) {
|
||||
throw new IllegalArgumentException("could not detect recipe type");
|
||||
throw new IllegalArgumentException("could not detect recipe type for recipe " + id);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -31,6 +31,7 @@ import java.util.HashSet;
|
|||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
import java.util.function.Consumer;
|
||||
import java.util.stream.Collectors;
|
||||
|
@ -111,7 +112,9 @@ public class RecipeTransformer {
|
|||
return recipes
|
||||
.entrySet()
|
||||
.stream()
|
||||
.map(entry -> new RecipeLink(entry.getKey(), entry.getValue().getAsJsonObject()))
|
||||
.filter(entry -> entry.getValue() instanceof JsonObject jsonObject && !jsonObject.isEmpty())
|
||||
.map(entry -> RecipeLink.of(entry.getKey(), entry.getValue().getAsJsonObject()))
|
||||
.filter(Objects::nonNull)
|
||||
.sorted(Comparator.comparing(entry -> entry.getId().toString()))
|
||||
.collect(Collectors.groupingByConcurrent(RecipeLink::getType));
|
||||
}
|
||||
|
|
|
@ -83,11 +83,11 @@ public class TestUtils {
|
|||
|
||||
public static RecipeLink recipe(String jsonStr) {
|
||||
var json = json(jsonStr);
|
||||
return new RecipeLink(ResourceLocation.parse("test"), json);
|
||||
return RecipeLink.ofOrThrow(ResourceLocation.parse("test"), json);
|
||||
}
|
||||
|
||||
public static RecipeLink recipe(JsonObject json) {
|
||||
return new RecipeLink(ResourceLocation.parse("test"), json);
|
||||
return RecipeLink.ofOrThrow(ResourceLocation.parse("test"), json);
|
||||
}
|
||||
|
||||
public static JsonObject json(String json) {
|
||||
|
|
|
@ -8,7 +8,7 @@ enableAccessWidener = false
|
|||
minecraftVersion = 1.21.1
|
||||
|
||||
# Mod
|
||||
modVersion = 1.2.0
|
||||
modVersion = 1.2.2
|
||||
modPackage = com.almostreliable.unified
|
||||
modId = almostunified
|
||||
modName = AlmostUnified
|
||||
|
|
Loading…
Reference in a new issue