Mirrors/ViaVersion
3
0
Fork 1
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-12-24 23:30:15 +01:00
Code Issues Releases Aktivität

Fix item hover event for 1.12 players

Quellcode durchsuchen
Dieser Commit ist enthalten in:
MrMicky 2019-10-23 16:11:14 +02:00
Ursprung 98a8f7f072
Commit ee54e153bf
1 geänderte Dateien mit 19 neuen und 11 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

30
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_12to1_11_1/ChatItemRewriter.java
Datei anzeigen

@ -3,6 +3,7 @@ package us.myles.ViaVersion.protocols.protocol1_12to1_11_1;
import com.google.gson.JsonArray; import com.google.gson.JsonArray;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.google.gson.JsonPrimitive;
import us.myles.ViaVersion.api.data.UserConnection; import us.myles.ViaVersion.api.data.UserConnection;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -20,23 +21,30 @@ public class ChatItemRewriter {
if (hoverEvent.has("action") && hoverEvent.has("value")) { if (hoverEvent.has("action") && hoverEvent.has("value")) {
String type = hoverEvent.get("action").getAsString(); String type = hoverEvent.get("action").getAsString();
if (type.equals("show_item") || type.equals("show_entity")) { if (type.equals("show_item") || type.equals("show_entity")) {
if (hoverEvent.get("value").isJsonPrimitive()) { JsonElement value = hoverEvent.get("value");
if (hoverEvent.get("value").getAsJsonPrimitive().isString()) {
String value = hoverEvent.get("value").getAsString(); if (value.isJsonPrimitive() && value.getAsJsonPrimitive().isString()) {
value = indexRemoval.matcher(value).replaceAll(""); String newValue = indexRemoval.matcher(value.getAsString()).replaceAll("");
hoverEvent.addProperty("value", value); hoverEvent.addProperty("value", newValue);
} else if (value.isJsonArray()) {
JsonArray newArray = new JsonArray();
for (JsonElement valueElement : value.getAsJsonArray()) {
if (valueElement.isJsonPrimitive() && valueElement.getAsJsonPrimitive().isString()) {
String newValue = indexRemoval.matcher(valueElement.getAsString()).replaceAll("");
newArray.add(new JsonPrimitive(newValue));
}
}
hoverEvent.add("value", newArray);
} }
} }
} }
} }
} } else if (obj.has("extra")) {
} else {
if (obj.has("extra")) {
toClient(obj.get("extra"), user); toClient(obj.get("extra"), user);
} }
} } else if (element instanceof JsonArray) {
}
if (element instanceof JsonArray) {
JsonArray array = (JsonArray) element; JsonArray array = (JsonArray) element;
for (JsonElement value : array) { for (JsonElement value : array) {
toClient(value, user); toClient(value, user);