[ci skip]Removed useless patches
This commit is contained in:
@@ -1,19 +0,0 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: MrHua269 <wangxyper@163.com>
|
|
||||||
Date: Mon, 12 Aug 2024 10:37:33 +0800
|
|
||||||
Subject: [PATCH] Try fixing folia #273
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/inventory/CraftingRecipe.java b/src/main/java/org/bukkit/inventory/CraftingRecipe.java
|
|
||||||
index e8c3afda92d4ae5430d622ea18500985d6cc00f2..c78c1ee19a0960c6eca685a3b0d1ddbcb2831e94 100644
|
|
||||||
--- a/src/main/java/org/bukkit/inventory/CraftingRecipe.java
|
|
||||||
+++ b/src/main/java/org/bukkit/inventory/CraftingRecipe.java
|
|
||||||
@@ -102,7 +102,7 @@ public abstract class CraftingRecipe implements Recipe, Keyed {
|
|
||||||
@ApiStatus.Internal
|
|
||||||
@NotNull
|
|
||||||
protected static ItemStack checkResult(@NotNull ItemStack result) {
|
|
||||||
- Preconditions.checkArgument(result.isEmpty(), "Recipe cannot have an empty result"); // Paper
|
|
||||||
+ Preconditions.checkArgument(!result.isEmpty(), "Recipe cannot have an empty result"); // Paper
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,129 +0,0 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: MrHua269 <novau233@163.com>
|
|
||||||
Date: Sun, 17 Mar 2024 00:00:45 +0000
|
|
||||||
Subject: [PATCH] Leaves Replay Mod API
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
|
||||||
index b4327a55c422380ca6b3a1dc47c3adbe76de4655..8645a137c6beb5fe9bbb30159317a35a4cd96a50 100644
|
|
||||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
||||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
||||||
@@ -2918,4 +2918,10 @@ public final class Bukkit {
|
|
||||||
public static Server.Spigot spigot() {
|
|
||||||
return server.spigot();
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ // Leaves start - Photographer API
|
|
||||||
+ public static @NotNull top.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 2a888d33eff4487f23463c565c9f75c40fba7d94..3a78bcb6f681b44594c4f5f35120b67adbe6aeb5 100644
|
|
||||||
--- a/src/main/java/org/bukkit/Server.java
|
|
||||||
+++ b/src/main/java/org/bukkit/Server.java
|
|
||||||
@@ -2546,4 +2546,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
|
||||||
*/
|
|
||||||
public boolean isGlobalTickThread();
|
|
||||||
// Folia end - region threading API
|
|
||||||
+
|
|
||||||
+ // Leaves start - Photographer API
|
|
||||||
+ @NotNull top.leavesmc.leaves.entity.PhotographerManager getPhotographerManager();
|
|
||||||
+ // Leaves end - Photographer API
|
|
||||||
}
|
|
||||||
diff --git a/src/main/java/top/leavesmc/leaves/entity/Photographer.java b/src/main/java/top/leavesmc/leaves/entity/Photographer.java
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000000000000000000000000000000000..bfa6fe2a0ca095170aa5e073251402cf83a53ba0
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/entity/Photographer.java
|
|
||||||
@@ -0,0 +1,27 @@
|
|
||||||
+package top.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);
|
|
||||||
+}
|
|
||||||
diff --git a/src/main/java/top/leavesmc/leaves/entity/PhotographerManager.java b/src/main/java/top/leavesmc/leaves/entity/PhotographerManager.java
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000000000000000000000000000000000..2889a4835edea4254a3d35fc7861983644a1dc4b
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/entity/PhotographerManager.java
|
|
||||||
@@ -0,0 +1,32 @@
|
|
||||||
+package top.leavesmc.leaves.entity;
|
|
||||||
+
|
|
||||||
+import org.bukkit.Location;
|
|
||||||
+import org.bukkit.util.Consumer;
|
|
||||||
+import org.jetbrains.annotations.NotNull;
|
|
||||||
+import org.jetbrains.annotations.Nullable;
|
|
||||||
+import top.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();
|
|
||||||
+}
|
|
||||||
diff --git a/src/main/java/top/leavesmc/leaves/replay/BukkitRecorderOption.java b/src/main/java/top/leavesmc/leaves/replay/BukkitRecorderOption.java
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000000000000000000000000000000000..3df4a6055b91c28e273d6fb2697b608778f40a9c
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/src/main/java/top/leavesmc/leaves/replay/BukkitRecorderOption.java
|
|
||||||
@@ -0,0 +1,18 @@
|
|
||||||
+package top.leavesmc.leaves.replay;
|
|
||||||
+
|
|
||||||
+public class BukkitRecorderOption {
|
|
||||||
+
|
|
||||||
+ // public int recordDistance = -1;
|
|
||||||
+ public String serverName = "Leaves";
|
|
||||||
+ public BukkitRecordWeather forceWeather = BukkitRecordWeather.NULL;
|
|
||||||
+ public int forceDayTime = -1;
|
|
||||||
+ public boolean ignoreChat = false;
|
|
||||||
+ // public boolean ignoreItem = false;
|
|
||||||
+
|
|
||||||
+ public enum BukkitRecordWeather {
|
|
||||||
+ CLEAR,
|
|
||||||
+ RAIN,
|
|
||||||
+ THUNDER,
|
|
||||||
+ NULL
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user