From f6b8c4a8c87853fff2a344e477672b1d4437103c Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Thu, 3 Aug 2023 18:38:18 +1000 Subject: [PATCH] Rename rewriter classes --- .../protocol1_20_2to1_20/Protocol1_20_2To1_20.java | 12 ++++++------ .../BlockItemPacketRewriter1_20_2.java} | 6 +++--- .../EntityPacketRewriter1_20_2.java} | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) rename common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/{handler/BlockItemPacketHandler1_20_2.java => rewriter/BlockItemPacketRewriter1_20_2.java} (87%) rename common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/{handler/EntityPacketHandler1_20_2.java => rewriter/EntityPacketRewriter1_20_2.java} (97%) diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/Protocol1_20_2To1_20.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/Protocol1_20_2To1_20.java index cafab951e..5dd3404f8 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/Protocol1_20_2To1_20.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/Protocol1_20_2To1_20.java @@ -31,8 +31,8 @@ import com.viaversion.viaversion.data.entity.EntityTrackerBase; import com.viaversion.viaversion.protocols.base.ServerboundLoginPackets; import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.ClientboundPackets1_19_4; import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.ServerboundPackets1_19_4; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.handler.BlockItemPacketHandler1_20_2; -import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.handler.EntityPacketHandler1_20_2; +import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.rewriter.BlockItemPacketRewriter1_20_2; +import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.rewriter.EntityPacketRewriter1_20_2; import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ClientboundConfigurationPackets1_20_2; import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ClientboundPackets1_20_2; import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ServerboundConfigurationPackets1_20_2; @@ -47,8 +47,8 @@ import java.util.UUID; public final class Protocol1_20_2To1_20 extends AbstractProtocol { - private final EntityPacketHandler1_20_2 entityPacketHandler = new EntityPacketHandler1_20_2(this); - private final BlockItemPacketHandler1_20_2 itemPacketHandler = new BlockItemPacketHandler1_20_2(this); + private final EntityPacketRewriter1_20_2 entityPacketRewriter = new EntityPacketRewriter1_20_2(this); + private final BlockItemPacketRewriter1_20_2 itemPacketRewriter = new BlockItemPacketRewriter1_20_2(this); public Protocol1_20_2To1_20() { // Passing the class types into the super constructor is needed for automatic packet type id remapping, but can otherwise be omitted @@ -176,11 +176,11 @@ public final class Protocol1_20_2To1_20 extends AbstractProtocol getEntityRewriter() { - return entityPacketHandler; + return entityPacketRewriter; } @Override public ItemRewriter getItemRewriter() { - return itemPacketHandler; + return itemPacketRewriter; } } \ No newline at end of file diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/handler/BlockItemPacketHandler1_20_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/BlockItemPacketRewriter1_20_2.java similarity index 87% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/handler/BlockItemPacketHandler1_20_2.java rename to common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/BlockItemPacketRewriter1_20_2.java index 172a7f73e..7321fe85e 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/handler/BlockItemPacketHandler1_20_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/BlockItemPacketRewriter1_20_2.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_2to1_20.handler; +package com.viaversion.viaversion.protocols.protocol1_20_2to1_20.rewriter; import com.viaversion.viaversion.api.minecraft.metadata.ChunkPosition; import com.viaversion.viaversion.api.type.Type; @@ -24,9 +24,9 @@ import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.Protocol1_20_2To import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ServerboundPackets1_20_2; import com.viaversion.viaversion.rewriter.ItemRewriter; -public final class BlockItemPacketHandler1_20_2 extends ItemRewriter { +public final class BlockItemPacketRewriter1_20_2 extends ItemRewriter { - public BlockItemPacketHandler1_20_2(final Protocol1_20_2To1_20 protocol) { + public BlockItemPacketRewriter1_20_2(final Protocol1_20_2To1_20 protocol) { super(protocol); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/handler/EntityPacketHandler1_20_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/EntityPacketRewriter1_20_2.java similarity index 97% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/handler/EntityPacketHandler1_20_2.java rename to common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/EntityPacketRewriter1_20_2.java index e241681b0..0810a7eab 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/handler/EntityPacketHandler1_20_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/EntityPacketRewriter1_20_2.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.viaversion.viaversion.protocols.protocol1_20_2to1_20.handler; +package com.viaversion.viaversion.protocols.protocol1_20_2to1_20.rewriter; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.viaversion.viaversion.api.minecraft.entities.Entity1_19_4Types; @@ -29,9 +29,9 @@ import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.Protocol1_20_2To import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ClientboundConfigurationPackets1_20_2; import com.viaversion.viaversion.rewriter.EntityRewriter; -public final class EntityPacketHandler1_20_2 extends EntityRewriter { +public final class EntityPacketRewriter1_20_2 extends EntityRewriter { - public EntityPacketHandler1_20_2(final Protocol1_20_2To1_20 protocol) { + public EntityPacketRewriter1_20_2(final Protocol1_20_2To1_20 protocol) { super(protocol); }