Apple/Geyser
1
0
Fork 0
forked from GeyserMC/Geyser
Code Issues Pull requests Projects Releases Wiki Activity

Initial villager types support

Browse source
This commit is contained in:
DoctorMacc 2020-04-09 19:33:52 -04:00
parent 6dbb09de81
commit d0a7f6282c
3 changed files with 73 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
connector/src/main/java/org/geysermc/connector/entity/living/AbstractMerchantEntity.java → connector/src/main/java/org/geysermc/connector/entity/living/merchant/AbstractMerchantEntity.java
View file

@ -23,9 +23,10 @@
* @link https://github.com/GeyserMC/Geyser * @link https://github.com/GeyserMC/Geyser
*/ */
package org.geysermc.connector.entity.living; package org.geysermc.connector.entity.living.merchant;
import com.nukkitx.math.vector.Vector3f; import com.nukkitx.math.vector.Vector3f;
import org.geysermc.connector.entity.living.AgeableEntity;
import org.geysermc.connector.entity.type.EntityType; import org.geysermc.connector.entity.type.EntityType;
public class AbstractMerchantEntity extends AgeableEntity { public class AbstractMerchantEntity extends AgeableEntity {

69
connector/src/main/java/org/geysermc/connector/entity/living/merchant/VillagerEntity.java Normal file
View file

@ -0,0 +1,69 @@
package org.geysermc.connector.entity.living.merchant;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.VillagerData;
import com.nukkitx.math.vector.Vector3f;
import com.nukkitx.protocol.bedrock.data.EntityData;
import com.nukkitx.protocol.bedrock.packet.AddEntityPacket;
import it.unimi.dsi.fastutil.ints.Int2IntMap;
import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
import org.geysermc.connector.entity.type.EntityType;
import org.geysermc.connector.network.session.GeyserSession;
public class VillagerEntity extends AbstractMerchantEntity {
public static Int2IntMap VILLAGER_VARIANTS = new Int2IntOpenHashMap();
static {
VILLAGER_VARIANTS.put(1, 8);
VILLAGER_VARIANTS.put(2, 11);
VILLAGER_VARIANTS.put(3, 6);
VILLAGER_VARIANTS.put(4, 7);
VILLAGER_VARIANTS.put(5, 1);
VILLAGER_VARIANTS.put(6, 2);
VILLAGER_VARIANTS.put(7, 4);
VILLAGER_VARIANTS.put(8, 12);
VILLAGER_VARIANTS.put(9, 5);
VILLAGER_VARIANTS.put(10, 13);
VILLAGER_VARIANTS.put(11, 14);
VILLAGER_VARIANTS.put(12, 3);
VILLAGER_VARIANTS.put(13, 10);
VILLAGER_VARIANTS.put(14, 9);
}
public VillagerEntity(long entityId, long geyserId, EntityType entityType, Vector3f position, Vector3f motion, Vector3f rotation) {
super(entityId, geyserId, entityType, position, motion, rotation);
}
@Override
public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) {
System.out.println("ID: " + entityMetadata.getId() + ", " + entityMetadata.getValue());
if (entityMetadata.getId() == 17) {
VillagerData villagerData = (VillagerData) entityMetadata.getValue();
metadata.put(EntityData.VARIANT, VILLAGER_VARIANTS.get(villagerData.getProfession()));
metadata.put(EntityData.SKIN_ID, villagerData.getType());
metadata.put(EntityData.TRADE_TIER, villagerData.getLevel() - 1);
}
super.updateBedrockMetadata(entityMetadata, session);
}
@Override
public void spawnEntity(GeyserSession session) {
AddEntityPacket addEntityPacket = new AddEntityPacket();
// "v2" or else it's the legacy villager
addEntityPacket.setIdentifier("minecraft:villager_v2");
addEntityPacket.setRuntimeEntityId(geyserId);
addEntityPacket.setUniqueEntityId(geyserId);
addEntityPacket.setPosition(position);
addEntityPacket.setMotion(motion);
addEntityPacket.setRotation(getBedrockRotation());
addEntityPacket.setEntityType(entityType.getType());
addEntityPacket.getMetadata().putAll(metadata);
valid = true;
session.getUpstream().sendPacket(addEntityPacket);
session.getConnector().getLogger().debug("Spawned entity " + entityType + " at location " + position + " with id " + geyserId + " (java id " + entityId + ")");
}
}

3
connector/src/main/java/org/geysermc/connector/entity/type/EntityType.java
View file

@ -33,6 +33,7 @@ import org.geysermc.connector.entity.living.animal.tameable.CatEntity;
import org.geysermc.connector.entity.living.animal.tameable.TameableEntity; import org.geysermc.connector.entity.living.animal.tameable.TameableEntity;
import org.geysermc.connector.entity.living.animal.horse.*; import org.geysermc.connector.entity.living.animal.horse.*;
import org.geysermc.connector.entity.living.animal.tameable.WolfEntity; import org.geysermc.connector.entity.living.animal.tameable.WolfEntity;
import org.geysermc.connector.entity.living.merchant.*;
import org.geysermc.connector.entity.living.monster.*; import org.geysermc.connector.entity.living.monster.*;
import org.geysermc.connector.entity.living.monster.raid.AbstractIllagerEntity; import org.geysermc.connector.entity.living.monster.raid.AbstractIllagerEntity;
import org.geysermc.connector.entity.living.monster.raid.RaidParticipantEntity; import org.geysermc.connector.entity.living.monster.raid.RaidParticipantEntity;
@ -46,7 +47,7 @@ public enum EntityType {
PIG(PigEntity.class, 12, 0.9f), PIG(PigEntity.class, 12, 0.9f),
SHEEP(SheepEntity.class, 13, 1.3f, 0.9f), SHEEP(SheepEntity.class, 13, 1.3f, 0.9f),
WOLF(WolfEntity.class, 14, 0.85f, 0.6f), WOLF(WolfEntity.class, 14, 0.85f, 0.6f),
VILLAGER(AbstractMerchantEntity.class, 15, 1.8f, 0.6f, 0.6f, 1.62f), VILLAGER(VillagerEntity.class, 15, 1.8f, 0.6f, 0.6f, 1.62f),
MOOSHROOM(AnimalEntity.class, 16, 1.4f, 0.9f), MOOSHROOM(AnimalEntity.class, 16, 1.4f, 0.9f),
SQUID(WaterEntity.class, 17, 0.8f), SQUID(WaterEntity.class, 17, 0.8f),
RABBIT(RabbitEntity.class, 18, 0.5f, 0.4f), RABBIT(RabbitEntity.class, 18, 0.5f, 0.4f),