Skip to content

Track titles to restore them after hit cooldown #693

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
Beaness wants to merge 1 commit into
base: master
Choose a base branch
from
+139 −0
Open

Track titles to restore them after hit cooldown #693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/Protocol1_9To1_8.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import com.viaversion.viabackwards.api.BackwardsProtocol;
import com.viaversion.viarewind.api.data.RewindMappingData;
import com.viaversion.viarewind.protocol.v1_9to1_8.cooldown.TitleCooldownVisualization;
import com.viaversion.viarewind.protocol.v1_9to1_8.provider.InventoryProvider;
import com.viaversion.viarewind.protocol.v1_9to1_8.rewriter.BlockItemPacketRewriter1_9;
import com.viaversion.viarewind.protocol.v1_9to1_8.rewriter.EntityPacketRewriter1_9;
Expand Down Expand Up @@ -87,6 +88,7 @@ public void init(UserConnection connection) {
connection.put(new LevitationStorage());
connection.put(new PlayerPositionTracker());
connection.put(new CooldownStorage());
connection.put(new TitleCooldownVisualization.StoredTitle());
connection.put(new BlockPlaceDestroyTracker());
connection.put(new BossBarStorage(connection));
}
Expand Down
134 changes: 134 additions & 0 deletions ...java/com/viaversion/viarewind/protocol/v1_9to1_8/cooldown/TitleCooldownVisualization.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@
package com.viaversion.viarewind.protocol.v1_9to1_8.cooldown;

import com.viaversion.viarewind.protocol.v1_9to1_8.Protocol1_9To1_8;
import com.viaversion.viaversion.api.connection.StorableObject;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
import com.viaversion.viaversion.api.type.Types;
import com.viaversion.viaversion.libs.gson.JsonElement;
import com.viaversion.viaversion.libs.gson.JsonPrimitive;
import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_8;
import java.util.function.Consumer;
Expand All @@ -31,15 +33,44 @@ public class TitleCooldownVisualization implements CooldownVisualization {
private static final int ACTION_SET_SUBTITLE = 1;
private static final int ACTION_SET_TIMES_AND_DISPLAY = 2;
private static final int ACTION_HIDE = 3;
private static final int ACTION_RESET = 4;

private final UserConnection user;
private boolean visible;

public TitleCooldownVisualization(UserConnection user) {
this.user = user;
}

public static void trackTitle(PacketWrapper wrapper) {
final StoredTitle title = wrapper.user().get(StoredTitle.class);
final int action = wrapper.passthrough(Types.VAR_INT);
if (action == ACTION_SET_TITLE) {
title.setTitle(wrapper.passthrough(Types.COMPONENT));
} else if (action == ACTION_SET_SUBTITLE) {
title.setSubtitle(wrapper.passthrough(Types.COMPONENT));
} else if (action == ACTION_SET_TIMES_AND_DISPLAY) {
final int fadeIn = wrapper.passthrough(Types.INT);
final int stay = wrapper.passthrough(Types.INT);
final int fadeOut = wrapper.passthrough(Types.INT);
title.setTimes(fadeIn, stay, fadeOut);
} else if (action == ACTION_HIDE) {
title.clear();
} else if (action == ACTION_RESET) {
title.reset();
}
}

@Override
public void show(double progress) throws Exception {
final StoredTitle title = user.get(StoredTitle.class);
if (title.isVisible() && title.title() != null) {
if (visible) {
restoreTitle(title);
}
return;
}

final String text = CooldownVisualization.buildProgressText("˙", progress);

sendTitlePacket(ACTION_SET_TITLE, wrapper -> wrapper.write(Types.COMPONENT, new JsonPrimitive("")));
Expand All @@ -49,12 +80,38 @@ public void show(double progress) throws Exception {
wrapper.write(Types.INT, 2);
wrapper.write(Types.INT, 5);
});
visible = true;
}

@Override
public void hide() throws Exception {
if (!visible) {
return;
}

final StoredTitle title = user.get(StoredTitle.class);
if (title.isVisible() && title.title() != null) {
restoreTitle(title);
return;
}

sendTitlePacket(ACTION_HIDE, wrapper -> {
});
visible = false;
}

