添加TickCount渲染属性

This commit is contained in:
Light_Quanta 2025-07-03 10:44:32 +08:00
parent c03e27d317
commit 779b4a0db1
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
3 changed files with 19 additions and 6 deletions

View file

@ -142,10 +142,10 @@ public class DroneRenderer extends GeoEntityRenderer<DroneEntity> {
entityCache = renderEntity; entityCache = renderEntity;
attachedTick = entity.tickCount; attachedTick = entity.tickCount;
} }
renderEntity.tickCount = entity.tickCount - attachedTick;
var displayData = data.get(ATTACHMENT_DISPLAY); var displayData = data.get(ATTACHMENT_DISPLAY);
renderEntity.tickCount = displayData.get(11) >= 0 ? displayData.get(11).intValue() : entity.tickCount - attachedTick;
var scale = new float[]{displayData.get(0), displayData.get(1), displayData.get(2)}; var scale = new float[]{displayData.get(0), displayData.get(1), displayData.get(2)};
var offset = new float[]{displayData.get(3), displayData.get(4), displayData.get(5)}; var offset = new float[]{displayData.get(3), displayData.get(4), displayData.get(5)};
var rotation = new float[]{displayData.get(6), displayData.get(7), displayData.get(8)}; var rotation = new float[]{displayData.get(6), displayData.get(7), displayData.get(8)};

View file

@ -72,6 +72,9 @@ public class DroneAttachmentData implements IDBasedData {
@SerializedName("ZLength") @SerializedName("ZLength")
public float zLength = 0.35f; public float zLength = 0.35f;
@SerializedName("TickCount")
public int tickCount = -1;
/** /**
* 无人机显示的挂载实体的实体数据 * 无人机显示的挂载实体的实体数据
*/ */

View file

@ -2,6 +2,7 @@ package com.atsuishio.superbwarfare.entity.vehicle;
import com.atsuishio.superbwarfare.config.server.ExplosionConfig; import com.atsuishio.superbwarfare.config.server.ExplosionConfig;
import com.atsuishio.superbwarfare.data.CustomData; import com.atsuishio.superbwarfare.data.CustomData;
import com.atsuishio.superbwarfare.data.drone_attachment.DroneAttachmentData;
import com.atsuishio.superbwarfare.entity.projectile.*; import com.atsuishio.superbwarfare.entity.projectile.*;
import com.atsuishio.superbwarfare.entity.vehicle.base.MobileVehicleEntity; import com.atsuishio.superbwarfare.entity.vehicle.base.MobileVehicleEntity;
import com.atsuishio.superbwarfare.init.*; import com.atsuishio.superbwarfare.init.*;
@ -64,7 +65,7 @@ public class DroneEntity extends MobileVehicleEntity implements GeoEntity {
public static final EntityDataAccessor<Float> DELTA_X_ROT = SynchedEntityData.defineId(DroneEntity.class, EntityDataSerializers.FLOAT); public static final EntityDataAccessor<Float> DELTA_X_ROT = SynchedEntityData.defineId(DroneEntity.class, EntityDataSerializers.FLOAT);
public static final EntityDataAccessor<String> ATTACHED_ENTITY = SynchedEntityData.defineId(DroneEntity.class, EntityDataSerializers.STRING); public static final EntityDataAccessor<String> ATTACHED_ENTITY = SynchedEntityData.defineId(DroneEntity.class, EntityDataSerializers.STRING);
// scale[3], offset[3], rotation[3], xLength, zLength // scale[3], offset[3], rotation[3], xLength, zLength, tickCount
public static final EntityDataAccessor<List<Float>> ATTACHMENT_DISPLAY = SynchedEntityData.defineId(DroneEntity.class, ModSerializers.FLOAT_LIST_SERIALIZER.get()); public static final EntityDataAccessor<List<Float>> ATTACHMENT_DISPLAY = SynchedEntityData.defineId(DroneEntity.class, ModSerializers.FLOAT_LIST_SERIALIZER.get());
public static final EntityDataAccessor<CompoundTag> ATTACHED_ENTITY_TAG = SynchedEntityData.defineId(DroneEntity.class, EntityDataSerializers.COMPOUND_TAG); public static final EntityDataAccessor<CompoundTag> ATTACHED_ENTITY_TAG = SynchedEntityData.defineId(DroneEntity.class, EntityDataSerializers.COMPOUND_TAG);
public static final EntityDataAccessor<Integer> MAX_AMMO = SynchedEntityData.defineId(DroneEntity.class, EntityDataSerializers.INT); public static final EntityDataAccessor<Integer> MAX_AMMO = SynchedEntityData.defineId(DroneEntity.class, EntityDataSerializers.INT);
@ -103,12 +104,20 @@ public class DroneEntity extends MobileVehicleEntity implements GeoEntity {
@Override @Override
protected void defineSynchedData(SynchedEntityData.Builder builder) { protected void defineSynchedData(SynchedEntityData.Builder builder) {
super.defineSynchedData(builder); super.defineSynchedData(builder);
var data = new DroneAttachmentData();
builder.define(DELTA_X_ROT, 0f) builder.define(DELTA_X_ROT, 0f)
.define(CONTROLLER, "undefined") .define(CONTROLLER, "undefined")
.define(LINKED, false) .define(LINKED, false)
.define(KAMIKAZE_MODE, 0) .define(KAMIKAZE_MODE, 0)
.define(ATTACHED_ENTITY, "") .define(ATTACHED_ENTITY, "")
.define(ATTACHMENT_DISPLAY, List.of(1f, 1f, 1f, 0f, 0f, 0f, 0f, 0f, 0f, 0.2f, 0.5f)) .define(ATTACHMENT_DISPLAY, List.of(
data.scale()[0], data.scale()[1], data.scale()[2],
data.offset()[0], data.offset()[1], data.offset()[2],
data.rotation()[0], data.rotation()[1], data.rotation()[2],
data.xLength, data.zLength,
(float) data.tickCount
))
.define(ATTACHED_ENTITY_TAG, new CompoundTag()) .define(ATTACHED_ENTITY_TAG, new CompoundTag())
.define(MAX_AMMO, 1); .define(MAX_AMMO, 1);
} }
@ -404,8 +413,9 @@ public class DroneEntity extends MobileVehicleEntity implements GeoEntity {
scale[0], scale[1], scale[2], scale[0], scale[1], scale[2],
offset[0], offset[1], offset[2], offset[0], offset[1], offset[2],
rotation[0], rotation[1], rotation[2], rotation[0], rotation[1], rotation[2],
attachmentData.xLength, attachmentData.zLength) attachmentData.xLength, attachmentData.zLength,
); (float) attachmentData.tickCount
));
this.entityData.set(MAX_AMMO, attachmentData.count()); this.entityData.set(MAX_AMMO, attachmentData.count());
} }
} }