Skip to content

[Mainline Feature] Roll rotation support #226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Goldenfield192 wants to merge 3 commits into
base: 1.12.2-forge
Choose a base branch
from
Open

[Mainline Feature] Roll rotation support #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
881d648
feat: add roll axis
Goldenfield192 Mar 21, 2026
8b2666c
remove testing code
Goldenfield192 Mar 22, 2026
a03a15c
fix: restrict degrees range
Goldenfield192 Mar 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 61 additions & 9 deletions src/main/java/cam72cam/mod/entity/Entity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
import cam72cam.mod.world.World;
import net.minecraft.entity.monster.EntityMob;
import net.minecraft.entity.passive.EntityVillager;
import net.minecraft.util.DamageSource;
import net.minecraft.network.datasync.EntityDataManager;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.Explosion;

import java.util.List;
Expand All @@ -26,6 +26,8 @@ public class Entity {
/** The wrapped MC construct. Do not use directly */
public net.minecraft.entity.Entity internal;

private float rotationRoll;

/** Wrap a MC entity in UMC entity. Do not use directly. */
public Entity(net.minecraft.entity.Entity entity) {
this.internal = entity;
Expand Down Expand Up @@ -79,17 +81,15 @@ public float getRotationYaw() {
public void setRotationYaw(float yaw) {
internal.prevRotationYaw = internal.rotationYaw;
internal.rotationYaw = yaw;
double d0 = internal.prevRotationYaw - yaw;
if (d0 < -180.0D)
{
internal.prevRotationYaw += 360.0F;
}

if (d0 >= 180.0D)
while (internal.rotationYaw - internal.prevRotationYaw < -180.0F)
{
internal.prevRotationYaw -= 360.0F;
}

while (internal.rotationYaw - internal.prevRotationYaw >= 180.0F)
{
internal.prevRotationYaw += 360.0F;
}
}

public float getRotationPitch() {
Expand All @@ -99,6 +99,51 @@ public float getRotationPitch() {
public void setRotationPitch(float pitch) {
internal.prevRotationPitch = internal.rotationPitch;
internal.rotationPitch = pitch;

while (internal.rotationPitch - internal.prevRotationPitch < -180.0F)
{
internal.prevRotationPitch -= 360.0F;
}
while (internal.rotationPitch - internal.prevRotationPitch >= 180.0F)
{
internal.prevRotationPitch += 360.0F;
}
}

public float getRotationRoll() {
if (internal instanceof ModdedEntity) {
return internal.getDataManager().get(ModdedEntity.ROLL);
}
return 0f;
}

public void setRotationRoll(float roll) {
if (internal instanceof ModdedEntity) {
EntityDataManager dataManager = internal.getDataManager();
float prevRoll = dataManager.get(ModdedEntity.PREV_ROLL);
while (roll - prevRoll < -180.0F)
{
prevRoll -= 360.0F;
}
while (roll - prevRoll >= 180.0F)
{
prevRoll += 360.0F;
}
dataManager.set(ModdedEntity.PREV_ROLL, prevRoll);
dataManager.set(ModdedEntity.ROLL, roll);
}
}

public float getRotationYaw(float partialTicks) {
return (float) MathHelper.clampedLerp(internal.prevRotationYaw, internal.rotationYaw, partialTicks);
}

public float getRotationPitch(float partialTicks) {
return (float) MathHelper.clampedLerp(internal.prevRotationPitch, internal.rotationPitch, partialTicks);
}

public float getRotationRoll(float partialTicks) {
return (float) MathHelper.clampedLerp(getPrevRotationRoll(), getRotationRoll(), partialTicks);
}

public float getPrevRotationYaw() {
Expand All @@ -109,6 +154,13 @@ public float getPrevRotationPitch() {
return internal.prevRotationPitch;
}

public float getPrevRotationRoll() {
if (internal instanceof ModdedEntity) {
return internal.getDataManager().get(ModdedEntity.PREV_ROLL);
}
return 0f;
}

Vec3d eyeCache;
public Vec3d getPositionEyes() {
if (eyeCache == null || (
Expand Down
25 changes: 25 additions & 0 deletions src/main/java/cam72cam/mod/entity/ModdedEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.datasync.DataParameter;
import net.minecraft.network.datasync.DataSerializers;
import net.minecraft.network.datasync.EntityDataManager;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.AxisAlignedBB;
Expand All @@ -37,6 +40,15 @@ public class ModdedEntity extends Entity implements IEntityAdditionalSpawnData {
@TagField(value = "passengers", mapper = PassengerMapper.class)
private Map<UUID, Vec3d> passengerPositions = new HashMap<>();

//For data sync
static final DataParameter<Float> PREV_ROLL = EntityDataManager.createKey(ModdedEntity.class, DataSerializers.FLOAT);
static final DataParameter<Float> ROLL = EntityDataManager.createKey(ModdedEntity.class, DataSerializers.FLOAT);
//For data storage
@TagField
private float roll;
@TagField
private float prevRoll;

// All of the known seats attached to this entity
private final List<SeatEntity> seats = new ArrayList<>();

Expand Down Expand Up @@ -70,6 +82,8 @@ public ModdedEntity(World world) {
super(world);

super.preventEntitySpawning = true;
this.dataManager.register(ROLL, 0f);
this.dataManager.register(PREV_ROLL, 0f);
}

@Override
Expand Down Expand Up @@ -129,6 +143,11 @@ private void load(TagCompound data) {
ModCore.catching(e, "Error during entity load: %s - %s", this, data);
}

if (!this.world.isRemote) {
dataManager.set(ROLL, this.roll);
dataManager.set(PREV_ROLL, this.prevRoll);
}

TagCompound selfData = data.get("selfData");
if (selfData == null) {
// Old style used to save everything in one giant NBT blob. New versions save self in a sub tag.
Expand Down Expand Up @@ -162,6 +181,11 @@ protected final void writeEntityToNBT(NBTTagCompound compound) {
*/
private void save(TagCompound data) {
data.setString("custom_mob_type", type);
if (!this.world.isRemote) {
this.roll = dataManager.get(ROLL);
this.prevRoll = dataManager.get(PREV_ROLL);
}

try {
TagSerializer.serialize(data, this);
} catch (SerializationException e) {
Expand Down Expand Up @@ -226,6 +250,7 @@ public final void writeSpawnData(ByteBuf buffer) {
@Override
public final void onUpdate() {
iTickable.onTick();
this.dataManager.set(PREV_ROLL, this.dataManager.get(ROLL));
try {
self.sync.send();
} catch (SerializationException e) {
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/cam72cam/mod/render/EntityRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ public void doRender(ModdedEntity stock, double x, double y, double z, float ent
RenderState state = new RenderState();
state.translate(x, y, z);
state.rotate(180 - entityYaw, 0, 1, 0);
state.rotate(self.getRotationPitch(), 1, 0, 0);
state.rotate(self.getRotationPitch(partialTicks), 1, 0, 0);
state.rotate(self.getRotationRoll(partialTicks), 0, 0, 1);
state.rotate(-90, 0, 1, 0);
state.stage(RenderContext.Stage.ENTITY);
renderers.get(self.getClass()).render(self, state, partialTicks);
Expand All @@ -120,7 +121,8 @@ public void renderMultipass(ModdedEntity stock, double x, double y, double z, fl
RenderState state = new RenderState();
state.translate(x, y, z);
state.rotate(180 - entityYaw, 0, 1, 0);
state.rotate(self.getRotationPitch(), 1, 0, 0);
state.rotate(self.getRotationPitch(partialTicks), 1, 0, 0);
state.rotate(self.getRotationRoll(partialTicks), 0, 0, 1);
state.rotate(-90, 0, 1, 0);
state.stage(RenderContext.Stage.ENTITY);
renderers.get(self.getClass()).postRender(self, state, partialTicks);
Expand Down