From f86fdd1eb4e52475c283f9c1131f89d61b37b404 Mon Sep 17 00:00:00 2001 From: EnZaXD Date: Thu, 6 Jun 2024 11:09:39 +0200 Subject: [PATCH] Update VV API usage (#776) --- .../v1_13_1to1_13/rewriter/EntityPacketRewriter1_13_1.java | 5 +---- .../rewriter/EntityPacketRewriter1_19_3.java | 5 +---- .../rewriter/EntityPacketRewriter1_19_4.java | 6 +----- .../v1_19to1_18_2/rewriter/EntityPacketRewriter1_19.java | 6 +----- .../v1_20_2to1_20/rewriter/EntityPacketRewriter1_20_2.java | 6 +----- .../rewriter/EntityPacketRewriter1_20_3.java | 6 +----- .../rewriter/EntityPacketRewriter1_20_5.java | 6 +----- .../v1_20to1_19_4/rewriter/EntityPacketRewriter1_20.java | 6 +----- .../protocol/rewriter/EntityPacketRewriter1_99.java | 7 +------ 9 files changed, 9 insertions(+), 44 deletions(-) diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_13_1to1_13/rewriter/EntityPacketRewriter1_13_1.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_13_1to1_13/rewriter/EntityPacketRewriter1_13_1.java index 687c9ec7..c376edd9 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_13_1to1_13/rewriter/EntityPacketRewriter1_13_1.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_13_1to1_13/rewriter/EntityPacketRewriter1_13_1.java @@ -155,10 +155,7 @@ public class EntityPacketRewriter1_13_1 extends LegacyEntityRewriter { - int data = (int) meta.getValue(); - meta.setValue(protocol.getMappingData().getNewBlockStateId(data)); - }); + registerBlockStateHandler(EntityTypes1_13.EntityType.ABSTRACT_MINECART, 9); } @Override diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19_3to1_19_1/rewriter/EntityPacketRewriter1_19_3.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19_3to1_19_1/rewriter/EntityPacketRewriter1_19_3.java index 8b4183bb..122fb562 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19_3to1_19_1/rewriter/EntityPacketRewriter1_19_3.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19_3to1_19_1/rewriter/EntityPacketRewriter1_19_3.java @@ -240,6 +240,7 @@ public final class EntityPacketRewriter1_19_3 extends EntityRewriter { // Sitting pose added @@ -250,10 +251,6 @@ public final class EntityPacketRewriter1_19_3 extends EntityRewriter { - final int data = (int) meta.getValue(); - meta.setValue(protocol.getMappingData().getNewBlockStateId(data)); - }); filter().type(EntityTypes1_19_3.CAMEL).cancel(19); // Dashing filter().type(EntityTypes1_19_3.CAMEL).cancel(20); // Last pose change time diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19_4to1_19_3/rewriter/EntityPacketRewriter1_19_4.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19_4to1_19_3/rewriter/EntityPacketRewriter1_19_4.java index d0297fc4..56164d61 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19_4to1_19_3/rewriter/EntityPacketRewriter1_19_4.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19_4to1_19_3/rewriter/EntityPacketRewriter1_19_4.java @@ -143,11 +143,7 @@ public final class EntityPacketRewriter1_19_4 extends EntityRewriter { - final int blockState = meta.value(); - meta.setValue(protocol.getMappingData().getNewBlockStateId(blockState)); - }); + registerBlockStateHandler(EntityTypes1_19_4.ABSTRACT_MINECART, 11); filter().type(EntityTypes1_19_4.BOAT).index(11).handler((event, meta) -> { final int boatType = meta.value(); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19to1_18_2/rewriter/EntityPacketRewriter1_19.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19to1_18_2/rewriter/EntityPacketRewriter1_19.java index 78e6be38..cc769b28 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19to1_18_2/rewriter/EntityPacketRewriter1_19.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19to1_18_2/rewriter/EntityPacketRewriter1_19.java @@ -282,11 +282,7 @@ public final class EntityPacketRewriter1_19 extends EntityRewriter { - final int data = (int) meta.getValue(); - meta.setValue(protocol.getMappingData().getNewBlockStateId(data)); - }); + registerBlockStateHandler(EntityTypes1_19.ABSTRACT_MINECART, 11); filter().type(EntityTypes1_19.PAINTING).index(8).handler((event, meta) -> { event.cancel(); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_2to1_20/rewriter/EntityPacketRewriter1_20_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_2to1_20/rewriter/EntityPacketRewriter1_20_2.java index fa9d6b7b..4e64527e 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_2to1_20/rewriter/EntityPacketRewriter1_20_2.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_2to1_20/rewriter/EntityPacketRewriter1_20_2.java @@ -200,13 +200,9 @@ public final class EntityPacketRewriter1_20_2 extends EntityRewriter meta.setDataType(Types1_20.ENTITY_DATA_TYPES.byId(meta.dataType().typeId()))); registerMetaTypeHandler(Types1_20.ENTITY_DATA_TYPES.itemType, Types1_20.ENTITY_DATA_TYPES.blockStateType, Types1_20.ENTITY_DATA_TYPES.optionalBlockStateType, Types1_20.ENTITY_DATA_TYPES.particleType, null, null); + registerBlockStateHandler(EntityTypes1_19_4.ABSTRACT_MINECART, 11); filter().type(EntityTypes1_19_4.DISPLAY).removeIndex(10); - - filter().type(EntityTypes1_19_4.ABSTRACT_MINECART).index(11).handler((event, meta) -> { - final int blockState = meta.value(); - meta.setValue(protocol.getMappingData().getNewBlockStateId(blockState)); - }); } @Override diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_3to1_20_2/rewriter/EntityPacketRewriter1_20_3.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_3to1_20_2/rewriter/EntityPacketRewriter1_20_3.java index 2146d7a0..10417acf 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_3to1_20_2/rewriter/EntityPacketRewriter1_20_3.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_3to1_20_2/rewriter/EntityPacketRewriter1_20_3.java @@ -135,11 +135,7 @@ public final class EntityPacketRewriter1_20_3 extends EntityRewriter { - final int blockState = meta.value(); - meta.setValue(protocol.getMappingData().getNewBlockStateId(blockState)); - }); + registerBlockStateHandler(EntityTypes1_20_3.ABSTRACT_MINECART, 11); filter().type(EntityTypes1_20_3.TNT).removeIndex(9); // Block state } diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java index 4a7e189f..b2ac9311 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java @@ -408,6 +408,7 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter { final Particle[] particles = meta.value(); @@ -431,11 +432,6 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter { - final int blockState = meta.value(); - meta.setValue(protocol.getMappingData().getNewBlockStateId(blockState)); - }); - filter().type(EntityTypes1_20_5.LLAMA).addIndex(20); // Carpet color filter().type(EntityTypes1_20_5.ARMADILLO).removeIndex(17); // State filter().type(EntityTypes1_20_5.WOLF).removeIndex(22); // Wolf variant diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20to1_19_4/rewriter/EntityPacketRewriter1_20.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20to1_19_4/rewriter/EntityPacketRewriter1_20.java index d23a5ccb..353e0c93 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20to1_19_4/rewriter/EntityPacketRewriter1_20.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20to1_19_4/rewriter/EntityPacketRewriter1_20.java @@ -127,11 +127,7 @@ public final class EntityPacketRewriter1_20 extends EntityRewriter meta.setDataType(Types1_19_4.ENTITY_DATA_TYPES.byId(meta.dataType().typeId()))); registerMetaTypeHandler(Types1_19_4.ENTITY_DATA_TYPES.itemType, Types1_19_4.ENTITY_DATA_TYPES.blockStateType, Types1_19_4.ENTITY_DATA_TYPES.optionalBlockStateType, Types1_19_4.ENTITY_DATA_TYPES.particleType, Types1_19_4.ENTITY_DATA_TYPES.componentType, Types1_19_4.ENTITY_DATA_TYPES.optionalComponentType); - - filter().type(EntityTypes1_19_4.ABSTRACT_MINECART).index(11).handler((event, meta) -> { - final int blockState = meta.value(); - meta.setValue(protocol.getMappingData().getNewBlockStateId(blockState)); - }); + registerBlockStateHandler(EntityTypes1_19_4.ABSTRACT_MINECART, 11); // Rotate item display by 180 degrees around the Y axis filter().type(EntityTypes1_19_4.ITEM_DISPLAY).handler((event, meta) -> { diff --git a/template/src/main/java/com/viaversion/viabackwards/template/protocol/rewriter/EntityPacketRewriter1_99.java b/template/src/main/java/com/viaversion/viabackwards/template/protocol/rewriter/EntityPacketRewriter1_99.java index 59bd02c7..5b017354 100644 --- a/template/src/main/java/com/viaversion/viabackwards/template/protocol/rewriter/EntityPacketRewriter1_99.java +++ b/template/src/main/java/com/viaversion/viabackwards/template/protocol/rewriter/EntityPacketRewriter1_99.java @@ -23,7 +23,6 @@ import com.viaversion.viaversion.api.minecraft.entities.EntityType; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_20_5; import com.viaversion.viaversion.api.protocol.packet.State; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; -import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.Types; import com.viaversion.viaversion.api.type.types.version.Types1_20_5; import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ClientboundConfigurationPackets1_20_5; @@ -104,11 +103,7 @@ public final class EntityPacketRewriter1_99 extends EntityRewriter { - final int blockState = meta.value(); - meta.setValue(protocol.getMappingData().getNewBlockStateId(blockState)); - }); + registerBlockStateHandler(EntityTypes1_20_5.ABSTRACT_MINECART, 11); // Remove metadata of new entity type // filter().type(EntityTypes1_20_5.SNIFFER).removeIndex(newIndex);