mirror of
https://github.com/GeyserMC/Geyser.git
synced 2024-08-14 23:57:35 +00:00
Basic Armadillo structure
This commit is contained in:
parent
bbaffb2ab3
commit
a1534e4535
3 changed files with 46 additions and 2 deletions
|
@ -53,6 +53,7 @@ import org.geysermc.geyser.translator.text.MessageTranslator;
|
||||||
public final class EntityDefinitions {
|
public final class EntityDefinitions {
|
||||||
public static final EntityDefinition<AllayEntity> ALLAY;
|
public static final EntityDefinition<AllayEntity> ALLAY;
|
||||||
public static final EntityDefinition<AreaEffectCloudEntity> AREA_EFFECT_CLOUD;
|
public static final EntityDefinition<AreaEffectCloudEntity> AREA_EFFECT_CLOUD;
|
||||||
|
public static final EntityDefinition<ArmadilloEntity> ARMADILLO;
|
||||||
public static final EntityDefinition<ArmorStandEntity> ARMOR_STAND;
|
public static final EntityDefinition<ArmorStandEntity> ARMOR_STAND;
|
||||||
public static final EntityDefinition<TippedArrowEntity> ARROW;
|
public static final EntityDefinition<TippedArrowEntity> ARROW;
|
||||||
public static final EntityDefinition<AxolotlEntity> AXOLOTL;
|
public static final EntityDefinition<AxolotlEntity> AXOLOTL;
|
||||||
|
@ -770,6 +771,11 @@ public final class EntityDefinitions {
|
||||||
|
|
||||||
// Extends ageable
|
// Extends ageable
|
||||||
{
|
{
|
||||||
|
ARMADILLO = EntityDefinition.inherited(ArmadilloEntity::new, ageableEntityBase)
|
||||||
|
.type(EntityType.ARMADILLO)
|
||||||
|
.height(0.65f).width(0.7f)
|
||||||
|
.addTranslator(null)
|
||||||
|
.build();
|
||||||
AXOLOTL = EntityDefinition.inherited(AxolotlEntity::new, ageableEntityBase)
|
AXOLOTL = EntityDefinition.inherited(AxolotlEntity::new, ageableEntityBase)
|
||||||
.type(EntityType.AXOLOTL)
|
.type(EntityType.AXOLOTL)
|
||||||
.height(0.42f).width(0.7f)
|
.height(0.42f).width(0.7f)
|
||||||
|
|
|
@ -0,0 +1,38 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2019-2024 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.geyser.entity.type.living.animal;
|
||||||
|
|
||||||
|
import org.cloudburstmc.math.vector.Vector3f;
|
||||||
|
import org.geysermc.geyser.entity.EntityDefinition;
|
||||||
|
import org.geysermc.geyser.session.GeyserSession;
|
||||||
|
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
|
public class ArmadilloEntity extends AnimalEntity {
|
||||||
|
public ArmadilloEntity(GeyserSession session, int entityId, long geyserId, UUID uuid, EntityDefinition<?> definition, Vector3f position, Vector3f motion, float yaw, float pitch, float headYaw) {
|
||||||
|
super(session, entityId, geyserId, uuid, definition, position, motion, yaw, pitch, headYaw);
|
||||||
|
}
|
||||||
|
}
|
|
@ -98,9 +98,9 @@ public class ItemMappings implements DefinitionRegistry<ItemDefinition> {
|
||||||
return javaId >= 0 && javaId < this.items.length ? this.items[javaId] : ItemMapping.AIR;
|
return javaId >= 0 && javaId < this.items.length ? this.items[javaId] : ItemMapping.AIR;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@NonNull
|
||||||
public ItemMapping getMapping(Item javaItem) {
|
public ItemMapping getMapping(Item javaItem) {
|
||||||
return getMapping(javaItem.javaIdentifier());
|
return getMapping(javaItem.javaId());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in a new issue