diff --git a/connector/pom.xml b/connector/pom.xml
index 9e223d4ea..4a488271d 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -139,5 +139,23 @@
<artifactId>reflections</artifactId>
<version>0.9.12</version>
</dependency>
+ <dependency>
+ <groupId>net.kyori</groupId>
+ <artifactId>text-api</artifactId>
+ <version>3.0.3</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.kyori</groupId>
+ <artifactId>text-serializer-gson</artifactId>
+ <version>3.0.3</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.kyori</groupId>
+ <artifactId>text-serializer-legacy</artifactId>
+ <version>3.0.3</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/BookPagesTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/BookPagesTranslator.java
new file mode 100644
index 000000000..f29f16fea
--- /dev/null
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/BookPagesTranslator.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.connector.network.translators.item.translators.nbt;
+
+import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
+import com.github.steveice10.opennbt.tag.builtin.ListTag;
+import com.github.steveice10.opennbt.tag.builtin.StringTag;
+import com.github.steveice10.opennbt.tag.builtin.Tag;
+import org.geysermc.connector.network.translators.ItemRemapper;
+import org.geysermc.connector.network.translators.NbtItemStackTranslator;
+import org.geysermc.connector.network.translators.item.ItemEntry;
+import org.geysermc.connector.utils.MessageUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@ItemRemapper
+public class BookPagesTranslator extends NbtItemStackTranslator {
+
+ @Override
+ public void translateToBedrock(CompoundTag itemTag, ItemEntry itemEntry) {
+ if (itemTag.contains("pages")) {
+ List<Tag> pages = new ArrayList<>();
+ ListTag pagesTag = itemTag.get("pages");
+ for (Tag tag : pagesTag.getValue()) {
+ if (!(tag instanceof StringTag))
+ continue;
+
+ StringTag textTag = (StringTag) tag;
+
+ CompoundTag pageTag = new CompoundTag("");
+ pageTag.put(new StringTag("photoname", ""));
+ pageTag.put(new StringTag("text", MessageUtils.getBedrockMessage(textTag.getValue())));
+ pages.add(pageTag);
+ }
+
+ itemTag.remove("pages");
+ itemTag.put(new ListTag("pages", pages));
+ }
+ }
+
+ @Override
+ public void translateToJava(CompoundTag itemTag, ItemEntry itemEntry) {
+ if (itemTag.contains("pages")) {
+ List<Tag> pages = new ArrayList<>();
+ ListTag pagesTag = itemTag.get("pages");
+ for (Tag tag : pagesTag.getValue()) {
+ if (!(tag instanceof CompoundTag))
+ continue;
+
+ CompoundTag pageTag = (CompoundTag) tag;
+
+ StringTag textTag = pageTag.get("text");
+ pages.add(new StringTag(MessageUtils.getJavaMessage(textTag.getValue())));
+ }
+
+ itemTag.remove("pages");
+ itemTag.put(new ListTag("pages", pages));
+ }
+ }
+}
diff --git a/connector/src/main/java/org/geysermc/connector/utils/MessageUtils.java b/connector/src/main/java/org/geysermc/connector/utils/MessageUtils.java
index c00d4bd5b..ac111c71e 100644
--- a/connector/src/main/java/org/geysermc/connector/utils/MessageUtils.java
+++ b/connector/src/main/java/org/geysermc/connector/utils/MessageUtils.java
@@ -32,6 +32,9 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.JsonPrimitive;
+import net.kyori.text.Component;
+import net.kyori.text.serializer.gson.GsonComponentSerializer;
+import net.kyori.text.serializer.legacy.LegacyComponentSerializer;
import org.geysermc.connector.network.session.GeyserSession;
import java.util.*;
@@ -62,7 +65,7 @@ public class MessageUtils {
List<String> furtherParams = getTranslationParams(translation.getTranslationParams(), locale);
if (locale != null) {
strings.add(insertParams(LocaleUtils.getLocaleString(translation.getTranslationKey(), locale), furtherParams));
- }else{
+ } else {
strings.addAll(furtherParams);
}
} else {
@@ -118,14 +121,30 @@ public class MessageUtils {
}
public static String getBedrockMessage(Message message) {
- return getTranslatedBedrockMessage(message, null, false);
+ Component component;
+ if (isMessage(message.getText())) {
+ component = GsonComponentSerializer.INSTANCE.deserialize(message.getText());
+ } else {
+ component = GsonComponentSerializer.INSTANCE.deserialize(message.toJsonString());
+ }
+ return LegacyComponentSerializer.legacy().serialize(component);
+ }
+
+ public static String getBedrockMessage(String message) {
+ Component component = GsonComponentSerializer.INSTANCE.deserialize(message);
+ return LegacyComponentSerializer.legacy().serialize(component);
+ }
+
+ public static String getJavaMessage(String message) {
+ Component component = LegacyComponentSerializer.legacy().deserialize(message);
+ return GsonComponentSerializer.INSTANCE.serialize(component);
}
/**
* Inserts the given parameters into the given message both in sequence and as requested
*
* @param message Message containing possible parameter replacement strings
- * @param params A list of parameter strings
+ * @param params A list of parameter strings
* @return Parsed message with all params inserted as needed
*/
public static String insertParams(String message, List<String> params) {
@@ -135,7 +154,7 @@ public class MessageUtils {
Matcher m = p.matcher(message);
while (m.find()) {
try {
- newMessage = newMessage.replaceFirst("%" + m.group(1) + "\\$s" , params.get(Integer.parseInt(m.group(1)) - 1));
+ newMessage = newMessage.replaceFirst("%" + m.group(1) + "\\$s", params.get(Integer.parseInt(m.group(1)) - 1));
} catch (Exception e) {
// Couldn't find the param to replace
}