mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-20 04:09:51 +00:00
Provide access to the haveTime supplier in WorldTickEvent and ServerTickEvent (#8470)
This commit is contained in:
1 parent
cdd91968b4
commit
41c88f6e52
3 files changed
+107
-8
No files matched your search
@@ -7,6 +7,7 @@ package net.minecraftforge.event;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.*;
|
||||
import java.util.function.BooleanSupplier;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
@@ -848,14 +849,36 @@ public class ForgeEventFactory
|
||||
MinecraftForge.EVENT_BUS.post(new TickEvent.PlayerTickEvent(TickEvent.Phase.END, player));
|
||||
}
|
||||
|
||||
/**
|
||||
* TODO: Remove in 1.19
|
||||
*
|
||||
* @deprecated Use {@link #onPreWorldTick(Level, BooleanSupplier)}
|
||||
*/
|
||||
@Deprecated(forRemoval = true, since = "1.18.1")
|
||||
public static void onPreWorldTick(Level level)
|
||||
{
|
||||
MinecraftForge.EVENT_BUS.post(new TickEvent.WorldTickEvent(LogicalSide.SERVER, TickEvent.Phase.START, level));
|
||||
onPreWorldTick(level, () -> false);
|
||||
}
|
||||
|
||||
public static void onPreWorldTick(Level level, BooleanSupplier haveTime)
|
||||
{
|
||||
MinecraftForge.EVENT_BUS.post(new TickEvent.WorldTickEvent(LogicalSide.SERVER, TickEvent.Phase.START, level, haveTime));
|
||||
}
|
||||
|
||||
/**
|
||||
* TODO: Remove in 1.19
|
||||
*
|
||||
* @deprecated Use {@link #onPostWorldTick(Level, BooleanSupplier)}
|
||||
*/
|
||||
@Deprecated(forRemoval = true, since = "1.18.1")
|
||||
public static void onPostWorldTick(Level level)
|
||||
{
|
||||
MinecraftForge.EVENT_BUS.post(new TickEvent.WorldTickEvent(LogicalSide.SERVER, TickEvent.Phase.END, level));
|
||||
onPostWorldTick(level, () -> false);
|
||||
}
|
||||
|
||||
public static void onPostWorldTick(Level level, BooleanSupplier haveTime)
|
||||
{
|
||||
MinecraftForge.EVENT_BUS.post(new TickEvent.WorldTickEvent(LogicalSide.SERVER, TickEvent.Phase.END, level, haveTime));
|
||||
}
|
||||
|
||||
public static void onPreClientTick()
|
||||
@@ -868,13 +891,35 @@ public class ForgeEventFactory
|
||||
MinecraftForge.EVENT_BUS.post(new TickEvent.ClientTickEvent(TickEvent.Phase.END));
|
||||
}
|
||||
|
||||
/**
|
||||
* TODO: Remove in 1.19
|
||||
*
|
||||
* @deprecated Use {@link #onPreServerTick(BooleanSupplier)}
|
||||
*/
|
||||
@Deprecated(forRemoval = true, since = "1.18.1")
|
||||
public static void onPreServerTick()
|
||||
{
|
||||
MinecraftForge.EVENT_BUS.post(new TickEvent.ServerTickEvent(TickEvent.Phase.START));
|
||||
onPreServerTick(() -> false);
|
||||
}
|
||||
|
||||
public static void onPreServerTick(BooleanSupplier haveTime)
|
||||
{
|
||||
MinecraftForge.EVENT_BUS.post(new TickEvent.ServerTickEvent(TickEvent.Phase.START, haveTime));
|
||||
}
|
||||
|
||||
/**
|
||||
* TODO: Remove in 1.19
|
||||
*
|
||||
* @deprecated Use {@link #onPostServerTick(BooleanSupplier)}
|
||||
*/
|
||||
@Deprecated(forRemoval = true, since = "1.18.1")
|
||||
public static void onPostServerTick()
|
||||
{
|
||||
MinecraftForge.EVENT_BUS.post(new TickEvent.ServerTickEvent(TickEvent.Phase.END));
|
||||
onPostServerTick(() -> false);
|
||||
}
|
||||
|
||||
public static void onPostServerTick(BooleanSupplier haveTime)
|
||||
{
|
||||
MinecraftForge.EVENT_BUS.post(new TickEvent.ServerTickEvent(TickEvent.Phase.END, haveTime));
|
||||
}
|
||||
}
|
||||
@@ -6,6 +6,9 @@
|
||||
package net.minecraftforge.event;
|
||||
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
|
||||
import java.util.function.BooleanSupplier;
|
||||
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraftforge.eventbus.api.Event;
|
||||
@@ -31,9 +34,34 @@ public class TickEvent extends Event
|
||||
}
|
||||
|
||||
public static class ServerTickEvent extends TickEvent {
|
||||
|
||||
private final BooleanSupplier haveTime;
|
||||
|
||||
/**
|
||||
* TODO: Remove in 1.19
|
||||
*
|
||||
* @deprecated Use {@link ServerTickEvent#ServerTickEvent(Phase, BooleanSupplier)}
|
||||
*/
|
||||
@Deprecated(forRemoval = true, since = "1.18.1")
|
||||
public ServerTickEvent(Phase phase)
|
||||
{
|
||||
this(phase, () -> false);
|
||||
}
|
||||
|
||||
public ServerTickEvent(Phase phase, BooleanSupplier haveTime)
|
||||
{
|
||||
super(Type.SERVER, LogicalSide.SERVER, phase);
|
||||
this.haveTime = haveTime;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return {@code true} whether the server has enough time to perform any
|
||||
* additional tasks (usually IO related) during the current tick,
|
||||
* otherwise {@code false}
|
||||
*/
|
||||
public boolean haveTime()
|
||||
{
|
||||
return this.haveTime.getAsBoolean();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -46,10 +74,36 @@ public class TickEvent extends Event
|
||||
|
||||
public static class WorldTickEvent extends TickEvent {
|
||||
public final Level world;
|
||||
private final BooleanSupplier haveTime;
|
||||
|
||||
/**
|
||||
* TODO: Remove in 1.19
|
||||
*
|
||||
* @deprecated Use {@link WorldTickEvent#WorldTickEvent(LogicalSide, Phase, Level, BooleanSupplier)}
|
||||
*/
|
||||
@Deprecated(forRemoval = true, since = "1.18.1")
|
||||
public WorldTickEvent(LogicalSide side, Phase phase, Level world)
|
||||
{
|
||||
this(side, phase, world, () -> false);
|
||||
}
|
||||
|
||||
public WorldTickEvent(LogicalSide side, Phase phase, Level world, BooleanSupplier haveTime)
|
||||
{
|
||||
super(Type.WORLD, side, phase);
|
||||
this.world = world;
|
||||
this.haveTime = haveTime;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return {@code true} whether the server has enough time to perform any
|
||||
* additional tasks (usually IO related) during the current tick,
|
||||
* otherwise {@code false}
|
||||
*
|
||||
* @see ServerTickEvent#haveTime()
|
||||
*/
|
||||
public boolean haveTime()
|
||||
{
|
||||
return this.haveTime.getAsBoolean();
|
||||
}
|
||||
}
|
||||
public static class PlayerTickEvent extends TickEvent {
|
||||
|
||||
Reference in new issue
Block a user