mirror of
https://github.com/GeyserMC/Geyser.git
synced 2024-08-14 23:57:35 +00:00
Fix evoker fangs not being visible
Also implement sound when attacking
This commit is contained in:
parent
24f09e016d
commit
6eb069cc13
3 changed files with 78 additions and 3 deletions
|
@ -79,7 +79,7 @@ public final class EntityDefinitions {
|
||||||
public static final EntityDefinition<ThrowableItemEntity> ENDER_PEARL;
|
public static final EntityDefinition<ThrowableItemEntity> ENDER_PEARL;
|
||||||
public static final EntityDefinition<EnderCrystalEntity> END_CRYSTAL;
|
public static final EntityDefinition<EnderCrystalEntity> END_CRYSTAL;
|
||||||
public static final EntityDefinition<SpellcasterIllagerEntity> EVOKER;
|
public static final EntityDefinition<SpellcasterIllagerEntity> EVOKER;
|
||||||
public static final EntityDefinition<Entity> EVOKER_FANGS;
|
public static final EntityDefinition<EvokerFangsEntity> EVOKER_FANGS;
|
||||||
public static final EntityDefinition<ThrowableItemEntity> EXPERIENCE_BOTTLE;
|
public static final EntityDefinition<ThrowableItemEntity> EXPERIENCE_BOTTLE;
|
||||||
public static final EntityDefinition<ExpOrbEntity> EXPERIENCE_ORB;
|
public static final EntityDefinition<ExpOrbEntity> EXPERIENCE_ORB;
|
||||||
public static final EntityDefinition<Entity> EYE_OF_ENDER;
|
public static final EntityDefinition<Entity> EYE_OF_ENDER;
|
||||||
|
@ -225,7 +225,7 @@ public final class EntityDefinitions {
|
||||||
.type(EntityType.EXPERIENCE_ORB)
|
.type(EntityType.EXPERIENCE_ORB)
|
||||||
.identifier("minecraft:xp_orb")
|
.identifier("minecraft:xp_orb")
|
||||||
.build();
|
.build();
|
||||||
EVOKER_FANGS = EntityDefinition.builder(entityBase.factory()) // No entity metadata to listen to as of 1.18.1
|
EVOKER_FANGS = EntityDefinition.builder(EvokerFangsEntity::new) // No entity metadata to listen to as of 1.18.1
|
||||||
.type(EntityType.EVOKER_FANGS)
|
.type(EntityType.EVOKER_FANGS)
|
||||||
.height(0.8f).width(0.5f)
|
.height(0.8f).width(0.5f)
|
||||||
.identifier("minecraft:evocation_fang")
|
.identifier("minecraft:evocation_fang")
|
||||||
|
|
|
@ -0,0 +1,71 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2019-2021 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;
|
||||||
|
|
||||||
|
import com.nukkitx.math.vector.Vector3f;
|
||||||
|
import com.nukkitx.protocol.bedrock.data.entity.EntityData;
|
||||||
|
import com.nukkitx.protocol.bedrock.data.entity.EntityFlag;
|
||||||
|
import com.nukkitx.protocol.bedrock.packet.PlaySoundPacket;
|
||||||
|
import org.geysermc.geyser.entity.EntityDefinition;
|
||||||
|
import org.geysermc.geyser.session.GeyserSession;
|
||||||
|
|
||||||
|
import java.util.UUID;
|
||||||
|
import java.util.concurrent.ThreadLocalRandom;
|
||||||
|
|
||||||
|
public class EvokerFangsEntity extends Entity implements Tickable {
|
||||||
|
private int limitedLife = 22;
|
||||||
|
private boolean attackStarted = false;
|
||||||
|
|
||||||
|
public EvokerFangsEntity(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);
|
||||||
|
// As of 1.18.2 Bedrock, this line is required for the entity to be visible
|
||||||
|
// 22 is the starting number on Java Edition
|
||||||
|
dirtyMetadata.put(EntityData.LIMITED_LIFE, this.limitedLife);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void tick() {
|
||||||
|
if (attackStarted) {
|
||||||
|
if (--this.limitedLife > 0 && this.limitedLife % 2 == 0) { // Matches Bedrock behavior
|
||||||
|
dirtyMetadata.put(EntityData.LIMITED_LIFE, this.limitedLife);
|
||||||
|
updateBedrockMetadata();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setAttackStarted() {
|
||||||
|
this.attackStarted = true;
|
||||||
|
if (!getFlag(EntityFlag.SILENT)) {
|
||||||
|
// Play the chomp sound
|
||||||
|
PlaySoundPacket packet = new PlaySoundPacket();
|
||||||
|
packet.setPosition(this.position);
|
||||||
|
packet.setSound("mob.evocation_fangs.attack");
|
||||||
|
packet.setVolume(1.0f);
|
||||||
|
packet.setPitch(ThreadLocalRandom.current().nextFloat() * 0.2f + 0.85f);
|
||||||
|
session.sendUpstreamPacket(packet);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -34,6 +34,7 @@ import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
|
||||||
import com.nukkitx.protocol.bedrock.packet.*;
|
import com.nukkitx.protocol.bedrock.packet.*;
|
||||||
import org.geysermc.geyser.entity.type.Entity;
|
import org.geysermc.geyser.entity.type.Entity;
|
||||||
import org.geysermc.geyser.entity.EntityDefinitions;
|
import org.geysermc.geyser.entity.EntityDefinitions;
|
||||||
|
import org.geysermc.geyser.entity.type.EvokerFangsEntity;
|
||||||
import org.geysermc.geyser.entity.type.FishingHookEntity;
|
import org.geysermc.geyser.entity.type.FishingHookEntity;
|
||||||
import org.geysermc.geyser.entity.type.LivingEntity;
|
import org.geysermc.geyser.entity.type.LivingEntity;
|
||||||
import org.geysermc.geyser.session.GeyserSession;
|
import org.geysermc.geyser.session.GeyserSession;
|
||||||
|
@ -178,8 +179,11 @@ public class JavaEntityEventTranslator extends PacketTranslator<ClientboundEntit
|
||||||
entityEventPacket.setType(EntityEventType.GOLEM_FLOWER_WITHDRAW);
|
entityEventPacket.setType(EntityEventType.GOLEM_FLOWER_WITHDRAW);
|
||||||
break;
|
break;
|
||||||
case IRON_GOLEM_ATTACK:
|
case IRON_GOLEM_ATTACK:
|
||||||
if (entity.getDefinition() == EntityDefinitions.IRON_GOLEM) {
|
if (entity.getDefinition() == EntityDefinitions.IRON_GOLEM || entity.getDefinition() == EntityDefinitions.EVOKER_FANGS) {
|
||||||
entityEventPacket.setType(EntityEventType.ATTACK_START);
|
entityEventPacket.setType(EntityEventType.ATTACK_START);
|
||||||
|
if (entity.getDefinition() == EntityDefinitions.EVOKER_FANGS) {
|
||||||
|
((EvokerFangsEntity) entity).setAttackStarted();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case RABBIT_JUMP_OR_MINECART_SPAWNER_DELAY_RESET:
|
case RABBIT_JUMP_OR_MINECART_SPAWNER_DELAY_RESET:
|
||||||
|
|
Loading…
Reference in a new issue