Google
/
Geyser
forked from GeyserMC/Geyser
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update Adventure-Legacy dependency (#996)

This commit is contained in:
Camotoy 2020-07-22 14:52:12 -04:00 committed by GitHub
parent b211b9da2e
commit ad9184ad13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
connector/src/main/java/org/geysermc/connector/network/translators/inventory/AnvilInventoryTranslator.java
View File

@ -26,8 +26,6 @@
package org.geysermc.connector.network.translators.inventory; package org.geysermc.connector.network.translators.inventory;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack; import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack;
import com.github.steveice10.mc.protocol.data.message.MessageSerializer;
import com.github.steveice10.mc.protocol.data.message.TextMessage;
import com.github.steveice10.mc.protocol.packet.ingame.client.window.ClientRenameItemPacket; import com.github.steveice10.mc.protocol.packet.ingame.client.window.ClientRenameItemPacket;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.nukkitx.nbt.NbtMap; import com.nukkitx.nbt.NbtMap;
@ -111,7 +109,7 @@ public class AnvilInventoryTranslator extends BlockInventoryTranslator {
if (tag != null) { if (tag != null) {
String name = tag.getCompound("display").getString("Name"); String name = tag.getCompound("display").getString("Name");
Component component = GsonComponentSerializer.gson().deserialize(name); Component component = GsonComponentSerializer.gson().deserialize(name);
rename = LegacyComponentSerializer.legacy().serialize(component); rename = LegacyComponentSerializer.legacySection().serialize(component);
} else { } else {
rename = ""; rename = "";
} }
@ -144,7 +142,7 @@ public class AnvilInventoryTranslator extends BlockInventoryTranslator {
if (displayTag != null && displayTag.contains("Name")) { if (displayTag != null && displayTag.contains("Name")) {
String itemName = displayTag.get("Name").getValue().toString(); String itemName = displayTag.get("Name").getValue().toString();
Component component = GsonComponentSerializer.gson().deserialize(itemName); Component component = GsonComponentSerializer.gson().deserialize(itemName);
rename = LegacyComponentSerializer.legacy().serialize(component); rename = LegacyComponentSerializer.legacySection().serialize(component);
} else { } else {
rename = ""; rename = "";
} }

2
connector/src/main/java/org/geysermc/connector/network/translators/item/ItemTranslator.java
View File

@ -162,7 +162,7 @@ public abstract class ItemTranslator {
// If its not a message convert it // If its not a message convert it
if (!MessageUtils.isMessage(name)) { if (!MessageUtils.isMessage(name)) {
TextComponent component = LegacyComponentSerializer.legacy().deserialize(name); TextComponent component = LegacyComponentSerializer.legacySection().deserialize(name);
name = GsonComponentSerializer.gson().serialize(component); name = GsonComponentSerializer.gson().serialize(component);
} }

4
connector/src/main/java/org/geysermc/connector/network/translators/item/translators/nbt/BasicItemTranslator.java
View File

@ -108,8 +108,8 @@ public class BasicItemTranslator extends NbtItemStackTranslator {
String message = tag.getValue(); String message = tag.getValue();
if (message == null) return null; if (message == null) return null;
TextComponent component = (TextComponent) MessageUtils.phraseJavaMessage(message); TextComponent component = (TextComponent) MessageUtils.phraseJavaMessage(message);
String legacy = LegacyComponentSerializer.legacy().serialize(component); String legacy = LegacyComponentSerializer.legacySection().serialize(component);
if (hasFormatting(LegacyComponentSerializer.legacy().deserialize(legacy))) { if (hasFormatting(LegacyComponentSerializer.legacySection().deserialize(legacy))) {
return "§r" + legacy; return "§r" + legacy;
} }
return legacy; return legacy;

4
connector/src/main/java/org/geysermc/connector/utils/MessageUtils.java
View File

@ -259,7 +259,7 @@ public class MessageUtils {
public static String getBedrockMessage(String message) { public static String getBedrockMessage(String message) {
Component component = phraseJavaMessage(message); Component component = phraseJavaMessage(message);
return LegacyComponentSerializer.legacy().serialize(component); return LegacyComponentSerializer.legacySection().serialize(component);
} }
public static Component phraseJavaMessage(String message) { public static Component phraseJavaMessage(String message) {
@ -267,7 +267,7 @@ public class MessageUtils {
} }
public static String getJavaMessage(String message) { public static String getJavaMessage(String message) {
Component component = LegacyComponentSerializer.legacy().deserialize(message); Component component = LegacyComponentSerializer.legacySection().deserialize(message);
return GsonComponentSerializer.gson().serialize(component); return GsonComponentSerializer.gson().serialize(component);
} }