Upstream/ViaBackwards
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaBackwards.git synced 2025-02-22 02:51:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move particles type handling into generic handler

Browse Source 
This allows for handling of data for untracked entities
This commit is contained in:
Nassim Jahnke 2024-06-18 10:00:20 +02:00
parent 4dded860ce
commit da5837d794
No known key found for this signature in database
GPG Key ID: EF6771C01F6EF02F
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_5to1_20_3/rewriter/EntityPacketRewriter1_20_5.java
View File

@ -380,23 +380,32 @@ public final class EntityPacketRewriter1_20_5 extends EntityRewriter<Clientbound
@Override
protected void registerRewrites() {
filter().mapDataType(typeId -> {
filter().handler((event, data) -> {
final int typeId = data.dataType().typeId();
if (typeId == Types1_20_5.ENTITY_DATA_TYPES.particlesType.typeId()) {
// Handled with living entity
return Types1_20_5.ENTITY_DATA_TYPES.particlesType;
final Particle[] particles = data.value();
int color = 0;
for (final Particle particle : particles) {
if (particle.id() == protocol.getMappingData().getParticleMappings().id("entity_effect")) {
// Remove color argument, use one of them for the ambient particle color
color = particle.<Integer>removeArgument(0).getValue();
}
}
data.setTypeAndValue(Types1_20_3.ENTITY_DATA_TYPES.varIntType, removeAlpha(color));
return;
}
int id = typeId;
if (typeId >= Types1_20_5.ENTITY_DATA_TYPES.wolfVariantType.typeId()) {
if (typeId >= Types1_20_5.ENTITY_DATA_TYPES.armadilloState.typeId()) {
id--;
}
if (typeId >= Types1_20_5.ENTITY_DATA_TYPES.armadilloState.typeId()) {
if (typeId >= Types1_20_5.ENTITY_DATA_TYPES.wolfVariantType.typeId()) {
id--;
}
if (typeId >= Types1_20_5.ENTITY_DATA_TYPES.particlesType.typeId()) {
id--;
}
return Types1_20_3.ENTITY_DATA_TYPES.byId(id);
data.setDataType(Types1_20_3.ENTITY_DATA_TYPES.byId(id));
});
registerMetaTypeHandler1_20_3(