From 80ef8a401d669e04f835bdfb9cd3e1c5c4aa6f7d Mon Sep 17 00:00:00 2001 From: KennyTV <28825609+KennyTV@users.noreply.github.com> Date: Thu, 16 Jan 2020 17:12:25 +0100 Subject: [PATCH] Minor change to rewriter register --- .../api/rewriters/BlockItemRewriter.java | 5 +- .../api/rewriters/EntityRewriter.java | 6 +- .../viabackwards/api/rewriters/Rewriter.java | 23 ++-- .../api/rewriters/SoundRewriter.java | 4 + .../Protocol1_10To1_11.java | 6 +- .../packets/BlockItemPackets1_11.java | 6 +- .../packets/EntityPackets1_11.java | 6 +- .../packets/SoundPackets1_11.java | 7 +- .../Protocol1_11_1To1_12.java | 10 +- .../packets/BlockItemPackets1_12.java | 6 +- .../packets/ChangedPacketIds1_12.java | 123 +++++++++--------- .../packets/ChatPackets1_12.java | 7 +- .../packets/EntityPackets1_12.java | 6 +- .../packets/SoundPackets1_12.java | 7 +- .../Protocol1_11To1_11_1.java | 4 +- .../packets/EntityPackets1_11_1.java | 6 +- .../packets/ItemPackets1_11_1.java | 6 +- .../Protocol1_12_2To1_13.java | 8 +- .../packets/BlockItemPackets1_13.java | 13 +- .../packets/EntityPackets1_13.java | 6 +- .../packets/PlayerPacket1_13.java | 7 +- .../packets/SoundPackets1_13.java | 6 +- .../Protocol1_13_2To1_14.java | 12 +- .../packets/BlockItemPackets1_14.java | 6 +- .../packets/EntityPackets1_14.java | 6 +- .../packets/PlayerPackets1_14.java | 7 +- .../packets/SoundPackets1_14.java | 7 +- .../Protocol1_13To1_13_1.java | 2 +- .../packets/EntityPackets1_13_1.java | 6 +- .../Protocol1_14_4To1_15.java | 5 +- .../packets/BlockItemPackets1_15.java | 6 +- .../packets/EntityPackets1_15.java | 6 +- .../Protocol1_14To1_14_1.java | 2 +- .../packets/EntityPackets1_14_1.java | 6 +- .../Protocol1_9_4To1_10.java | 6 +- .../packets/BlockItemPackets1_10.java | 7 +- .../packets/EntityPackets1_10.java | 7 +- .../packets/SoundPackets1_10.java | 8 +- 38 files changed, 241 insertions(+), 136 deletions(-) diff --git a/core/src/main/java/nl/matsv/viabackwards/api/rewriters/BlockItemRewriter.java b/core/src/main/java/nl/matsv/viabackwards/api/rewriters/BlockItemRewriter.java index 00555e89..77761b1f 100644 --- a/core/src/main/java/nl/matsv/viabackwards/api/rewriters/BlockItemRewriter.java +++ b/core/src/main/java/nl/matsv/viabackwards/api/rewriters/BlockItemRewriter.java @@ -38,10 +38,9 @@ public abstract class BlockItemRewriter extends Rew protected String nbtTagName; protected boolean jsonNameFormat = true; - @Override - public void register(T protocol) { + protected BlockItemRewriter(T protocol) { + super(protocol); nbtTagName = "ViaBackwards|" + protocol.getClass().getSimpleName(); - super.register(protocol); } protected BlockItemSettings rewrite(int itemId) { diff --git a/core/src/main/java/nl/matsv/viabackwards/api/rewriters/EntityRewriter.java b/core/src/main/java/nl/matsv/viabackwards/api/rewriters/EntityRewriter.java index 4128d51b..22c063db 100644 --- a/core/src/main/java/nl/matsv/viabackwards/api/rewriters/EntityRewriter.java +++ b/core/src/main/java/nl/matsv/viabackwards/api/rewriters/EntityRewriter.java @@ -10,7 +10,6 @@ package nl.matsv.viabackwards.api.rewriters; -import lombok.RequiredArgsConstructor; import nl.matsv.viabackwards.ViaBackwards; import nl.matsv.viabackwards.api.BackwardsProtocol; import nl.matsv.viabackwards.api.entities.meta.MetaHandlerEvent; @@ -42,7 +41,6 @@ import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; -@RequiredArgsConstructor public abstract class EntityRewriter extends Rewriter { private final Map entityTypes = new ConcurrentHashMap<>(); private final Map objectTypes = new ConcurrentHashMap<>(); @@ -52,6 +50,10 @@ public abstract class EntityRewriter extends Rewrit private int displayNameIndex = 2; private boolean isDisplayNameJson; + protected EntityRewriter(T protocol) { + super(protocol); + } + protected EntityType getEntityType(UserConnection connection, int id) { return getEntityTracker(connection).getEntityType(id); } diff --git a/core/src/main/java/nl/matsv/viabackwards/api/rewriters/Rewriter.java b/core/src/main/java/nl/matsv/viabackwards/api/rewriters/Rewriter.java index d677c046..2fec3715 100644 --- a/core/src/main/java/nl/matsv/viabackwards/api/rewriters/Rewriter.java +++ b/core/src/main/java/nl/matsv/viabackwards/api/rewriters/Rewriter.java @@ -13,28 +13,27 @@ package nl.matsv.viabackwards.api.rewriters; import nl.matsv.viabackwards.api.BackwardsProtocol; public abstract class Rewriter { - protected T protocol; + protected final T protocol; + + protected Rewriter(final T protocol) { + this.protocol = protocol; + } /** - * Register everything - * - * @param protocol Protocol instance + * Register everything. */ - public void register(T protocol) { - this.protocol = protocol; - registerPackets(protocol); + public void register() { + registerPackets(); registerRewrites(); } /** - * Register packet listeners - * - * @param protocol Protocol instance + * Register packet listeners. */ - protected abstract void registerPackets(T protocol); + protected abstract void registerPackets(); /** - * Register rewrites + * Register rewrites. */ protected abstract void registerRewrites(); diff --git a/core/src/main/java/nl/matsv/viabackwards/api/rewriters/SoundRewriter.java b/core/src/main/java/nl/matsv/viabackwards/api/rewriters/SoundRewriter.java index ac625be2..84dc3f22 100644 --- a/core/src/main/java/nl/matsv/viabackwards/api/rewriters/SoundRewriter.java +++ b/core/src/main/java/nl/matsv/viabackwards/api/rewriters/SoundRewriter.java @@ -20,6 +20,10 @@ import java.util.Map; public abstract class SoundRewriter extends Rewriter { private final Map soundRewrites = new HashMap<>(); + protected SoundRewriter(T protocol) { + super(protocol); + } + public SoundData added(int id, int replacement) { return added(id, replacement, -1); } diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/Protocol1_10To1_11.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/Protocol1_10To1_11.java index 80a7245f..3e9c6e0e 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/Protocol1_10To1_11.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/Protocol1_10To1_11.java @@ -29,10 +29,10 @@ public class Protocol1_10To1_11 extends BackwardsProtocol { @Override protected void registerPackets() { - (entityPackets = new EntityPackets1_11()).register(this); + (entityPackets = new EntityPackets1_11(this)).register(); new PlayerPackets1_11().register(this); - (blockItemPackets = new BlockItemPackets1_11()).register(this); - new SoundPackets1_11().register(this); + (blockItemPackets = new BlockItemPackets1_11(this)).register(); + new SoundPackets1_11(this).register(); } @Override diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java index da37455b..4bf4dbdd 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java @@ -45,8 +45,12 @@ public class BlockItemPackets1_11 extends BlockItemRewriter private LegacyEnchantmentRewriter enchantmentRewriter; + public BlockItemPackets1_11(Protocol1_10To1_11 protocol) { + super(protocol); + } + @Override - protected void registerPackets(Protocol1_10To1_11 protocol) { + protected void registerPackets() { jsonNameFormat = false; ItemRewriter itemRewriter = new ItemRewriter(protocol, this::handleItemToClient, this::handleItemToServer); diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/EntityPackets1_11.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/EntityPackets1_11.java index 67b04b65..9761cbb7 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/EntityPackets1_11.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/EntityPackets1_11.java @@ -35,8 +35,12 @@ import java.util.Optional; public class EntityPackets1_11 extends EntityRewriter { + public EntityPackets1_11(Protocol1_10To1_11 protocol) { + super(protocol); + } + @Override - protected void registerPackets(Protocol1_10To1_11 protocol) { + protected void registerPackets() { // Spawn Object protocol.registerOutgoing(State.PLAY, 0x00, 0x00, new PacketRemapper() { @Override diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/SoundPackets1_11.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/SoundPackets1_11.java index 2de1eb08..7989b5f2 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/SoundPackets1_11.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/SoundPackets1_11.java @@ -19,8 +19,13 @@ import us.myles.ViaVersion.api.type.Type; import us.myles.ViaVersion.packets.State; public class SoundPackets1_11 extends SoundRewriter { + + public SoundPackets1_11(Protocol1_10To1_11 protocol) { + super(protocol); + } + @Override - protected void registerPackets(Protocol1_10To1_11 protocol) { + protected void registerPackets() { // Named sound effect protocol.registerOutgoing(State.PLAY, 0x19, 0x19, new PacketRemapper() { @Override diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/Protocol1_11_1To1_12.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/Protocol1_11_1To1_12.java index ca45588b..84f5afc5 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/Protocol1_11_1To1_12.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/Protocol1_11_1To1_12.java @@ -25,11 +25,11 @@ public class Protocol1_11_1To1_12 extends BackwardsProtocol { @Override protected void registerPackets() { - new ChangedPacketIds1_12().register(this); - (entityPackets = new EntityPackets1_12()).register(this); - (blockItemPackets = new BlockItemPackets1_12()).register(this); - new SoundPackets1_12().register(this); - new ChatPackets1_12().register(this); + new ChangedPacketIds1_12(this).register(); + (entityPackets = new EntityPackets1_12(this)).register(); + (blockItemPackets = new BlockItemPackets1_12(this)).register(); + new SoundPackets1_12(this).register(); + new ChatPackets1_12(this).register(); } @Override diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java index 0a80ed7c..c6944379 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java @@ -34,8 +34,12 @@ import java.util.Collections; public class BlockItemPackets1_12 extends BlockItemRewriter { + public BlockItemPackets1_12(Protocol1_11_1To1_12 protocol) { + super(protocol); + } + @Override - protected void registerPackets(Protocol1_11_1To1_12 protocol) { + protected void registerPackets() { jsonNameFormat = false; protocol.registerOutgoing(State.PLAY, 0x24, 0x24, new PacketRemapper() { @Override diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/ChangedPacketIds1_12.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/ChangedPacketIds1_12.java index 5d7cda0f..a93bc975 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/ChangedPacketIds1_12.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/ChangedPacketIds1_12.java @@ -12,89 +12,90 @@ package nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.packets; import nl.matsv.viabackwards.api.rewriters.Rewriter; import nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.Protocol1_11_1To1_12; -import us.myles.ViaVersion.api.PacketWrapper; -import us.myles.ViaVersion.api.remapper.PacketHandler; -import us.myles.ViaVersion.api.remapper.PacketRemapper; import us.myles.ViaVersion.packets.State; public class ChangedPacketIds1_12 extends Rewriter { - @Override - protected void registerPackets(Protocol1_11_1To1_12 p) { - p.registerOutgoing(State.PLAY, 0x25, 0x28); // Entity - p.registerOutgoing(State.PLAY, 0x26, 0x25); // Entity Relative Move - p.registerOutgoing(State.PLAY, 0x27, 0x26); // Entity Look and Relative Move - p.registerOutgoing(State.PLAY, 0x28, 0x27); // Entity Look + public ChangedPacketIds1_12(Protocol1_11_1To1_12 protocol) { + super(protocol); + } - p.cancelOutgoing(State.PLAY, 0x30); // Unlock Recipes + @Override + protected void registerPackets() { + protocol.registerOutgoing(State.PLAY, 0x25, 0x28); // Entity + protocol.registerOutgoing(State.PLAY, 0x26, 0x25); // Entity Relative Move + protocol.registerOutgoing(State.PLAY, 0x27, 0x26); // Entity Look and Relative Move + protocol.registerOutgoing(State.PLAY, 0x28, 0x27); // Entity Look + + protocol.cancelOutgoing(State.PLAY, 0x30); // Unlock Recipes // 0x31 -> 0x30 Destroy Entities handled in EntityPackets1_12.java - p.registerOutgoing(State.PLAY, 0x32, 0x31); // Remove Entity Effect - p.registerOutgoing(State.PLAY, 0x33, 0x32); // Resource Pack Send + protocol.registerOutgoing(State.PLAY, 0x32, 0x31); // Remove Entity Effect + protocol.registerOutgoing(State.PLAY, 0x33, 0x32); // Resource Pack Send // 0x34 -> 0x33 Respawn handled in EntityPackets1_12.java - p.registerOutgoing(State.PLAY, 0x35, 0x34); // Entity Head Look + protocol.registerOutgoing(State.PLAY, 0x35, 0x34); // Entity Head Look - p.cancelOutgoing(State.PLAY, 0x36); // Advancement Progress + protocol.cancelOutgoing(State.PLAY, 0x36); // Advancement Progress - p.registerOutgoing(State.PLAY, 0x37, 0x35); // World Border - p.registerOutgoing(State.PLAY, 0x38, 0x36); //Camera - p.registerOutgoing(State.PLAY, 0x39, 0x37); // Held Item Change (ClientBound) - p.registerOutgoing(State.PLAY, 0x3A, 0x38); // Display Scoreboard + protocol.registerOutgoing(State.PLAY, 0x37, 0x35); // World Border + protocol.registerOutgoing(State.PLAY, 0x38, 0x36); //Camera + protocol.registerOutgoing(State.PLAY, 0x39, 0x37); // Held Item Change (ClientBound) + protocol.registerOutgoing(State.PLAY, 0x3A, 0x38); // Display Scoreboard // 0x3B -> 0x39 Entity Metadata handled in EntityPackets1_12.java - p.registerOutgoing(State.PLAY, 0x3C, 0x3A); // Attach Entity - p.registerOutgoing(State.PLAY, 0x3D, 0x3B); // Entity Velocity + protocol.registerOutgoing(State.PLAY, 0x3C, 0x3A); // Attach Entity + protocol.registerOutgoing(State.PLAY, 0x3D, 0x3B); // Entity Velocity // 0x3E -> 0x3C Entity Equipment handled in BlockItemPackets1_12.java - p.registerOutgoing(State.PLAY, 0x3F, 0x3D); // Set Experience - p.registerOutgoing(State.PLAY, 0x40, 0x3E); // Update Health - p.registerOutgoing(State.PLAY, 0x41, 0x3F); // ScoreBoard Objective - p.registerOutgoing(State.PLAY, 0x42, 0x40); // Set Passengers - p.registerOutgoing(State.PLAY, 0x43, 0x41); // Teams - p.registerOutgoing(State.PLAY, 0x44, 0x42); // Update Score - p.registerOutgoing(State.PLAY, 0x45, 0x43); // Spawn Position - p.registerOutgoing(State.PLAY, 0x46, 0x44); // Time Update - p.registerOutgoing(State.PLAY, 0x47, 0x45); // Title + protocol.registerOutgoing(State.PLAY, 0x3F, 0x3D); // Set Experience + protocol.registerOutgoing(State.PLAY, 0x40, 0x3E); // Update Health + protocol.registerOutgoing(State.PLAY, 0x41, 0x3F); // ScoreBoard Objective + protocol.registerOutgoing(State.PLAY, 0x42, 0x40); // Set Passengers + protocol.registerOutgoing(State.PLAY, 0x43, 0x41); // Teams + protocol.registerOutgoing(State.PLAY, 0x44, 0x42); // Update Score + protocol.registerOutgoing(State.PLAY, 0x45, 0x43); // Spawn Position + protocol.registerOutgoing(State.PLAY, 0x46, 0x44); // Time Update + protocol.registerOutgoing(State.PLAY, 0x47, 0x45); // Title // 0x48 -> 0x46 Sound Effect handled in SoundPackets1_12.java - p.registerOutgoing(State.PLAY, 0x49, 0x47); // Player List Header And Footer - p.registerOutgoing(State.PLAY, 0x4A, 0x48); // Collect Item - p.registerOutgoing(State.PLAY, 0x4B, 0x49); // Entity Teleport + protocol.registerOutgoing(State.PLAY, 0x49, 0x47); // Player List Header And Footer + protocol.registerOutgoing(State.PLAY, 0x4A, 0x48); // Collect Item + protocol.registerOutgoing(State.PLAY, 0x4B, 0x49); // Entity Teleport - p.cancelOutgoing(State.PLAY, 0x4C); // Advancements + protocol.cancelOutgoing(State.PLAY, 0x4C); // Advancements - p.registerOutgoing(State.PLAY, 0x4D, 0x4A); // Entity Properties - p.registerOutgoing(State.PLAY, 0x4E, 0x4B); // Entity Effect + protocol.registerOutgoing(State.PLAY, 0x4D, 0x4A); // Entity Properties + protocol.registerOutgoing(State.PLAY, 0x4E, 0x4B); // Entity Effect // New incoming packet 0x01 - Prepare Crafting Grid - p.registerIncoming(State.PLAY, 0x02, 0x01); // Tab-Complete (Serverbound) - p.registerIncoming(State.PLAY, 0x03, 0x02); // Chat Message (Serverbound) + protocol.registerIncoming(State.PLAY, 0x02, 0x01); // Tab-Complete (Serverbound) + protocol.registerIncoming(State.PLAY, 0x03, 0x02); // Chat Message (Serverbound) // 0x04->0x03 Client Status handled in BlockItemPackets1_12.java - p.registerIncoming(State.PLAY, 0x05, 0x04); // Client Settings - p.registerIncoming(State.PLAY, 0x06, 0x05); // Confirm Transaction (Serverbound) - p.registerIncoming(State.PLAY, 0x07, 0x06); // Enchant Item + protocol.registerIncoming(State.PLAY, 0x05, 0x04); // Client Settings + protocol.registerIncoming(State.PLAY, 0x06, 0x05); // Confirm Transaction (Serverbound) + protocol.registerIncoming(State.PLAY, 0x07, 0x06); // Enchant Item // 0x08 -> 0x07 Click Window handled in BlockItemPackets1_12.java - p.registerIncoming(State.PLAY, 0x09, 0x08); // Close Window (Serverbound) - p.registerIncoming(State.PLAY, 0x0A, 0x09); // Plugin message (Serverbound) - p.registerIncoming(State.PLAY, 0x0B, 0x0A); // Use Entity - p.registerIncoming(State.PLAY, 0x0C, 0x0B); // Keep Alive (Serverbound) - p.registerIncoming(State.PLAY, 0x0D, 0x0F); // Player - p.registerIncoming(State.PLAY, 0x0E, 0x0C); // Player Position - p.registerIncoming(State.PLAY, 0x0F, 0x0D); // Player Position And Look (ServerBound) - p.registerIncoming(State.PLAY, 0x10, 0x0E); // Player Look - p.registerIncoming(State.PLAY, 0x11, 0x10); // Vehicle Move - p.registerIncoming(State.PLAY, 0x12, 0x11); // Steer Boat - p.registerIncoming(State.PLAY, 0x13, 0x12); // Player Abilities (Serverbound) - p.registerIncoming(State.PLAY, 0x14, 0x13); // Player Digging - p.registerIncoming(State.PLAY, 0x15, 0x14); // Entity Action - p.registerIncoming(State.PLAY, 0x16, 0x15); // Steer Vehicle + protocol.registerIncoming(State.PLAY, 0x09, 0x08); // Close Window (Serverbound) + protocol.registerIncoming(State.PLAY, 0x0A, 0x09); // Plugin message (Serverbound) + protocol.registerIncoming(State.PLAY, 0x0B, 0x0A); // Use Entity + protocol.registerIncoming(State.PLAY, 0x0C, 0x0B); // Keep Alive (Serverbound) + protocol.registerIncoming(State.PLAY, 0x0D, 0x0F); // Player + protocol.registerIncoming(State.PLAY, 0x0E, 0x0C); // Player Position + protocol.registerIncoming(State.PLAY, 0x0F, 0x0D); // Player Position And Look (ServerBound) + protocol.registerIncoming(State.PLAY, 0x10, 0x0E); // Player Look + protocol.registerIncoming(State.PLAY, 0x11, 0x10); // Vehicle Move + protocol.registerIncoming(State.PLAY, 0x12, 0x11); // Steer Boat + protocol.registerIncoming(State.PLAY, 0x13, 0x12); // Player Abilities (Serverbound) + protocol.registerIncoming(State.PLAY, 0x14, 0x13); // Player Digging + protocol.registerIncoming(State.PLAY, 0x15, 0x14); // Entity Action + protocol.registerIncoming(State.PLAY, 0x16, 0x15); // Steer Vehicle // New incoming packet 0x17 - Crafting Book Data - p.registerIncoming(State.PLAY, 0x18, 0x16); // Resource Pack Status + protocol.registerIncoming(State.PLAY, 0x18, 0x16); // Resource Pack Status // New incoming packet 0x19 - Advancement Tab - p.registerIncoming(State.PLAY, 0x1A, 0x17); // Held Item Change (Serverbound) + protocol.registerIncoming(State.PLAY, 0x1A, 0x17); // Held Item Change (Serverbound) // 0x1B -> 0x18 Creative Inventory Action handled in BlockItemPackets.java - p.registerIncoming(State.PLAY, 0x1C, 0x19); // Update Sign - p.registerIncoming(State.PLAY, 0x1D, 0x1A); // Animatin (Serverbound) - p.registerIncoming(State.PLAY, 0x1E, 0x1B); // Spectate - p.registerIncoming(State.PLAY, 0x1F, 0x1C); // Player Block Placement - p.registerIncoming(State.PLAY, 0x20, 0x1D); // Use Item + protocol.registerIncoming(State.PLAY, 0x1C, 0x19); // Update Sign + protocol.registerIncoming(State.PLAY, 0x1D, 0x1A); // Animatin (Serverbound) + protocol.registerIncoming(State.PLAY, 0x1E, 0x1B); // Spectate + protocol.registerIncoming(State.PLAY, 0x1F, 0x1C); // Player Block Placement + protocol.registerIncoming(State.PLAY, 0x20, 0x1D); // Use Item } @Override diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/ChatPackets1_12.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/ChatPackets1_12.java index 94f54e5c..0c69fcb6 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/ChatPackets1_12.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/ChatPackets1_12.java @@ -27,8 +27,13 @@ import us.myles.ViaVersion.packets.State; import java.util.Map; public class ChatPackets1_12 extends Rewriter { + + public ChatPackets1_12(Protocol1_11_1To1_12 protocol) { + super(protocol); + } + @Override - protected void registerPackets(Protocol1_11_1To1_12 protocol) { + protected void registerPackets() { // Chat Message (ClientBound) protocol.registerOutgoing(State.PLAY, 0x0F, 0x0F, new PacketRemapper() { @Override diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/EntityPackets1_12.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/EntityPackets1_12.java index ff290662..7915a212 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/EntityPackets1_12.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/EntityPackets1_12.java @@ -35,8 +35,12 @@ import java.util.Optional; public class EntityPackets1_12 extends EntityRewriter { + public EntityPackets1_12(Protocol1_11_1To1_12 protocol) { + super(protocol); + } + @Override - protected void registerPackets(Protocol1_11_1To1_12 protocol) { + protected void registerPackets() { // Spawn Object protocol.registerOutgoing(State.PLAY, 0x00, 0x00, new PacketRemapper() { @Override diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/SoundPackets1_12.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/SoundPackets1_12.java index 4781890c..383b9d46 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/SoundPackets1_12.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/SoundPackets1_12.java @@ -19,8 +19,13 @@ import us.myles.ViaVersion.api.type.Type; import us.myles.ViaVersion.packets.State; public class SoundPackets1_12 extends SoundRewriter { + + public SoundPackets1_12(Protocol1_11_1To1_12 protocol) { + super(protocol); + } + @Override - protected void registerPackets(Protocol1_11_1To1_12 protocol) { + protected void registerPackets() { // Named sound effect protocol.registerOutgoing(State.PLAY, 0x19, 0x19, new PacketRemapper() { @Override diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/Protocol1_11To1_11_1.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/Protocol1_11To1_11_1.java index 64c00d23..ca37329b 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/Protocol1_11To1_11_1.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/Protocol1_11To1_11_1.java @@ -24,8 +24,8 @@ public class Protocol1_11To1_11_1 extends BackwardsProtocol { @Override protected void registerPackets() { - (entityPackets = new EntityPackets1_11_1()).register(this); - new ItemPackets1_11_1().register(this); + (entityPackets = new EntityPackets1_11_1(this)).register(); + new ItemPackets1_11_1(this).register(); } @Override diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/EntityPackets1_11_1.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/EntityPackets1_11_1.java index 2278518f..dac1f4dc 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/EntityPackets1_11_1.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/EntityPackets1_11_1.java @@ -28,8 +28,12 @@ import java.util.Optional; public class EntityPackets1_11_1 extends EntityRewriter { + public EntityPackets1_11_1(Protocol1_11To1_11_1 protocol) { + super(protocol); + } + @Override - protected void registerPackets(Protocol1_11To1_11_1 protocol) { + protected void registerPackets() { // Spawn Object protocol.registerOutgoing(State.PLAY, 0x00, 0x00, new PacketRemapper() { @Override diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/ItemPackets1_11_1.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/ItemPackets1_11_1.java index c42384b9..8f73fb33 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/ItemPackets1_11_1.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/ItemPackets1_11_1.java @@ -28,8 +28,12 @@ public class ItemPackets1_11_1 extends BlockItemRewriter { private LegacyEnchantmentRewriter enchantmentRewriter; + public ItemPackets1_11_1(Protocol1_11To1_11_1 protocol) { + super(protocol); + } + @Override - protected void registerPackets(Protocol1_11To1_11_1 protocol) { + protected void registerPackets() { jsonNameFormat = false; ItemRewriter itemRewriter = new ItemRewriter(protocol, this::handleItemToClient, this::handleItemToServer); diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java index daf0b896..02e5424b 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java @@ -44,10 +44,10 @@ public class Protocol1_12_2To1_13 extends BackwardsProtocol { @Override protected void registerPackets() { - (blockItemPackets = new BlockItemPackets1_13()).register(this); - new EntityPackets1_13().register(this); - new PlayerPacket1_13().register(this); - new SoundPackets1_13().register(this); + (blockItemPackets = new BlockItemPackets1_13(this)).register(); + new EntityPackets1_13(this).register(); + new PlayerPacket1_13(this).register(); + new SoundPackets1_13(this).register(); // Thanks to https://wiki.vg/index.php?title=Pre-release_protocol&oldid=14150 diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java index 151f1ccb..25957ff9 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java @@ -46,8 +46,13 @@ import java.util.*; public class BlockItemPackets1_13 extends BlockItemRewriter { - private static String NBT_TAG_NAME; - private static final Map enchantmentMappings = new HashMap<>(); + private final Map enchantmentMappings = new HashMap<>(); + private final String NBT_TAG_NAME; + + public BlockItemPackets1_13(Protocol1_12_2To1_13 protocol) { + super(protocol); + NBT_TAG_NAME = "ViaBackwards|" + protocol.getClass().getSimpleName() + "|Part2"; + } public static int toOldId(int oldId) { if (oldId < 0) { @@ -77,9 +82,7 @@ public class BlockItemPackets1_13 extends BlockItemRewriter { + public EntityPackets1_13(Protocol1_12_2To1_13 protocol) { + super(protocol); + } + @Override - protected void registerPackets(Protocol1_12_2To1_13 protocol) { + protected void registerPackets() { // Player Position And Look (clientbound) protocol.out(State.PLAY, 0x32, 0x2F, new PacketRemapper() { @Override diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java index 5b9966e3..c2f27172 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java @@ -27,8 +27,13 @@ import java.util.UUID; import java.util.concurrent.ThreadLocalRandom; public class PlayerPacket1_13 extends Rewriter { + + public PlayerPacket1_13(Protocol1_12_2To1_13 protocol) { + super(protocol); + } + @Override - protected void registerPackets(Protocol1_12_2To1_13 protocol) { + protected void registerPackets() { // Login Plugin Request protocol.out(State.LOGIN, 0x04, -1, new PacketRemapper() { @Override diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/SoundPackets1_13.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/SoundPackets1_13.java index eda87fe2..44138bb9 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/SoundPackets1_13.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/SoundPackets1_13.java @@ -15,8 +15,12 @@ import us.myles.ViaVersion.packets.State; public class SoundPackets1_13 extends Rewriter { private static final String[] SOUND_SOURCES = {"master", "music", "record", "weather", "block", "hostile", "neutral", "player", "ambient", "voice"}; + public SoundPackets1_13(Protocol1_12_2To1_13 protocol) { + super(protocol); + } + @Override - protected void registerPackets(Protocol1_12_2To1_13 protocol) { + protected void registerPackets() { // Named Sound Event protocol.out(State.PLAY, 0x1A, 0x19, new PacketRemapper() { diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/Protocol1_13_2To1_14.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/Protocol1_13_2To1_14.java index 80652073..bc8ff81c 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/Protocol1_13_2To1_14.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/Protocol1_13_2To1_14.java @@ -32,12 +32,12 @@ public class Protocol1_13_2To1_14 extends BackwardsProtocol { @Override protected void registerPackets() { - blockItemPackets = new BlockItemPackets1_14(); - blockItemPackets.register(this); - entityPackets = new EntityPackets1_14(); - entityPackets.register(this); - new PlayerPackets1_14().register(this); - new SoundPackets1_14().register(this); + blockItemPackets = new BlockItemPackets1_14(this); + blockItemPackets.register(); + entityPackets = new EntityPackets1_14(this); + entityPackets.register(); + new PlayerPackets1_14(this).register(); + new SoundPackets1_14(this).register(); registerOutgoing(State.PLAY, 0x15, 0x16); diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java index b03457a1..814c9be7 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java @@ -47,8 +47,12 @@ public class BlockItemPackets1_14 extends BlockItemRewriter { private EntityPositionHandler positionHandler; + public EntityPackets1_14(Protocol1_13_2To1_14 protocol) { + super(protocol); + } + @Override protected void addTrackedEntity(PacketWrapper wrapper, int entityId, EntityType type) throws Exception { super.addTrackedEntity(wrapper, entityId, type); @@ -49,7 +53,7 @@ public class EntityPackets1_14 extends EntityRewriter { } @Override - protected void registerPackets(Protocol1_13_2To1_14 protocol) { + protected void registerPackets() { positionHandler = new EntityPositionHandler(this, EntityPositionStorage1_14.class, EntityPositionStorage1_14::new); // Entity teleport diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/PlayerPackets1_14.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/PlayerPackets1_14.java index 117b4110..adf5c377 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/PlayerPackets1_14.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/PlayerPackets1_14.java @@ -10,8 +10,13 @@ import us.myles.ViaVersion.api.type.Type; import us.myles.ViaVersion.packets.State; public class PlayerPackets1_14 extends Rewriter { + + public PlayerPackets1_14(Protocol1_13_2To1_14 protocol) { + super(protocol); + } + @Override - protected void registerPackets(Protocol1_13_2To1_14 protocol) { + protected void registerPackets() { // Server Difficulty protocol.registerOutgoing(State.PLAY, 0x0D, 0x0D, new PacketRemapper() { diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/SoundPackets1_14.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/SoundPackets1_14.java index bd9709aa..40c80ce8 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/SoundPackets1_14.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/SoundPackets1_14.java @@ -15,8 +15,13 @@ import us.myles.ViaVersion.packets.State; import java.util.Optional; public class SoundPackets1_14 extends Rewriter { + + public SoundPackets1_14(Protocol1_13_2To1_14 protocol) { + super(protocol); + } + @Override - protected void registerPackets(Protocol1_13_2To1_14 protocol) { + protected void registerPackets() { // Sound Effect protocol.registerOutgoing(State.PLAY, 0x51, 0x4D, new PacketRemapper() { @Override diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java index be1a301b..9c6b8bc8 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java @@ -19,7 +19,7 @@ public class Protocol1_13To1_13_1 extends BackwardsProtocol { @Override protected void registerPackets() { - new EntityPackets1_13_1().register(this); + new EntityPackets1_13_1(this).register(); InventoryPackets1_13_1.register(this); WorldPackets1_13_1.register(this); diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/EntityPackets1_13_1.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/EntityPackets1_13_1.java index 08cb3825..690283b6 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/EntityPackets1_13_1.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/EntityPackets1_13_1.java @@ -18,8 +18,12 @@ import us.myles.ViaVersion.packets.State; public class EntityPackets1_13_1 extends EntityRewriter { + public EntityPackets1_13_1(Protocol1_13To1_13_1 protocol) { + super(protocol); + } + @Override - protected void registerPackets(Protocol1_13To1_13_1 protocol) { + protected void registerPackets() { // Spawn Object protocol.out(State.PLAY, 0x00, 0x00, new PacketRemapper() { diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/Protocol1_14_4To1_15.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/Protocol1_14_4To1_15.java index d0752890..164c8404 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/Protocol1_14_4To1_15.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/Protocol1_14_4To1_15.java @@ -25,9 +25,8 @@ public class Protocol1_14_4To1_15 extends BackwardsProtocol { @Override protected void registerPackets() { BackwardsMappings.init(); - blockItemPackets = new BlockItemPackets1_15(); - blockItemPackets.register(this); - new EntityPackets1_15().register(this); + (blockItemPackets = new BlockItemPackets1_15(this)).register(); + new EntityPackets1_15(this).register(); // Entity Sound Effect registerOutgoing(State.PLAY, 0x51, 0x50, new PacketRemapper() { diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/BlockItemPackets1_15.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/BlockItemPackets1_15.java index 0d658212..b9ebd91c 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/BlockItemPackets1_15.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/BlockItemPackets1_15.java @@ -23,8 +23,12 @@ import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; public class BlockItemPackets1_15 extends BlockItemRewriter { + public BlockItemPackets1_15(Protocol1_14_4To1_15 protocol) { + super(protocol); + } + @Override - protected void registerPackets(Protocol1_14_4To1_15 protocol) { + protected void registerPackets() { ItemRewriter itemRewriter = new ItemRewriter(protocol, this::handleItemToClient, this::handleItemToServer); BlockRewriter blockRewriter = new BlockRewriter(protocol, Type.POSITION1_14, Protocol1_14_4To1_15::getNewBlockStateId, Protocol1_14_4To1_15::getNewBlockId); diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/EntityPackets1_15.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/EntityPackets1_15.java index c455591f..be6589a1 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/EntityPackets1_15.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/EntityPackets1_15.java @@ -26,8 +26,12 @@ import java.util.ArrayList; public class EntityPackets1_15 extends EntityRewriter { + public EntityPackets1_15(Protocol1_14_4To1_15 protocol) { + super(protocol); + } + @Override - protected void registerPackets(Protocol1_14_4To1_15 protocol) { + protected void registerPackets() { // Update health protocol.registerOutgoing(State.PLAY, 0x49, 0x48, new PacketRemapper() { @Override diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/Protocol1_14To1_14_1.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/Protocol1_14To1_14_1.java index 062a7c95..955963ef 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/Protocol1_14To1_14_1.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/Protocol1_14To1_14_1.java @@ -9,7 +9,7 @@ public class Protocol1_14To1_14_1 extends BackwardsProtocol { @Override protected void registerPackets() { - new EntityPackets1_14_1().register(this); + new EntityPackets1_14_1(this).register(); } @Override diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/packets/EntityPackets1_14_1.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/packets/EntityPackets1_14_1.java index 33d57530..f294f070 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/packets/EntityPackets1_14_1.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/packets/EntityPackets1_14_1.java @@ -14,8 +14,12 @@ import us.myles.ViaVersion.packets.State; public class EntityPackets1_14_1 extends EntityRewriter { + public EntityPackets1_14_1(Protocol1_14To1_14_1 protocol) { + super(protocol); + } + @Override - protected void registerPackets(Protocol1_14To1_14_1 protocol) { + protected void registerPackets() { registerExtraTracker(0x01, Entity1_14Types.EntityType.XP_ORB); registerExtraTracker(0x02, Entity1_14Types.EntityType.LIGHTNING_BOLT); registerExtraTracker(0x04, Entity1_14Types.EntityType.PAINTING); diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/Protocol1_9_4To1_10.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/Protocol1_9_4To1_10.java index 7b3470c3..5585774e 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/Protocol1_9_4To1_10.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/Protocol1_9_4To1_10.java @@ -27,9 +27,9 @@ public class Protocol1_9_4To1_10 extends BackwardsProtocol { protected void registerPackets() { new ChangedPackets1_10().register(this); - new SoundPackets1_10().register(this); - (entityPackets = new EntityPackets1_10()).register(this); - (blockItemPackets = new BlockItemPackets1_10()).register(this); + new SoundPackets1_10(this).register(); + (entityPackets = new EntityPackets1_10(this)).register(); + (blockItemPackets = new BlockItemPackets1_10(this)).register(); } public void init(UserConnection user) { diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets1_10.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets1_10.java index 79e20b06..9387a593 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets1_10.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets1_10.java @@ -28,7 +28,12 @@ import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld; public class BlockItemPackets1_10 extends BlockItemRewriter { - protected void registerPackets(Protocol1_9_4To1_10 protocol) { + public BlockItemPackets1_10(Protocol1_9_4To1_10 protocol) { + super(protocol); + } + + @Override + protected void registerPackets() { jsonNameFormat = false; ItemRewriter itemRewriter = new ItemRewriter(protocol, this::handleItemToClient, this::handleItemToServer); diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/EntityPackets1_10.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/EntityPackets1_10.java index 6ba84e55..88c07ca8 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/EntityPackets1_10.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/EntityPackets1_10.java @@ -35,9 +35,12 @@ import java.util.Optional; public class EntityPackets1_10 extends EntityRewriter { - @Override - protected void registerPackets(Protocol1_9_4To1_10 protocol) { + public EntityPackets1_10(Protocol1_9_4To1_10 protocol) { + super(protocol); + } + @Override + protected void registerPackets() { // Spawn Object protocol.registerOutgoing(State.PLAY, 0x00, 0x00, new PacketRemapper() { @Override diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/SoundPackets1_10.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/SoundPackets1_10.java index 62d2d85f..1e3a3cc5 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/SoundPackets1_10.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/SoundPackets1_10.java @@ -26,8 +26,12 @@ public class SoundPackets1_10 extends SoundRewriter { } }; + public SoundPackets1_10(Protocol1_9_4To1_10 protocol) { + super(protocol); + } + @Override - protected void registerPackets(Protocol1_9_4To1_10 protocol) { + protected void registerPackets() { // Named sound effect protocol.registerOutgoing(State.PLAY, 0x19, 0x19, new PacketRemapper() { @Override @@ -75,7 +79,7 @@ public class SoundPackets1_10 extends SoundRewriter { @Override protected void registerRewrites() { added(24, -1); // Enchantment table sound - + // Husk added(249, 381); // Husk -> Zombie ambient added(250, 385); // Husk -> Zombie death