mirror of
https://github.com/CitizensDev/Citizens2.git
synced 2025-02-03 22:12:23 +01:00
Add camel support
This commit is contained in:
fullwall
parent
dffccdd2d4
commit
b4b54dabdc
@ -0,0 +1,247 @@
|
||||
package net.citizensnpcs.nms.v1_19_R2.entity;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.craftbukkit.v1_19_R2.CraftServer;
|
||||
import org.bukkit.craftbukkit.v1_19_R2.entity.CraftCamel;
|
||||
import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity;
|
||||
import org.bukkit.util.Vector;
|
||||
|
||||
import net.citizensnpcs.api.event.NPCEnderTeleportEvent;
|
||||
import net.citizensnpcs.api.event.NPCKnockbackEvent;
|
||||
import net.citizensnpcs.api.npc.NPC;
|
||||
import net.citizensnpcs.nms.v1_19_R2.util.ForwardingNPCHolder;
|
||||
import net.citizensnpcs.nms.v1_19_R2.util.NMSImpl;
|
||||
import net.citizensnpcs.npc.CitizensNPC;
|
||||
import net.citizensnpcs.npc.ai.NPCHolder;
|
||||
import net.citizensnpcs.trait.HorseModifiers;
|
||||
import net.citizensnpcs.util.NMS;
|
||||
import net.citizensnpcs.util.Util;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.PositionImpl;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
import net.minecraft.network.syncher.EntityDataAccessor;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.sounds.SoundEvent;
|
||||
import net.minecraft.tags.TagKey;
|
||||
import net.minecraft.world.damagesource.DamageSource;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.EntityType;
|
||||
import net.minecraft.world.entity.animal.camel.Camel;
|
||||
import net.minecraft.world.entity.vehicle.AbstractMinecart;
|
||||
import net.minecraft.world.entity.vehicle.Boat;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraft.world.level.material.Fluid;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
|
||||
public class CamelController extends MobEntityController {
|
||||
public CamelController() {
|
||||
super(EntityCamelNPC.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public org.bukkit.entity.Camel getBukkitEntity() {
|
||||
return (org.bukkit.entity.Camel) super.getBukkitEntity();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void spawn(Location at, NPC npc) {
|
||||
npc.getOrAddTrait(HorseModifiers.class);
|
||||
super.spawn(at, npc);
|
||||
}
|
||||
|
||||
public static class CamelNPC extends CraftCamel implements ForwardingNPCHolder {
|
||||
public CamelNPC(EntityCamelNPC entity) {
|
||||
super((CraftServer) Bukkit.getServer(), entity);
|
||||
}
|
||||
}
|
||||
|
||||
public static class EntityCamelNPC extends Camel implements NPCHolder {
|
||||
boolean calledNMSHeight = false;
|
||||
private final CitizensNPC npc;
|
||||
|
||||
public EntityCamelNPC(EntityType<? extends Camel> types, Level level) {
|
||||
this(types, level, null);
|
||||
}
|
||||
|
||||
public EntityCamelNPC(EntityType<? extends Camel> types, Level level, NPC npc) {
|
||||
super(types, level);
|
||||
this.npc = (CitizensNPC) npc;
|
||||
if (npc != null) {
|
||||
((org.bukkit.entity.Camel) getBukkitEntity())
|
||||
.setDomestication(((org.bukkit.entity.Camel) getBukkitEntity()).getMaxDomestication());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean canRide(Entity entity) {
|
||||
if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {
|
||||
return !npc.isProtected();
|
||||
}
|
||||
return super.canRide(entity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean causeFallDamage(float f, float f1, DamageSource damagesource) {
|
||||
if (npc == null || !npc.isFlyable()) {
|
||||
return super.causeFallDamage(f, f1, damagesource);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void checkDespawn() {
|
||||
if (npc == null) {
|
||||
super.checkDespawn();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void checkFallDamage(double d0, boolean flag, BlockState iblockdata, BlockPos blockposition) {
|
||||
if (npc == null || !npc.isFlyable()) {
|
||||
super.checkFallDamage(d0, flag, iblockdata, blockposition);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void customServerAiStep() {
|
||||
if (npc == null) {
|
||||
super.customServerAiStep();
|
||||
} else {
|
||||
NMSImpl.updateMinecraftAIState(npc, this);
|
||||
if (npc.useMinecraftAI()) {
|
||||
super.customServerAiStep();
|
||||
}
|
||||
NMS.setStepHeight(getBukkitEntity(), 1);
|
||||
npc.update();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void dismountTo(double d0, double d1, double d2) {
|
||||
if (npc == null) {
|
||||
super.dismountTo(d0, d1, d2);
|
||||
return;
|
||||
}
|
||||
NPCEnderTeleportEvent event = new NPCEnderTeleportEvent(npc);
|
||||
Bukkit.getPluginManager().callEvent(event);
|
||||
if (!event.isCancelled()) {
|
||||
super.dismountTo(d0, d1, d2);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected SoundEvent getAmbientSound() {
|
||||
return NMSImpl.getSoundEffect(npc, super.getAmbientSound(), NPC.AMBIENT_SOUND_METADATA);
|
||||
}
|
||||
|
||||
@Override
|
||||
public CraftEntity getBukkitEntity() {
|
||||
if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
|
||||
NMSImpl.setBukkitEntity(this, new CamelNPC(this));
|
||||
}
|
||||
return super.getBukkitEntity();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected SoundEvent getDeathSound() {
|
||||
return NMSImpl.getSoundEffect(npc, super.getDeathSound(), NPC.DEATH_SOUND_METADATA);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected SoundEvent getHurtSound(DamageSource damagesource) {
|
||||
return NMSImpl.getSoundEffect(npc, super.getHurtSound(damagesource), NPC.HURT_SOUND_METADATA);
|
||||
}
|
||||
|
||||
@Override
|
||||
public NPC getNPC() {
|
||||
return npc;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isLeashed() {
|
||||
return NMSImpl.isLeashed(this, super.isLeashed());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void knockback(double strength, double dx, double dz) {
|
||||
NPCKnockbackEvent event = new NPCKnockbackEvent(npc, strength, dx, dz);
|
||||
Bukkit.getPluginManager().callEvent(event);
|
||||
Vector kb = event.getKnockbackVector();
|
||||
if (!event.isCancelled()) {
|
||||
super.knockback(event.getStrength(), kb.getX(), kb.getZ());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onClimbable() {
|
||||
if (npc == null || !npc.isFlyable()) {
|
||||
return super.onClimbable();
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onSyncedDataUpdated(EntityDataAccessor<?> datawatcherobject) {
|
||||
if (npc != null && !calledNMSHeight) {
|
||||
calledNMSHeight = true;
|
||||
NMSImpl.checkAndUpdateHeight(this, datawatcherobject);
|
||||
calledNMSHeight = false;
|
||||
return;
|
||||
}
|
||||
|
||||
super.onSyncedDataUpdated(datawatcherobject);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void push(double x, double y, double z) {
|
||||
Vector vector = Util.callPushEvent(npc, x, y, z);
|
||||
if (vector != null) {
|
||||
super.push(vector.getX(), vector.getY(), vector.getZ());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void push(Entity entity) {
|
||||
// this method is called by both the entities involved - cancelling
|
||||
// it will not stop the NPC from moving.
|
||||
super.push(entity);
|
||||
if (npc != null) {
|
||||
Util.callCollisionEvent(npc, entity.getBukkitEntity());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean save(CompoundTag save) {
|
||||
return npc == null ? super.save(save) : false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Entity teleportTo(ServerLevel worldserver, PositionImpl location) {
|
||||
if (npc == null)
|
||||
return super.teleportTo(worldserver, location);
|
||||
return NMSImpl.teleportAcrossWorld(this, worldserver, location);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void travel(Vec3 vec3d) {
|
||||
if (npc == null || !npc.isFlyable()) {
|
||||
super.travel(vec3d);
|
||||
} else {
|
||||
NMSImpl.flyingMoveLogic(this, vec3d);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tagkey, double d0) {
|
||||
Vec3 old = getDeltaMovement().add(0, 0, 0);
|
||||
boolean res = super.updateFluidHeightAndDoFluidPushing(tagkey, d0);
|
||||
if (!npc.isPushableByFluids()) {
|
||||
setDeltaMovement(old);
|
||||
}
|
||||
return res;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -53,6 +53,7 @@ import net.minecraft.world.entity.animal.Turtle;
|
||||
import net.minecraft.world.entity.animal.Wolf;
|
||||
import net.minecraft.world.entity.animal.allay.Allay;
|
||||
import net.minecraft.world.entity.animal.axolotl.Axolotl;
|
||||
import net.minecraft.world.entity.animal.camel.Camel;
|
||||
import net.minecraft.world.entity.animal.frog.Frog;
|
||||
import net.minecraft.world.entity.animal.frog.Tadpole;
|
||||
import net.minecraft.world.entity.animal.goat.Goat;
|
||||
@ -320,6 +321,7 @@ public class CustomEntityRegistry extends DefaultedMappedRegistry {
|
||||
minecraftClassMap.put(EntityType.BOAT, Boat.class);
|
||||
minecraftClassMap.put(EntityType.CHEST_BOAT, ChestBoat.class);
|
||||
minecraftClassMap.put(EntityType.CAT, Cat.class);
|
||||
minecraftClassMap.put(EntityType.CAMEL, Camel.class);
|
||||
minecraftClassMap.put(EntityType.CAVE_SPIDER, CaveSpider.class);
|
||||
minecraftClassMap.put(EntityType.CHICKEN, Chicken.class);
|
||||
minecraftClassMap.put(EntityType.COD, Cod.class);
|
||||
|
||||
@ -100,6 +100,7 @@ import net.citizensnpcs.nms.v1_19_R2.entity.AxolotlController;
|
||||
import net.citizensnpcs.nms.v1_19_R2.entity.BatController;
|
||||
import net.citizensnpcs.nms.v1_19_R2.entity.BeeController;
|
||||
import net.citizensnpcs.nms.v1_19_R2.entity.BlazeController;
|
||||
import net.citizensnpcs.nms.v1_19_R2.entity.CamelController;
|
||||
import net.citizensnpcs.nms.v1_19_R2.entity.CatController;
|
||||
import net.citizensnpcs.nms.v1_19_R2.entity.CaveSpiderController;
|
||||
import net.citizensnpcs.nms.v1_19_R2.entity.ChickenController;
|
||||
@ -852,6 +853,7 @@ public class NMSImpl implements NMSBridge {
|
||||
EntityControllers.setEntityControllerForType(EntityType.BLAZE, BlazeController.class);
|
||||
EntityControllers.setEntityControllerForType(EntityType.BOAT, BoatController.class);
|
||||
EntityControllers.setEntityControllerForType(EntityType.CAT, CatController.class);
|
||||
EntityControllers.setEntityControllerForType(EntityType.CAMEL, CamelController.class);
|
||||
EntityControllers.setEntityControllerForType(EntityType.CAVE_SPIDER, CaveSpiderController.class);
|
||||
EntityControllers.setEntityControllerForType(EntityType.CHEST_BOAT, ChestBoatController.class);
|
||||
EntityControllers.setEntityControllerForType(EntityType.CHICKEN, ChickenController.class);
|
||||
@ -2153,7 +2155,8 @@ public class NMSImpl implements NMSBridge {
|
||||
radius *= radius;
|
||||
final org.bukkit.World world = location.getWorld();
|
||||
for (Player player : CitizensAPI.getLocationLookup().getNearbyPlayers(location, radius)) {
|
||||
if (world != player.getWorld() || (from != null && !player.canSee(from)) || (location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius)) {
|
||||
if (world != player.getWorld() || (from != null && !player.canSee(from))
|
||||
|| (location.distanceSquared(player.getLocation(PACKET_CACHE_LOCATION)) > radius)) {
|
||||
continue;
|
||||
}
|
||||
for (Packet<?> packet : packets) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user