Updated Upstream (Bukkit/CraftBukkit/Spigot)

2021-12-31 19:05:42 -08:00 · 2021-12-31 19:05:42 -08:00 · 3a43821c38
commit 3a43821c38
parent 8b1734123e
859 changed files with 561 additions and 656 deletions
--- a/patches/api/0215-Add-moon-phase-API.patch
+++ b/patches/api/0215-Add-moon-phase-API.patch
@ -0,0 +1,65 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <Blake.Galbreath@GMail.com>
+Date: Sun, 23 Aug 2020 16:32:03 +0200
+Subject: [PATCH] Add moon phase API
+
+
+diff --git a/src/main/java/io/papermc/paper/world/MoonPhase.java b/src/main/java/io/papermc/paper/world/MoonPhase.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..df05153397b42930cd53d37b30824c7e5f008f7e
+--- /dev/null
+++ b/src/main/java/io/papermc/paper/world/MoonPhase.java
+@@ -0,0 +1,36 @@
+package io.papermc.paper.world;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum MoonPhase {
+    FULL_MOON(0L),
+    WANING_GIBBOUS(1L),
+    LAST_QUARTER(2L),
+    WANING_CRESCENT(3L),
+    NEW_MOON(4L),
+    WAXING_CRESCENT(5L),
+    FIRST_QUARTER(6L),
+    WAXING_GIBBOUS(7L);
+
+    private final long day;
+
+    MoonPhase(long day) {
+        this.day = day;
+    }
+
+    private static final Map<Long, MoonPhase> BY_DAY = new HashMap<>();
+
+    static {
+        for (MoonPhase phase : values()) {
+            BY_DAY.put(phase.day, phase);
+        }
+    }
+
+    @NotNull
+    public static MoonPhase getPhase(long day) {
+        return BY_DAY.get(day % 8L);
+    }
+}
+diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
+index 99729c954ae5114260ae50ad3de32ba9d9344ca8..f60fdb12d7dcd60179e07ea764302ebb1c91c619 100644
+--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
+@@ -68,6 +68,12 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+      * @return The amount of Players in this world
+      */
+     int getPlayerCount();
+
+    /**
+     * @return the current moon phase at the current time in the world
+     */
+    @NotNull
+    io.papermc.paper.world.MoonPhase getMoonPhase();
+     // Paper end
+ 
+     /**