GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-20 15:29:27 +00:00
Code Issues Releases Activity

Use molang to fix falling leaves & firework particles' color (#5522)

Browse Source 
* Use molang to fix firework particle color

* Fix leaf particle color
This commit is contained in:
rtm516
2025-05-05 19:14:44 +01:00
committed by GitHub
parent 3c51e46d6e
commit 0edd85c7b2
1 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/src/main/java/org/geysermc/geyser/translator/protocol/java/level/JavaLevelParticlesTranslator.java
View File

@@ -27,6 +27,7 @@ package org.geysermc.geyser.translator.protocol.java.level;
import org.geysermc.mcprotocollib.protocol.data.game.item.ItemStack; import org.geysermc.mcprotocollib.protocol.data.game.item.ItemStack;
import org.geysermc.mcprotocollib.protocol.data.game.level.particle.BlockParticleData; import org.geysermc.mcprotocollib.protocol.data.game.level.particle.BlockParticleData;
import org.geysermc.mcprotocollib.protocol.data.game.level.particle.ColorParticleData;
import org.geysermc.mcprotocollib.protocol.data.game.level.particle.DustParticleData; import org.geysermc.mcprotocollib.protocol.data.game.level.particle.DustParticleData;
import org.geysermc.mcprotocollib.protocol.data.game.level.particle.ItemParticleData; import org.geysermc.mcprotocollib.protocol.data.game.level.particle.ItemParticleData;
import org.geysermc.mcprotocollib.protocol.data.game.level.particle.Particle; import org.geysermc.mcprotocollib.protocol.data.game.level.particle.Particle;
@@ -174,6 +175,33 @@ public class JavaLevelParticlesTranslator extends PacketTranslator<ClientboundLe
return packet; return packet;
}; };
} }
case FIREWORK -> {
int dimensionId = DimensionUtils.javaToBedrock(session);
return (position) -> {
SpawnParticleEffectPacket particlePacket = new SpawnParticleEffectPacket();
particlePacket.setIdentifier("minecraft:sparkler_emitter");
particlePacket.setDimensionId(dimensionId);
particlePacket.setPosition(position);
particlePacket.setMolangVariablesJson(Optional.of("[{ \"name\": \"variable.color\", \"value\": { \"type\": \"member_array\", \"value\": [{\"name\": \".r\", \"value\": { \"type\": \"float\", \"value\": 1.0}},{\"name\": \".g\", \"value\": {\"type\": \"float\", \"value\": 1.0}},{\"name\": \".b\", \"value\": {\"type\": \"float\", \"value\": 1.0}},{\"name\": \".a\", \"value\": {\"type\": \"float\", \"value\": 1.0}}]}}]"));
return particlePacket;
};
}
case TINTED_LEAVES -> {
int dimensionId = DimensionUtils.javaToBedrock(session);
ColorParticleData data = (ColorParticleData) particle.getData();
int rgbData = data.getColor();
float red = ((rgbData >> 16) & 0xFF) / 255f;
float green = ((rgbData >> 8) & 0xFF) / 255f;
float blue = (rgbData & 0xFF) / 255f;
return (position) -> {
SpawnParticleEffectPacket particlePacket = new SpawnParticleEffectPacket();
particlePacket.setIdentifier("minecraft:biome_tinted_leaves_particle");
particlePacket.setDimensionId(dimensionId);
particlePacket.setPosition(position);
particlePacket.setMolangVariablesJson(Optional.of("[{ \"name\": \"variable.color\", \"value\": { \"type\": \"member_array\", \"value\": [{\"name\": \".r\", \"value\": { \"type\": \"float\", \"value\": " + red + "}},{\"name\": \".g\", \"value\": {\"type\": \"float\", \"value\": " + green + "}},{\"name\": \".b\", \"value\": {\"type\": \"float\", \"value\": " + blue + "}}]}}]"));
return particlePacket;
};
}
default -> { default -> {
ParticleMapping particleMapping = Registries.PARTICLES.get(particle.getType()); ParticleMapping particleMapping = Registries.PARTICLES.get(particle.getType());
if (particleMapping == null) { //TODO ensure no particle can be null if (particleMapping == null) { //TODO ensure no particle can be null