mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-22 08:29:28 +00:00
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@30fdfb1a [ci/skip] Fix docs for DamageResistant (#11992) PaperMC/Paper@6b7650d8 Only add goat horn once (#12001) PaperMC/Paper@30046e04 Fix a rare crash with a concurrent modification of scaled health attributes (#12002) PaperMC/Paper@88bbead1 Flush regionfiles on save configuration option PaperMC/Paper@336ea9df Check for empty when sending equipment changes (#12008) PaperMC/Paper@939bb782 Add RayTraceConfigurationBuilder (#11907) PaperMC/Paper@81bb82f5 Fix wrong piston world border check (#12007) PaperMC/Paper@ce95b5d6 Use proper default for setting null display background color (#12010) PaperMC/Paper@2477f1f6 [ci/skip] fix and improvements for docs in ConsumeEffect component (#11998) PaperMC/Paper@fb5b173c Add PlayerClientLoadedWorldEvent (#11940) PaperMC/Paper@3af5e771 Add Player#give (#11995) PaperMC/Paper@7e21cb81 fix PlayerChangedMainHandEvent javadoc (#12020) PaperMC/Paper@5a34bf04 Correctly retrun true for empty input shapes in EntityGetter#isUnobstructed PaperMC/Paper@a392d475 Make Watchdog thread extend TickThread Gale Changes: Dreeam-qwq/Gale@f9080a7e Updated Upstream (Paper) Dreeam-qwq/Gale@ff0596c1 [ci/skip] Fix upstream commit sh on mac Dreeam-qwq/Gale@24970274 [ci/skip] Hermanez - Wutaf Dreeam-qwq/Gale@85eabf60 [ci/skip] cleanup Dreeam-qwq/Gale@7d9faf00 [ci/skip] cleanup & drop xor-shift random Dreeam-qwq/Gale@7af04981 [ci/skip] cleanup Dreeam-qwq/Gale@4d5d39df [ci/skip] Remove useless params standardize in upstream commit generator Dreeam-qwq/Gale@964f16ff Updated Upstream (Paper) Dreeam-qwq/Gale@0566a223 [ci/skip] cleanup Dreeam-qwq/Gale@5e3f6740 [ci/skip] cleanup work finished Dreeam-qwq/Gale@98a66cfb Updated Upstream (Paper) Dreeam-qwq/Gale@f7736578 [ci/skip] Update upstreamCommit.sh Dreeam-qwq/Gale@1c46c816 Updated Upstream (Paper) Dreeam-qwq/Gale@2b0a4c09 [ci/skip] Skip tests during auto update validate phase Purpur Changes: PurpurMC/Purpur@4a0a86b9 Updated Upstream (Paper) PurpurMC/Purpur@7399988c Fix hover in /plugins PurpurMC/Purpur@5e5857dc [ci/skip] modify ci skip references in paper upstream commits PurpurMC/Purpur@5583a3f1 Updated Upstream (Paper)
155 lines
5.2 KiB
Diff
155 lines
5.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: violetc <58360096+s-yh-china@users.noreply.github.com>
|
|
Date: Thu, 3 Aug 2023 20:36:38 +0800
|
|
Subject: [PATCH] Leaves: Replay Mod API
|
|
|
|
Co-authored-by: alazeprt <nono135246@126.com>
|
|
|
|
Original license: GPLv3
|
|
Original project: https://github.com/LeavesMC/Leaves
|
|
|
|
This patch is Powered by ReplayMod(https://github.com/ReplayMod)
|
|
|
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
|
index d67af3fdc4434817cea29673069430a33fb30a8e..1e32c10f3e7687cbd55985a2e03f0ab6c5f93b31 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -3047,6 +3047,7 @@ public final class Bukkit {
|
|
return server.spigot();
|
|
}
|
|
|
|
+
|
|
// Purpur start - Bring back server name
|
|
/**
|
|
* Get the name of this server
|
|
@@ -3175,4 +3176,10 @@ public final class Bukkit {
|
|
server.clearBlockHighlights();
|
|
}
|
|
// Purpur end - Debug Marker API
|
|
+
|
|
+ // Leaves start - Photographer API
|
|
+ public static @NotNull org.leavesmc.leaves.entity.PhotographerManager getPhotographerManager() {
|
|
+ return server.getPhotographerManager();
|
|
+ }
|
|
+ // Leaves end - Photographer API
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index 6790ca1648a17cf30063522f68b3ac3e82e3bd8c..223f3a4545996073872d1650c9a84feacfd2c493 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -66,6 +66,7 @@ import org.jetbrains.annotations.ApiStatus;
|
|
import org.jetbrains.annotations.Contract;
|
|
import org.jetbrains.annotations.NotNull;
|
|
import org.jetbrains.annotations.Nullable;
|
|
+import org.leavesmc.leaves.entity.PhotographerManager;
|
|
|
|
/**
|
|
* Represents a server implementation.
|
|
@@ -2858,4 +2859,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
|
*/
|
|
void clearBlockHighlights();
|
|
// Purpur end - Debug Marker API
|
|
+
|
|
+ // Leaves start - Photographer API
|
|
+ @NotNull PhotographerManager getPhotographerManager();
|
|
+ // Leaves end - Photographer API
|
|
}
|
|
diff --git a/src/main/java/org/leavesmc/leaves/entity/Photographer.java b/src/main/java/org/leavesmc/leaves/entity/Photographer.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..5b564dfd8aa882d0dc8b1833a4b46e1bba699876
|
|
--- /dev/null
|
|
+++ b/src/main/java/org/leavesmc/leaves/entity/Photographer.java
|
|
@@ -0,0 +1,27 @@
|
|
+package org.leavesmc.leaves.entity;
|
|
+
|
|
+import org.bukkit.entity.Player;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+import org.jetbrains.annotations.Nullable;
|
|
+
|
|
+import java.io.File;
|
|
+
|
|
+public interface Photographer extends Player {
|
|
+
|
|
+ @NotNull
|
|
+ public String getId();
|
|
+
|
|
+ public void setRecordFile(@NotNull File file);
|
|
+
|
|
+ public void stopRecording();
|
|
+
|
|
+ public void stopRecording(boolean async);
|
|
+
|
|
+ public void stopRecording(boolean async, boolean save);
|
|
+
|
|
+ public void pauseRecording();
|
|
+
|
|
+ public void resumeRecording();
|
|
+
|
|
+ public void setFollowPlayer(@Nullable Player player);
|
|
+}
|
|
\ No newline at end of file
|
|
diff --git a/src/main/java/org/leavesmc/leaves/entity/PhotographerManager.java b/src/main/java/org/leavesmc/leaves/entity/PhotographerManager.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..ccb19e75748803eb9ad356ffcd0ccfd5145ed776
|
|
--- /dev/null
|
|
+++ b/src/main/java/org/leavesmc/leaves/entity/PhotographerManager.java
|
|
@@ -0,0 +1,32 @@
|
|
+package org.leavesmc.leaves.entity;
|
|
+
|
|
+import org.bukkit.Location;
|
|
+import org.bukkit.util.Consumer;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+import org.jetbrains.annotations.Nullable;
|
|
+import org.leavesmc.leaves.replay.BukkitRecorderOption;
|
|
+
|
|
+import java.util.Collection;
|
|
+import java.util.UUID;
|
|
+
|
|
+public interface PhotographerManager {
|
|
+ @Nullable
|
|
+ public Photographer getPhotographer(@NotNull UUID uuid);
|
|
+
|
|
+ @Nullable
|
|
+ public Photographer getPhotographer(@NotNull String id);
|
|
+
|
|
+ @Nullable
|
|
+ public Photographer createPhotographer(@NotNull String id, @NotNull Location location);
|
|
+
|
|
+ @Nullable
|
|
+ public Photographer createPhotographer(@NotNull String id, @NotNull Location location, @NotNull BukkitRecorderOption recorderOption);
|
|
+
|
|
+ public void removePhotographer(@NotNull String id);
|
|
+
|
|
+ public void removePhotographer(@NotNull UUID uuid);
|
|
+
|
|
+ public void removeAllPhotographers();
|
|
+
|
|
+ public Collection<Photographer> getPhotographers();
|
|
+}
|
|
\ No newline at end of file
|
|
diff --git a/src/main/java/org/leavesmc/leaves/replay/BukkitRecorderOption.java b/src/main/java/org/leavesmc/leaves/replay/BukkitRecorderOption.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..c985721bdf6be0b8a154e7abfd50e0168965a8d1
|
|
--- /dev/null
|
|
+++ b/src/main/java/org/leavesmc/leaves/replay/BukkitRecorderOption.java
|
|
@@ -0,0 +1,18 @@
|
|
+package org.leavesmc.leaves.replay;
|
|
+
|
|
+public class BukkitRecorderOption {
|
|
+
|
|
+ // public int recordDistance = -1;
|
|
+ public String serverName = "Leaf";
|
|
+ public BukkitRecordWeather forceWeather = BukkitRecordWeather.NULL;
|
|
+ public int forceDayTime = -1;
|
|
+ public boolean ignoreChat = false;
|
|
+ // public boolean ignoreItem = false;
|
|
+
|
|
+ public enum BukkitRecordWeather {
|
|
+ CLEAR,
|
|
+ RAIN,
|
|
+ THUNDER,
|
|
+ NULL
|
|
+ }
|
|
+}
|
|
\ No newline at end of file
|