From 3b48f11f7b83690a7d5d5957e649dfcc242167f1 Mon Sep 17 00:00:00 2001 From: Marco Neuhaus Date: Thu, 16 Aug 2018 22:38:22 +0200 Subject: [PATCH] add support for 1.13.1-pre1 --- bukkit/pom.xml | 2 +- bungee/pom.xml | 2 +- common/pom.xml | 2 +- .../api/protocol/ProtocolRegistry.java | 4 ++-- .../ViaVersion/api/protocol/ProtocolVersion.java | 4 ++-- .../MetadataRewriter.java | 8 ++++---- .../Protocol13_1_PRE1TO1_13.java} | 10 +++++----- .../packets/EntityPackets.java | 8 ++++---- .../packets/InventoryPackets.java | 2 +- .../packets/WorldPackets.java | 16 ++++++++-------- jar/pom.xml | 2 +- pom.xml | 2 +- sponge-legacy/pom.xml | 2 +- sponge/pom.xml | 2 +- 14 files changed, 33 insertions(+), 33 deletions(-) rename common/src/main/java/us/myles/ViaVersion/protocols/{protocol18w32ato1_13 => protocol1_13_1_pre1to1_13}/MetadataRewriter.java (85%) rename common/src/main/java/us/myles/ViaVersion/protocols/{protocol18w32ato1_13/Protocol18w32aTO1_13.java => protocol1_13_1_pre1to1_13/Protocol13_1_PRE1TO1_13.java} (95%) rename common/src/main/java/us/myles/ViaVersion/protocols/{protocol18w32ato1_13 => protocol1_13_1_pre1to1_13}/packets/EntityPackets.java (95%) rename common/src/main/java/us/myles/ViaVersion/protocols/{protocol18w32ato1_13 => protocol1_13_1_pre1to1_13}/packets/InventoryPackets.java (98%) rename common/src/main/java/us/myles/ViaVersion/protocols/{protocol18w32ato1_13 => protocol1_13_1_pre1to1_13}/packets/WorldPackets.java (91%) diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 6cef1de2e..dc3108081 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.4.2-18w32a + 1.4.2-1.13.1-pre1 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index 54b8e5c61..8d8966c6a 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.4.2-18w32a + 1.4.2-1.13.1-pre1 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index f9a7d4a86..5f664092e 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.4.2-18w32a + 1.4.2-1.13.1-pre1 4.0.0 diff --git a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolRegistry.java b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolRegistry.java index c6af45153..3fac9c2dd 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolRegistry.java +++ b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolRegistry.java @@ -19,7 +19,7 @@ import us.myles.ViaVersion.protocols.protocol1_9_1to1_9.Protocol1_9_1TO1_9; import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.Protocol1_9_3TO1_9_1_2; import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8; import us.myles.ViaVersion.protocols.protocol1_9to1_9_1.Protocol1_9TO1_9_1; -import us.myles.ViaVersion.protocols.protocol18w32ato1_13.Protocol18w32aTO1_13; +import us.myles.ViaVersion.protocols.protocol1_13_1_pre1to1_13.Protocol13_1_PRE1TO1_13; import java.util.*; import java.util.concurrent.ConcurrentHashMap; @@ -57,7 +57,7 @@ public class ProtocolRegistry { // 1.13 support in development! (: registerProtocol(new Protocol1_13To1_12_2(), Collections.singletonList(ProtocolVersion.v1_13.getId()), ProtocolVersion.v1_12_2.getId()); - registerProtocol(new Protocol18w32aTO1_13(), Arrays.asList(ProtocolVersion.v18w32a.getId()), ProtocolVersion.v1_13.getId()); + registerProtocol(new Protocol13_1_PRE1TO1_13(), Arrays.asList(ProtocolVersion.v1_13_1_pre1.getId()), ProtocolVersion.v1_13.getId()); } /** 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 8fb744bab..73cea6f48 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 @@ -34,7 +34,7 @@ public class ProtocolVersion { public static final ProtocolVersion v1_12_2; // v1_13 as name for better ViaBackwards compatibility. public static final ProtocolVersion v1_13; - public static final ProtocolVersion v18w32a; + public static final ProtocolVersion v1_13_1_pre1; public static final ProtocolVersion unknown; private final int id; @@ -64,7 +64,7 @@ public class ProtocolVersion { register(v1_12_1 = new ProtocolVersion(338, "1.12.1")); register(v1_12_2 = new ProtocolVersion(340, "1.12.2")); register(v1_13 = new ProtocolVersion(393, "1.13")); - register(v18w32a = new ProtocolVersion(397, "18w32a")); + register(v1_13_1_pre1 = new ProtocolVersion(399, "1.13.1-pre1")); register(unknown = new ProtocolVersion(-1, "UNKNOWN")); } diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol18w32ato1_13/MetadataRewriter.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13_1_pre1to1_13/MetadataRewriter.java similarity index 85% rename from common/src/main/java/us/myles/ViaVersion/protocols/protocol18w32ato1_13/MetadataRewriter.java rename to common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13_1_pre1to1_13/MetadataRewriter.java index 6cddfca16..e498f232d 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol18w32ato1_13/MetadataRewriter.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13_1_pre1to1_13/MetadataRewriter.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.protocols.protocol18w32ato1_13; +package us.myles.ViaVersion.protocols.protocol1_13_1_pre1to1_13; import us.myles.ViaVersion.api.Via; import us.myles.ViaVersion.api.data.UserConnection; @@ -7,7 +7,7 @@ import us.myles.ViaVersion.api.entities.Entity1_13Types.EntityType; import us.myles.ViaVersion.api.minecraft.item.Item; import us.myles.ViaVersion.api.minecraft.metadata.Metadata; import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_13; -import us.myles.ViaVersion.protocols.protocol18w32ato1_13.packets.InventoryPackets; +import us.myles.ViaVersion.protocols.protocol1_13_1_pre1to1_13.packets.InventoryPackets; import java.util.ArrayList; import java.util.List; @@ -23,13 +23,13 @@ public class MetadataRewriter { } else if (metadata.getMetaType() == MetaType1_13.BlockID) { // Convert to new block id int data = (int) metadata.getValue(); - metadata.setValue(Protocol18w32aTO1_13.getNewBlockStateId(data)); + metadata.setValue(Protocol13_1_PRE1TO1_13.getNewBlockStateId(data)); } if (type == null) continue; if (type.isOrHasParent(Entity1_13Types.EntityType.MINECART_ABSTRACT) && metadata.getId() == 9) { // New block format int data = (int) metadata.getValue(); - metadata.setValue(Protocol18w32aTO1_13.getNewBlockStateId(data)); + metadata.setValue(Protocol13_1_PRE1TO1_13.getNewBlockStateId(data)); } if(type.is(EntityType.ITEM)){ diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol18w32ato1_13/Protocol18w32aTO1_13.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13_1_pre1to1_13/Protocol13_1_PRE1TO1_13.java similarity index 95% rename from common/src/main/java/us/myles/ViaVersion/protocols/protocol18w32ato1_13/Protocol18w32aTO1_13.java rename to common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13_1_pre1to1_13/Protocol13_1_PRE1TO1_13.java index c398ce614..ba5d42f8d 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol18w32ato1_13/Protocol18w32aTO1_13.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13_1_pre1to1_13/Protocol13_1_PRE1TO1_13.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.protocols.protocol18w32ato1_13; +package us.myles.ViaVersion.protocols.protocol1_13_1_pre1to1_13; import us.myles.ViaVersion.api.PacketWrapper; import us.myles.ViaVersion.api.data.UserConnection; @@ -8,13 +8,13 @@ import us.myles.ViaVersion.api.remapper.PacketHandler; import us.myles.ViaVersion.api.remapper.PacketRemapper; import us.myles.ViaVersion.api.type.Type; import us.myles.ViaVersion.packets.State; -import us.myles.ViaVersion.protocols.protocol18w32ato1_13.packets.EntityPackets; -import us.myles.ViaVersion.protocols.protocol18w32ato1_13.packets.InventoryPackets; -import us.myles.ViaVersion.protocols.protocol18w32ato1_13.packets.WorldPackets; +import us.myles.ViaVersion.protocols.protocol1_13_1_pre1to1_13.packets.EntityPackets; +import us.myles.ViaVersion.protocols.protocol1_13_1_pre1to1_13.packets.InventoryPackets; +import us.myles.ViaVersion.protocols.protocol1_13_1_pre1to1_13.packets.WorldPackets; import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.storage.EntityTracker; import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; -public class Protocol18w32aTO1_13 extends Protocol { +public class Protocol13_1_PRE1TO1_13 extends Protocol { @Override protected void registerPackets() { diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol18w32ato1_13/packets/EntityPackets.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13_1_pre1to1_13/packets/EntityPackets.java similarity index 95% rename from common/src/main/java/us/myles/ViaVersion/protocols/protocol18w32ato1_13/packets/EntityPackets.java rename to common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13_1_pre1to1_13/packets/EntityPackets.java index fc7e839e3..2193d1a5d 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol18w32ato1_13/packets/EntityPackets.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13_1_pre1to1_13/packets/EntityPackets.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.protocols.protocol18w32ato1_13.packets; +package us.myles.ViaVersion.protocols.protocol1_13_1_pre1to1_13.packets; import com.google.common.base.Optional; import us.myles.ViaVersion.api.PacketWrapper; @@ -10,9 +10,9 @@ import us.myles.ViaVersion.api.remapper.PacketRemapper; import us.myles.ViaVersion.api.type.Type; import us.myles.ViaVersion.api.type.types.version.Types1_13; import us.myles.ViaVersion.packets.State; -import us.myles.ViaVersion.protocols.protocol18w32ato1_13.MetadataRewriter; +import us.myles.ViaVersion.protocols.protocol1_13_1_pre1to1_13.MetadataRewriter; import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.storage.EntityTracker; -import us.myles.ViaVersion.protocols.protocol18w32ato1_13.Protocol18w32aTO1_13; +import us.myles.ViaVersion.protocols.protocol1_13_1_pre1to1_13.Protocol13_1_PRE1TO1_13; public class EntityPackets { @@ -43,7 +43,7 @@ public class EntityPackets { if (entType != null) { if (entType.is(Entity1_13Types.EntityType.FALLING_BLOCK)) { int data = wrapper.get(Type.INT, 0); - wrapper.set(Type.INT, 0, Protocol18w32aTO1_13.getNewBlockStateId(data)); + wrapper.set(Type.INT, 0, Protocol13_1_PRE1TO1_13.getNewBlockStateId(data)); } } // Register Type ID diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol18w32ato1_13/packets/InventoryPackets.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13_1_pre1to1_13/packets/InventoryPackets.java similarity index 98% rename from common/src/main/java/us/myles/ViaVersion/protocols/protocol18w32ato1_13/packets/InventoryPackets.java rename to common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13_1_pre1to1_13/packets/InventoryPackets.java index 367c8f7d9..cc7fef063 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol18w32ato1_13/packets/InventoryPackets.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13_1_pre1to1_13/packets/InventoryPackets.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.protocols.protocol18w32ato1_13.packets; +package us.myles.ViaVersion.protocols.protocol1_13_1_pre1to1_13.packets; import us.myles.ViaVersion.api.PacketWrapper; import us.myles.ViaVersion.api.minecraft.item.Item; diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol18w32ato1_13/packets/WorldPackets.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13_1_pre1to1_13/packets/WorldPackets.java similarity index 91% rename from common/src/main/java/us/myles/ViaVersion/protocols/protocol18w32ato1_13/packets/WorldPackets.java rename to common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13_1_pre1to1_13/packets/WorldPackets.java index 041e1e14e..917cf384a 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol18w32ato1_13/packets/WorldPackets.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13_1_pre1to1_13/packets/WorldPackets.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.protocols.protocol18w32ato1_13.packets; +package us.myles.ViaVersion.protocols.protocol1_13_1_pre1to1_13.packets; import us.myles.ViaVersion.api.PacketWrapper; import us.myles.ViaVersion.api.minecraft.BlockChangeRecord; @@ -9,7 +9,7 @@ import us.myles.ViaVersion.api.remapper.PacketHandler; import us.myles.ViaVersion.api.remapper.PacketRemapper; import us.myles.ViaVersion.api.type.Type; import us.myles.ViaVersion.packets.State; -import us.myles.ViaVersion.protocols.protocol18w32ato1_13.Protocol18w32aTO1_13; +import us.myles.ViaVersion.protocols.protocol1_13_1_pre1to1_13.Protocol13_1_PRE1TO1_13; import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.types.Chunk1_13Type; import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; @@ -31,7 +31,7 @@ public class WorldPackets { for (int i = 0; i < section.getPalette().size(); i++) { section.getPalette().set( i, - Protocol18w32aTO1_13.getNewBlockStateId(section.getPalette().get(i)) + Protocol13_1_PRE1TO1_13.getNewBlockStateId(section.getPalette().get(i)) ); } } @@ -53,7 +53,7 @@ public class WorldPackets { handler(new PacketHandler() { @Override public void handle(PacketWrapper wrapper) throws Exception { - wrapper.set(Type.VAR_INT, 0, Protocol18w32aTO1_13.getNewBlockId(wrapper.get(Type.VAR_INT, 0))); + wrapper.set(Type.VAR_INT, 0, Protocol13_1_PRE1TO1_13.getNewBlockId(wrapper.get(Type.VAR_INT, 0))); } }); } @@ -70,7 +70,7 @@ public class WorldPackets { public void handle(PacketWrapper wrapper) throws Exception { int id = wrapper.get(Type.VAR_INT, 0); - wrapper.set(Type.VAR_INT, 0, Protocol18w32aTO1_13.getNewBlockStateId(id)); + wrapper.set(Type.VAR_INT, 0, Protocol13_1_PRE1TO1_13.getNewBlockStateId(id)); } }); } @@ -89,7 +89,7 @@ public class WorldPackets { // Convert ids for (BlockChangeRecord record : wrapper.get(Type.BLOCK_CHANGE_RECORD_ARRAY, 0)) { int id = record.getBlockId(); - record.setBlockId(Protocol18w32aTO1_13.getNewBlockStateId(id)); + record.setBlockId(Protocol13_1_PRE1TO1_13.getNewBlockStateId(id)); } } }); @@ -111,7 +111,7 @@ public class WorldPackets { if (id == 1010) { // Play record wrapper.set(Type.INT, 1, data = InventoryPackets.getNewItemId(data)); } else if (id == 2001) { // Block break + block break sound - wrapper.set(Type.INT, 1, data = Protocol18w32aTO1_13.getNewBlockStateId(data)); + wrapper.set(Type.INT, 1, data = Protocol13_1_PRE1TO1_13.getNewBlockStateId(data)); } } }); @@ -174,7 +174,7 @@ public class WorldPackets { int id = wrapper.get(Type.INT, 0); if(id == 3 || id == 20){ int data = wrapper.passthrough(Type.VAR_INT); - wrapper.set(Type.VAR_INT, 0, Protocol18w32aTO1_13.getNewBlockStateId(data)); + wrapper.set(Type.VAR_INT, 0, Protocol13_1_PRE1TO1_13.getNewBlockStateId(data)); } } }); diff --git a/jar/pom.xml b/jar/pom.xml index bef0e27b2..4a1e330b5 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.4.2-18w32a + 1.4.2-1.13.1-pre1 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index 73e304597..f9dfa9949 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 1.4.2-18w32a + 1.4.2-1.13.1-pre1 pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index b5c1a03d8..870098d3c 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.4.2-18w32a + 1.4.2-1.13.1-pre1 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index 7656d2573..b9fe83e6c 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 1.4.2-18w32a + 1.4.2-1.13.1-pre1 4.0.0