From 79a23047281eb1bff1b4b67e28e665c04bceb4e5 Mon Sep 17 00:00:00 2001 From: KennyTV <28825609+KennyTV@users.noreply.github.com> Date: Wed, 2 Oct 2019 16:19:56 +0200 Subject: [PATCH 1/9] 19w40a --- bukkit/pom.xml | 2 +- bungee/pom.xml | 2 +- common/pom.xml | 2 +- .../java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java | 2 +- jar/pom.xml | 2 +- pom.xml | 2 +- sponge-legacy/pom.xml | 2 +- sponge/pom.xml | 2 +- velocity/pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 6ca316f2a..2f90c95f4 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w39a + 2.1.4-19w40a 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index f2a529fce..2c48434b0 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w39a + 2.1.4-19w40a 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 479d5bf03..ae3f0a5b6 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w39a + 2.1.4-19w40a 4.0.0 diff --git a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java index 4e156c956..9d144392a 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java +++ b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java @@ -77,7 +77,7 @@ public class ProtocolVersion { register(v1_14_2 = new ProtocolVersion(485, "1.14.2")); register(v1_14_3 = new ProtocolVersion(490, "1.14.3")); register(v1_14_4 = new ProtocolVersion(498, "1.14.4")); - register(v1_15 = new ProtocolVersion(556, "1.15")); + register(v1_15 = new ProtocolVersion(557, "1.15")); register(unknown = new ProtocolVersion(-1, "UNKNOWN")); } diff --git a/jar/pom.xml b/jar/pom.xml index f36b49d54..4fe48c73e 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w39a + 2.1.4-19w40a 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index 274e4e71a..a91f9586e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 2.1.4-19w39a + 2.1.4-19w40a pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index 2a0df8f84..9c1f0abcc 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w39a + 2.1.4-19w40a 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index 9fa504508..76a23e947 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w39a + 2.1.4-19w40a 4.0.0 diff --git a/velocity/pom.xml b/velocity/pom.xml index 47be564ad..1cb2a7a7a 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w39a + 2.1.4-19w40a 4.0.0 From 626eb14960a7e76fe0ba2dcd02b3cc7c5284dbe9 Mon Sep 17 00:00:00 2001 From: KennyTV <28825609+KennyTV@users.noreply.github.com> Date: Fri, 4 Oct 2019 13:26:51 +0200 Subject: [PATCH 2/9] Fix an error in the player spawn packet --- .../packets/EntityPackets.java | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java index 9c76c258a..57638ac2b 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java @@ -60,27 +60,28 @@ public class EntityPackets { protocol.registerOutgoing(State.PLAY, 0x03, 0x03, new PacketRemapper() { @Override public void registerMap() { + map(Type.VAR_INT); // 0 - Entity ID + map(Type.UUID); // 1 - Entity UUID + map(Type.VAR_INT); // 2 - Entity Type + map(Type.DOUBLE); // 3 - X + map(Type.DOUBLE); // 4 - Y + map(Type.DOUBLE); // 5 - Z + map(Type.BYTE); // 6 - Yaw + map(Type.BYTE); // 7 - Pitch + map(Type.BYTE); // 8 - Head Pitch + map(Type.SHORT); // 9 - Velocity X + map(Type.SHORT); // 10 - Velocity Y + map(Type.SHORT); // 11 - Velocity Z + map(Types1_14.METADATA_LIST, Type.NOTHING); // removed - probably sent in an update packet? + handler(new PacketHandler() { @Override public void handle(PacketWrapper wrapper) throws Exception { - int entityId = wrapper.passthrough(Type.VAR_INT); - wrapper.passthrough(Type.UUID); - - int typeId = wrapper.read(Type.VAR_INT); + int entityId = wrapper.get(Type.VAR_INT, 0); + int typeId = wrapper.get(Type.VAR_INT, 1); Entity1_15Types.EntityType entityType = Entity1_15Types.getTypeFromId(getNewEntityId(typeId)); wrapper.user().get(EntityTracker.class).addEntity(entityId, entityType); - wrapper.write(Type.VAR_INT, entityType.getId()); - - wrapper.passthrough(Type.DOUBLE); - wrapper.passthrough(Type.DOUBLE); - wrapper.passthrough(Type.DOUBLE); - wrapper.passthrough(Type.BYTE); - wrapper.passthrough(Type.BYTE); - wrapper.passthrough(Type.BYTE); - wrapper.passthrough(Type.SHORT); - wrapper.passthrough(Type.SHORT); - wrapper.passthrough(Type.SHORT); - wrapper.read(Types1_14.METADATA_LIST); // removed - probably sent in an update packet? + wrapper.set(Type.VAR_INT, 1, entityType.getId()); } }); } @@ -90,23 +91,22 @@ public class EntityPackets { protocol.registerOutgoing(State.PLAY, 0x05, 0x05, new PacketRemapper() { @Override public void registerMap() { + map(Type.VAR_INT); // 0 - Entity ID + map(Type.UUID); // 1 - Player UUID + map(Type.DOUBLE); // 2 - X + map(Type.DOUBLE); // 3 - Y + map(Type.DOUBLE); // 4 - Z + map(Type.BYTE); // 5 - Yaw + map(Type.BYTE); // 6 - Pitch + map(Types1_14.METADATA_LIST, Type.NOTHING); // removed - probably sent in an update packet? + handler(new PacketHandler() { @Override public void handle(PacketWrapper wrapper) throws Exception { - int entityId = wrapper.passthrough(Type.VAR_INT); - wrapper.passthrough(Type.UUID); + int entityId = wrapper.get(Type.VAR_INT, 0); - int typeId = wrapper.read(Type.VAR_INT); - Entity1_15Types.EntityType entityType = Entity1_15Types.getTypeFromId(getNewEntityId(typeId)); + Entity1_15Types.EntityType entityType = Entity1_15Types.EntityType.PLAYER; wrapper.user().get(EntityTracker.class).addEntity(entityId, entityType); - wrapper.write(Type.VAR_INT, entityType.getId()); - - wrapper.passthrough(Type.DOUBLE); - wrapper.passthrough(Type.DOUBLE); - wrapper.passthrough(Type.DOUBLE); - wrapper.passthrough(Type.BYTE); - wrapper.passthrough(Type.BYTE); - wrapper.read(Types1_14.METADATA); // removed - probably sent in an update packet? } }); } From 96c58e7b1c2f4ba9c6a825ce2b6e8b00dc87dc89 Mon Sep 17 00:00:00 2001 From: MrMicky Date: Tue, 8 Oct 2019 13:25:37 +0200 Subject: [PATCH 3/9] Fix scoreboard colors on 1.13 --- .../protocol1_13to1_12_2/Protocol1_13To1_12_2.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java index 3aac71e72..9039c7168 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java @@ -105,8 +105,7 @@ public class Protocol1_13To1_12_2 extends Protocol { }; // These are arbitrary rewrite values, it just needs an invalid color code character. - protected static EnumMap SCOREBOARD_TEAM_NAME_REWRITE = new EnumMap<>(ChatColor.class); - // @formatter:on + protected static final EnumMap SCOREBOARD_TEAM_NAME_REWRITE = new EnumMap<>(ChatColor.class); static { SCOREBOARD_TEAM_NAME_REWRITE.put(ChatColor.BLACK, 'g'); @@ -125,6 +124,13 @@ public class Protocol1_13To1_12_2 extends Protocol { SCOREBOARD_TEAM_NAME_REWRITE.put(ChatColor.LIGHT_PURPLE, 'z'); SCOREBOARD_TEAM_NAME_REWRITE.put(ChatColor.YELLOW, '!'); SCOREBOARD_TEAM_NAME_REWRITE.put(ChatColor.WHITE, '?'); + SCOREBOARD_TEAM_NAME_REWRITE.put(ChatColor.MAGIC, '#'); + SCOREBOARD_TEAM_NAME_REWRITE.put(ChatColor.BOLD, '('); + SCOREBOARD_TEAM_NAME_REWRITE.put(ChatColor.STRIKETHROUGH, ')'); + SCOREBOARD_TEAM_NAME_REWRITE.put(ChatColor.UNDERLINE, ':'); + SCOREBOARD_TEAM_NAME_REWRITE.put(ChatColor.ITALIC, ';'); + SCOREBOARD_TEAM_NAME_REWRITE.put(ChatColor.RESET, '/'); + MappingData.init(); ConnectionData.init(); RecipeData.init(); From 3ffc55b539e2d4832ff94e4590b44858f3a791b8 Mon Sep 17 00:00:00 2001 From: Gerrygames Date: Wed, 9 Oct 2019 18:06:37 +0200 Subject: [PATCH 4/9] 19w41a --- bukkit/pom.xml | 2 +- bungee/pom.xml | 2 +- common/pom.xml | 2 +- .../api/protocol/ProtocolVersion.java | 2 +- .../assets/viaversion/data/mapping-1.15.json | 69 +++++++++++-------- jar/pom.xml | 2 +- pom.xml | 2 +- sponge-legacy/pom.xml | 2 +- sponge/pom.xml | 2 +- velocity/pom.xml | 2 +- 10 files changed, 50 insertions(+), 37 deletions(-) diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 2f90c95f4..f49a3a07a 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w40a + 2.1.4-19w41a 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index 2c48434b0..5ec7a0c8c 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w40a + 2.1.4-19w41a 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index ae3f0a5b6..3fe868399 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w40a + 2.1.4-19w41a 4.0.0 diff --git a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java index 9d144392a..6b97b0a1b 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java +++ b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java @@ -77,7 +77,7 @@ public class ProtocolVersion { register(v1_14_2 = new ProtocolVersion(485, "1.14.2")); register(v1_14_3 = new ProtocolVersion(490, "1.14.3")); register(v1_14_4 = new ProtocolVersion(498, "1.14.4")); - register(v1_15 = new ProtocolVersion(557, "1.15")); + register(v1_15 = new ProtocolVersion(558, "1.15")); register(unknown = new ProtocolVersion(-1, "UNKNOWN")); } diff --git a/common/src/main/resources/assets/viaversion/data/mapping-1.15.json b/common/src/main/resources/assets/viaversion/data/mapping-1.15.json index 53765b42a..7eb6d35af 100644 --- a/common/src/main/resources/assets/viaversion/data/mapping-1.15.json +++ b/common/src/main/resources/assets/viaversion/data/mapping-1.15.json @@ -11311,30 +11311,32 @@ "11308": "minecraft:bee_nest[facing=east,honey_level=3]", "11309": "minecraft:bee_nest[facing=east,honey_level=4]", "11310": "minecraft:bee_nest[facing=east,honey_level=5]", - "11311": "minecraft:bee_hive[facing=north,honey_level=0]", - "11312": "minecraft:bee_hive[facing=north,honey_level=1]", - "11313": "minecraft:bee_hive[facing=north,honey_level=2]", - "11314": "minecraft:bee_hive[facing=north,honey_level=3]", - "11315": "minecraft:bee_hive[facing=north,honey_level=4]", - "11316": "minecraft:bee_hive[facing=north,honey_level=5]", - "11317": "minecraft:bee_hive[facing=south,honey_level=0]", - "11318": "minecraft:bee_hive[facing=south,honey_level=1]", - "11319": "minecraft:bee_hive[facing=south,honey_level=2]", - "11320": "minecraft:bee_hive[facing=south,honey_level=3]", - "11321": "minecraft:bee_hive[facing=south,honey_level=4]", - "11322": "minecraft:bee_hive[facing=south,honey_level=5]", - "11323": "minecraft:bee_hive[facing=west,honey_level=0]", - "11324": "minecraft:bee_hive[facing=west,honey_level=1]", - "11325": "minecraft:bee_hive[facing=west,honey_level=2]", - "11326": "minecraft:bee_hive[facing=west,honey_level=3]", - "11327": "minecraft:bee_hive[facing=west,honey_level=4]", - "11328": "minecraft:bee_hive[facing=west,honey_level=5]", - "11329": "minecraft:bee_hive[facing=east,honey_level=0]", - "11330": "minecraft:bee_hive[facing=east,honey_level=1]", - "11331": "minecraft:bee_hive[facing=east,honey_level=2]", - "11332": "minecraft:bee_hive[facing=east,honey_level=3]", - "11333": "minecraft:bee_hive[facing=east,honey_level=4]", - "11334": "minecraft:bee_hive[facing=east,honey_level=5]" + "11311": "minecraft:beehive[facing=north,honey_level=0]", + "11312": "minecraft:beehive[facing=north,honey_level=1]", + "11313": "minecraft:beehive[facing=north,honey_level=2]", + "11314": "minecraft:beehive[facing=north,honey_level=3]", + "11315": "minecraft:beehive[facing=north,honey_level=4]", + "11316": "minecraft:beehive[facing=north,honey_level=5]", + "11317": "minecraft:beehive[facing=south,honey_level=0]", + "11318": "minecraft:beehive[facing=south,honey_level=1]", + "11319": "minecraft:beehive[facing=south,honey_level=2]", + "11320": "minecraft:beehive[facing=south,honey_level=3]", + "11321": "minecraft:beehive[facing=south,honey_level=4]", + "11322": "minecraft:beehive[facing=south,honey_level=5]", + "11323": "minecraft:beehive[facing=west,honey_level=0]", + "11324": "minecraft:beehive[facing=west,honey_level=1]", + "11325": "minecraft:beehive[facing=west,honey_level=2]", + "11326": "minecraft:beehive[facing=west,honey_level=3]", + "11327": "minecraft:beehive[facing=west,honey_level=4]", + "11328": "minecraft:beehive[facing=west,honey_level=5]", + "11329": "minecraft:beehive[facing=east,honey_level=0]", + "11330": "minecraft:beehive[facing=east,honey_level=1]", + "11331": "minecraft:beehive[facing=east,honey_level=2]", + "11332": "minecraft:beehive[facing=east,honey_level=3]", + "11333": "minecraft:beehive[facing=east,honey_level=4]", + "11334": "minecraft:beehive[facing=east,honey_level=5]", + "11335": "minecraft:honey_block", + "11336": "minecraft:honeycomb_block" }, "blocks": { "0": "air", @@ -12014,7 +12016,9 @@ "674": "jigsaw", "675": "composter", "676": "bee_nest", - "677": "bee_hive" + "677": "beehive", + "678": "honey_block", + "679": "honeycomb_block" }, "items": { "0": "minecraft:air", @@ -12897,8 +12901,10 @@ "877": "minecraft:campfire", "878": "minecraft:honeycomb", "879": "minecraft:bee_nest", - "880": "minecraft:bee_hive", - "881": "minecraft:honey_bottle" + "880": "minecraft:beehive", + "881": "minecraft:honey_bottle", + "882": "minecraft:honey_block", + "883": "minecraft:honeycomb_block" }, "sounds": [ "ambient.cave", @@ -13202,6 +13208,12 @@ "entity.guardian.hurt", "entity.guardian.hurt_land", "item.hoe.till", + "block.honey_block.break", + "block.honey_block.fall", + "block.honey_block.hit", + "block.honey_block.place", + "block.honey_block.slide", + "block.honey_block.step", "item.honey_bottle.drink", "entity.horse.ambient", "entity.horse.angry", @@ -13245,8 +13257,10 @@ "block.iron_door.close", "block.iron_door.open", "entity.iron_golem.attack", + "entity.iron_golem.damage", "entity.iron_golem.death", "entity.iron_golem.hurt", + "entity.iron_golem.repair", "entity.iron_golem.step", "block.iron_trapdoor.close", "block.iron_trapdoor.open", @@ -13367,7 +13381,6 @@ "entity.parrot.imitate.husk", "entity.parrot.imitate.illusioner", "entity.parrot.imitate.magma_cube", - "entity.parrot.imitate.panda", "entity.parrot.imitate.phantom", "entity.parrot.imitate.pillager", "entity.parrot.imitate.polar_bear", diff --git a/jar/pom.xml b/jar/pom.xml index 4fe48c73e..01e1c5fea 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w40a + 2.1.4-19w41a 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index a91f9586e..e29140377 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 2.1.4-19w40a + 2.1.4-19w41a pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index 9c1f0abcc..21f7035a4 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w40a + 2.1.4-19w41a 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index 76a23e947..c6afc9096 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w40a + 2.1.4-19w41a 4.0.0 diff --git a/velocity/pom.xml b/velocity/pom.xml index 1cb2a7a7a..81a889eee 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w40a + 2.1.4-19w41a 4.0.0 From bd805bfdc4f3df6840683091980b530ad02938fb Mon Sep 17 00:00:00 2001 From: Gerrygames Date: Wed, 16 Oct 2019 18:07:58 +0200 Subject: [PATCH 5/9] 19w42a --- bukkit/pom.xml | 2 +- bungee/pom.xml | 2 +- common/pom.xml | 2 +- .../java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java | 2 +- jar/pom.xml | 2 +- pom.xml | 2 +- sponge-legacy/pom.xml | 2 +- sponge/pom.xml | 2 +- velocity/pom.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bukkit/pom.xml b/bukkit/pom.xml index f49a3a07a..79cdcbb67 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w41a + 2.1.4-19w42a 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index 5ec7a0c8c..b8d6e407b 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w41a + 2.1.4-19w42a 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 3fe868399..3e98c443e 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w41a + 2.1.4-19w42a 4.0.0 diff --git a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java index 6b97b0a1b..6c2482baf 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java +++ b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java @@ -77,7 +77,7 @@ public class ProtocolVersion { register(v1_14_2 = new ProtocolVersion(485, "1.14.2")); register(v1_14_3 = new ProtocolVersion(490, "1.14.3")); register(v1_14_4 = new ProtocolVersion(498, "1.14.4")); - register(v1_15 = new ProtocolVersion(558, "1.15")); + register(v1_15 = new ProtocolVersion(559, "1.15")); register(unknown = new ProtocolVersion(-1, "UNKNOWN")); } diff --git a/jar/pom.xml b/jar/pom.xml index 01e1c5fea..5d556b4a7 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w41a + 2.1.4-19w42a 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index e29140377..030274fd8 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 2.1.4-19w41a + 2.1.4-19w42a pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index 21f7035a4..1704b3ec7 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w41a + 2.1.4-19w42a 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index c6afc9096..7ac63444d 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w41a + 2.1.4-19w42a 4.0.0 diff --git a/velocity/pom.xml b/velocity/pom.xml index 81a889eee..7ad7700eb 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w41a + 2.1.4-19w42a 4.0.0 From ee54e153bfc8fb2d14020d30192950baba4a7b89 Mon Sep 17 00:00:00 2001 From: MrMicky Date: Wed, 23 Oct 2019 16:11:14 +0200 Subject: [PATCH 6/9] Fix item hover event for 1.12 players --- .../ChatItemRewriter.java | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_12to1_11_1/ChatItemRewriter.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_12to1_11_1/ChatItemRewriter.java index 2d315a65f..422976c97 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_12to1_11_1/ChatItemRewriter.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_12to1_11_1/ChatItemRewriter.java @@ -3,6 +3,7 @@ package us.myles.ViaVersion.protocols.protocol1_12to1_11_1; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import com.google.gson.JsonPrimitive; import us.myles.ViaVersion.api.data.UserConnection; import java.util.regex.Pattern; @@ -20,23 +21,30 @@ public class ChatItemRewriter { if (hoverEvent.has("action") && hoverEvent.has("value")) { String type = hoverEvent.get("action").getAsString(); if (type.equals("show_item") || type.equals("show_entity")) { - if (hoverEvent.get("value").isJsonPrimitive()) { - if (hoverEvent.get("value").getAsJsonPrimitive().isString()) { - String value = hoverEvent.get("value").getAsString(); - value = indexRemoval.matcher(value).replaceAll(""); - hoverEvent.addProperty("value", value); + JsonElement value = hoverEvent.get("value"); + + if (value.isJsonPrimitive() && value.getAsJsonPrimitive().isString()) { + String newValue = indexRemoval.matcher(value.getAsString()).replaceAll(""); + 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")) { - toClient(obj.get("extra"), user); - } + } else if (obj.has("extra")) { + toClient(obj.get("extra"), user); } - } - if (element instanceof JsonArray) { + } else if (element instanceof JsonArray) { JsonArray array = (JsonArray) element; for (JsonElement value : array) { toClient(value, user); From 12279731adce31e0af57d58f33b007c16cc35314 Mon Sep 17 00:00:00 2001 From: Gerrygames Date: Wed, 30 Oct 2019 17:14:00 +0100 Subject: [PATCH 7/9] 19w44a --- bukkit/pom.xml | 2 +- bungee/pom.xml | 2 +- common/pom.xml | 2 +- .../java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java | 2 +- .../main/resources/assets/viaversion/data/mapping-1.15.json | 3 --- jar/pom.xml | 2 +- pom.xml | 2 +- sponge-legacy/pom.xml | 2 +- sponge/pom.xml | 2 +- velocity/pom.xml | 2 +- 10 files changed, 9 insertions(+), 12 deletions(-) diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 79cdcbb67..821d9d07c 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w42a + 2.1.4-19w44a 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index b8d6e407b..b9a66aa06 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w42a + 2.1.4-19w44a 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 3e98c443e..3a4835d40 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w42a + 2.1.4-19w44a 4.0.0 diff --git a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java index 6c2482baf..370a243b1 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java +++ b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java @@ -77,7 +77,7 @@ public class ProtocolVersion { register(v1_14_2 = new ProtocolVersion(485, "1.14.2")); register(v1_14_3 = new ProtocolVersion(490, "1.14.3")); register(v1_14_4 = new ProtocolVersion(498, "1.14.4")); - register(v1_15 = new ProtocolVersion(559, "1.15")); + register(v1_15 = new ProtocolVersion(560, "1.15")); register(unknown = new ProtocolVersion(-1, "UNKNOWN")); } diff --git a/common/src/main/resources/assets/viaversion/data/mapping-1.15.json b/common/src/main/resources/assets/viaversion/data/mapping-1.15.json index 7eb6d35af..9e8c7f399 100644 --- a/common/src/main/resources/assets/viaversion/data/mapping-1.15.json +++ b/common/src/main/resources/assets/viaversion/data/mapping-1.15.json @@ -13383,7 +13383,6 @@ "entity.parrot.imitate.magma_cube", "entity.parrot.imitate.phantom", "entity.parrot.imitate.pillager", - "entity.parrot.imitate.polar_bear", "entity.parrot.imitate.ravager", "entity.parrot.imitate.shulker", "entity.parrot.imitate.silverfish", @@ -13396,9 +13395,7 @@ "entity.parrot.imitate.witch", "entity.parrot.imitate.wither", "entity.parrot.imitate.wither_skeleton", - "entity.parrot.imitate.wolf", "entity.parrot.imitate.zombie", - "entity.parrot.imitate.zombie_pigman", "entity.parrot.imitate.zombie_villager", "entity.parrot.step", "entity.phantom.ambient", diff --git a/jar/pom.xml b/jar/pom.xml index 5d556b4a7..0db24e153 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w42a + 2.1.4-19w44a 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index 030274fd8..068bdf881 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 2.1.4-19w42a + 2.1.4-19w44a pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index 1704b3ec7..0753228cf 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w42a + 2.1.4-19w44a 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index 7ac63444d..61e5c19b1 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w42a + 2.1.4-19w44a 4.0.0 diff --git a/velocity/pom.xml b/velocity/pom.xml index 7ad7700eb..2e3b3398c 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.1.4-19w42a + 2.1.4-19w44a 4.0.0 From ce4ae73f5559a6ddc54db13b0c954ef0bac68221 Mon Sep 17 00:00:00 2001 From: creeper123123321 Date: Wed, 30 Oct 2019 14:30:36 -0300 Subject: [PATCH 8/9] forgotten merge conflict --- .../packets/EntityPackets.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java index 3c20fc1a4..b91f6ad13 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_15to1_14_4/packets/EntityPackets.java @@ -106,22 +106,8 @@ public class EntityPackets { public void handle(PacketWrapper wrapper) throws Exception { int entityId = wrapper.get(Type.VAR_INT, 0); -<<<<<<< HEAD - int typeId = wrapper.read(Type.VAR_INT); - Entity1_15Types.EntityType entityType = Entity1_15Types.getTypeFromId(getNewEntityId(typeId)); - wrapper.user().get(EntityTracker1_15.class).addEntity(entityId, entityType); - wrapper.write(Type.VAR_INT, entityType.getId()); - - wrapper.passthrough(Type.DOUBLE); - wrapper.passthrough(Type.DOUBLE); - wrapper.passthrough(Type.DOUBLE); - wrapper.passthrough(Type.BYTE); - wrapper.passthrough(Type.BYTE); - wrapper.read(Types1_14.METADATA); // removed - probably sent in an update packet? -======= Entity1_15Types.EntityType entityType = Entity1_15Types.EntityType.PLAYER; - wrapper.user().get(EntityTracker.class).addEntity(entityId, entityType); ->>>>>>> upstream/dev + wrapper.user().get(EntityTracker1_15.class).addEntity(entityId, entityType); } }); } From a280c1ad39f0768f0a347195beae52b88e63df60 Mon Sep 17 00:00:00 2001 From: creeper123123321 <7974274+creeper123123321@users.noreply.github.com> Date: Wed, 30 Oct 2019 14:53:38 -0300 Subject: [PATCH 9/9] Add "install: true" in .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index ce6c32a37..dfd0a2c13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,3 +11,5 @@ cache: script: - mvn dependency:purge-local-repository -DactTransitively=false -DreResolve=false - mvn clean install -B -U + +install: true