private void restoreTitle(StoredTitle title) {
final int[] times = title.remainingTimes();
sendTitlePacket(ACTION_SET_TIMES_AND_DISPLAY, wrapper -> {
wrapper.write(Types.INT, times[0]);
wrapper.write(Types.INT, times[1]);
wrapper.write(Types.INT, times[2]);
});
if (title.subtitle() != null) {
sendTitlePacket(ACTION_SET_SUBTITLE, wrapper -> wrapper.write(Types.COMPONENT, title.subtitle()));
}
sendTitlePacket(ACTION_SET_TITLE, wrapper -> wrapper.write(Types.COMPONENT, title.title()));
visible = false;
}

private void sendTitlePacket(int action, Consumer<PacketWrapper> writer) {
Expand All @@ -64,4 +121,81 @@ private void sendTitlePacket(int action, Consumer<PacketWrapper> writer) {
title.scheduleSend(Protocol1_9To1_8.class);
}

public static final class StoredTitle implements StorableObject {
private JsonElement title;
private JsonElement subtitle;
private int fadeIn = 10;
private int stay = 70;
private int fadeOut = 20;
private long visibleSince;
private long visibleUntil;

public void setTitle(JsonElement title) {
final long now = System.currentTimeMillis();
this.title = title;
visibleSince = now;
visibleUntil = now + titleLength();
}

public void setSubtitle(JsonElement subtitle) {
this.subtitle = subtitle;
}

public void setTimes(int fadeIn, int stay, int fadeOut) {
final long now = System.currentTimeMillis();
this.fadeIn = fadeIn;
this.stay = stay;
this.fadeOut = fadeOut;
if (isVisible()) {
visibleSince = now;
visibleUntil = now + titleLength();
}
}

public void clear() {
visibleSince = 0;
visibleUntil = 0;
}

public void reset() {
clear();
title = null;
subtitle = null;
fadeIn = 10;
stay = 70;
fadeOut = 20;
}

public boolean isVisible() {
return visibleUntil > System.currentTimeMillis();
}

public JsonElement title() {
return title;
}

public JsonElement subtitle() {
return subtitle;
}

public int[] remainingTimes() {
final int fullLength = Math.max(0, fadeIn + stay + fadeOut);
final int elapsed = (int) Math.min(fullLength, Math.max(0, (System.currentTimeMillis() - visibleSince) / 50L));
if (elapsed < fadeIn) {
return new int[]{fadeIn - elapsed, stay, fadeOut};
}

final int titleEnd = fadeIn + stay;
if (elapsed < titleEnd) {
return new int[]{0, titleEnd - elapsed, fadeOut};
}

return new int[]{0, 0, fullLength - elapsed};
}

private long titleLength() {
return Math.max(0, fadeIn + stay + fadeOut) * 50L;
}
}

}
3 changes: 3 additions & 0 deletions ...in/java/com/viaversion/viarewind/protocol/v1_9to1_8/rewriter/PlayerPacketRewriter1_9.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import com.viaversion.viarewind.ViaRewind;
import com.viaversion.viarewind.api.type.RewindTypes;
import com.viaversion.viarewind.protocol.v1_9to1_8.Protocol1_9To1_8;
import com.viaversion.viarewind.protocol.v1_9to1_8.cooldown.TitleCooldownVisualization;
import com.viaversion.viarewind.protocol.v1_9to1_8.provider.InventoryProvider;
import com.viaversion.viarewind.protocol.v1_9to1_8.storage.BlockPlaceDestroyTracker;
import com.viaversion.viarewind.protocol.v1_9to1_8.storage.BossBarStorage;
Expand Down Expand Up @@ -107,6 +108,8 @@ public void register() {

protocol.cancelClientbound(ClientboundPackets1_9.COOLDOWN);

protocol.registerClientbound(ClientboundPackets1_9.SET_TITLES, TitleCooldownVisualization::trackTitle);

protocol.registerClientbound(ClientboundPackets1_9.CUSTOM_PAYLOAD, new PacketHandlers() {
@Override
public void register() {
Expand Down