From 8fe1648d6b3a514b8f31a940912cbb377fb991a7 Mon Sep 17 00:00:00 2001 From: creeper123123321 <7974274+creeper123123321@users.noreply.github.com> Date: Sun, 2 Aug 2020 12:37:36 -0300 Subject: [PATCH 1/4] Explain chatrewriter changes --- .../protocols/protocol1_13to1_12_2/ChatRewriter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/ChatRewriter.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/ChatRewriter.java index a75155e37..206d24785 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/ChatRewriter.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/ChatRewriter.java @@ -63,7 +63,7 @@ public class ChatRewriter { component = new TextComponent(); component.setColor(format); - // ViaVersion start + // ViaVersion start - Items have style default to italic component.setBold(false); component.setItalic(false); component.setUnderlined(false); @@ -73,7 +73,7 @@ public class ChatRewriter { } else { component = new TextComponent(); component.setColor(format); - // ViaVersion start + // ViaVersion start- Items have style default to italic component.setBold(false); component.setItalic(false); component.setUnderlined(false); From 3d2225832147370d67fdf38be0fdefbcca54786d Mon Sep 17 00:00:00 2001 From: creeper123123321 <7974274+creeper123123321@users.noreply.github.com> Date: Sun, 2 Aug 2020 12:47:45 -0300 Subject: [PATCH 2/4] update velocity repo --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6edd6f8ea..cd91cc0d1 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ velocity - https://repo.velocitypowered.com/snapshots + https://nexus.velocitypowered.com/repository/maven-public From a42aa4b2027765d59486b30f714b67a4f7015826 Mon Sep 17 00:00:00 2001 From: creeper123123321 <7974274+creeper123123321@users.noreply.github.com> Date: Sun, 2 Aug 2020 13:55:48 -0300 Subject: [PATCH 3/4] use velocity snapshots repo --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cd91cc0d1..4819bd4f8 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ velocity - https://nexus.velocitypowered.com/repository/maven-public + https://nexus.velocitypowered.com/repository/velocity-artifacts-snapshots From be2ba2b1b92c3b7ee69e4f7c1349432c695dcc17 Mon Sep 17 00:00:00 2001 From: KennyTV Date: Mon, 3 Aug 2020 08:39:39 +0200 Subject: [PATCH 4/4] Fix Chat meta type Fixes #1949 --- .../ViaVersion/api/minecraft/metadata/types/MetaType1_12.java | 2 +- .../ViaVersion/api/minecraft/metadata/types/MetaType1_9.java | 2 +- .../protocol1_9to1_8/metadata/MetadataRewriter1_9To1_8.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/us/myles/ViaVersion/api/minecraft/metadata/types/MetaType1_12.java b/common/src/main/java/us/myles/ViaVersion/api/minecraft/metadata/types/MetaType1_12.java index a44369621..56481a8f4 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/minecraft/metadata/types/MetaType1_12.java +++ b/common/src/main/java/us/myles/ViaVersion/api/minecraft/metadata/types/MetaType1_12.java @@ -8,7 +8,7 @@ public enum MetaType1_12 implements MetaType { VarInt(1, Type.VAR_INT), Float(2, Type.FLOAT), String(3, Type.STRING), - Chat(4, Type.STRING), + Chat(4, Type.COMPONENT), Slot(5, Type.ITEM), Boolean(6, Type.BOOLEAN), Vector3F(7, Type.ROTATION), diff --git a/common/src/main/java/us/myles/ViaVersion/api/minecraft/metadata/types/MetaType1_9.java b/common/src/main/java/us/myles/ViaVersion/api/minecraft/metadata/types/MetaType1_9.java index ff336cd89..3ee63bde8 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/minecraft/metadata/types/MetaType1_9.java +++ b/common/src/main/java/us/myles/ViaVersion/api/minecraft/metadata/types/MetaType1_9.java @@ -8,7 +8,7 @@ public enum MetaType1_9 implements MetaType { VarInt(1, Type.VAR_INT), Float(2, Type.FLOAT), String(3, Type.STRING), - Chat(4, Type.STRING), + Chat(4, Type.COMPONENT), Slot(5, Type.ITEM), Boolean(6, Type.BOOLEAN), Vector3F(7, Type.ROTATION), diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/metadata/MetadataRewriter1_9To1_8.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/metadata/MetadataRewriter1_9To1_8.java index 10f626a05..b295c787f 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/metadata/MetadataRewriter1_9To1_8.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/metadata/MetadataRewriter1_9To1_8.java @@ -121,7 +121,7 @@ public class MetadataRewriter1_9To1_8 extends MetadataRewriter { metadata.setValue(angle); break; case Chat: - value = Protocol1_9To1_8.fixJson((String) value); + value = Protocol1_9To1_8.fixJson(value.toString()); metadata.setValue(value); break; default: