From bf11a0a7de33f05db4b1cf8649c355704b4073c4 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Thu, 14 Mar 2024 18:25:18 +0100 Subject: [PATCH] Start working on 24w11a --- .../metadata/types/MetaTypes1_20_5.java | 32 ++++++++++-------- .../api/protocol/version/ProtocolVersion.java | 2 +- .../api/type/types/misc/ParticleType.java | 1 + .../api/type/types/version/Types1_20_5.java | 4 ++- .../MetadataRewriter1_13_1To1_13.java | 2 +- .../MetadataRewriter1_14To1_13_2.java | 2 +- .../MetadataRewriter1_15To1_14_4.java | 2 +- .../MetadataRewriter1_16_2To1_16_1.java | 2 +- .../MetadataRewriter1_16To1_15_2.java | 2 +- .../packets/EntityPackets.java | 3 +- .../packets/EntityPackets.java | 2 +- .../packets/EntityPackets.java | 2 +- .../packets/EntityPackets.java | 3 +- .../packets/EntityPackets.java | 2 +- .../rewriter/EntityPacketRewriter1_20_2.java | 2 +- .../rewriter/EntityPacketRewriter1_20_3.java | 4 +-- .../Protocol1_20_5To1_20_3.java | 3 +- ...s1_20_3.java => BannerPatterns1_20_5.java} | 6 ++-- ...rns1_20_3.java => TrimPatterns1_20_5.java} | 6 ++-- .../BlockItemPacketRewriter1_20_5.java | 10 +++--- .../rewriter/EntityPacketRewriter1_20_5.java | 28 ++++++++++++--- .../rewriter/StructuredDataConverter.java | 4 +-- .../packets/EntityPackets.java | 3 +- .../viaversion/rewriter/EntityRewriter.java | 17 ++++++---- .../viaversion/data/identifiers-1.20.5.nbt | Bin 4807 -> 4784 bytes .../data/mappings-1.20.3to1.20.5.nbt | Bin 683 -> 763 bytes gradle.properties | 2 +- .../template/protocols/Protocol1_99To_98.java | 2 ++ .../rewriter/EntityPacketRewriter1_99.java | 9 ++--- 29 files changed, 97 insertions(+), 60 deletions(-) rename common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/{BannerPatterns1_20_3.java => BannerPatterns1_20_5.java} (98%) rename common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/{TrimPatterns1_20_3.java => TrimPatterns1_20_5.java} (94%) diff --git a/api/src/main/java/com/viaversion/viaversion/api/minecraft/metadata/types/MetaTypes1_20_5.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/metadata/types/MetaTypes1_20_5.java index a58bd2259..3b1d81201 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/minecraft/metadata/types/MetaTypes1_20_5.java +++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/metadata/types/MetaTypes1_20_5.java @@ -22,8 +22,10 @@ */ package com.viaversion.viaversion.api.minecraft.metadata.types; +import com.viaversion.viaversion.api.minecraft.Particle; import com.viaversion.viaversion.api.minecraft.metadata.MetaType; import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.api.type.types.ArrayType; import com.viaversion.viaversion.api.type.types.misc.ParticleType; import com.viaversion.viaversion.api.type.types.version.Types1_20_5; @@ -47,21 +49,23 @@ public final class MetaTypes1_20_5 extends AbstractMetaTypes { public final MetaType optionalBlockStateType = add(15, Type.VAR_INT); public final MetaType nbtType = add(16, Type.COMPOUND_TAG); public final MetaType particleType; - public final MetaType villagerDatatType = add(18, Type.VILLAGER_DATA); - public final MetaType optionalVarIntType = add(19, Type.OPTIONAL_VAR_INT); - public final MetaType poseType = add(20, Type.VAR_INT); - public final MetaType catVariantType = add(21, Type.VAR_INT); - public final MetaType wolfVariantType = add(22, Type.VAR_INT); - public final MetaType frogVariantType = add(23, Type.VAR_INT); - public final MetaType optionalGlobalPosition = add(24, Type.OPTIONAL_GLOBAL_POSITION); - public final MetaType paintingVariantType = add(25, Type.VAR_INT); - public final MetaType snifferState = add(26, Type.VAR_INT); - public final MetaType armadilloState = add(27, Type.VAR_INT); - public final MetaType vectorType = add(28, Type.VECTOR3F); - public final MetaType quaternionType = add(29, Type.QUATERNION); + public final MetaType particlesType; + public final MetaType villagerDatatType = add(19, Type.VILLAGER_DATA); + public final MetaType optionalVarIntType = add(20, Type.OPTIONAL_VAR_INT); + public final MetaType poseType = add(21, Type.VAR_INT); + public final MetaType catVariantType = add(22, Type.VAR_INT); + public final MetaType wolfVariantType = add(23, Type.VAR_INT); + public final MetaType frogVariantType = add(24, Type.VAR_INT); + public final MetaType optionalGlobalPosition = add(25, Type.OPTIONAL_GLOBAL_POSITION); + public final MetaType paintingVariantType = add(26, Type.VAR_INT); + public final MetaType snifferState = add(27, Type.VAR_INT); + public final MetaType armadilloState = add(28, Type.VAR_INT); + public final MetaType vectorType = add(29, Type.VECTOR3F); + public final MetaType quaternionType = add(30, Type.QUATERNION); - public MetaTypes1_20_5(final ParticleType particleType) { - super(30); + public MetaTypes1_20_5(final ParticleType particleType, final ArrayType particlesType) { + super(31); this.particleType = add(17, particleType); + this.particlesType = add(18, particlesType); } } diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java index 2d393df53..615d77cdd 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java +++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java @@ -83,7 +83,7 @@ public class ProtocolVersion implements Comparable { public static final ProtocolVersion v1_20 = register(763, "1.20/1.20.1", new SubVersionRange("1.20", 0, 1)); public static final ProtocolVersion v1_20_2 = register(764, "1.20.2"); public static final ProtocolVersion v1_20_3 = register(765, "1.20.3/1.20.4", new SubVersionRange("1.20", 3, 4)); - public static final ProtocolVersion v1_20_5 = register(766, 179, "1.20.5"); + public static final ProtocolVersion v1_20_5 = register(766, 180, "1.20.5"); public static final ProtocolVersion unknown = new ProtocolVersion(VersionType.SPECIAL, -1, -1, "UNKNOWN", null); public static ProtocolVersion register(int version, String name) { diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/ParticleType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/ParticleType.java index 3f64c2cbe..50fa2e806 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/ParticleType.java +++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/misc/ParticleType.java @@ -135,5 +135,6 @@ public class ParticleType extends DynamicType { public static final DataReader SHRIEK = (buf, particle) -> { particle.add(Type.VAR_INT, Type.VAR_INT.readPrimitive(buf)); // Delay }; + public static final DataReader COLOR = (buf, particle) -> particle.add(Type.INT, buf.readInt()); } } diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/version/Types1_20_5.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/version/Types1_20_5.java index daba1e0a7..fee0cd852 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/types/version/Types1_20_5.java +++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/version/Types1_20_5.java @@ -22,6 +22,7 @@ */ package com.viaversion.viaversion.api.type.types.version; +import com.viaversion.viaversion.api.minecraft.Particle; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.minecraft.metadata.Metadata; import com.viaversion.viaversion.api.minecraft.metadata.types.MetaTypes1_20_5; @@ -38,10 +39,11 @@ public final class Types1_20_5 { // Most of these are only safe to use after protocol loading public static final ParticleType PARTICLE = new ParticleType(); + public static final ArrayType PARTICLES = new ArrayType<>(PARTICLE); public static final StructuredDataType STRUCTURED_DATA = new StructuredDataType(); public static final Type ITEM = new ItemType1_20_5(STRUCTURED_DATA); public static final Type ITEM_ARRAY = new ArrayType<>(ITEM); - public static final MetaTypes1_20_5 META_TYPES = new MetaTypes1_20_5(PARTICLE); + public static final MetaTypes1_20_5 META_TYPES = new MetaTypes1_20_5(PARTICLE, PARTICLES); public static final Type METADATA = new MetadataType(META_TYPES); public static final Type> METADATA_LIST = new MetaListType(METADATA); } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/metadata/MetadataRewriter1_13_1To1_13.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/metadata/MetadataRewriter1_13_1To1_13.java index 389618163..9c256c2ef 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/metadata/MetadataRewriter1_13_1To1_13.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13_1to1_13/metadata/MetadataRewriter1_13_1To1_13.java @@ -32,7 +32,7 @@ public class MetadataRewriter1_13_1To1_13 extends EntityRewriter { int data = meta.value(); meta.setValue(protocol.getMappingData().getNewBlockStateId(data)); diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/metadata/MetadataRewriter1_14To1_13_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/metadata/MetadataRewriter1_14To1_13_2.java index 1a9c79b94..a60c2644c 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/metadata/MetadataRewriter1_14To1_13_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/metadata/MetadataRewriter1_14To1_13_2.java @@ -45,7 +45,7 @@ public class MetadataRewriter1_14To1_13_2 extends EntityRewriter { int data = meta.value(); meta.setValue(protocol.getMappingData().getNewBlockStateId(data)); diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/metadata/MetadataRewriter1_16_2To1_16_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/metadata/MetadataRewriter1_16_2To1_16_1.java index fd6eecd8c..d13fb582a 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/metadata/MetadataRewriter1_16_2To1_16_1.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/metadata/MetadataRewriter1_16_2To1_16_1.java @@ -34,7 +34,7 @@ public class MetadataRewriter1_16_2To1_16_1 extends EntityRewriter { int data = meta.value(); meta.setValue(protocol.getMappingData().getNewBlockStateId(data)); diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/metadata/MetadataRewriter1_16To1_15_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/metadata/MetadataRewriter1_16To1_15_2.java index c3716726d..dd241c109 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/metadata/MetadataRewriter1_16To1_15_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/metadata/MetadataRewriter1_16To1_15_2.java @@ -37,7 +37,7 @@ public class MetadataRewriter1_16To1_15_2 extends EntityRewriter { int data = meta.value(); meta.setValue(protocol.getMappingData().getNewBlockStateId(data)); diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/packets/EntityPackets.java index 6ee44a1ad..8b5cf1633 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/packets/EntityPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/packets/EntityPackets.java @@ -20,7 +20,6 @@ package com.viaversion.viaversion.protocols.protocol1_17to1_16_4.packets; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.github.steveice10.opennbt.tag.builtin.IntTag; import com.github.steveice10.opennbt.tag.builtin.ListTag; -import com.github.steveice10.opennbt.tag.builtin.Tag; import com.viaversion.viaversion.api.data.entity.EntityTracker; import com.viaversion.viaversion.api.minecraft.entities.EntityType; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_16_2; @@ -159,7 +158,7 @@ public final class EntityPackets extends EntityRewriter Types1_19_3.META_TYPES.byId(typeId >= 2 ? typeId + 1 : typeId)); // Long added - registerMetaTypeHandler(Types1_19_3.META_TYPES.itemType, Types1_19_3.META_TYPES.blockStateType, null, Types1_19_3.META_TYPES.particleType); + registerMetaTypeHandler(Types1_19_3.META_TYPES.itemType, Types1_19_3.META_TYPES.blockStateType, null, Types1_19_3.META_TYPES.particleType, null); filter().type(EntityTypes1_19_3.ENTITY).index(6).handler((event, meta) -> { // Sitting pose added diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/packets/EntityPackets.java index e0ec51e9c..71cabf5c7 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/packets/EntityPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/packets/EntityPackets.java @@ -21,7 +21,6 @@ import com.github.steveice10.opennbt.tag.builtin.ByteTag; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.github.steveice10.opennbt.tag.builtin.ListTag; import com.github.steveice10.opennbt.tag.builtin.StringTag; -import com.github.steveice10.opennbt.tag.builtin.Tag; import com.viaversion.viaversion.api.minecraft.entities.EntityType; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_19_4; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; @@ -227,7 +226,7 @@ public final class EntityPackets extends EntityRewriter Types1_19_4.META_TYPES.byId(typeId >= 14 ? typeId + 1 : typeId)); // Optional block state (and map block state=14 to optional block state) - registerMetaTypeHandler(Types1_19_4.META_TYPES.itemType, Types1_19_4.META_TYPES.blockStateType, Types1_19_4.META_TYPES.optionalBlockStateType, Types1_19_4.META_TYPES.particleType); + registerMetaTypeHandler(Types1_19_4.META_TYPES.itemType, Types1_19_4.META_TYPES.blockStateType, Types1_19_4.META_TYPES.optionalBlockStateType, Types1_19_4.META_TYPES.particleType, null); filter().type(EntityTypes1_19_4.MINECART_ABSTRACT).index(11).handler((event, meta) -> { final int blockState = meta.value(); diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/packets/EntityPackets.java index 35323362f..edd1879ba 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/packets/EntityPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/packets/EntityPackets.java @@ -338,7 +338,7 @@ public final class EntityPackets extends EntityRewriter { // Convert to new block id diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/EntityPacketRewriter1_20_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/EntityPacketRewriter1_20_2.java index f187f233c..ae20d5217 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/EntityPacketRewriter1_20_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_2to1_20/rewriter/EntityPacketRewriter1_20_2.java @@ -173,7 +173,7 @@ public final class EntityPacketRewriter1_20_2 extends EntityRewriter { final int blockState = meta.value(); diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/Protocol1_20_5To1_20_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/Protocol1_20_5To1_20_3.java index 6d4d63f0e..90f6e7837 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/Protocol1_20_5To1_20_3.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/Protocol1_20_5To1_20_3.java @@ -113,7 +113,8 @@ public final class Protocol1_20_5To1_20_3 extends AbstractProtocol PATTERN_IDS = new HashMap<>(); diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/TrimPatterns1_20_3.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/TrimPatterns1_20_5.java similarity index 94% rename from common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/TrimPatterns1_20_3.java rename to common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/TrimPatterns1_20_5.java index 36b1b2b31..6e1729134 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/TrimPatterns1_20_3.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/TrimPatterns1_20_5.java @@ -20,7 +20,7 @@ package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data; import com.viaversion.viaversion.util.KeyMappings; import org.checkerframework.checker.nullness.qual.Nullable; -public final class TrimPatterns1_20_3 { +public final class TrimPatterns1_20_5 { private static final KeyMappings PATTERNS = new KeyMappings( "sentry", @@ -38,7 +38,9 @@ public final class TrimPatterns1_20_3 { "shaper", "silence", "raiser", - "host" + "host", + "flow", + "bolt" ); public static @Nullable String idToKey(final int id) { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java index 85d2ff180..9687ed9ae 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java @@ -72,14 +72,14 @@ import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.Clientb import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.rewriter.RecipeRewriter1_20_3; import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.Protocol1_20_5To1_20_3; import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Attributes1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.BannerPatterns1_20_3; +import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.BannerPatterns1_20_5; import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.DyeColors; import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Enchantments1_20_3; import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Instruments1_20_3; import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.MapDecorations1_20_3; import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Potions1_20_3; import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.TrimMaterials1_20_3; -import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.TrimPatterns1_20_3; +import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.TrimPatterns1_20_5; import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ServerboundPacket1_20_5; import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.packet.ServerboundPackets1_20_5; import com.viaversion.viaversion.rewriter.BlockRewriter; @@ -597,7 +597,7 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter patternHolder; if (patternTag instanceof StringTag) { - final int id = TrimPatterns1_20_3.keyToId(((StringTag) patternTag).getValue()); + final int id = TrimPatterns1_20_5.keyToId(((StringTag) patternTag).getValue()); if (id == -1) { return; } @@ -978,7 +978,7 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter { final String pattern = patternTag.getString("Pattern", ""); final int color = patternTag.getInt("Color", -1); - final String fullPatternIdentifier = BannerPatterns1_20_3.compactToFullId(pattern); + final String fullPatternIdentifier = BannerPatterns1_20_5.compactToFullId(pattern); if (fullPatternIdentifier == null || color == -1) { return null; } @@ -988,7 +988,7 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter { int id = typeId; + if (typeId >= Types1_20_5.META_TYPES.particlesType.typeId()) { + id++; + } if (typeId >= Types1_20_5.META_TYPES.armadilloState.typeId()) { id++; } @@ -232,9 +236,17 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter { + final int effectColor = meta.value(); + final Particle particle = new Particle(protocol.getMappingData().getParticleMappings().mappedId("entity_effect")); + particle.add(Type.INT, effectColor); + meta.setTypeAndValue(Types1_20_5.META_TYPES.particlesType, new Particle[]{particle}); + }); + filter().type(EntityTypes1_20_5.LLAMA).removeIndex(20); // Carpet color filter().type(EntityTypes1_20_5.MINECART_ABSTRACT).index(11).handler((event, meta) -> { @@ -243,6 +255,14 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter { final ListTag patternsTag = getOrCreateListTag(tag, "Patterns"); for (final BannerPatternLayer layer : data) { - final String pattern = BannerPatterns1_20_3.fullIdToCompact(BannerPatterns1_20_3.idToKey(layer.pattern().id())); + final String pattern = BannerPatterns1_20_5.fullIdToCompact(BannerPatterns1_20_5.idToKey(layer.pattern().id())); if (pattern == null) { continue; } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20to1_19_4/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20to1_19_4/packets/EntityPackets.java index 308fc3f80..557991906 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20to1_19_4/packets/EntityPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20to1_19_4/packets/EntityPackets.java @@ -22,7 +22,6 @@ import com.github.steveice10.opennbt.tag.builtin.FloatTag; import com.github.steveice10.opennbt.tag.builtin.IntTag; import com.github.steveice10.opennbt.tag.builtin.ListTag; import com.github.steveice10.opennbt.tag.builtin.StringTag; -import com.github.steveice10.opennbt.tag.builtin.Tag; import com.viaversion.viaversion.api.minecraft.Quaternion; import com.viaversion.viaversion.api.minecraft.entities.EntityType; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_19_4; @@ -129,7 +128,7 @@ public final class EntityPackets extends EntityRewriter { diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/EntityRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/EntityRewriter.java index 4f7bfd2b1..0d2c2af33 100644 --- a/common/src/main/java/com/viaversion/viaversion/rewriter/EntityRewriter.java +++ b/common/src/main/java/com/viaversion/viaversion/rewriter/EntityRewriter.java @@ -20,7 +20,6 @@ package com.viaversion.viaversion.rewriter; import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.github.steveice10.opennbt.tag.builtin.ListTag; import com.github.steveice10.opennbt.tag.builtin.NumberTag; -import com.github.steveice10.opennbt.tag.builtin.Tag; import com.google.common.base.Preconditions; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; @@ -59,7 +58,7 @@ import java.util.stream.Collectors; import org.checkerframework.checker.nullness.qual.Nullable; public abstract class EntityRewriter> - extends RewriterBase implements com.viaversion.viaversion.api.rewriter.EntityRewriter { + extends RewriterBase implements com.viaversion.viaversion.api.rewriter.EntityRewriter { private static final Metadata[] EMPTY_ARRAY = new Metadata[0]; protected final List metadataFilters = new ArrayList<>(); protected final boolean trackMappedType; @@ -187,7 +186,7 @@ public abstract class EntityRewriter { final MetaType type = meta.metaType(); if (type == itemType) { @@ -225,6 +225,11 @@ public abstract class EntityRewriterdR%qGWLAkZ2GPXaq|DU3l6WA_EUAo7O-oBnF4;VVRfZP;35N~3 diff --git a/common/src/main/resources/assets/viaversion/data/mappings-1.20.3to1.20.5.nbt b/common/src/main/resources/assets/viaversion/data/mappings-1.20.3to1.20.5.nbt index 11278b72e61912fb95a18f73ba1faf0dab273f4e..82b5d624406881815868959423b60daf78e6f929 100644 GIT binary patch delta 331 zcmZ9`u};EJ6vpxIw!I9H5C#UQ2@l``lj&j{AWp295Ll#iXdE2G#fKnZHwQ-;9AskQ z5qJRKz)1&5h=2?KnsnhNzq_1szH{E}pPkfAW7;_9>s1E@Ngc^O!#6gPcZn;^ageM7 z7x{vm(LDp{&<)Ks{NR_yCa$rd(V~bFD$`fL9~e3D(75s*;-^T;xkTNLh@njvV4q$v z!@Fe0Vi$JA2lycB4oj@C&Tc6tCF9qeXL>5=Vo#kc`-v}>DQTIQ2Cm%1f`ZhP;LNI21_n06i612yc_(u-N+~m20F_^7U|`J#;%z{@ z3y60E@oAX3ypw$xrKFgHfa-wuu}%i!`~QIeNIwPQpOae{OKs8^8JIFt7?~MZiosSe jqyn`kmH?f_48&4EoD9S%Ff&1dKu<8Zf&?eKGHn9@c;hXE diff --git a/gradle.properties b/gradle.properties index c1c3c100e..a7aa0b9fd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Project properties - we put these here so they can be modified without causing a recompile of the build scripts -projectVersion=4.10.0-24w10a-SNAPSHOT +projectVersion=4.10.0-24w11a-SNAPSHOT # Smile emoji mcVersions=1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10, 1.9.4, 1.9.3, 1.9.2, 1.9.1, 1.9, 1.8.9 diff --git a/template/src/main/java/com/viaversion/viaversion/template/protocols/Protocol1_99To_98.java b/template/src/main/java/com/viaversion/viaversion/template/protocols/Protocol1_99To_98.java index e9a8e23df..529d7a7a4 100644 --- a/template/src/main/java/com/viaversion/viaversion/template/protocols/Protocol1_99To_98.java +++ b/template/src/main/java/com/viaversion/viaversion/template/protocols/Protocol1_99To_98.java @@ -79,6 +79,8 @@ public final class Protocol1_99To_98 extends AbstractProtocol