Skip to content

allow specifying component changes as json rather than stringified nbt #1132

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

Open
Abbie5 wants to merge 1 commit into
base: 1.21
Choose a base branch
from
Open

allow specifying component changes as json rather than stringified nbt #1132

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
7 changes: 6 additions & 1 deletion xplat/src/main/java/dev/emi/emi/api/stack/serializer/EmiStackSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package dev.emi.emi.api.stack.serializer;

import com.mojang.serialization.DynamicOps;
import com.mojang.serialization.JsonOps;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

Expand Down Expand Up @@ -38,6 +39,7 @@ private static <T> DynamicOps<T> withRegistryAccess(DynamicOps<T> ops) {
default EmiIngredient deserialize(JsonElement element) {
Identifier id = null;
String nbt = null;
JsonObject changesJson = null;
long amount = 1;
float chance = 1;
EmiStack remainder = EmiStack.EMPTY;
Expand All @@ -52,6 +54,7 @@ default EmiIngredient deserialize(JsonElement element) {
JsonObject json = element.getAsJsonObject();
id = EmiPort.id(JsonHelper.getString(json, "id"));
nbt = JsonHelper.getString(json, "nbt", null);
changesJson = JsonHelper.getObject(json, "componentChanges", null);
amount = JsonHelper.getLong(json, "amount", 1);
chance = JsonHelper.getFloat(json, "chance", 1);
if (JsonHelper.hasElement(json, "remainder")) {
Expand All @@ -64,7 +67,9 @@ default EmiIngredient deserialize(JsonElement element) {
if (id != null) {
try {
ComponentChanges changes = ComponentChanges.EMPTY;
if (nbt != null) {
if (changesJson != null) {
changes = ComponentChanges.CODEC.decode(withRegistryAccess(JsonOps.INSTANCE), changesJson).getOrThrow().getFirst();
} else if (nbt != null) {
changes = ComponentChanges.CODEC.decode(withRegistryAccess(NbtOps.INSTANCE), StringNbtReader.parse(nbt)).getOrThrow().getFirst();
}
EmiStack stack = create(id, changes, amount);
Expand Down