mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 23:38:25 +01:00
0ea3083817
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: 1e843b72 #510: Add NamespacedKey#fromString() to fetch from user input a4d18241 #581: Add methods to modify despawn delay for wandering villagers CraftBukkit Changes: 0cd8f19f #802: Add methods to modify despawn delay for wandering villagers d5c5d998 SPIGOT-6362: ConcurrentModificationException: null --> Server Crash 8c7d69fe SPIGOT-5228: Entities that are removed during chunk unloads are not properly removed from the chunk.
65 lines
1.8 KiB
Diff
65 lines
1.8 KiB
Diff
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 9b12fbec82017d8cbb21b5a8c3d563f1974dc1c5..042baabf18f86a9c915db7e9d515f26f840a12d7 100644
|
|
--- a/src/main/java/org/bukkit/World.java
|
|
+++ b/src/main/java/org/bukkit/World.java
|
|
@@ -70,6 +70,12 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
|
* @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
|
|
|
|
/**
|