Skip to content
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

Jump to bottom

fix: correctly (de)serialise ItemType #2620

Merged
merged 1 commit into from Mar 15, 2024
Merged

fix: correctly (de)serialise ItemType #2620

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions worldedit-core/src/main/java/com/sk89q/worldedit/util/gson/GsonUtil.java
View file
Open in desktop
Expand Up @@ -23,6 +23,8 @@
import com.google.gson.GsonBuilder;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.math.Vector3;
import com.sk89q.worldedit.world.item.ItemType;
import com.sk89q.worldedit.world.item.ItemTypes;

/**
* Utility methods for Google's GSON library.
Expand All @@ -41,6 +43,7 @@ public static GsonBuilder createBuilder() {
GsonBuilder gsonBuilder = new GsonBuilder();
gsonBuilder.registerTypeAdapter(Vector3.class, new VectorAdapter());
gsonBuilder.registerTypeAdapter(BlockVector3.class, new BlockVectorAdapter());
gsonBuilder.registerTypeAdapter(ItemType.class, new ItemTypeAdapter());
return gsonBuilder;
}

Expand Down
26 changes: 26 additions & 0 deletions worldedit-core/src/main/java/com/sk89q/worldedit/util/gson/ItemTypeAdapter.java
View file
Open in desktop
@@ -0,0 +1,26 @@
package com.sk89q.worldedit.util.gson;

import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import com.sk89q.worldedit.world.item.ItemType;
import com.sk89q.worldedit.world.item.ItemTypes;

import java.lang.reflect.Type;

public final class ItemTypeAdapter implements JsonDeserializer<ItemType> {

@Override
public ItemType deserialize(JsonElement json, Type type, JsonDeserializationContext cont) throws JsonParseException {
JsonObject jsonObject = json.getAsJsonObject();
String id = jsonObject.get("id").getAsString();
ItemType itemType = ItemTypes.get(id);
if (itemType == null) {
throw new JsonParseException("Could not parse item type `" + id + "`");
}
return itemType;
}

}
2 changes: 1 addition & 1 deletion worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemType.java
View file
Open in desktop
Expand Up @@ -79,7 +79,7 @@ public String getId() {
}

//FAWE start
private int internalId;
private transient int internalId;

@Override
public void setInternalId(int internalId) {
Expand Down