yeet most of tick
This commit is contained in:
gnembon committed
1 parent
2c01a98216
commit
1a7e8b6875
30 files changed
+156
-1420
No files matched your search
@@ -1,255 +1,20 @@
|
||||
package carpet.helpers;
|
||||
|
||||
import carpet.CarpetServer;
|
||||
import carpet.network.ServerNetworkHandler;
|
||||
import carpet.utils.Messenger;
|
||||
import net.minecraft.commands.CommandSourceStack;
|
||||
import net.minecraft.commands.Commands;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.function.BiConsumer;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
|
||||
|
||||
public class ServerTickRateManager extends TickRateManager
|
||||
{
|
||||
private long remainingWarpTicks = 0;
|
||||
private long tickWarpStartTime = 0;
|
||||
private long scheduledCurrentWarpTicks = 0;
|
||||
private ServerPlayer warpResponsiblePlayer = null;
|
||||
private String tickWarpCallback = null;
|
||||
private CommandSourceStack warpResponsibleSource = null;
|
||||
|
||||
private MinecraftServer server;
|
||||
|
||||
public ServerTickRateManager(MinecraftServer server) {
|
||||
this.server = server;
|
||||
}
|
||||
|
||||
public boolean isInWarpSpeed()
|
||||
{
|
||||
return tickWarpStartTime != 0;
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean shouldEntityTick(Entity e)
|
||||
{
|
||||
return (runsNormally() || (e instanceof Player));
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether or not the game is deeply frozen.
|
||||
* This can be used for things that you may not normally want
|
||||
* to freeze, but may need to in some situations.
|
||||
* This should be checked with {@link #runGameElements} to make sure the
|
||||
* current tick is actually frozen, not only the game
|
||||
*
|
||||
* @return Whether or not the game is deeply frozen.
|
||||
*/
|
||||
public boolean deeplyFrozen()
|
||||
{
|
||||
return deepFreeze;
|
||||
}
|
||||
|
||||
/**
|
||||
* Used to update the frozen state of the game.
|
||||
* Handles connected clients as well.
|
||||
*
|
||||
* @param isPaused Whether or not the game is paused
|
||||
* @param isDeepFreeze Whether or not the game is deeply frozen
|
||||
*/
|
||||
@Override
|
||||
public void setFrozenState(boolean isPaused, boolean isDeepFreeze)
|
||||
{
|
||||
super.setFrozenState(isPaused, isDeepFreeze);
|
||||
ServerNetworkHandler.updateFrozenStateToConnectedPlayers(server);
|
||||
}
|
||||
|
||||
|
||||
public void resetPlayerActivity()
|
||||
{
|
||||
if (playerActivityTimeout < PLAYER_GRACE)
|
||||
{
|
||||
playerActivityTimeout = PLAYER_GRACE;
|
||||
ServerNetworkHandler.updateTickPlayerActiveTimeoutToConnectedPlayers(server);
|
||||
}
|
||||
}
|
||||
|
||||
public void stepGameIfPaused(int ticks)
|
||||
{
|
||||
playerActivityTimeout = PLAYER_GRACE + ticks;
|
||||
ServerNetworkHandler.updateTickPlayerActiveTimeoutToConnectedPlayers(server);
|
||||
}
|
||||
|
||||
public Component requestGameToWarpSpeed(ServerPlayer player, int advance, String callback, CommandSourceStack source)
|
||||
{
|
||||
if (0 == advance)
|
||||
{
|
||||
tickWarpCallback = null;
|
||||
if (source != warpResponsibleSource)
|
||||
{
|
||||
warpResponsibleSource = null;
|
||||
}
|
||||
if (remainingWarpTicks > 0)
|
||||
{
|
||||
finishTickWarp();
|
||||
warpResponsibleSource = null;
|
||||
return Messenger.c("gi Warp interrupted");
|
||||
}
|
||||
return Messenger.c("ri No warp in progress");
|
||||
}
|
||||
if (remainingWarpTicks > 0)
|
||||
{
|
||||
String who = "Another player";
|
||||
if (warpResponsiblePlayer != null)
|
||||
{
|
||||
who = warpResponsiblePlayer.getScoreboardName();
|
||||
}
|
||||
return Messenger.c("l " + who + " is already advancing time at the moment. Try later or ask them");
|
||||
}
|
||||
warpResponsiblePlayer = player;
|
||||
tickWarpStartTime = System.nanoTime();
|
||||
scheduledCurrentWarpTicks = advance;
|
||||
remainingWarpTicks = advance;
|
||||
tickWarpCallback = callback;
|
||||
warpResponsibleSource = source;
|
||||
return Messenger.c("gi Warp speed ....");
|
||||
}
|
||||
|
||||
// should be private
|
||||
public void finishTickWarp()
|
||||
{
|
||||
|
||||
long completed_ticks = scheduledCurrentWarpTicks - remainingWarpTicks;
|
||||
double milis_to_complete = System.nanoTime() - tickWarpStartTime;
|
||||
if (milis_to_complete == 0.0)
|
||||
{
|
||||
milis_to_complete = 1.0;
|
||||
}
|
||||
milis_to_complete /= 1000000.0;
|
||||
int tps = (int) (1000.0D * completed_ticks / milis_to_complete);
|
||||
double mspt = (1.0 * milis_to_complete) / completed_ticks;
|
||||
scheduledCurrentWarpTicks = 0;
|
||||
tickWarpStartTime = 0;
|
||||
if (tickWarpCallback != null)
|
||||
{
|
||||
Commands icommandmanager = warpResponsibleSource.getServer().getCommands();
|
||||
try
|
||||
{
|
||||
icommandmanager.performPrefixedCommand(warpResponsibleSource, tickWarpCallback);
|
||||
}
|
||||
catch (Throwable var23)
|
||||
{
|
||||
if (warpResponsiblePlayer != null)
|
||||
{
|
||||
Messenger.m(warpResponsiblePlayer, "r Command Callback failed - unknown error: ", "rb /" + tickWarpCallback, "/" + tickWarpCallback);
|
||||
}
|
||||
}
|
||||
tickWarpCallback = null;
|
||||
warpResponsibleSource = null;
|
||||
}
|
||||
if (warpResponsiblePlayer != null)
|
||||
{
|
||||
Messenger.m(warpResponsiblePlayer, String.format("gi ... Time warp completed with %d tps, or %.2f mspt", tps, mspt));
|
||||
warpResponsiblePlayer = null;
|
||||
}
|
||||
else
|
||||
{
|
||||
Messenger.print_server_message(CarpetServer.minecraft_server, String.format("... Time warp completed with %d tps, or %.2f mspt", tps, mspt));
|
||||
}
|
||||
remainingWarpTicks = 0;
|
||||
|
||||
}
|
||||
|
||||
public boolean continueWarp()
|
||||
{
|
||||
if (!runGameElements)
|
||||
// Returning false so we don't have to run at max speed when doing nothing
|
||||
{
|
||||
return false;
|
||||
}
|
||||
if (remainingWarpTicks > 0)
|
||||
{
|
||||
if (remainingWarpTicks == scheduledCurrentWarpTicks) //first call after previous tick, adjust start time
|
||||
{
|
||||
tickWarpStartTime = System.nanoTime();
|
||||
}
|
||||
remainingWarpTicks -= 1;
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
finishTickWarp();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Functional interface that listens for tickrate changes. This is
|
||||
* implemented to allow tickrate compatibility with other mods etc.
|
||||
*/
|
||||
private final Map<String, BiConsumer<String, Float>> tickrateListeners = new HashMap<>();
|
||||
private static final float MIN_TICKRATE = 0.01f;
|
||||
|
||||
//unused - mod compat reasons
|
||||
@Override
|
||||
public void setTickRate(float rate)
|
||||
{
|
||||
setTickRate(rate, true);
|
||||
}
|
||||
|
||||
public void setTickRate(float rate, boolean update)
|
||||
{
|
||||
super.setTickRate(rate);
|
||||
if (update)
|
||||
{
|
||||
notifyTickrateListeners("carpet");
|
||||
}
|
||||
}
|
||||
|
||||
private void tickrateChanged(String modId, float rate)
|
||||
{
|
||||
// Other mods might change the tickrate in a slightly
|
||||
// different way. Also allow for tickrates that don't
|
||||
// divide into 1000 here.
|
||||
|
||||
if (rate < MIN_TICKRATE)
|
||||
{
|
||||
rate = MIN_TICKRATE;
|
||||
}
|
||||
|
||||
tickrate = rate;
|
||||
mspt = 1000.0f / tickrate;
|
||||
|
||||
notifyTickrateListeners(modId);
|
||||
}
|
||||
|
||||
private void notifyTickrateListeners(String originModId)
|
||||
{
|
||||
synchronized (tickrateListeners)
|
||||
{
|
||||
for (Map.Entry<String, BiConsumer<String, Float>> listenerEntry : tickrateListeners.entrySet())
|
||||
{
|
||||
if (originModId == null || !originModId.equals(listenerEntry.getKey()))
|
||||
{
|
||||
listenerEntry.getValue().accept(originModId, tickrate);
|
||||
}
|
||||
}
|
||||
}
|
||||
ServerNetworkHandler.updateTickSpeedToConnectedPlayers(server);
|
||||
}
|
||||
|
||||
public BiConsumer<String, Float> addTickrateListener(String modId, BiConsumer<String, Float> tickrateListener)
|
||||
{
|
||||
synchronized (tickrateListeners)
|
||||
{
|
||||
tickrateListeners.put(modId, tickrateListener);
|
||||
}
|
||||
return this::tickrateChanged;
|
||||
public void requestGameToSprint(final int ticks)
|
||||
{ // noop
|
||||
}
|
||||
}
|
||||
@@ -1,105 +1,19 @@
|
||||
package carpet.helpers;
|
||||
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
|
||||
public class TickRateManager
|
||||
{
|
||||
public static final int PLAYER_GRACE = 2;
|
||||
protected float tickrate = 20.0f;
|
||||
protected float mspt = 50.0f;
|
||||
protected int playerActivityTimeout = 0;
|
||||
protected boolean runGameElements = true;
|
||||
// deep freeze is onlyu used serverside
|
||||
protected boolean deepFreeze = false;
|
||||
protected boolean isGamePaused = false;
|
||||
protected boolean isSuperHot = false;
|
||||
|
||||
public void setTickRate(float rate)
|
||||
{
|
||||
tickrate = rate;
|
||||
long msptt = (long) (1000.0 / tickrate);
|
||||
if (msptt <= 0L)
|
||||
{
|
||||
msptt = 1L;
|
||||
tickrate = 1000.0f;
|
||||
}
|
||||
mspt = msptt;
|
||||
}
|
||||
|
||||
public float tickrate()
|
||||
{
|
||||
return tickrate;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Whether or not the game is in a frozen state.
|
||||
* You should normally use {@link #runGameElements} instead,
|
||||
* since that one accounts for tick steps and superhot
|
||||
*/
|
||||
public boolean gameIsPaused()
|
||||
{
|
||||
return isGamePaused;
|
||||
return false;
|
||||
}
|
||||
|
||||
public float mspt() {
|
||||
return mspt;
|
||||
public float mspt()
|
||||
{
|
||||
return 50.0f;
|
||||
}
|
||||
|
||||
public boolean runsNormally()
|
||||
{
|
||||
return runGameElements;
|
||||
}
|
||||
|
||||
public boolean isSuperHot()
|
||||
{
|
||||
return isSuperHot;
|
||||
}
|
||||
|
||||
public void setPlayerActiveTimeout(int timeout)
|
||||
{
|
||||
playerActivityTimeout = timeout;
|
||||
}
|
||||
|
||||
public int getPlayerActiveTimeout()
|
||||
{
|
||||
return playerActivityTimeout;
|
||||
}
|
||||
|
||||
public void setFrozenState(boolean isPaused, boolean isDeepFreeze)
|
||||
{
|
||||
isGamePaused = isPaused;
|
||||
deepFreeze = isPaused && isDeepFreeze;
|
||||
}
|
||||
|
||||
public void setSuperHot(boolean isSuperHot)
|
||||
{
|
||||
this.isSuperHot = isSuperHot;
|
||||
}
|
||||
|
||||
public void tick()
|
||||
{
|
||||
if (playerActivityTimeout > 0)
|
||||
{
|
||||
playerActivityTimeout--;
|
||||
}
|
||||
if (isGamePaused)
|
||||
{
|
||||
runGameElements = playerActivityTimeout >= PLAYER_GRACE;
|
||||
}
|
||||
else if (isSuperHot)
|
||||
{
|
||||
runGameElements = playerActivityTimeout > 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
runGameElements = true;
|
||||
}
|
||||
}
|
||||
|
||||
public boolean shouldEntityTick(Entity e)
|
||||
{
|
||||
// client
|
||||
return (runsNormally() || (e instanceof Player) || isSuperHot() && e.getControllingPassenger() instanceof Player);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -1,175 +0,0 @@
|
||||
package carpet.helpers;
|
||||
|
||||
import java.util.Optional;
|
||||
import java.util.function.BiConsumer;
|
||||
|
||||
import carpet.fakes.MinecraftServerInterface;
|
||||
import net.minecraft.commands.CommandSourceStack;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import carpet.CarpetServer;
|
||||
import carpet.utils.Messenger;
|
||||
|
||||
@Deprecated(forRemoval = true, since = "now")
|
||||
public class TickSpeed
|
||||
{
|
||||
private static Optional<ServerTickRateManager> gTRM() {
|
||||
if (CarpetServer.minecraft_server == null) return Optional.empty();
|
||||
return Optional.of(((MinecraftServerInterface)CarpetServer.minecraft_server).getTickRateManager());
|
||||
}
|
||||
|
||||
public static boolean process_entities() {
|
||||
return gTRM().map(ServerTickRateManager::runsNormally).orElse(true);
|
||||
}
|
||||
|
||||
public static float mspt() {
|
||||
return gTRM().map(ServerTickRateManager::mspt).orElse(50.0f);
|
||||
}
|
||||
|
||||
public static boolean isPaused() {
|
||||
return gTRM().map(ServerTickRateManager::gameIsPaused).orElse(false);
|
||||
}
|
||||
|
||||
public static boolean deeplyFrozen() {
|
||||
return gTRM().map(ServerTickRateManager::deeplyFrozen).orElse(false);
|
||||
}
|
||||
|
||||
public static void setFrozenState(boolean isPaused, boolean isDeepFreeze) {
|
||||
gTRM().ifPresent(trm -> trm.setFrozenState(isPaused, isDeepFreeze));
|
||||
}
|
||||
|
||||
public static void reset_player_active_timeout()
|
||||
{
|
||||
gTRM().ifPresent(ServerTickRateManager::resetPlayerActivity);
|
||||
}
|
||||
|
||||
public static void reset()
|
||||
{
|
||||
// noop - called on server to reset client
|
||||
}
|
||||
|
||||
public static void add_ticks_to_run_in_pause(int ticks)
|
||||
{
|
||||
gTRM().ifPresent(trm -> trm.stepGameIfPaused(ticks));
|
||||
}
|
||||
|
||||
public static Component tickrate_advance(ServerPlayer player, int advance, String callback, CommandSourceStack source)
|
||||
{
|
||||
return gTRM().map(trm -> trm.requestGameToWarpSpeed(player, advance, callback, source)).orElse(Messenger.c("ri Tickrate management not enabled"));
|
||||
}
|
||||
|
||||
public static void finish_time_warp()
|
||||
{
|
||||
gTRM().ifPresent(ServerTickRateManager::finishTickWarp);
|
||||
}
|
||||
|
||||
public static boolean continueWarp()
|
||||
{
|
||||
return gTRM().map(ServerTickRateManager::continueWarp).orElse(false);
|
||||
}
|
||||
|
||||
public static void tick()
|
||||
{
|
||||
gTRM().ifPresent(ServerTickRateManager::tick);
|
||||
}
|
||||
//unused - mod compat reasons
|
||||
public static void tickrate(float rate) {tickrate(rate, true);}
|
||||
public static void tickrate(float rate, boolean update)
|
||||
{
|
||||
gTRM().ifPresent(trm -> trm.setTickRate(rate, update));
|
||||
}
|
||||
|
||||
|
||||
public static BiConsumer<String, Float> addTickrateListener(String modId, BiConsumer<String, Float> tickrateListener)
|
||||
{
|
||||
return gTRM().map(trm -> trm.addTickrateListener(modId, tickrateListener)).orElse(null);
|
||||
}
|
||||
|
||||
|
||||
// client only
|
||||
|
||||
private static float tickrate = 20.0f;
|
||||
private static float mspt = 50.0f;
|
||||
private static int player_active_timeout = 0;
|
||||
private static boolean process_entities = true;
|
||||
private static boolean deepFreeze = false;
|
||||
private static boolean is_paused = false;
|
||||
private static boolean is_superHot = false;
|
||||
|
||||
public static void tickrateClient(float rate)
|
||||
{
|
||||
tickrate = rate;
|
||||
long msptt = (long) (1000.0 / tickrate);
|
||||
if (msptt <= 0L)
|
||||
{
|
||||
msptt = 1L;
|
||||
tickrate = 1000.0f;
|
||||
}
|
||||
|
||||
mspt = msptt;
|
||||
}
|
||||
|
||||
public static float msptClient() {
|
||||
return mspt;
|
||||
}
|
||||
|
||||
public static boolean process_entitiesClient()
|
||||
{
|
||||
return process_entities;
|
||||
}
|
||||
|
||||
public static boolean isIs_superHotClient()
|
||||
{
|
||||
return is_superHot;
|
||||
}
|
||||
|
||||
public static void setPlayer_active_timeoutClient(int timeout)
|
||||
{
|
||||
player_active_timeout = timeout;
|
||||
}
|
||||
|
||||
|
||||
public static void setFrozenStateClient(boolean isPaused, boolean isDeepFreeze)
|
||||
{
|
||||
is_paused = isPaused;
|
||||
deepFreeze = isPaused ? isDeepFreeze : false;
|
||||
}
|
||||
|
||||
public static void setSuperHotClient(boolean isSuperHot)
|
||||
{
|
||||
is_superHot = isSuperHot;
|
||||
}
|
||||
|
||||
public static void tickClient()
|
||||
{
|
||||
if (player_active_timeout > 0)
|
||||
{
|
||||
player_active_timeout--;
|
||||
}
|
||||
if (is_paused)
|
||||
{
|
||||
process_entities = player_active_timeout >= ServerTickRateManager.PLAYER_GRACE;
|
||||
}
|
||||
else if (is_superHot)
|
||||
{
|
||||
process_entities = player_active_timeout > 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
process_entities = true;
|
||||
}
|
||||
}
|
||||
|
||||
public static void resetClient()
|
||||
{
|
||||
tickrate = 20.0f;
|
||||
mspt = 50.0f;
|
||||
player_active_timeout = 0;
|
||||
process_entities = true;
|
||||
deepFreeze = false;
|
||||
is_paused = false;
|
||||
is_superHot = false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user