Skip to content

Translate villager data and horse flags #494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
guhlutions wants to merge 1 commit into
base: main
Choose a base branch
from
+69 −2
Open

Translate villager data and horse flags #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 68 additions & 1 deletion src/main/java/net/raphimc/viabedrock/protocol/rewriter/EntityMetadataRewriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.BlockPosition;
import com.viaversion.viaversion.api.minecraft.EulerAngle;
import com.viaversion.viaversion.api.minecraft.VillagerData;
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes26_3;
import com.viaversion.viaversion.api.minecraft.entitydata.EntityData;
import com.viaversion.viaversion.api.minecraft.entitydata.EntityDataType;
Expand All @@ -31,6 +32,7 @@
import net.raphimc.viabedrock.api.model.entity.LivingEntity;
import net.raphimc.viabedrock.api.model.entity.properties.EntityProperty;
import net.raphimc.viabedrock.api.model.entity.properties.EntityPropertyList;
import net.raphimc.viabedrock.api.util.MathUtil;
import net.raphimc.viabedrock.protocol.BedrockProtocol;
import net.raphimc.viabedrock.protocol.data.enums.bedrock.ActorDataIds;
import net.raphimc.viabedrock.protocol.data.enums.bedrock.ActorFlags;
Expand Down Expand Up @@ -186,6 +188,20 @@ public static boolean rewrite(final UserConnection user, final Entity entity, fi
javaEntityData.add(new EntityData(entity.getJavaEntityDataIndex(EntityDataFields.LAYING_EGG), VersionedTypes.V26_3.entityDataTypes().booleanType, bedrockFlags.contains(ActorFlags.LAYING_EGG)));
}

if (entity.javaType().isOrHasParent(EntityTypes26_3.ABSTRACT_HORSE)) {
byte horseFlags = 0;
if (bedrockFlags.contains(ActorFlags.TAMED)) {
horseFlags |= 0x02;
}
if (bedrockFlags.contains(ActorFlags.EATING)) {
horseFlags |= 0x10;
}
if (bedrockFlags.contains(ActorFlags.STANDING)) {
horseFlags |= 0x20;
}
javaEntityData.add(new EntityData(entity.getJavaEntityDataIndex(EntityDataFields.FLAGS), VersionedTypes.V26_3.entityDataTypes().byteType, horseFlags));
}

if (entity.javaType().isOrHasParent(EntityTypes26_3.ABSTRACT_CHESTED_HORSE)) {
javaEntityData.add(new EntityData(entity.getJavaEntityDataIndex(EntityDataFields.CHEST), VersionedTypes.V26_3.entityDataTypes().booleanType, bedrockFlags.contains(ActorFlags.CHESTED)));
}
Expand Down Expand Up @@ -254,7 +270,15 @@ public static boolean rewrite(final UserConnection user, final Entity entity, fi
}

}
case VARIANT -> {
case VARIANT, MARK_VARIANT, TRADE_TIER -> {
// Legacy Bedrock villagers use different profession IDs.
if (entity.type().equals("minecraft:villager_v2") || entity.type().equals("minecraft:zombie_villager_v2")) {
rewriteVillagerData(entity, javaEntityData);
break;
}
if (id != ActorDataIds.VARIANT) {
return false;
}
final int variant = readNumber(entityData).intValue();

switch (entity.javaType()) {
Expand Down Expand Up @@ -369,6 +393,9 @@ public static boolean rewrite(final UserConnection user, final Entity entity, fi
}
}
case OWNER -> {
if (entity.javaType().isOrHasParent(EntityTypes26_3.ABSTRACT_HORSE)) {
break; // The Java client gets horse taming state from the horse flags.
}
final long ownerId = readNumber(entityData).longValue();
if (ownerId == -1) {
break; // No owner
Expand Down Expand Up @@ -742,6 +769,46 @@ public static boolean rewrite(final UserConnection user, final Entity entity, fi
return true;
}

private static void rewriteVillagerData(final Entity entity, final List<EntityData> javaEntityData) {
// Java 26.3 uses the built-in villager type and profession registry IDs.
final int type = switch (getIntEntityData(entity, ActorDataIds.MARK_VARIANT)) {
case 1 -> 0; // DESERT
case 2 -> 1; // JUNGLE
case 3 -> 3; // SAVANNA
case 4 -> 4; // SNOW
case 5 -> 5; // SWAMP
case 6 -> 6; // TAIGA
default -> 2; // PLAINS
};
final int profession = switch (getIntEntityData(entity, ActorDataIds.VARIANT)) {
case 1 -> 5; // FARMER
case 2 -> 6; // FISHERMAN
case 3 -> 12; // SHEPHERD
case 4 -> 7; // FLETCHER
case 5 -> 9; // LIBRARIAN
case 6 -> 3; // CARTOGRAPHER
case 7 -> 4; // CLERIC
case 8 -> 1; // ARMORER
case 9 -> 14; // WEAPONSMITH
case 10 -> 13; // TOOLSMITH
case 11 -> 2; // BUTCHER
case 12 -> 8; // LEATHERWORKER
case 13 -> 10; // MASON
case 14 -> 11; // NITWIT
default -> 0; // NONE
};
final int level = MathUtil.clamp(getIntEntityData(entity, ActorDataIds.TRADE_TIER), 0, 4) + 1;
final int index = entity.getJavaEntityDataIndex(EntityDataFields.VILLAGER_DATA);
// Several Bedrock fields can change in the same packet. Send only the latest combined value.
javaEntityData.removeIf(data -> data.id() == index);
javaEntityData.add(new EntityData(index, VersionedTypes.V26_3.entityDataTypes().villagerDataType, new VillagerData(type, profession, level)));
}

private static int getIntEntityData(final Entity entity, final ActorDataIds id) {
final EntityData data = entity.entityData().get(id);
return data != null ? data.<Integer>value() : 0;
}

public static void rewriteProperties(final UserConnection user, final Entity entity, final EntityProperties properties, final List<EntityData> javaEntityData) {
final EntityPropertyTracker epTracker = user.get(EntityPropertyTracker.class);
final CompoundTag registries = BedrockProtocol.MAPPINGS.getJavaRegistries();
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/viabedrock/data/bedrock/entity_data_types.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
"DATA_CHANGE_ON_PICKUP": null,
"DATA_PICKUP_COUNT": null,
"INTERACT_TEXT": null,
"TRADE_TIER": null,
"TRADE_TIER": "Int",
"MAX_TRADE_TIER": null,
"TRADE_EXPERIENCE": null,
"SKIN_ID": null,
Expand Down