Skip to content

Remove windups (for now) #31

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

Merged
SuperRicky14 merged 2 commits into from
Jan 19, 2026
Merged

Remove windups (for now) #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68cbf4a
Remove windups except for the messages
SuperRicky14 Jan 19, 2026
253f768
Remove dead config option: TPA_ACCEPT_TIME_IN_SECONDS
SuperRicky14 Jan 19, 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
15 changes: 2 additions & 13 deletions common/src/main/java/net/superricky/tpaplusplus/TPAPlusPlus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,13 @@
import net.superricky.tpaplusplus.commands.tpaplusplus.TPAPlusPlusCommand;
import net.superricky.tpaplusplus.commands.unblock.TPUnBlockCommand;
import net.superricky.tpaplusplus.config.Config;
import net.superricky.tpaplusplus.cooldown.CooldownExpiredEvent;
import net.superricky.tpaplusplus.cooldown.CooldownManager;
import net.superricky.tpaplusplus.io.ServerLifecycleHandler;
import net.superricky.tpaplusplus.network.UpdateCheckKt;
import net.superricky.tpaplusplus.timeout.RequestTimeoutEvent;
import net.superricky.tpaplusplus.timeout.TimeoutManager;
import net.superricky.tpaplusplus.util.MsgFmt;
import net.superricky.tpaplusplus.windupcooldown.cooldown.CooldownExpiredEvent;
import net.superricky.tpaplusplus.windupcooldown.cooldown.CooldownManager;
import net.superricky.tpaplusplus.windupcooldown.windup.WindupWatcher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -75,16 +74,6 @@ public static void init() {
LOGGER.info("REGISTERING \"TimeoutTicker\"...");
TickEvent.SERVER_POST.register(TimeoutManager.INSTANCE::onMinecraftServerTick);

if (Config.USE_NON_BLOCKING_ASYNC_TICK_LOOP.get()) {
LOGGER.warn("USING EXPERIMENTAL NON BLOCKING TICK LOOP");
LOGGER.info(MsgFmt.fmt("INITIALIZING TICK LOOP WITH RATE OF ${tick_rate}...", Map.of("tick_rate", Config.ASYNC_TICK_LOOP_UPDATE_RATE.get())));
WindupWatcher.INSTANCE.startAsyncTickLoop(Config.ASYNC_TICK_LOOP_UPDATE_RATE.get());
} else {
LOGGER.info("USING SYNCHRONOUS TICK LOOP");
LOGGER.info("REGISTERING \"TickEvent.SERVER_POST\"...");
TickEvent.SERVER_POST.register(server -> WindupWatcher.INSTANCE.runTick());
}

LOGGER.info("INITIALIZING VERSION CHECKING...");
UpdateCheckKt.initVersionCheckDaemon();

Expand Down
14 changes: 4 additions & 10 deletions common/src/main/java/net/superricky/tpaplusplus/commands/accept/AcceptTPA.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@
import net.minecraft.server.level.ServerPlayer;
import net.superricky.tpaplusplus.config.Config;
import net.superricky.tpaplusplus.config.Messages;
import net.superricky.tpaplusplus.cooldown.CommandType;
import net.superricky.tpaplusplus.cooldown.CooldownData;
import net.superricky.tpaplusplus.cooldown.CooldownManager;
import net.superricky.tpaplusplus.requests.Request;
import net.superricky.tpaplusplus.requests.RequestGrabUtil;
import net.superricky.tpaplusplus.requests.RequestHelper;
import net.superricky.tpaplusplus.util.MsgFmt;
import net.superricky.tpaplusplus.windupcooldown.cooldown.CommandType;
import net.superricky.tpaplusplus.windupcooldown.cooldown.CooldownData;
import net.superricky.tpaplusplus.windupcooldown.cooldown.CooldownManager;
import net.superricky.tpaplusplus.windupcooldown.windup.AsyncWindup;
import net.superricky.tpaplusplus.windupcooldown.windup.impl.AcceptWindup;

import java.time.Duration;
import java.util.Map;
Expand All @@ -35,11 +33,7 @@ public static void acceptFunctionality(Request request, ServerPlayer receiver) {
if (Config.ACCEPT_COOLDOWN.get() > 0) // Check if cooldown is enabled
CooldownManager.INSTANCE.scheduleCooldown(receiver.getUUID(), Duration.ofSeconds(Config.ACCEPT_COOLDOWN.get()), CommandType.ACCEPT);

if (Config.ACCEPT_WINDUP.get() == 0) {
absoluteAcceptFunctionality(request, receiver);
} else {
AsyncWindup.INSTANCE.schedule(new AcceptWindup(request));
}
absoluteAcceptFunctionality(request, receiver);
}

public static void absoluteAcceptFunctionality(Request request, ServerPlayer receiver) {
Expand Down
14 changes: 4 additions & 10 deletions common/src/main/java/net/superricky/tpaplusplus/commands/back/Back.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@
import net.minecraft.server.level.ServerPlayer;
import net.superricky.tpaplusplus.config.Config;
import net.superricky.tpaplusplus.config.Messages;
import net.superricky.tpaplusplus.windupcooldown.cooldown.CommandType;
import net.superricky.tpaplusplus.windupcooldown.cooldown.CooldownData;
import net.superricky.tpaplusplus.windupcooldown.cooldown.CooldownManager;
import net.superricky.tpaplusplus.windupcooldown.windup.AsyncWindup;
import net.superricky.tpaplusplus.windupcooldown.windup.impl.BackWindup;
import net.superricky.tpaplusplus.cooldown.CommandType;
import net.superricky.tpaplusplus.cooldown.CooldownData;
import net.superricky.tpaplusplus.cooldown.CooldownManager;
import org.jetbrains.annotations.Nullable;

import java.time.Duration;
Expand Down Expand Up @@ -42,11 +40,7 @@ public static void teleportToLatestDeath(ServerPlayer executor) {
if (Config.BACK_COOLDOWN.get() > 0) // Check if cooldown is enabled
CooldownManager.INSTANCE.scheduleCooldown(executor.getUUID(), Duration.ofSeconds(Config.BACK_COOLDOWN.get()), CommandType.BACK);

if (Config.BACK_WINDUP.get() == 0) {
absoluteTeleportToLatestDeath(executor, deathPosition);
} else {
AsyncWindup.INSTANCE.schedule(new BackWindup(executor, deathPosition));
}
absoluteTeleportToLatestDeath(executor, deathPosition);
}

public static void absoluteTeleportToLatestDeath(ServerPlayer executor, LevelBoundVec3 deathPosition) {
Expand Down
14 changes: 4 additions & 10 deletions common/src/main/java/net/superricky/tpaplusplus/commands/block/BlockPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@
import net.minecraft.server.level.ServerPlayer;
import net.superricky.tpaplusplus.config.Config;
import net.superricky.tpaplusplus.config.Messages;
import net.superricky.tpaplusplus.cooldown.CommandType;
import net.superricky.tpaplusplus.cooldown.CooldownData;
import net.superricky.tpaplusplus.cooldown.CooldownManager;
import net.superricky.tpaplusplus.io.PlayerData;
import net.superricky.tpaplusplus.io.SaveDataManager;
import net.superricky.tpaplusplus.requests.RequestHelper;
import net.superricky.tpaplusplus.util.MsgFmt;
import net.superricky.tpaplusplus.windupcooldown.cooldown.CommandType;
import net.superricky.tpaplusplus.windupcooldown.cooldown.CooldownData;
import net.superricky.tpaplusplus.windupcooldown.cooldown.CooldownManager;
import net.superricky.tpaplusplus.windupcooldown.windup.AsyncWindup;
import net.superricky.tpaplusplus.windupcooldown.windup.impl.BlockPlayerWindup;

import java.time.Duration;
import java.util.Map;
Expand Down Expand Up @@ -43,11 +41,7 @@ public static void blockPlayer(ServerPlayer executor, ServerPlayer blockedPlayer
if (Config.BLOCK_COOLDOWN.get() > 0) // Check if cooldown is enabled
CooldownManager.INSTANCE.scheduleCooldown(executor.getUUID(), Duration.ofSeconds(Config.BLOCK_COOLDOWN.get()), CommandType.BLOCK);

if (Config.BLOCK_WINDUP.get() == 0) {
absoluteBlockPlayer(executorData, executor, blockedPlayer);
} else {
AsyncWindup.INSTANCE.schedule(new BlockPlayerWindup(executorData, executor, blockedPlayer));
}
absoluteBlockPlayer(executorData, executor, blockedPlayer);
}

public static void absoluteBlockPlayer(PlayerData executorData, ServerPlayer executor, ServerPlayer blockedPlayer) {
Expand Down
14 changes: 4 additions & 10 deletions common/src/main/java/net/superricky/tpaplusplus/commands/cancel/CancelTPA.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@
import net.minecraft.server.level.ServerPlayer;
import net.superricky.tpaplusplus.config.Config;
import net.superricky.tpaplusplus.config.Messages;
import net.superricky.tpaplusplus.cooldown.CommandType;
import net.superricky.tpaplusplus.cooldown.CooldownData;
import net.superricky.tpaplusplus.cooldown.CooldownManager;
import net.superricky.tpaplusplus.requests.Request;
import net.superricky.tpaplusplus.requests.RequestGrabUtil;
import net.superricky.tpaplusplus.requests.RequestHelper;
import net.superricky.tpaplusplus.util.MsgFmt;
import net.superricky.tpaplusplus.windupcooldown.cooldown.CooldownData;
import net.superricky.tpaplusplus.windupcooldown.cooldown.CooldownManager;
import net.superricky.tpaplusplus.windupcooldown.cooldown.CommandType;
import net.superricky.tpaplusplus.windupcooldown.windup.AsyncWindup;
import net.superricky.tpaplusplus.windupcooldown.windup.impl.CancelWindup;

import java.time.Duration;
import java.util.Map;
Expand All @@ -35,11 +33,7 @@ private static void cancelFunctionality(Request request, ServerPlayer sender) {
if (Config.CANCEL_COOLDOWN.get() > 0) // Check if cooldown is enabled
CooldownManager.INSTANCE.scheduleCooldown(sender.getUUID(), Duration.ofSeconds(Config.CANCEL_COOLDOWN.get()), CommandType.CANCEL);

if (Config.CANCEL_WINDUP.get() == 0) {
absoluteCancel(request);
} else {
AsyncWindup.INSTANCE.schedule(new CancelWindup(request));
}
absoluteCancel(request);
}

public static void absoluteCancel(Request request) {
Expand Down
14 changes: 4 additions & 10 deletions common/src/main/java/net/superricky/tpaplusplus/commands/deny/DenyTPA.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@
import net.minecraft.server.level.ServerPlayer;
import net.superricky.tpaplusplus.config.Config;
import net.superricky.tpaplusplus.config.Messages;
import net.superricky.tpaplusplus.cooldown.CommandType;
import net.superricky.tpaplusplus.cooldown.CooldownData;
import net.superricky.tpaplusplus.cooldown.CooldownManager;
import net.superricky.tpaplusplus.requests.Request;
import net.superricky.tpaplusplus.requests.RequestGrabUtil;
import net.superricky.tpaplusplus.requests.RequestHelper;
import net.superricky.tpaplusplus.util.MsgFmt;
import net.superricky.tpaplusplus.windupcooldown.cooldown.CooldownData;
import net.superricky.tpaplusplus.windupcooldown.cooldown.CooldownManager;
import net.superricky.tpaplusplus.windupcooldown.cooldown.CommandType;
import net.superricky.tpaplusplus.windupcooldown.windup.AsyncWindup;
import net.superricky.tpaplusplus.windupcooldown.windup.impl.DenyWindup;

import java.time.Duration;
import java.util.Map;
Expand All @@ -35,11 +33,7 @@ private static void denyFunctionality(Request request, ServerPlayer receiver) {
if (Config.DENY_COOLDOWN.get() > 0) // Check if cooldown is enabled
CooldownManager.INSTANCE.scheduleCooldown(receiver.getUUID(), Duration.ofSeconds(Config.DENY_COOLDOWN.get()), CommandType.DENY);

if (Config.DENY_WINDUP.get() == 0) {
absoluteDeny(request);
} else {
AsyncWindup.INSTANCE.schedule(new DenyWindup(request));
}
absoluteDeny(request);
}

public static void absoluteDeny(Request request) {
Expand Down
21 changes: 5 additions & 16 deletions common/src/main/java/net/superricky/tpaplusplus/commands/send/SendTPA.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,16 @@
import net.superricky.tpaplusplus.commands.block.PlayerBlockingHelper;
import net.superricky.tpaplusplus.config.Config;
import net.superricky.tpaplusplus.config.Messages;
import net.superricky.tpaplusplus.cooldown.CommandType;
import net.superricky.tpaplusplus.cooldown.CooldownData;
import net.superricky.tpaplusplus.cooldown.CooldownManager;
import net.superricky.tpaplusplus.io.PlayerData;
import net.superricky.tpaplusplus.io.SaveDataManager;
import net.superricky.tpaplusplus.limitations.LimitationManager;
import net.superricky.tpaplusplus.requests.Request;
import net.superricky.tpaplusplus.requests.RequestHelper;
import net.superricky.tpaplusplus.timeout.TimeoutManager;
import net.superricky.tpaplusplus.util.MsgFmt;
import net.superricky.tpaplusplus.windupcooldown.cooldown.CommandType;
import net.superricky.tpaplusplus.windupcooldown.cooldown.CooldownData;
import net.superricky.tpaplusplus.windupcooldown.cooldown.CooldownManager;
import net.superricky.tpaplusplus.windupcooldown.windup.AsyncWindup;
import net.superricky.tpaplusplus.windupcooldown.windup.impl.TPAHereWindup;
import net.superricky.tpaplusplus.windupcooldown.windup.impl.TPAWindup;

import java.time.Duration;
import java.util.Map;
Expand Down Expand Up @@ -73,11 +70,7 @@ public static void sendTeleportRequest(ServerPlayer sender, ServerPlayer receive
if (Config.TPAHERE_COOLDOWN.get() > 0) // Check if cooldown is enabled
CooldownManager.INSTANCE.scheduleCooldown(sender.getUUID(), Duration.ofSeconds(Config.TPAHERE_COOLDOWN.get()), CommandType.TPAHERE);

if (Config.TPAHERE_WINDUP.get() == 0) {
absoluteSendTeleportRequest(sender, receiver, isHereRequest);
} else {
AsyncWindup.INSTANCE.schedule(new TPAHereWindup(sender, receiver));
}
absoluteSendTeleportRequest(sender, receiver, isHereRequest);
} else {
CooldownData cooldown;
if ((cooldown = CooldownManager.INSTANCE.getPlayerCooldown(sender.getUUID(), CommandType.TPA)) != null) {
Expand All @@ -88,11 +81,7 @@ public static void sendTeleportRequest(ServerPlayer sender, ServerPlayer receive
if (Config.TPA_COOLDOWN.get() > 0) // Check if cooldown is enabled
CooldownManager.INSTANCE.scheduleCooldown(sender.getUUID(), Duration.ofSeconds(Config.TPA_COOLDOWN.get()), CommandType.TPA);

if (Config.TPA_WINDUP.get() == 0) {
absoluteSendTeleportRequest(sender, receiver, isHereRequest);
} else {
AsyncWindup.INSTANCE.schedule(new TPAWindup(sender, receiver));
}
absoluteSendTeleportRequest(sender, receiver, isHereRequest);
}
}

Expand Down
14 changes: 4 additions & 10 deletions common/src/main/java/net/superricky/tpaplusplus/commands/toggle/TPToggle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@
import net.superricky.tpaplusplus.TPAPlusPlus;
import net.superricky.tpaplusplus.config.Config;
import net.superricky.tpaplusplus.config.Messages;
import net.superricky.tpaplusplus.cooldown.CommandType;
import net.superricky.tpaplusplus.cooldown.CooldownData;
import net.superricky.tpaplusplus.cooldown.CooldownManager;
import net.superricky.tpaplusplus.io.PlayerData;
import net.superricky.tpaplusplus.io.SaveDataManager;
import net.superricky.tpaplusplus.windupcooldown.cooldown.CommandType;
import net.superricky.tpaplusplus.windupcooldown.cooldown.CooldownData;
import net.superricky.tpaplusplus.windupcooldown.cooldown.CooldownManager;
import net.superricky.tpaplusplus.windupcooldown.windup.AsyncWindup;
import net.superricky.tpaplusplus.windupcooldown.windup.impl.TPToggleWindup;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -30,11 +28,7 @@ public static void toggleTPOrWait(ServerPlayer executor) {
if (Config.TOGGLE_COOLDOWN.get() > 0) // Check if cooldown is enabled
CooldownManager.INSTANCE.scheduleCooldown(executor.getUUID(), Duration.ofSeconds(Config.TOGGLE_COOLDOWN.get()), CommandType.TOGGLE);

if (Config.TOGGLE_WINDUP.get() == 0) {
toggleTP(executor);
} else {
AsyncWindup.INSTANCE.schedule(new TPToggleWindup(executor));
}
toggleTP(executor);
}

public static void toggleTP(ServerPlayer executor) {
Expand Down
2 changes: 0 additions & 2 deletions common/src/main/java/net/superricky/tpaplusplus/commands/tpaplusplus/TPAPlusPlusCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import net.superricky.tpaplusplus.network.UpdateCheckKt;
import net.superricky.tpaplusplus.requests.RequestHelper;
import net.superricky.tpaplusplus.util.MsgFmt;
import net.superricky.tpaplusplus.windupcooldown.windup.WindupWatcher;

import java.util.Map;
import java.util.Objects;
Expand Down Expand Up @@ -143,7 +142,6 @@ private static int reloadConfig(CommandSourceStack source, boolean force) {

RequestHelper.clearRequestSet();
DeathHelper.clearDeathCoordinates();
WindupWatcher.INSTANCE.clearTrackedWindupData();

source.sendSystemMessage(Component.literal(Messages.TPAPLUSPLUS_FORCE_RELOADED_CONFIG.get()));
return 1;
Expand Down
14 changes: 4 additions & 10 deletions common/src/main/java/net/superricky/tpaplusplus/commands/unblock/UnBlockPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@
import net.superricky.tpaplusplus.commands.block.PlayerBlockingHelper;
import net.superricky.tpaplusplus.config.Config;
import net.superricky.tpaplusplus.config.Messages;
import net.superricky.tpaplusplus.cooldown.CommandType;
import net.superricky.tpaplusplus.cooldown.CooldownData;
import net.superricky.tpaplusplus.cooldown.CooldownManager;
import net.superricky.tpaplusplus.io.PlayerData;
import net.superricky.tpaplusplus.io.SaveDataManager;
import net.superricky.tpaplusplus.requests.RequestHelper;
import net.superricky.tpaplusplus.util.MsgFmt;
import net.superricky.tpaplusplus.windupcooldown.cooldown.CooldownData;
import net.superricky.tpaplusplus.windupcooldown.cooldown.CooldownManager;
import net.superricky.tpaplusplus.windupcooldown.cooldown.CommandType;
import net.superricky.tpaplusplus.windupcooldown.windup.AsyncWindup;
import net.superricky.tpaplusplus.windupcooldown.windup.impl.UnBlockPlayerWindup;

import java.time.Duration;
import java.util.Map;
Expand Down Expand Up @@ -44,11 +42,7 @@ public static void unBlockPlayer(ServerPlayer executor, ServerPlayer blockedPlay
if (Config.UNBLOCK_COOLDOWN.get() > 0) // Check if cooldown is enabled
CooldownManager.INSTANCE.scheduleCooldown(executor.getUUID(), Duration.ofSeconds(Config.UNBLOCK_COOLDOWN.get()), CommandType.UNBLOCK);

if (Config.UNBLOCK_WINDUP.get() == 0) {
absoluteUnBlockPlayer(executorData, executor, blockedPlayer);
} else {
AsyncWindup.INSTANCE.schedule(new UnBlockPlayerWindup(executorData, executor, blockedPlayer));
}
absoluteUnBlockPlayer(executorData, executor, blockedPlayer);
}

public static void absoluteUnBlockPlayer(PlayerData executorData, ServerPlayer executor, ServerPlayer blockedPlayer) {
Expand Down
Loading
Loading