Skip to content

Commit

Permalink
Show sponsor cooldowns & fix their logic
Browse files Browse the repository at this point in the history 
Signed-off-by: Pablo Herrera <[email protected]>
  • Loading branch information
@Pablete1234
Pablete1234 committed Jan 3, 2025
1 parent 939c80c commit 80b3e57
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 97 deletions.
12 changes: 7 additions & 5 deletions core/src/main/java/dev/pgm/community/requests/commands/RequestCommands.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.format.TextDecoration;
import org.bukkit.entity.Player;
import tc.oc.pgm.api.PGM;
import tc.oc.pgm.api.map.MapInfo;
import tc.oc.pgm.lib.org.incendo.cloud.annotation.specifier.Greedy;
import tc.oc.pgm.lib.org.incendo.cloud.annotations.Argument;
Expand Down Expand Up @@ -55,16 +56,17 @@ public void request(
@Permission(CommunityPermissions.VIEW_MAP_COOLDOWNS)
public void viewCooldowns(
CommandAudience audience, Player sender, @Argument("page") @Default("1") int page) {
Map<MapInfo, MapCooldown> cooldowns = requests.getMapCooldowns();
Map<String, MapCooldown> cooldowns = requests.getMapCooldowns();
var library = PGM.get().getMapLibrary();

List<MapInfo> maps = cooldowns.entrySet().stream()
.filter(e -> !e.getValue().hasExpired())
.map(e -> e.getKey())
.map(e -> library.getMapById(e.getKey()))
.collect(Collectors.toList());

Comparator<MapInfo> compare = (m1, m2) -> {
MapCooldown m1C = cooldowns.get(m1);
MapCooldown m2C = cooldowns.get(m2);
MapCooldown m1C = cooldowns.get(m1.getId());
MapCooldown m2C = cooldowns.get(m2.getId());
Instant m1D = m1C.getEndTime();
Instant m2D = m2C.getEndTime();

Expand All @@ -85,7 +87,7 @@ public void viewCooldowns(
new PaginatedComponentResults<MapInfo>(formattedTitle, resultsPerPage) {
@Override
public Component format(MapInfo map, int index) {
MapCooldown cooldown = cooldowns.get(map);
MapCooldown cooldown = cooldowns.get(map.getId());

Component mapName = map.getStyledName(MapNameStyle.COLOR_WITH_AUTHORS)
.clickEvent(ClickEvent.runCommand("/map " + map.getName()))
Expand Down
5 changes: 4 additions & 1 deletion core/src/main/java/dev/pgm/community/requests/feature/RequestFeature.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import dev.pgm.community.requests.RequestProfile;
import dev.pgm.community.requests.SponsorRequest;
import dev.pgm.community.utils.PGMUtils.MapSizeBounds;
import java.time.Duration;
import java.util.List;
import java.util.Map;
import java.util.Optional;
Expand Down Expand Up @@ -168,7 +169,9 @@ public interface RequestFeature extends Feature {

boolean hasMapCooldown(MapInfo map);

Map<MapInfo, MapCooldown> getMapCooldowns();
Duration getApproximateCooldown(MapInfo map);

Map<String, MapCooldown> getMapCooldowns();

void openMenu(Player player);

Expand Down
148 changes: 57 additions & 91 deletions core/src/main/java/dev/pgm/community/requests/feature/RequestFeatureBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import dev.pgm.community.utils.VisibilityUtils;
import java.time.Duration;
import java.time.Instant;
import java.util.Comparator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
Expand All @@ -47,6 +48,7 @@
import java.util.logging.Logger;
import java.util.stream.Collectors;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.ComponentLike;
import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.event.ClickEvent;
import net.kyori.adventure.text.event.HoverEvent;
Expand All @@ -62,28 +64,26 @@
import tc.oc.pgm.api.map.MapInfo;
import tc.oc.pgm.api.map.MapOrder;
import tc.oc.pgm.api.map.Phase;
import tc.oc.pgm.api.map.VariantInfo;
import tc.oc.pgm.api.match.event.MatchFinishEvent;
import tc.oc.pgm.api.match.event.MatchVoteFinishEvent;
import tc.oc.pgm.events.PlayerJoinMatchEvent;
import tc.oc.pgm.restart.RestartManager;
import tc.oc.pgm.rotation.MapPoolManager;
import tc.oc.pgm.rotation.pools.MapPool;
import tc.oc.pgm.rotation.pools.VotingPool;
import tc.oc.pgm.rotation.vote.MapPoll;
import tc.oc.pgm.rotation.vote.VotePoolOptions;
import tc.oc.pgm.util.Audience;
import tc.oc.pgm.util.TimeUtils;
import tc.oc.pgm.util.named.MapNameStyle;
import tc.oc.pgm.util.named.NameStyle;
import tc.oc.pgm.util.text.TemporalComponent;

public abstract class RequestFeatureBase extends FeatureBase implements RequestFeature {

private Cache<UUID, MapInfo> requests;

private Cache<UUID, Instant> cooldown;

private Map<MapInfo, MapCooldown> mapCooldown;
private final Map<String, MapCooldown> mapCooldown;

private LinkedList<SponsorRequest> sponsors;

Expand Down Expand Up @@ -439,31 +439,26 @@ public void sponsor(Player player, MapInfo map) {
}

// Check if map has a cooldown
if (hasMapCooldown(map)) {
MapCooldown cooldown = getMapCooldown(map);
Component cooldownWarning = cooldown != null
? text()
.append(text("This map can be sponsored in ", NamedTextColor.RED))
.append(
TemporalComponent.duration(cooldown.getTimeRemaining(), NamedTextColor.YELLOW))
.build()
: text("This map is on cooldown! Please select another.", NamedTextColor.RED);
var cd = getApproximateCooldown(map);
if (cd.isPositive()) {
Component cooldownWarning = cd.toSeconds() > 0
? text("This map can be sponsored in ").append(duration(cd, NamedTextColor.YELLOW))
: text("This map played or lost a vote too recently!");
viewer.sendWarning(cooldownWarning);
return;
}

// Check map size
if (!isMapSizeAllowed(map)) {
viewer.sendWarning(text()
.append(map.getStyledName(MapNameStyle.COLOR)
.hoverEvent(HoverEvent.showText(text()
.append(text("Max of ", NamedTextColor.GRAY))
.append(text(PGMUtils.getMapMaxSize(map), NamedTextColor.RED)))))
.append(map.getStyledName(MapNameStyle.COLOR))
.append(text(" (Max of ", NamedTextColor.YELLOW)
.append(text(PGMUtils.getMapMaxSize(map), NamedTextColor.RED))
.append(text(")")))
.append(text(" does not fit the online player count "))
.append(getMapSizeBoundsComponent())
.append(newline())
.append(text("Please request a different map!"))
.build());
.append(text("Please request a different map!")));
return;
}

Expand Down Expand Up @@ -645,78 +640,53 @@ public MapSizeBounds getCurrentMapSizeBounds() {
getRequestConfig().getScaleFactor());
}

private boolean isACooldownVariant(MapInfo map) {
return mapCooldown.entrySet().stream().anyMatch((entry) -> {
MapInfo otherMap = entry.getKey();
MapCooldown cooldown = entry.getValue();

if (cooldown.hasExpired()) return false;

for (VariantInfo variant : otherMap.getVariants().values()) {
if (variant.getId().equalsIgnoreCase(map.getId())) {
return true;
}
}

return false;
});
}

private MapCooldown getMapCooldown(MapInfo map) {
if (mapCooldown.containsKey(map)) {
return mapCooldown.get(map);
}

for (Map.Entry<MapInfo, MapCooldown> entry : mapCooldown.entrySet()) {
MapInfo otherMap = entry.getKey();
MapCooldown cooldown = entry.getValue();

for (VariantInfo variant : otherMap.getVariants().values()) {
if (variant.getId().equalsIgnoreCase(map.getId())) {
return cooldown;
}
}
}

return null;
@Override
public boolean hasMapCooldown(MapInfo map) {
return getApproximateCooldown(map).isPositive();
}

public boolean isOnLongtermCooldown(MapInfo map) {
if (!getRequestConfig().isPGMCooldownsUsed()) return false;

MapPool activePool = PGMUtils.getActiveMapPool();
if (!(activePool instanceof VotingPool)) return false;

VotingPool pool = (VotingPool) activePool;
VotingPool.VoteConstants constants = pool.constants;
/**
* How long until the map (or any of its variants) is off cooldown.
*
* @param map the map to check
* @return zero for no cooldown. 1ms for undetermined (ie: score-based cooldown), otherwise the
* full cd duration
*/
@Override
public Duration getApproximateCooldown(MapInfo map) {
var mapLibrary = PGM.get().getMapLibrary();

return map.getVariants().values().stream()
.map(variant -> mapLibrary.getMapById(variant.getId()))
.filter(Objects::nonNull)
.map(pool::getVoteData)
.allMatch(data ->
!data.isOnCooldown(constants) && data.getScore() > (constants.defaultScore() / 2));
}

@Override
public boolean hasMapCooldown(MapInfo map) {
if (isOnLongtermCooldown(map)) return true;
if (isACooldownVariant(map)) return true;

MapCooldown cooldown = getMapCooldown(map);
if (cooldown == null) return false;

if (cooldown.hasExpired()) {
mapCooldown.remove(map);
return false;
.map(m -> TimeUtils.max(getSponsorCooldown(map), getPgmCooldown(map)))
.max(Comparator.naturalOrder())
.orElse(Duration.ZERO);
}

private Duration getSponsorCooldown(MapInfo map) {
var cd = mapCooldown.get(map.getId());
if (cd == null) return Duration.ZERO;
var remaining = cd.getTimeRemaining();
if (remaining.isNegative()) {
mapCooldown.remove(map.getId());
return Duration.ZERO;
}
return remaining;
}

return true;
private Duration getPgmCooldown(MapInfo map) {
if (!getRequestConfig().isPGMCooldownsUsed()) return Duration.ZERO;
if (!(PGMUtils.getActiveMapPool() instanceof VotingPool pool)) return Duration.ZERO;
var data = pool.getVoteData(map);
Duration cd = data.remainingCooldown(pool.constants);
if (cd.isPositive()) return cd;
return data.getScore() < (pool.constants.defaultScore() / 2)
? Duration.ofMillis(1L)
: Duration.ZERO;
}

@Override
public Map<MapInfo, MapCooldown> getMapCooldowns() {
public Map<String, MapCooldown> getMapCooldowns() {
return mapCooldown;
}

Expand Down Expand Up @@ -865,7 +835,7 @@ private MapPoolManager getPoolManager() {

private void startNewMapCooldown(MapInfo map, Duration matchLength) {
this.mapCooldown.putIfAbsent(
map,
map.getId(),
new MapCooldown(
Instant.now(), matchLength.multipliedBy(getRequestConfig().getMapCooldownMultiply())));
}
Expand Down Expand Up @@ -907,17 +877,13 @@ private void sendWrongSizeMapError(SponsorRequest request) {
.append(text(" and select a new map to sponsor.")));
}

private Component getMapSizeBoundsComponent() {
private ComponentLike getMapSizeBoundsComponent() {
MapSizeBounds bounds = getCurrentMapSizeBounds();
int min = bounds.getLowerBound();
int max = bounds.getUpperBound();
return text()
.append(text("(", NamedTextColor.GRAY))
.append(text(min, NamedTextColor.GOLD))
.append(text("-", NamedTextColor.GRAY))
.append(text(max, NamedTextColor.GOLD))
.append(text(")", NamedTextColor.GRAY))
.build();
return text("(", NamedTextColor.YELLOW)
.append(text(bounds.getLowerBound(), NamedTextColor.GOLD))
.append(text("-"))
.append(text(bounds.getUpperBound(), NamedTextColor.GOLD))
.append(text(")"));
}

private boolean isRestartQueued() {
Expand Down

0 comments on commit 80b3e57

Please sign in to comment.