Skip to content

Commit

Permalink
Consolidate body yaw implementations
Browse files Browse the repository at this point in the history
  • Loading branch information
@fullwall
fullwall committed Dec 22, 2023
1 parent d005c22 commit d54b3ef
Show file tree
Hide file tree
Showing 13 changed files with 97 additions and 84 deletions.
3 changes: 3 additions & 0 deletions main/src/main/java/net/citizensnpcs/npc/CitizensTraitFactory.java
View file
Expand Up @@ -19,6 +19,7 @@
import net.citizensnpcs.api.trait.trait.Owner;
import net.citizensnpcs.api.trait.trait.PlayerFilter;
import net.citizensnpcs.api.trait.trait.Spawned;
import net.citizensnpcs.model.ModelTrait;
import net.citizensnpcs.trait.Age;
import net.citizensnpcs.trait.Anchors;
import net.citizensnpcs.trait.ArmorStandTrait;
Expand Down Expand Up @@ -92,6 +93,8 @@ public CitizensTraitFactory(Citizens plugin) {
registerTrait(TraitInfo.create(LookClose.class));
registerTrait(TraitInfo.create(PaintingTrait.class));
registerTrait(TraitInfo.create(MirrorTrait.class).optInToStats());
registerTrait(TraitInfo.create(ModelTrait.class).withSupplier(() -> new ModelTrait(plugin.getModelRegistry()))
.optInToStats());
registerTrait(TraitInfo.create(MountTrait.class));
registerTrait(TraitInfo.create(MobType.class).asDefaultTrait());
registerTrait(TraitInfo.create(OcelotModifiers.class));
Expand Down
15 changes: 8 additions & 7 deletions v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java
View file
Expand Up @@ -1164,6 +1164,13 @@ public void sendTeamPacket(Player recipient, Team team, int mode) {
@Override
public void setBodyYaw(org.bukkit.entity.Entity entity, float yaw) {
getHandle(entity).yaw = yaw;
if (entity instanceof EntityLiving) {
EntityLiving handle = (EntityLiving) getHandle(entity);
handle.aP = yaw;
if (!(handle instanceof EntityHuman)) {
handle.aO = yaw; // TODO: why this
}
}
}

@Override
Expand Down Expand Up @@ -1202,14 +1209,8 @@ public void setEndermanAngry(org.bukkit.entity.Enderman enderman, boolean angry)

@Override
public void setHeadAndBodyYaw(org.bukkit.entity.Entity entity, float yaw) {
if (!(entity instanceof LivingEntity))
return;
EntityLiving handle = (EntityLiving) getHandle(entity);
yaw = Util.clamp(yaw);
handle.aP = yaw;
if (!(handle instanceof EntityHuman)) {
handle.aO = yaw; // TODO: why this
}
setBodyYaw(entity, yaw);
setHeadYaw(entity, yaw);
}

Expand Down
15 changes: 8 additions & 7 deletions v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java
View file
Expand Up @@ -1217,6 +1217,13 @@ public void sendTeamPacket(Player recipient, Team team, int mode) {
@Override
public void setBodyYaw(org.bukkit.entity.Entity entity, float yaw) {
getHandle(entity).yaw = yaw;
if (entity instanceof EntityLiving) {
EntityLiving handle = (EntityLiving) getHandle(entity);
handle.aO = yaw;
if (!(handle instanceof EntityHuman)) {
handle.aN = yaw; // TODO: why this
}
}
}

@Override
Expand Down Expand Up @@ -1255,14 +1262,8 @@ public void setEndermanAngry(org.bukkit.entity.Enderman enderman, boolean angry)

@Override
public void setHeadAndBodyYaw(org.bukkit.entity.Entity entity, float yaw) {
if (!(entity instanceof LivingEntity))
return;
EntityLiving handle = (EntityLiving) getHandle(entity);
yaw = Util.clamp(yaw);
handle.aO = yaw;
if (!(handle instanceof EntityHuman)) {
handle.aN = yaw; // TODO: why this
}
setBodyYaw(entity, yaw);
setHeadYaw(entity, yaw);
}

Expand Down
15 changes: 8 additions & 7 deletions v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java
View file
Expand Up @@ -1224,6 +1224,13 @@ public void sendTeamPacket(Player recipient, Team team, int mode) {
@Override
public void setBodyYaw(org.bukkit.entity.Entity entity, float yaw) {
getHandle(entity).yaw = yaw;
if (entity instanceof EntityLiving) {
EntityLiving handle = (EntityLiving) getHandle(entity);
handle.aO = yaw;
if (!(handle instanceof EntityHuman)) {
handle.aN = yaw; // TODO: why this
}
}
}

@Override
Expand Down Expand Up @@ -1262,14 +1269,8 @@ public void setEndermanAngry(org.bukkit.entity.Enderman enderman, boolean angry)

@Override
public void setHeadAndBodyYaw(org.bukkit.entity.Entity entity, float yaw) {
if (!(entity instanceof LivingEntity))
return;
EntityLiving handle = (EntityLiving) getHandle(entity);
yaw = Util.clamp(yaw);
handle.aO = yaw;
if (!(handle instanceof EntityHuman)) {
handle.aN = yaw; // TODO: why this
}
setBodyYaw(entity, yaw);
setHeadYaw(entity, yaw);
}

Expand Down
15 changes: 8 additions & 7 deletions v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java
View file
Expand Up @@ -1261,6 +1261,13 @@ public void sendTeamPacket(Player recipient, Team team, int mode) {
@Override
public void setBodyYaw(org.bukkit.entity.Entity entity, float yaw) {
getHandle(entity).yaw = yaw;
if (entity instanceof EntityLiving) {
EntityLiving handle = (EntityLiving) getHandle(entity);
handle.aR = yaw;
if (!(handle instanceof EntityHuman)) {
handle.aQ = yaw; // TODO: why this
}
}
}

@Override
Expand Down Expand Up @@ -1299,14 +1306,8 @@ public void setEndermanAngry(org.bukkit.entity.Enderman enderman, boolean angry)

@Override
public void setHeadAndBodyYaw(org.bukkit.entity.Entity entity, float yaw) {
if (!(entity instanceof LivingEntity))
return;
EntityLiving handle = (EntityLiving) getHandle(entity);
yaw = Util.clamp(yaw);
handle.aR = yaw;
if (!(handle instanceof EntityHuman)) {
handle.aQ = yaw; // TODO: why this
}
setBodyYaw(entity, yaw);
setHeadYaw(entity, yaw);
}

Expand Down
15 changes: 8 additions & 7 deletions v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java
View file
Expand Up @@ -1288,6 +1288,13 @@ public void setAggressive(org.bukkit.entity.Entity entity, boolean aggro) {
@Override
public void setBodyYaw(org.bukkit.entity.Entity entity, float yaw) {
getHandle(entity).yaw = yaw;
if (entity instanceof EntityLiving) {
EntityLiving handle = (EntityLiving) getHandle(entity);
handle.aL = yaw;
if (!(handle instanceof EntityHuman)) {
handle.aK = yaw; // TODO: why this
}
}
}

@Override
Expand Down Expand Up @@ -1333,14 +1340,8 @@ public void setEndermanAngry(org.bukkit.entity.Enderman enderman, boolean angry)

@Override
public void setHeadAndBodyYaw(org.bukkit.entity.Entity entity, float yaw) {
if (!(entity instanceof LivingEntity))
return;
EntityLiving handle = (EntityLiving) getHandle(entity);
yaw = Util.clamp(yaw);
handle.aL = yaw;
if (!(handle instanceof EntityHuman)) {
handle.aK = yaw; // TODO: why this
}
setBodyYaw(entity, yaw);
setHeadYaw(entity, yaw);
}

Expand Down
15 changes: 8 additions & 7 deletions v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java
View file
Expand Up @@ -1305,6 +1305,13 @@ public void setAggressive(org.bukkit.entity.Entity entity, boolean aggro) {
@Override
public void setBodyYaw(org.bukkit.entity.Entity entity, float yaw) {
getHandle(entity).yaw = yaw;
if (entity instanceof EntityLiving) {
EntityLiving handle = (EntityLiving) getHandle(entity);
handle.aJ = yaw;
if (!(handle instanceof EntityHuman)) {
handle.aI = yaw; // TODO: why this
}
}
}

@Override
Expand Down Expand Up @@ -1350,14 +1357,8 @@ public void setEndermanAngry(org.bukkit.entity.Enderman enderman, boolean angry)

@Override
public void setHeadAndBodyYaw(org.bukkit.entity.Entity entity, float yaw) {
if (!(entity instanceof LivingEntity))
return;
EntityLiving handle = (EntityLiving) getHandle(entity);
yaw = Util.clamp(yaw);
handle.aJ = yaw;
if (!(handle instanceof EntityHuman)) {
handle.aI = yaw; // TODO: why this
}
setBodyYaw(entity, yaw);
setHeadYaw(entity, yaw);
}

Expand Down
15 changes: 7 additions & 8 deletions v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java
View file
Expand Up @@ -1340,7 +1340,12 @@ public void setAggressive(org.bukkit.entity.Entity entity, boolean aggro) {

@Override
public void setBodyYaw(org.bukkit.entity.Entity entity, float yaw) {
getHandle(entity).yaw = yaw;
Entity handle = getHandle(entity);
handle.yaw = yaw;
if (handle instanceof EntityLiving) {
((EntityLiving) handle).aB = yaw;
((EntityLiving) handle).aA = yaw; // TODO: why this
}
}

@Override
Expand Down Expand Up @@ -1379,14 +1384,8 @@ public void setEndermanAngry(org.bukkit.entity.Enderman enderman, boolean angry)

@Override
public void setHeadAndBodyYaw(org.bukkit.entity.Entity entity, float yaw) {
if (!(entity instanceof LivingEntity))
return;
EntityLiving handle = (EntityLiving) getHandle(entity);
yaw = Util.clamp(yaw);
handle.aB = yaw;
if (!(handle instanceof EntityHuman)) {
handle.aA = yaw; // TODO: why this
}
setBodyYaw(entity, yaw);
setHeadYaw(entity, yaw);
}

Expand Down
16 changes: 7 additions & 9 deletions v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java
View file
Expand Up @@ -1034,7 +1034,6 @@ public void look(org.bukkit.entity.Entity entity, float yaw, float pitch) {
if (handle == null)
return;
yaw = Util.clamp(yaw);
handle.setYRot(yaw);
setHeadAndBodyYaw(entity, yaw);
handle.setXRot(pitch);
}
Expand Down Expand Up @@ -1340,7 +1339,12 @@ public void setAggressive(org.bukkit.entity.Entity entity, boolean aggro) {

@Override
public void setBodyYaw(org.bukkit.entity.Entity entity, float yaw) {
getHandle(entity).setYRot(yaw);
Entity handle = getHandle(entity);
if (handle instanceof LivingEntity) {
((LivingEntity) handle).yBodyRotO = yaw;
}
handle.setYBodyRot(yaw);
handle.setYRot(yaw);
}

@Override
Expand Down Expand Up @@ -1379,14 +1383,8 @@ public void setEndermanAngry(org.bukkit.entity.Enderman enderman, boolean angry)

@Override
public void setHeadAndBodyYaw(org.bukkit.entity.Entity entity, float yaw) {
if (!(entity instanceof org.bukkit.entity.LivingEntity))
return;
LivingEntity handle = (LivingEntity) getHandle(entity);
yaw = Util.clamp(yaw);
handle.yBodyRotO = yaw;
if (!(handle instanceof net.minecraft.world.entity.player.Player)) {
handle.setYBodyRot(yaw);
}
setBodyYaw(entity, yaw);
setHeadYaw(entity, yaw);
}

Expand Down
16 changes: 8 additions & 8 deletions v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java
View file
Expand Up @@ -1347,8 +1347,14 @@ public void setAggressive(org.bukkit.entity.Entity entity, boolean aggro) {
}

@Override

public void setBodyYaw(org.bukkit.entity.Entity entity, float yaw) {
getHandle(entity).setYRot(yaw);
Entity handle = getHandle(entity);
if (handle instanceof LivingEntity) {
((LivingEntity) handle).yBodyRotO = yaw;
}
handle.setYBodyRot(yaw);
handle.setYRot(yaw);
}

@Override
Expand Down Expand Up @@ -1387,14 +1393,8 @@ public void setEndermanAngry(org.bukkit.entity.Enderman enderman, boolean angry)

@Override
public void setHeadAndBodyYaw(org.bukkit.entity.Entity entity, float yaw) {
if (!(entity instanceof org.bukkit.entity.LivingEntity))
return;
LivingEntity handle = (LivingEntity) getHandle(entity);
yaw = Util.clamp(yaw);
handle.yBodyRotO = yaw;
if (!(handle instanceof net.minecraft.world.entity.player.Player)) {
handle.setYBodyRot(yaw);
}
setBodyYaw(entity, yaw);
setHeadYaw(entity, yaw);
}

Expand Down
11 changes: 9 additions & 2 deletions v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java
View file
Expand Up @@ -1460,7 +1460,12 @@ public void setAllayDancing(org.bukkit.entity.Entity entity, boolean dancing) {

@Override
public void setBodyYaw(org.bukkit.entity.Entity entity, float yaw) {
getHandle(entity).setYRot(yaw);
Entity handle = getHandle(entity);
if (handle instanceof LivingEntity) {
((LivingEntity) handle).yBodyRotO = yaw;
}
handle.setYBodyRot(yaw);
handle.setYRot(yaw);
}

@Override
Expand Down Expand Up @@ -1528,8 +1533,10 @@ public void setEndermanAngry(org.bukkit.entity.Enderman enderman, boolean angry)

@Override
public void setHeadAndBodyYaw(org.bukkit.entity.Entity entity, float yaw) {
if (!(entity instanceof org.bukkit.entity.LivingEntity))
if (!(entity instanceof org.bukkit.entity.LivingEntity)) {
getHandle(entity).setYRot(yaw);
return;
}
LivingEntity handle = (LivingEntity) getHandle(entity);
yaw = Util.clamp(yaw);
handle.yBodyRotO = yaw;
Expand Down
15 changes: 7 additions & 8 deletions v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/util/NMSImpl.java
View file
Expand Up @@ -1431,7 +1431,12 @@ public void setAllayDancing(org.bukkit.entity.Entity entity, boolean dancing) {

@Override
public void setBodyYaw(org.bukkit.entity.Entity entity, float yaw) {
getHandle(entity).setYRot(yaw);
Entity handle = getHandle(entity);
if (handle instanceof LivingEntity) {
((LivingEntity) handle).yBodyRotO = yaw;
}
handle.setYBodyRot(yaw);
handle.setYRot(yaw);
}

@Override
Expand Down Expand Up @@ -1499,14 +1504,8 @@ public void setEndermanAngry(org.bukkit.entity.Enderman enderman, boolean angry)

@Override
public void setHeadAndBodyYaw(org.bukkit.entity.Entity entity, float yaw) {
if (!(entity instanceof org.bukkit.entity.LivingEntity))
return;
LivingEntity handle = (LivingEntity) getHandle(entity);
yaw = Util.clamp(yaw);
handle.yBodyRotO = yaw;
if (!(handle instanceof net.minecraft.world.entity.player.Player)) {
handle.setYBodyRot(yaw);
}
setBodyYaw(entity, yaw);
setHeadYaw(entity, yaw);
}

Expand Down
15 changes: 8 additions & 7 deletions v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java
View file
Expand Up @@ -1084,6 +1084,13 @@ public void sendTeamPacket(Player recipient, Team team, int mode) {
@Override
public void setBodyYaw(org.bukkit.entity.Entity entity, float yaw) {
getHandle(entity).yaw = yaw;
if (entity instanceof EntityLiving) {
EntityLiving handle = (EntityLiving) getHandle(entity);
handle.aJ = yaw;
if (!(handle instanceof EntityHuman)) {
handle.aI = yaw; // TODO: why this
}
}
}

@Override
Expand Down Expand Up @@ -1120,14 +1127,8 @@ public void setEndermanAngry(org.bukkit.entity.Enderman enderman, boolean angry)

@Override
public void setHeadAndBodyYaw(org.bukkit.entity.Entity entity, float yaw) {
if (!(entity instanceof LivingEntity))
return;
EntityLiving handle = (EntityLiving) getHandle(entity);
yaw = Util.clamp(yaw);
handle.aJ = yaw;
if (!(handle instanceof EntityHuman)) {
handle.aI = yaw; // TODO: why this
}
setBodyYaw(entity, yaw);
setHeadYaw(entity, yaw);
}

Expand Down

0 comments on commit d54b3ef

Please sign in to comment.