From e7ad3970ccd764d8b972a6abae9549a26af5812e Mon Sep 17 00:00:00 2001 From: KennyTV Date: Wed, 9 Dec 2020 11:47:40 +0100 Subject: [PATCH] Complete vibration particle reading --- .../types/minecraft/Particle1_17Type.java | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/common/src/main/java/us/myles/ViaVersion/api/type/types/minecraft/Particle1_17Type.java b/common/src/main/java/us/myles/ViaVersion/api/type/types/minecraft/Particle1_17Type.java index aad6e7aa4..92dc29cf9 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/type/types/minecraft/Particle1_17Type.java +++ b/common/src/main/java/us/myles/ViaVersion/api/type/types/minecraft/Particle1_17Type.java @@ -1,6 +1,7 @@ package us.myles.ViaVersion.api.type.types.minecraft; import io.netty.buffer.ByteBuf; +import us.myles.ViaVersion.api.Via; import us.myles.ViaVersion.api.type.Type; import us.myles.ViaVersion.api.type.types.Particle; @@ -24,31 +25,37 @@ public class Particle1_17Type extends Type { Particle particle = new Particle(type); switch (type) { - // Block / Falling Dust - case 3: - case 24: + case 3: // Block + case 24: // Falling dust particle.getArguments().add(new Particle.ParticleData(Type.VAR_INT, Type.VAR_INT.readPrimitive(buffer))); // Flat Block break; - // Dust - case 14: - case 15: + case 14: // Dust + case 15: // Dust transition particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buffer))); // Red 0 - 1 particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buffer))); // Green 0 - 1 particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buffer))); // Blue 0 - 1 particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buffer))); // Scale 0.01 - 4 if (type == 15) { // Transition to color - particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buffer))); // Red 0 - 1 - particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buffer))); // Green 0 - 1 - particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buffer))); // Blue 0 - 1 + particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buffer))); // Red + particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buffer))); // Green + particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, Type.FLOAT.readPrimitive(buffer))); // Blue } break; - // Item - case 33: + case 33: // Item particle.getArguments().add(new Particle.ParticleData(Type.FLAT_VAR_INT_ITEM, Type.FLAT_VAR_INT_ITEM.read(buffer))); // Flat item break; - case 36: - + case 36: // Vibration path + particle.getArguments().add(new Particle.ParticleData(Type.POSITION1_14, Type.POSITION1_14.read(buffer))); // From block pos + String resourceLocation = Type.STRING.read(buffer); + if (resourceLocation.equals("block")) { + particle.getArguments().add(new Particle.ParticleData(Type.POSITION1_14, Type.POSITION1_14.read(buffer))); // Target block pos + } else if (resourceLocation.equals("entity")) { + particle.getArguments().add(new Particle.ParticleData(Type.POSITION1_14, Type.POSITION1_14.read(buffer))); // Target entity + } else { + Via.getPlatform().getLogger().warning("Unknown vibration path position source type: " + resourceLocation); + } + particle.getArguments().add(new Particle.ParticleData(Type.VAR_INT, Type.VAR_INT.readPrimitive(buffer))); // Arrival in ticks } return particle; }