Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-08 01:17:47 +01:00
Code Issues Projects Releases Wiki Activity

fix: add new display entity metadata for position/rotation interpolation

Browse Source 
(cherry picked from commit 0665f17c33)
This commit is contained in:
mworzala 2023-11-30 10:11:12 +02:00 committed by Matt Worzala
parent 4e2dfee232
commit e2d6439037
1 changed files with 44 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/main/java/net/minestom/server/entity/metadata/display/AbstractDisplayMeta.java
View File

@ -10,124 +10,132 @@ import org.jetbrains.annotations.NotNull;
public class AbstractDisplayMeta extends EntityMeta { public class AbstractDisplayMeta extends EntityMeta {
public static final byte OFFSET = EntityMeta.MAX_OFFSET; public static final byte OFFSET = EntityMeta.MAX_OFFSET;
public static final byte MAX_OFFSET = OFFSET + 14; public static final byte MAX_OFFSET = OFFSET + 15;
protected AbstractDisplayMeta(@NotNull Entity entity, @NotNull Metadata metadata) { protected AbstractDisplayMeta(@NotNull Entity entity, @NotNull Metadata metadata) {
super(entity, metadata); super(entity, metadata);
} }
public long getInterpolationStartDelta() { public long getPosRotInterpolationDuration() {
return super.metadata.getIndex(OFFSET, 0); return super.metadata.getIndex(OFFSET, 0);
} }
public void setInterpolationStartDelta(int value) { public void setPosRotInterpolationDuration(int value) {
super.metadata.setIndex(OFFSET, Metadata.VarInt(value)); super.metadata.setIndex(OFFSET, Metadata.VarInt(value));
} }
public int getInterpolationDuration() { public long getTransformationInterpolationStartDelta() {
return super.metadata.getIndex(OFFSET + 1, 0); return super.metadata.getIndex(OFFSET + 1, 0);
} }
public void setInterpolationDuration(int value) { public void setTransformationInterpolationStartDelta(int value) {
super.metadata.setIndex(OFFSET + 1, Metadata.VarInt(value)); super.metadata.setIndex(OFFSET + 1, Metadata.VarInt(value));
} }
public int getTransformationInterpolationDuration() {
return super.metadata.getIndex(OFFSET + 2, 0);
}
public void setTransformationInterpolationDuration(int value) {
super.metadata.setIndex(OFFSET + 2, Metadata.VarInt(value));
}
public @NotNull Point getTranslation() { public @NotNull Point getTranslation() {
return super.metadata.getIndex(OFFSET + 2, Vec.ZERO); return super.metadata.getIndex(OFFSET + 3, Vec.ZERO);
} }
public void setTranslation(@NotNull Point value) { public void setTranslation(@NotNull Point value) {
super.metadata.setIndex(OFFSET + 2, Metadata.Vector3(value)); super.metadata.setIndex(OFFSET + 3, Metadata.Vector3(value));
} }
public @NotNull Vec getScale() { public @NotNull Vec getScale() {
return super.metadata.getIndex(OFFSET + 3, Vec.ONE); return super.metadata.getIndex(OFFSET + 4, Vec.ONE);
} }
public void setScale(@NotNull Vec value) { public void setScale(@NotNull Vec value) {
super.metadata.setIndex(OFFSET + 3, Metadata.Vector3(value)); super.metadata.setIndex(OFFSET + 4, Metadata.Vector3(value));
} }
public float @NotNull[] getLeftRotation() { public float @NotNull[] getLeftRotation() {
//todo replace with actual quaternion type //todo replace with actual quaternion type
return super.metadata.getIndex(OFFSET + 4, new float[] {0, 0, 0, 1}); return super.metadata.getIndex(OFFSET + 5, new float[] {0, 0, 0, 1});
} }
public void setLeftRotation(float @NotNull[] value) { public void setLeftRotation(float @NotNull[] value) {
super.metadata.setIndex(OFFSET + 4, Metadata.Quaternion(value)); super.metadata.setIndex(OFFSET + 5, Metadata.Quaternion(value));
} }
public float @NotNull[] getRightRotation() { public float @NotNull[] getRightRotation() {
//todo replace with actual quaternion type //todo replace with actual quaternion type
return super.metadata.getIndex(OFFSET + 5, new float[] {0, 0, 0, 1}); return super.metadata.getIndex(OFFSET + 6, new float[] {0, 0, 0, 1});
} }
public void setRightRotation(float @NotNull[] value) { public void setRightRotation(float @NotNull[] value) {
super.metadata.setIndex(OFFSET + 5, Metadata.Quaternion(value)); super.metadata.setIndex(OFFSET + 6, Metadata.Quaternion(value));
} }
public @NotNull BillboardConstraints getBillboardRenderConstraints() { public @NotNull BillboardConstraints getBillboardRenderConstraints() {
return BillboardConstraints.VALUES[super.metadata.getIndex(OFFSET + 6, (byte) 0)]; return BillboardConstraints.VALUES[super.metadata.getIndex(OFFSET + 7, (byte) 0)];
} }
public void setBillboardRenderConstraints(@NotNull BillboardConstraints value) { public void setBillboardRenderConstraints(@NotNull BillboardConstraints value) {
super.metadata.setIndex(OFFSET + 6, Metadata.Byte((byte) value.ordinal())); super.metadata.setIndex(OFFSET + 7, Metadata.Byte((byte) value.ordinal()));
} }
public int getBrightnessOverride() { public int getBrightnessOverride() {
return super.metadata.getIndex(OFFSET + 7, -1); return super.metadata.getIndex(OFFSET + 8, -1);
} }
public void setBrightnessOverride(int value) { public void setBrightnessOverride(int value) {
super.metadata.setIndex(OFFSET + 7, Metadata.VarInt(value)); super.metadata.setIndex(OFFSET + 8, Metadata.VarInt(value));
} }
public float getViewRange() { public float getViewRange() {
return super.metadata.getIndex(OFFSET + 8, 1.0F); return super.metadata.getIndex(OFFSET + 9, 1.0F);
} }
public void setViewRange(float value) { public void setViewRange(float value) {
super.metadata.setIndex(OFFSET + 8, Metadata.Float(value));
}
public float getShadowRadius() {
return super.metadata.getIndex(OFFSET + 9, 0.0F);
}
public void setShadowRadius(float value) {
super.metadata.setIndex(OFFSET + 9, Metadata.Float(value)); super.metadata.setIndex(OFFSET + 9, Metadata.Float(value));
} }
public float getShadowStrength() { public float getShadowRadius() {
return super.metadata.getIndex(OFFSET + 10, 1.0F); return super.metadata.getIndex(OFFSET + 10, 0.0F);
} }
public void setShadowStrength(float value) { public void setShadowRadius(float value) {
super.metadata.setIndex(OFFSET + 10, Metadata.Float(value)); super.metadata.setIndex(OFFSET + 10, Metadata.Float(value));
} }
public float getWidth() { public float getShadowStrength() {
return super.metadata.getIndex(OFFSET + 11, 0.0F); return super.metadata.getIndex(OFFSET + 11, 1.0F);
} }
public void setWidth(float value) { public void setShadowStrength(float value) {
super.metadata.setIndex(OFFSET + 11, Metadata.Float(value)); super.metadata.setIndex(OFFSET + 11, Metadata.Float(value));
} }
public float getHeight() { public float getWidth() {
return super.metadata.getIndex(OFFSET + 12, 0.0F); return super.metadata.getIndex(OFFSET + 12, 0.0F);
} }
public void setHeight(float value) { public void setWidth(float value) {
super.metadata.setIndex(OFFSET + 12, Metadata.Float(value)); super.metadata.setIndex(OFFSET + 12, Metadata.Float(value));
} }
public float getHeight() {
return super.metadata.getIndex(OFFSET + 13, 0.0F);
}
public void setHeight(float value) {
super.metadata.setIndex(OFFSET + 13, Metadata.Float(value));
}
public int getGlowColorOverride() { public int getGlowColorOverride() {
return super.metadata.getIndex(OFFSET + 13, 0); return super.metadata.getIndex(OFFSET + 14, 0);
} }
public void setGlowColorOverride(int value) { public void setGlowColorOverride(int value) {
super.metadata.setIndex(OFFSET + 13, Metadata.VarInt(value)); super.metadata.setIndex(OFFSET + 14, Metadata.VarInt(value));
} }
public enum BillboardConstraints { public enum BillboardConstraints {