Skip to content
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.

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

Refactor and fix PressingBehaviour.java #7168

Open
wants to merge 13 commits into
base: mc1.20.1/dev
Choose a base branch
from
Prev Previous commit
Next Next commit
done!!
  • Loading branch information
Shroopy committed Nov 27, 2024
commit ba2417e417e6a07594430bfff723ac574be0f6c6
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,14 @@ public class PressingBehaviour extends BeltProcessingBehaviour {
public List<ItemStack> particleItems = new ArrayList<>();

public PressingBehaviourSpecifics specifics;
public int prevRunningTicks;
public int runningTicks;
public float prevRunningTicks;
public float runningTicks;
public boolean running;
public boolean finished;
public Mode mode;

private boolean ticksPaused;

int entityScanCooldown;

public interface PressingBehaviourSpecifics {
Expand Down Expand Up @@ -73,7 +75,7 @@ public void read(CompoundTag compound, boolean clientPacket) {
running = compound.getBoolean("Running");
mode = Mode.values()[compound.getInt("Mode")];
finished = compound.getBoolean("Finished");
prevRunningTicks = runningTicks = compound.getInt("Ticks");
prevRunningTicks = runningTicks = compound.getFloat("Ticks");
super.read(compound, clientPacket);

if (clientPacket) {
Expand All @@ -88,19 +90,20 @@ public void write(CompoundTag compound, boolean clientPacket) {
compound.putBoolean("Running", running);
compound.putInt("Mode", mode.ordinal());
compound.putBoolean("Finished", finished);
compound.putInt("Ticks", runningTicks);
compound.putFloat("Ticks", runningTicks);
super.write(compound, clientPacket);

if (clientPacket) {
compound.put("ParticleItems", NBTHelper.writeCompoundList(particleItems, ItemStack::serializeNBT));
compound.put("ParticleItems",
NBTHelper.writeCompoundList(particleItems, NBTSerializer::serializeNBTCompound));
particleItems.clear();
}
}

public float getRenderedHeadOffset(float partialTicks) {
if (!running)
return 0;
int runningTicks = Math.abs(this.runningTicks);
float runningTicks = Math.abs(this.runningTicks);
float ticks = Mth.lerp(partialTicks, prevRunningTicks, runningTicks);
if (runningTicks < (CYCLE * 2) / 3)
return (float) Mth.clamp(Math.pow(ticks / CYCLE * 2, 3), 0, 1);
Expand Down Expand Up @@ -156,7 +159,8 @@ public void tick() {
if (BasinBlock.isBasin(level, worldPosition.below(2)))
return;

for (ItemEntity itemEntity : level.getEntitiesOfClass(ItemEntity.class, new AABB(worldPosition.below()).deflate(.125f))) {
for (ItemEntity itemEntity : level.getEntitiesOfClass(ItemEntity.class,
new AABB(worldPosition.below()).deflate(.125f))) {
if (!itemEntity.isAlive() || !itemEntity.onGround())
continue;
if (!specifics.tryProcessInWorld(itemEntity, true))
Expand All @@ -169,46 +173,50 @@ public void tick() {
return;
}

if (level.isClientSide && runningTicks == -CYCLE / 2) {
/*
if (level.isClientSide && ticksPaused) {
prevRunningTicks = CYCLE / 2;
return;
}
*/

if (runningTicks >= CYCLE / 2 && !finished) {
if (inWorld())
applyInWorld();
if (onBasin())
applyOnBasin();

if (level.getBlockState(worldPosition.below(2))
.getSoundType() == SoundType.WOOL)
if (level.getBlockState(worldPosition.below(2)).getSoundType() == SoundType.WOOL)
AllSoundEvents.MECHANICAL_PRESS_ACTIVATION_ON_BELT.playOnServer(level, worldPosition);
else
AllSoundEvents.MECHANICAL_PRESS_ACTIVATION.playOnServer(level, worldPosition, .5f,
.75f + (Math.abs(specifics.getKineticSpeed()) / 1024f));
.75f + (Math.abs(specifics.getKineticSpeed()) / 1024f));

if (!level.isClientSide)
blockEntity.sendData();

finished = true;
}

if (!level.isClientSide && runningTicks > CYCLE) {
if (runningTicks > CYCLE) {
finished = false;
particleItems.clear();
specifics.onPressingCompleted();
blockEntity.sendData();
runningTicks -= 240;
return;
runningTicks -= CYCLE;
if (!level.isClientSide) {
particleItems.clear();
specifics.onPressingCompleted();
blockEntity.sendData();
}
}

prevRunningTicks = runningTicks;
runningTicks += getRunningTickSpeed();
/*
if (prevRunningTicks < CYCLE / 2 && runningTicks >= CYCLE / 2) {
// Pause the ticks until a packet is received
if (level.isClientSide && !blockEntity.isVirtual())
runningTicks = -(CYCLE / 2);
ticksPaused = true;
}
*/
}

protected void applyOnBasin() {
Expand Down Expand Up @@ -245,11 +253,11 @@ protected void applyInWorld() {
}
}

public int getRunningTickSpeed() {
public float getRunningTickSpeed() {
float speed = specifics.getKineticSpeed();
if (speed == 0)
return 0;
return (int) Mth.lerp(Mth.clamp(Math.abs(speed) / 512f, 0, 1), 1, 60);
return 30 * speed / 256;
}

protected void spawnParticles() {
Expand Down