From faedf26b5bbe37e0293143b4ec0401c1c8df9814 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Sat, 21 Oct 2023 13:00:39 +1000 Subject: [PATCH] Clean up Particle --- .../{type/types => minecraft}/Particle.java | 56 ++++++++++--------- .../viaversion/viaversion/api/type/Type.java | 9 ++- .../types/chunk/ChunkSectionType1_13.java | 2 +- .../types/chunk/ChunkSectionType1_16.java | 2 +- .../types/chunk/ChunkSectionType1_18.java | 2 +- .../type/types/chunk/ChunkSectionType1_8.java | 2 +- .../type/types/chunk/ChunkSectionType1_9.java | 2 +- .../api/type/types/item/ItemType1_13.java | 2 +- .../api/type/types/item/ItemType1_13_2.java | 2 +- .../api/type/types/item/ItemType1_20_2.java | 2 +- .../api/type/types/item/ItemType1_8.java | 2 +- .../api/type/types/misc/ParticleType.java | 6 +- .../MetadataRewriter1_13_1To1_13.java | 2 +- .../data/ParticleRewriter.java | 14 ++--- .../MetadataRewriter1_13To1_12_2.java | 2 +- .../packets/WorldPackets.java | 11 ++-- .../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 | 6 +- .../packets/EntityPackets.java | 6 +- .../viaversion/rewriter/EntityRewriter.java | 10 ++-- 23 files changed, 76 insertions(+), 72 deletions(-) rename api/src/main/java/com/viaversion/viaversion/api/{type/types => minecraft}/Particle.java (63%) diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/Particle.java b/api/src/main/java/com/viaversion/viaversion/api/minecraft/Particle.java similarity index 63% rename from api/src/main/java/com/viaversion/viaversion/api/type/types/Particle.java rename to api/src/main/java/com/viaversion/viaversion/api/minecraft/Particle.java index 2f4d1fa7d..3e4e200ee 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/types/Particle.java +++ b/api/src/main/java/com/viaversion/viaversion/api/minecraft/Particle.java @@ -20,17 +20,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package com.viaversion.viaversion.api.type.types; +package com.viaversion.viaversion.api.minecraft; +import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.type.Type; +import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.List; -public class Particle { - private List arguments = new ArrayList<>(4); +public final class Particle { + private final List> arguments = new ArrayList<>(4); private int id; - public Particle(int id) { + public Particle(final int id) { this.id = id; } @@ -38,50 +40,50 @@ public class Particle { return id; } - public void setId(int id) { + public void setId(final int id) { this.id = id; } - public List getArguments() { + public ParticleData getArgument(final int id) { + //noinspection unchecked + return (ParticleData) arguments.get(id); + } + + public List> getArguments() { return arguments; } - @Deprecated/*(forRemoval = true)*/ - public void setArguments(List arguments) { - this.arguments = arguments; + public void add(final Type type, final T value) { + arguments.add(new ParticleData<>(type, value)); } - public void add(Type type, T value) { - arguments.add(new ParticleData(type, value)); - } + public static final class ParticleData { + private final Type type; + private T value; - public static class ParticleData { - private Type type; - private Object value; - - public ParticleData(Type type, Object value) { + public ParticleData(final Type type, final T value) { this.type = type; this.value = value; } - public Type getType() { + public Type getType() { return type; } - public void setType(Type type) { - this.type = type; - } - - public Object getValue() { + public T getValue() { return value; } - public T get() { - return (T) value; + public void setValue(final T value) { + this.value = value; } - public void setValue(Object value) { - this.value = value; + public void write(final ByteBuf buf) throws Exception { + type.write(buf, value); + } + + public void write(final PacketWrapper wrapper) { + wrapper.write(type, value); } @Override diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/Type.java b/api/src/main/java/com/viaversion/viaversion/api/type/Type.java index 4c8d0bb15..499617156 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/Type.java +++ b/api/src/main/java/com/viaversion/viaversion/api/type/Type.java @@ -209,7 +209,7 @@ public abstract class Type implements ByteBufReader, ByteBufWriter { private final String typeName; protected Type(Class outputClass) { - this(outputClass.getSimpleName(), outputClass); + this(null, outputClass); } protected Type(String typeName, Class outputClass) { @@ -232,7 +232,7 @@ public abstract class Type implements ByteBufReader, ByteBufWriter { * @return type name */ public String getTypeName() { - return typeName; + return typeName != null ? typeName : this.getClass().getSimpleName(); } /** @@ -247,6 +247,9 @@ public abstract class Type implements ByteBufReader, ByteBufWriter { @Override public String toString() { - return typeName; + return "Type{" + + "outputClass=" + outputClass + + ", typeName='" + typeName + '\'' + + '}'; } } diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkSectionType1_13.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkSectionType1_13.java index 99933ab60..97f61fbab 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkSectionType1_13.java +++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkSectionType1_13.java @@ -34,7 +34,7 @@ public class ChunkSectionType1_13 extends Type { private static final int GLOBAL_PALETTE = 14; public ChunkSectionType1_13() { - super("Chunk Section Type", ChunkSection.class); + super(ChunkSection.class); } @Override diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkSectionType1_16.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkSectionType1_16.java index 1ea4be9fe..0b1fd68de 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkSectionType1_16.java +++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkSectionType1_16.java @@ -34,7 +34,7 @@ public class ChunkSectionType1_16 extends Type { private static final int GLOBAL_PALETTE = 15; public ChunkSectionType1_16() { - super("Chunk Section Type", ChunkSection.class); + super(ChunkSection.class); } @Override diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkSectionType1_18.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkSectionType1_18.java index 80a99a9bf..2e3e962b6 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkSectionType1_18.java +++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkSectionType1_18.java @@ -34,7 +34,7 @@ public final class ChunkSectionType1_18 extends Type { private final PaletteType1_18 biomePaletteType; public ChunkSectionType1_18(final int globalPaletteBlockBits, final int globalPaletteBiomeBits) { - super("Chunk Section Type", ChunkSection.class); + super(ChunkSection.class); this.blockPaletteType = new PaletteType1_18(PaletteType.BLOCKS, globalPaletteBlockBits); this.biomePaletteType = new PaletteType1_18(PaletteType.BIOMES, globalPaletteBiomeBits); } diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkSectionType1_8.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkSectionType1_8.java index 1f6765f97..73eef9dfd 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkSectionType1_8.java +++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkSectionType1_8.java @@ -33,7 +33,7 @@ import java.nio.ByteOrder; public class ChunkSectionType1_8 extends Type { public ChunkSectionType1_8() { - super("Chunk Section Type", ChunkSection.class); + super(ChunkSection.class); } @Override diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkSectionType1_9.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkSectionType1_9.java index 6e9231c89..627efe661 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkSectionType1_9.java +++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/chunk/ChunkSectionType1_9.java @@ -34,7 +34,7 @@ public class ChunkSectionType1_9 extends Type { private static final int GLOBAL_PALETTE = 13; public ChunkSectionType1_9() { - super("Chunk Section Type", ChunkSection.class); + super(ChunkSection.class); } @Override diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/item/ItemType1_13.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/item/ItemType1_13.java index a810e1921..f5fd13515 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/types/item/ItemType1_13.java +++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/item/ItemType1_13.java @@ -30,7 +30,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; public class ItemType1_13 extends Type { public ItemType1_13() { - super("FlatItem", Item.class); + super(Item.class); } @Override diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/item/ItemType1_13_2.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/item/ItemType1_13_2.java index b0ca34906..c1c9d6a5c 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/types/item/ItemType1_13_2.java +++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/item/ItemType1_13_2.java @@ -30,7 +30,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; public class ItemType1_13_2 extends Type { public ItemType1_13_2() { - super("FlatVarIntItem", Item.class); + super(Item.class); } @Override diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/item/ItemType1_20_2.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/item/ItemType1_20_2.java index 5cd44dd22..49a575520 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/types/item/ItemType1_20_2.java +++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/item/ItemType1_20_2.java @@ -31,7 +31,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; public class ItemType1_20_2 extends Type { public ItemType1_20_2() { - super("ItemType1_20_2", Item.class); + super(Item.class); } @Override diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/item/ItemType1_8.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/item/ItemType1_8.java index 721f40927..c50915a58 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/types/item/ItemType1_8.java +++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/item/ItemType1_8.java @@ -31,7 +31,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; public class ItemType1_8 extends Type { public ItemType1_8() { - super("Item", Item.class); + super(Item.class); } @Override 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 3d1ac1227..577f7d776 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 @@ -27,7 +27,7 @@ import com.viaversion.viaversion.api.data.ParticleMappings; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.protocol.Protocol; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.api.type.types.Particle; +import com.viaversion.viaversion.api.minecraft.Particle; import com.viaversion.viaversion.util.Key; import io.netty.buffer.ByteBuf; import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap; @@ -57,8 +57,8 @@ public class ParticleType extends Type { @Override public void write(final ByteBuf buffer, final Particle object) throws Exception { Type.VAR_INT.writePrimitive(buffer, object.getId()); - for (final Particle.ParticleData data : object.getArguments()) { - data.getType().write(buffer, data.getValue()); + for (final Particle.ParticleData data : object.getArguments()) { + data.write(buffer); } } 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 07def6b07..18eda8c5e 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 @@ -22,7 +22,7 @@ import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_13; import com.viaversion.viaversion.api.minecraft.entities.EntityType; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.minecraft.metadata.Metadata; -import com.viaversion.viaversion.api.type.types.Particle; +import com.viaversion.viaversion.api.minecraft.Particle; import com.viaversion.viaversion.api.type.types.version.Types1_13; import com.viaversion.viaversion.protocols.protocol1_13_1to1_13.Protocol1_13_1To1_13; import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/ParticleRewriter.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/ParticleRewriter.java index d5f4076b2..6d14e5959 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/ParticleRewriter.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/ParticleRewriter.java @@ -21,7 +21,7 @@ import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.minecraft.item.DataItem; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.api.type.types.Particle; +import com.viaversion.viaversion.api.minecraft.Particle; import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2; import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.packets.WorldPackets; import java.util.ArrayList; @@ -121,10 +121,10 @@ public class ParticleRewriter { // Randomized because the previous one was a lot of different colors at once! :) private static ParticleDataHandler reddustHandler() { return (particle, data) -> { - particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, randomBool() ? 1f : 0f)); // Red 0 - 1 - particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, 0f)); // Green 0 - 1 - particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, randomBool() ? 1f : 0f)); // Blue 0 - 1 - particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, 1f));// Scale 0.01 - 4 + particle.add(Type.FLOAT, randomBool() ? 1f : 0f); // Red 0 - 1 + particle.add(Type.FLOAT, 0f); // Green 0 - 1 + particle.add(Type.FLOAT, randomBool() ? 1f : 0f); // Blue 0 - 1 + particle.add(Type.FLOAT, 1f);// Scale 0.01 - 4 return particle; }; } @@ -148,7 +148,7 @@ public class ParticleRewriter { // Transform to new Item Via.getManager().getProtocolManager().getProtocol(Protocol1_13To1_12_2.class).getItemRewriter().handleItemToClient(item); - particle.getArguments().add(new Particle.ParticleData(Type.ITEM1_13, item)); // Item Slot The item that will be used. + particle.add(Type.ITEM1_13, item); // Item Slot The item that will be used. return particle; }; } @@ -160,7 +160,7 @@ public class ParticleRewriter { int combined = (((value & 4095) << 4) | (value >> 12 & 15)); int newId = WorldPackets.toNewId(combined); - particle.getArguments().add(new Particle.ParticleData(Type.VAR_INT, newId)); // BlockState VarInt The ID of the block state. + particle.add(Type.VAR_INT, newId); // BlockState VarInt The ID of the block state. return particle; }; } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/metadata/MetadataRewriter1_13To1_12_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/metadata/MetadataRewriter1_13To1_12_2.java index eec88830d..e8443402e 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/metadata/MetadataRewriter1_13To1_12_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/metadata/MetadataRewriter1_13To1_12_2.java @@ -22,7 +22,7 @@ import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_13; import com.viaversion.viaversion.api.minecraft.entities.EntityType; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.minecraft.metadata.Metadata; -import com.viaversion.viaversion.api.type.types.Particle; +import com.viaversion.viaversion.api.minecraft.Particle; import com.viaversion.viaversion.api.type.types.version.Types1_13; import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1; import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/WorldPackets.java index 720f9852e..6ac92d07a 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/WorldPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/WorldPackets.java @@ -32,7 +32,7 @@ import com.viaversion.viaversion.api.minecraft.chunks.PaletteType; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.api.type.types.Particle; +import com.viaversion.viaversion.api.minecraft.Particle; import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1; import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2; @@ -507,7 +507,7 @@ public class WorldPackets { return; } - //Handle reddust particle color + // Handle reddust particle color if (particle.getId() == 11) { int count = wrapper.get(Type.INT, 1); float speed = wrapper.get(Type.FLOAT, 6); @@ -516,7 +516,6 @@ public class WorldPackets { wrapper.set(Type.INT, 1, 1); wrapper.set(Type.FLOAT, 6, 0f); - List arguments = particle.getArguments(); for (int i = 0; i < 3; i++) { //RGB values are represented by the X/Y/Z offset float colorValue = wrapper.get(Type.FLOAT, i + 3) * speed; @@ -524,15 +523,15 @@ public class WorldPackets { // https://minecraft.gamepedia.com/User:Alphappy/reddust colorValue = 1; } - arguments.get(i).setValue(colorValue); + particle.getArgument(i).setValue(colorValue); wrapper.set(Type.FLOAT, i + 3, 0f); } } } wrapper.set(Type.INT, 0, particle.getId()); - for (Particle.ParticleData particleData : particle.getArguments()) - wrapper.write(particleData.getType(), particleData.getValue()); + for (Particle.ParticleData particleData : particle.getArguments()) + particleData.write(wrapper); }); } 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 f7e164edb..3f526b6ef 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 @@ -28,7 +28,7 @@ import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.minecraft.metadata.Metadata; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.api.type.types.Particle; +import com.viaversion.viaversion.api.minecraft.Particle; import com.viaversion.viaversion.api.type.types.version.Types1_14; import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13; import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/metadata/MetadataRewriter1_15To1_14_4.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/metadata/MetadataRewriter1_15To1_14_4.java index 40495b38c..c00f63a6c 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/metadata/MetadataRewriter1_15To1_14_4.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_15to1_14_4/metadata/MetadataRewriter1_15To1_14_4.java @@ -22,7 +22,7 @@ import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_15; import com.viaversion.viaversion.api.minecraft.entities.EntityType; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.minecraft.metadata.Metadata; -import com.viaversion.viaversion.api.type.types.Particle; +import com.viaversion.viaversion.api.minecraft.Particle; import com.viaversion.viaversion.api.type.types.version.Types1_14; import com.viaversion.viaversion.protocols.protocol1_14_4to1_14_3.ClientboundPackets1_14_4; import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.Protocol1_15To1_14_4; 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 bf6ae6295..b4d6f28e0 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 @@ -23,7 +23,7 @@ import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_16_2; import com.viaversion.viaversion.api.minecraft.entities.EntityType; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.minecraft.metadata.Metadata; -import com.viaversion.viaversion.api.type.types.Particle; +import com.viaversion.viaversion.api.minecraft.Particle; import com.viaversion.viaversion.api.type.types.version.Types1_16; import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.Protocol1_16_2To1_16_1; import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ClientboundPackets1_16; 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 1d56c4667..a2f3ffbac 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 @@ -23,7 +23,7 @@ import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_16; import com.viaversion.viaversion.api.minecraft.entities.EntityType; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.minecraft.metadata.Metadata; -import com.viaversion.viaversion.api.type.types.Particle; +import com.viaversion.viaversion.api.minecraft.Particle; import com.viaversion.viaversion.api.type.types.version.Types1_16; import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15; import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.Protocol1_16To1_15_2; diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/packets/EntityPackets.java index 855d7fc87..5defa30b7 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/packets/EntityPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/packets/EntityPackets.java @@ -22,7 +22,7 @@ import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_17; import com.viaversion.viaversion.api.minecraft.entities.EntityType; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.api.type.types.Particle; +import com.viaversion.viaversion.api.minecraft.Particle; import com.viaversion.viaversion.api.type.types.version.Types1_17; import com.viaversion.viaversion.api.type.types.version.Types1_18; import com.viaversion.viaversion.protocols.protocol1_17_1to1_17.ClientboundPackets1_17_1; @@ -87,9 +87,9 @@ public final class EntityPackets extends EntityRewritergetArgument(0).getValue()); if (resourceLocation.equals("entity")) { // Add Y offset - particle.getArguments().add(2, new Particle.ParticleData(Type.FLOAT, 0F)); + particle.getArguments().add(2, new Particle.ParticleData<>(Type.FLOAT, 0F)); } } 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 d70f963b1..8432dc7b3 100644 --- a/common/src/main/java/com/viaversion/viaversion/rewriter/EntityRewriter.java +++ b/common/src/main/java/com/viaversion/viaversion/rewriter/EntityRewriter.java @@ -40,7 +40,7 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.rewriter.RewriterBase; import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.api.type.types.Particle; +import com.viaversion.viaversion.api.minecraft.Particle; import com.viaversion.viaversion.data.entity.DimensionDataImpl; import com.viaversion.viaversion.rewriter.meta.MetaFilter; import com.viaversion.viaversion.rewriter.meta.MetaHandlerEvent; @@ -580,11 +580,11 @@ public abstract class EntityRewriter data = particle.getArgument(0); + data.setValue(protocol.getMappingData().getNewBlockStateId(data.getValue())); } else if (mappings.isItemParticle(id) && protocol.getItemRewriter() != null) { - Particle.ParticleData data = particle.getArguments().get(0); - Item item = data.get(); + Particle.ParticleData data = particle.getArgument(0); + Item item = data.getValue(); protocol.getItemRewriter().handleItemToClient(item); }