Parker2991/MCProtocolLib
1
0
Fork 0
mirror of https://github.com/GeyserMC/MCProtocolLib.git synced 2024-12-12 16:51:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix HoverEvent messages

Browse source
This commit is contained in:
rtm516 2020-06-26 23:20:09 +01:00
parent b43dcab2e1
commit 762fca77e3
2 changed files with 94 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
src/main/java/com/github/steveice10/mc/protocol/data/message/ItemHoverMessage.java Normal file
View file

@ -0,0 +1,71 @@
package com.github.steveice10.mc.protocol.data.message;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
import com.github.steveice10.mc.protocol.data.message.style.MessageStyle;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import lombok.EqualsAndHashCode;
import lombok.NonNull;
import java.util.List;
@EqualsAndHashCode(callSuper = true)
public class ItemHoverMessage extends Message {
public static class Builder extends Message.Builder<Builder, ItemHoverMessage> {
@NonNull
private String id = "";
private int count;
private CompoundTag tag;
public Builder id(@NonNull String id) {
this.id = id;
return this;
}
public Builder count(@NonNull int count) {
this.count = count;
return this;
}
public Builder tag(@NonNull CompoundTag tag) {
this.tag = tag;
return this;
}
@Override
public Builder copy(@NonNull ItemHoverMessage message) {
super.copy(message);
this.id = message.getId();
this.count = message.getCount();
this.tag = message.getTag();
return this;
}
@Override
public ItemHoverMessage build() {
return new ItemHoverMessage(this.style, this.extra, this.id, this.count, this.tag);
}
}
private final String id;
private final int count;
private final CompoundTag tag;
private ItemHoverMessage(MessageStyle style, List<Message> extra, String id, int count, CompoundTag tag) {
super(style, extra);
this.id = id;
this.count = count;
this.tag = tag;
}
public String getId() {
return this.id;
}
public int getCount() {
return this.count;
}
public CompoundTag getTag() {
return this.tag;
}
}

33
src/main/java/com/github/steveice10/mc/protocol/data/message/MessageSerializer.java
View file

@ -7,11 +7,9 @@ import com.github.steveice10.mc.protocol.data.message.style.ClickEvent;
import com.github.steveice10.mc.protocol.data.message.style.HoverAction; import com.github.steveice10.mc.protocol.data.message.style.HoverAction;
import com.github.steveice10.mc.protocol.data.message.style.HoverEvent; import com.github.steveice10.mc.protocol.data.message.style.HoverEvent;
import com.github.steveice10.mc.protocol.data.message.style.MessageStyle; import com.github.steveice10.mc.protocol.data.message.style.MessageStyle;
import com.google.gson.JsonArray; import com.github.steveice10.opennbt.conversion.builtin.CompoundTagConverter;
import com.google.gson.JsonElement; import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.google.gson.JsonObject; import com.google.gson.*;
import com.google.gson.JsonParser;
import com.google.gson.JsonPrimitive;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -121,11 +119,21 @@ public class MessageSerializer {
} else { } else {
throw new IllegalArgumentException("Unknown NBT message type in json: " + json); throw new IllegalArgumentException("Unknown NBT message type in json: " + json);
} }
} else if(json.has("type")) { } else if(json.has("type") && json.has("id")) {
return new EntityHoverMessage.Builder() EntityHoverMessage.Builder builder = new EntityHoverMessage.Builder();
.type(json.get("type").getAsString()) builder.type(json.get("type").getAsString());
.id(json.get("id").getAsString()) builder.id(json.get("id").getAsString());
.name(fromJson(json.get("name"))); if (json.has("name"))
builder.name(fromJson(json.get("name")));
return builder;
} else if(json.has("id")) {
ItemHoverMessage.Builder builder = new ItemHoverMessage.Builder();
builder.id(json.get("id").getAsString());
if (json.has("count"))
builder.count(json.get("count").getAsInt());
if (json.has("tag"))
builder.tag(new Gson().fromJson(json.get("tag"), CompoundTag.class));
return builder;
} else { } else {
throw new IllegalArgumentException("Unknown message type in json: " + json); throw new IllegalArgumentException("Unknown message type in json: " + json);
} }
@ -180,6 +188,11 @@ public class MessageSerializer {
json.addProperty("type", entityHoverMessage.getType()); json.addProperty("type", entityHoverMessage.getType());
json.addProperty("id", entityHoverMessage.getId()); json.addProperty("id", entityHoverMessage.getId());
json.add("name", toJson(entityHoverMessage.getName())); json.add("name", toJson(entityHoverMessage.getName()));
} else if(message instanceof ItemHoverMessage) {
ItemHoverMessage entityHoverMessage = (ItemHoverMessage) message;
json.addProperty("id", entityHoverMessage.getId());
json.addProperty("count", entityHoverMessage.getCount());
json.add("tag", new Gson().toJsonTree(entityHoverMessage.getTag()));
} }
} }