From 8aa7b749cafbdec32e111d297e18edcb2864f7cf Mon Sep 17 00:00:00 2001 From: Gerrygames Date: Thu, 29 Nov 2018 16:31:39 +0100 Subject: [PATCH] 18w48a --- bukkit/pom.xml | 2 +- bungee/pom.xml | 2 +- common/pom.xml | 2 +- .../us/myles/ViaVersion/api/protocol/ProtocolVersion.java | 2 +- .../protocol1_14to1_13_2/packets/InventoryPackets.java | 6 +++++- .../main/resources/assets/viaversion/data/mapping-1.14.json | 1 + jar/pom.xml | 2 +- pom.xml | 2 +- sponge-legacy/pom.xml | 2 +- sponge/pom.xml | 2 +- velocity/pom.xml | 2 +- 11 files changed, 15 insertions(+), 10 deletions(-) diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 14074d609..2033679db 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.0.0-18w47a + 2.0.0-18w48a 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index b2795f2be..a4e7ccf35 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.0.0-18w47a + 2.0.0-18w48a 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 8774e5261..1a6801a41 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.0.0-18w47a + 2.0.0-18w48a 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 492e95dba..c2df96a97 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 @@ -67,7 +67,7 @@ public class ProtocolVersion { register(v1_13 = new ProtocolVersion(393, "1.13")); register(v1_13_1 = new ProtocolVersion(401, "1.13.1")); register(v1_13_2 = new ProtocolVersion(404, "1.13.2")); - register(v1_14 = new ProtocolVersion(446, "1.14")); + register(v1_14 = new ProtocolVersion(448, "1.14")); register(unknown = new ProtocolVersion(-1, "UNKNOWN")); } diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/InventoryPackets.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/InventoryPackets.java index 0ff73ab09..a397f93b3 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/InventoryPackets.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/InventoryPackets.java @@ -1,5 +1,6 @@ package us.myles.ViaVersion.protocols.protocol1_14to1_13_2.packets; +import com.google.common.collect.Sets; import us.myles.ViaVersion.api.PacketWrapper; import us.myles.ViaVersion.api.Via; import us.myles.ViaVersion.api.minecraft.item.Item; @@ -10,7 +11,10 @@ import us.myles.ViaVersion.api.type.Type; import us.myles.ViaVersion.packets.State; import us.myles.ViaVersion.protocols.protocol1_14to1_13_2.data.MappingData; +import java.util.Set; + public class InventoryPackets { + private static final Set REMOVED_RECIPE_TYPES = Sets.newHashSet("crafting_special_banneraddpattern", "crafting_special_repairitem"); public static void register(Protocol protocol) { @@ -116,7 +120,7 @@ public class InventoryPackets { for (int i = 0; i < size; i++) { String id = wrapper.read(Type.STRING); // Recipe Identifier String type = wrapper.read(Type.STRING); - if (type.equals("crafting_special_banneraddpattern")) { + if (REMOVED_RECIPE_TYPES.contains(type)) { deleted++; continue; } diff --git a/common/src/main/resources/assets/viaversion/data/mapping-1.14.json b/common/src/main/resources/assets/viaversion/data/mapping-1.14.json index 328666bdf..958135cc8 100644 --- a/common/src/main/resources/assets/viaversion/data/mapping-1.14.json +++ b/common/src/main/resources/assets/viaversion/data/mapping-1.14.json @@ -12015,6 +12015,7 @@ "block.gravel.hit", "block.gravel.place", "block.gravel.step", + "block.grindstone.use", "entity.guardian.ambient", "entity.guardian.ambient_land", "entity.guardian.attack", diff --git a/jar/pom.xml b/jar/pom.xml index be11503d3..5095f2d82 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.0.0-18w47a + 2.0.0-18w48a 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index 119f28332..a9b2b3949 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 2.0.0-18w47a + 2.0.0-18w48a pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index a2995337f..476caf699 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.0.0-18w47a + 2.0.0-18w48a 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index 2afcd4a97..75f89fe90 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.0.0-18w47a + 2.0.0-18w48a 4.0.0 diff --git a/velocity/pom.xml b/velocity/pom.xml index 39821e960..ce3b8c507 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.0.0-18w47a + 2.0.0-18w48a 4.0.0