geforkt von Mirrors/Paper
928bcc8d3a
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: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
66 Zeilen
2.0 KiB
Diff
66 Zeilen
2.0 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/RegionAccessor.java b/src/main/java/org/bukkit/RegionAccessor.java
|
|
index e55f6e2baf35dbd91c433ab9e62713eaac85435b..2fa3de66107162ccaa158b369e2c4a926ecaff92 100644
|
|
--- a/src/main/java/org/bukkit/RegionAccessor.java
|
|
+++ b/src/main/java/org/bukkit/RegionAccessor.java
|
|
@@ -376,4 +376,12 @@ public interface RegionAccessor {
|
|
*/
|
|
@NotNull
|
|
public <T extends Entity> T spawn(@NotNull Location location, @NotNull Class<T> clazz, boolean randomizeData, @Nullable Consumer<T> function) throws IllegalArgumentException;
|
|
+
|
|
+ // Paper start
|
|
+ /**
|
|
+ * @return the current moon phase at the current time in the world
|
|
+ */
|
|
+ @NotNull
|
|
+ io.papermc.paper.world.MoonPhase getMoonPhase();
|
|
+ // Paper end
|
|
}
|