geforkt von Mirrors/Paper
ac554ad46d
Updated Upstream (Bukkit/CraftBukkit) 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: fa99e752 PR-1007: Add ItemMeta#getAsComponentString() 94a91782 Fix copy-pasted BlockType.Typed documentation 9b34ac8c Largely restore deprecated PotionData API 51a6449b PR-1008: Deprecate ITEMS_TOOLS, removed in 1.20.5 702d15fe Fix Javadoc reference 42f6cdf4 PR-919: Add internal ItemType and BlockType, delegate Material methods to them 237bb37b SPIGOT-1166, SPIGOT-7647: Expose Damager BlockState in EntityDamageByBlockEvent 035ea146 SPIGOT-6993: Allow #setVelocity to change the speed of a fireball and add a note to #setDirection about it 8c7880fb PR-1004: Improve field rename handling and centralize conversion between bukkit and string more 87c90e93 SPIGOT-7650: Add DamageSource for EntityDeathEvent and PlayerDeathEvent CraftBukkit Changes: 4af0f22e8 SPIGOT-7664: Item meta should prevail over block states c2ccc46ec SPIGOT-7666: Fix access to llama and horse special slot 124ac66d7 SPIGOT-7665: Fix ThrownPotion#getEffects() implementation only bringing custom effects 66f1f439a Restore null page behaviour of signed books even though not strictly allowed by API 6118e5398 Fix regression listening to minecraft:brand custom payloads c1a26b366 Fix unnecessary and potential not thread-safe chat visibility check 12360a7ec Remove unused imports 147b098b4 PR-1397: Add ItemMeta#getAsComponentString() 428aefe0e Largely restore deprecated PotionData API afe5b5ee9 PR-1275: Add internal ItemType and BlockType, delegate Material methods to them 8afeafa7d SPIGOT-1166, SPIGOT-7647: Expose Damager BlockState in EntityDamageByBlockEvent 4e7d749d4 SPIGOT-6993: Allow #setVelocity to change the speed of a fireball and add a note to #setDirection about it 441880757 Support both entity_data and bucket_entity_data on axolotl/fish buckets 0e22fdd1e Fix custom direct BlockState being not correctly set in DamageSource f2182ed47 SPIGOT-7659: TropicalFishBucketMeta should use BUCKET_ENTITY_DATA 2a6207fe1 PR-1393: Improve field rename handling and centralize conversion between bukkit and string more c024a5039 SPIGOT-7650: Add DamageSource for EntityDeathEvent and PlayerDeathEvent 741b84480 PR-1390: Improve internal handling of damage sources 0364df4e1 SPIGOT-7657: Error when loading angry entities
157 Zeilen
5.4 KiB
Diff
157 Zeilen
5.4 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..f147d909f2fc710c1d12bac3c7b66c2883139026
|
|
--- /dev/null
|
|
+++ b/src/test/java/io/papermc/paper/util/TickTest.java
|
|
@@ -0,0 +1,43 @@
|
|
+package io.papermc.paper.util;
|
|
+
|
|
+import java.time.Duration;
|
|
+import java.time.Instant;
|
|
+import java.time.temporal.ChronoUnit;
|
|
+import org.junit.jupiter.api.Test;
|
|
+
|
|
+import static org.junit.jupiter.api.Assertions.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()));
|
|
+ }
|
|
+}
|