efd47e3a68
* Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 2fcba9b2 SPIGOT-7347: Add missing documentation and details to ShapedRecipe c278419d PR-854: Move getHighestBlockYAt methods from World to RegionAccessor 201399fb PR-853: Add API for directly setting Display transformation matrices ecfa559a PR-849: Add InventoryView#setTitle 653d7edb SPIGOT-519: Add TNTPrimeEvent 22fccc09 PR-846: Add method to get chunk load level a070a52c PR-844: Add methods to convert Vector to and from JOML vectors cc7111fe PR-276: Add accessors to Wither's invulnerability ticks 777d24e9 SPIGOT-7209: Accessors and events for player's exp cooldown ccb2d01b SPIGOT-6308: Deprecate the location name property of map items cd04a31b PR-780: Add PlayerSpawnChangeEvent 7d1f5b64 SPIGOT-6780: Improve documentation for World#spawnFallingBlock 5696668a SPIGOT-6885: Add test and easier to debug code for reference in yaml configuration comments 2e13cff7 PR-589: Expand the FishHook API 2c7d3da5 PR-279: Minor edits to various Javadocs CraftBukkit Changes: 01b2e1af4 SPIGOT-7346: Disallow players from executing commands after disconnecting 7fe5ee022 PR-1186: Move getHighestBlockYAt methods from World to RegionAccessor bcc85ef67 PR-1185: Add API for directly setting Display transformation matrices a7cfc778f PR-1176: Add InventoryView#setTitle 563d42226 SPIGOT-519: Add TNTPrimeEvent ccbc6abca Add test for Chunk.LoadLevel mirroring 2926e0513 PR-1171: Add method to get chunk load level 63cad7f84 PR-375: Add accessors to Wither's invulnerability ticks bfd8b1ac8 SPIGOT-7209: Accessors and events for player's exp cooldown f92a41c39 PR-1181: Consolidate Location conversion code 10f866759 SPIGOT-6308: Deprecate the location name property of map items 82f7b658a PR-1095: Add PlayerSpawnChangeEvent b421af7e4 PR-808: Expand the FishHook API 598ad7b3f Increase outdated build delay Spigot Changes: d1bd3bd2 Rebuild patches e4265cc8 SPIGOT-7297: Entity Tracking Range option for Display entities * Work around javac bug * Call PlayerSpawnChangeEvent * Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 2fcba9b2 SPIGOT-7347: Add missing documentation and details to ShapedRecipe c278419d PR-854: Move getHighestBlockYAt methods from World to RegionAccessor 201399fb PR-853: Add API for directly setting Display transformation matrices CraftBukkit Changes: 01b2e1af4 SPIGOT-7346: Disallow players from executing commands after disconnecting 7fe5ee022 PR-1186: Move getHighestBlockYAt methods from World to RegionAccessor bcc85ef67 PR-1185: Add API for directly setting Display transformation matrices Spigot Changes: 7da74dae Rebuild patches
158 Zeilen
5.3 KiB
Diff
158 Zeilen
5.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Kieran Wallbanks <kieran.wallbanks@gmail.com>
|
|
Date: Fri, 2 Apr 2021 17:28:58 +0100
|
|
Subject: [PATCH] Add Tick TemporalUnit
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/util/Tick.java b/src/main/java/io/papermc/paper/util/Tick.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..10430f02e1d1e654383154c04473f07469bc7fee
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/util/Tick.java
|
|
@@ -0,0 +1,95 @@
|
|
+package io.papermc.paper.util;
|
|
+
|
|
+import net.kyori.adventure.util.Ticks;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+import java.time.Duration;
|
|
+import java.time.temporal.ChronoUnit;
|
|
+import java.time.temporal.Temporal;
|
|
+import java.time.temporal.TemporalUnit;
|
|
+import java.util.Objects;
|
|
+
|
|
+/**
|
|
+ * A TemporalUnit that represents the target length of one server tick. This is defined
|
|
+ * as 50 milliseconds. Note that this class is not for measuring the length that a tick
|
|
+ * took, rather it is used for simple conversion between times and ticks.
|
|
+ * @see #tick()
|
|
+ */
|
|
+public final class Tick implements TemporalUnit {
|
|
+ private static final Tick INSTANCE = new Tick(Ticks.SINGLE_TICK_DURATION_MS);
|
|
+
|
|
+ private final long milliseconds;
|
|
+
|
|
+ /**
|
|
+ * Gets the instance of the tick temporal unit.
|
|
+ * @return the tick instance
|
|
+ */
|
|
+ public static @NotNull Tick tick() {
|
|
+ return INSTANCE;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Creates a new tick.
|
|
+ * @param length the length of the tick in milliseconds
|
|
+ * @see #tick()
|
|
+ */
|
|
+ private Tick(long length) {
|
|
+ this.milliseconds = length;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Creates a duration from an amount of ticks. This is shorthand for
|
|
+ * {@link Duration#of(long, TemporalUnit)} called with the amount of ticks and
|
|
+ * {@link #tick()}.
|
|
+ * @param ticks the amount of ticks
|
|
+ * @return the duration
|
|
+ */
|
|
+ public static @NotNull Duration of(long ticks) {
|
|
+ return Duration.of(ticks, INSTANCE);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the number of whole ticks that occur in the provided duration. Note that this
|
|
+ * method returns an {@code int} as this is the unit that Minecraft stores ticks in.
|
|
+ * @param duration the duration
|
|
+ * @return the number of whole ticks in this duration
|
|
+ * @throws ArithmeticException if the duration is zero or an overflow occurs
|
|
+ */
|
|
+ public int fromDuration(@NotNull Duration duration) {
|
|
+ Objects.requireNonNull(duration, "duration cannot be null");
|
|
+ return Math.toIntExact(Math.floorDiv(duration.toMillis(), this.milliseconds));
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public @NotNull Duration getDuration() {
|
|
+ return Duration.ofMillis(this.milliseconds);
|
|
+ }
|
|
+
|
|
+ // Note: This is a workaround in order to allow calculations with this duration.
|
|
+ // See: Duration#add
|
|
+ @Override
|
|
+ public boolean isDurationEstimated() {
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isDateBased() {
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isTimeBased() {
|
|
+ return true;
|
|
+ }
|
|
+
|
|
+ @SuppressWarnings("unchecked") // following ChronoUnit#addTo
|
|
+ @Override
|
|
+ public <R extends Temporal> @NotNull R addTo(@NotNull R temporal, long amount) {
|
|
+ return (R) temporal.plus(getDuration().multipliedBy(amount));
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public long between(@NotNull Temporal start, @NotNull Temporal end) {
|
|
+ return start.until(end, ChronoUnit.MILLIS) / this.milliseconds;
|
|
+ }
|
|
+}
|
|
diff --git a/src/test/java/io/papermc/paper/util/TickTest.java b/src/test/java/io/papermc/paper/util/TickTest.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..6d6d0564e07c0886648000490337272e1740ea21
|
|
--- /dev/null
|
|
+++ b/src/test/java/io/papermc/paper/util/TickTest.java
|
|
@@ -0,0 +1,44 @@
|
|
+package io.papermc.paper.util;
|
|
+
|
|
+import java.time.Duration;
|
|
+import java.time.Instant;
|
|
+import java.time.temporal.ChronoUnit;
|
|
+
|
|
+import org.junit.Test;
|
|
+
|
|
+import static org.junit.Assert.assertEquals;
|
|
+
|
|
+public class TickTest {
|
|
+
|
|
+ @Test
|
|
+ public void testTickLength() {
|
|
+ assertEquals(50, Duration.of(1, Tick.tick()).toMillis());
|
|
+ assertEquals(100, Duration.of(2, Tick.tick()).toMillis());
|
|
+ }
|
|
+
|
|
+ @Test
|
|
+ public void testTickFromDuration() {
|
|
+ assertEquals(0, Tick.tick().fromDuration(Duration.ofMillis(0)));
|
|
+ assertEquals(0, Tick.tick().fromDuration(Duration.ofMillis(10)));
|
|
+ assertEquals(1, Tick.tick().fromDuration(Duration.ofMillis(60)));
|
|
+ assertEquals(2, Tick.tick().fromDuration(Duration.ofMillis(100)));
|
|
+ }
|
|
+
|
|
+ @Test
|
|
+ public void testAddTickToInstant() {
|
|
+ Instant now = Instant.now();
|
|
+ assertEquals(now, now.plus(0, Tick.tick()));
|
|
+ assertEquals(now.plus(50, ChronoUnit.MILLIS), now.plus(1, Tick.tick()));
|
|
+ assertEquals(now.plus(100, ChronoUnit.MILLIS), now.plus(2, Tick.tick()));
|
|
+ assertEquals(now.plus(150, ChronoUnit.MILLIS), now.plus(3, Tick.tick()));
|
|
+ }
|
|
+
|
|
+ @Test
|
|
+ public void testTicksBetweenInstants() {
|
|
+ Instant now = Instant.now();
|
|
+ assertEquals(0, now.until(now.plus(20, ChronoUnit.MILLIS), Tick.tick()));
|
|
+ assertEquals(1, now.until(now.plus(50, ChronoUnit.MILLIS), Tick.tick()));
|
|
+ assertEquals(1, now.until(now.plus(60, ChronoUnit.MILLIS), Tick.tick()));
|
|
+ assertEquals(2, now.until(now.plus(100, ChronoUnit.MILLIS), Tick.tick()));
|
|
+ }
|
|
+}
|