From 76e80df94c1fbeb4c92a530bbd2166f83dc0418c Mon Sep 17 00:00:00 2001 From: RednedEpic Date: Sat, 14 Dec 2019 11:40:04 -0600 Subject: [PATCH] Add trader llama entity --- .../entity/living/horse/LlamaEntity.java | 37 +++++++++++++++++++ .../connector/entity/type/EntityType.java | 4 +- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 connector/src/main/java/org/geysermc/connector/entity/living/horse/LlamaEntity.java diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/horse/LlamaEntity.java b/connector/src/main/java/org/geysermc/connector/entity/living/horse/LlamaEntity.java new file mode 100644 index 000000000..6050ff824 --- /dev/null +++ b/connector/src/main/java/org/geysermc/connector/entity/living/horse/LlamaEntity.java @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2019 GeyserMC. http://geysermc.org + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * @author GeyserMC + * @link https://github.com/GeyserMC/Geyser + */ + +package org.geysermc.connector.entity.living.horse; + +import com.nukkitx.math.vector.Vector3f; +import org.geysermc.connector.entity.living.ChestedHorseEntity; +import org.geysermc.connector.entity.type.EntityType; + +public class LlamaEntity extends ChestedHorseEntity { + + public LlamaEntity(long entityId, long geyserId, EntityType entityType, Vector3f position, Vector3f motion, Vector3f rotation) { + super(entityId, geyserId, entityType, position, motion, rotation); + } +} diff --git a/connector/src/main/java/org/geysermc/connector/entity/type/EntityType.java b/connector/src/main/java/org/geysermc/connector/entity/type/EntityType.java index 13e2abe54..1179617d8 100644 --- a/connector/src/main/java/org/geysermc/connector/entity/type/EntityType.java +++ b/connector/src/main/java/org/geysermc/connector/entity/type/EntityType.java @@ -29,6 +29,7 @@ import lombok.Getter; import org.geysermc.connector.entity.*; import org.geysermc.connector.entity.living.*; import org.geysermc.connector.entity.living.horse.HorseEntity; +import org.geysermc.connector.entity.living.horse.LlamaEntity; import org.geysermc.connector.entity.living.monster.GuardianEntity; import org.geysermc.connector.entity.living.monster.ZombieEntity; @@ -54,7 +55,8 @@ public enum EntityType { SKELETON_HORSE(AbstractHorseEntity.class, 26, 1.6f, 1.3965f), ZOMBIE_HORSE(AbstractHorseEntity.class, 27, 1.6f, 1.3965f), POLAR_BEAR(AnimalEntity.class, 28, 1.4f, 1.3f), - LLAMA(ChestedHorseEntity.class, 29, 1.87f, 0.9f), + LLAMA(LlamaEntity.class, 29, 1.87f, 0.9f), + TRADER_LLAMA(LlamaEntity.class, 29, 1.187f, 0.9f), PARROT(TameableEntity.class, 30, 0.9f, 0.5f), DOLPHIN(WaterEntity.class, 31, 0.6f, 0.9f), ZOMBIE(ZombieEntity.class, 32, 1.8f, 0.6f, 0.6f, 1.62f),