Replay Mod API Complete

LeavesMC · Aug 7, 2023 · cb3c558 · cb3c558
1 parent c8c4bc3
commit cb3c558
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/patches/api/0009-Replay-Mod-API.patch b/patches/api/0009-Replay-Mod-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Replay Mod API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 99a096e52775a58a38540dfd736b0f57236fd488..b27286fbeb4ce148d2c4d890a07d14c221ef7886 100644
+index 7203c39190772d4d8159e62367322fe4e3cae8a9..ee35ab3934af19013cfbb1516cc7dffea53d21e7 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -58,6 +58,7 @@ import org.jetbrains.annotations.NotNull;
@@ -16,7 +16,7 @@ index 99a096e52775a58a38540dfd736b0f57236fd488..b27286fbeb4ce148d2c4d890a07d14c2
 
  /**
   * Represents the Bukkit core, for version and Server singleton handling
-@@ -2669,6 +2670,11 @@ public final class Bukkit {
+@@ -2721,6 +2722,11 @@ public final class Bukkit {
          return server.getBotManager();
      }
      // Leaves end - Bot API
@@ -29,7 +29,7 @@ index 99a096e52775a58a38540dfd736b0f57236fd488..b27286fbeb4ce148d2c4d890a07d14c2
      @NotNull
      public static Server.Spigot spigot() {
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 0bfe5628c8327e9cd5728cea7ae6c2ce1ec9541d..b61151a99ec9d62bc8cf3fa39c71d452dc9964ed 100644
+index c952eea7533aeec1c789dbe58673625761b704f6..a88c68c089805dcec131f28c9b3471ba34838b22 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -58,6 +58,7 @@ import org.jetbrains.annotations.Contract;
@@ -40,7 +40,7 @@ index 0bfe5628c8327e9cd5728cea7ae6c2ce1ec9541d..b61151a99ec9d62bc8cf3fa39c71d452
 
  /**
   * Represents a server implementation.
-@@ -2331,4 +2332,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2382,4 +2383,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull BotManager getBotManager();
      // Leaves end - Bot API

diff --git a/patches/server/0117-Replay-Mod-API.patch → patches/server/0118-Replay-Mod-API.patch b/patches/server/0117-Replay-Mod-API.patch → patches/server/0118-Replay-Mod-API.patch
@@ -115,7 +115,7 @@ index fd9e85dab7c511873824cac56a270ff435792292..257e51570ed08660613895f5a1eccbee
          }
          // Leaves end - bot can't get advancement
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 16670088947fe126674fa9058f4fc8df01546a2c..24507d3e2dd2a6872bce76b4f15f0254507034fa 100644
+index 3ff61af745630dc692d84aeccc25ad8dcf5c5746..02c41b3c1afab147f47c9d7e998ec92274e6de5b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -136,6 +136,7 @@ import org.bukkit.event.player.PlayerSpawnChangeEvent;
@@ -293,26 +293,26 @@ index 16670088947fe126674fa9058f4fc8df01546a2c..24507d3e2dd2a6872bce76b4f15f0254
          // Paper start
          return this.remove(entityplayer, net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? entityplayer.getBukkitEntity().displayName() : PaperAdventure.asAdventure(entityplayer.getDisplayName())));
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 75c4b20c1637f4b2e1a77450d30a21b4d2db5af0..afea70c6406ec2e628d647ce5e7ac80e931d7c46 100644
+index 947f6f4b8daeff972aef5f22e633f398b46402bf..0e3753356d2080f31596d1d7bd4f0298e020efd9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -260,6 +260,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
+@@ -261,6 +261,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
 
  import net.md_5.bungee.api.chat.BaseComponent; // Spigot
  import top.leavesmc.leaves.entity.CraftBotManager;
 +import top.leavesmc.leaves.entity.CraftPhotographerManager;
 
  import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
-@@ -306,6 +307,7 @@ public final class CraftServer implements Server {
+@@ -307,6 +308,7 @@ public final class CraftServer implements Server {
      private final io.papermc.paper.logging.SysoutCatcher sysoutCatcher = new io.papermc.paper.logging.SysoutCatcher(); // Paper
      private final CraftPotionBrewer potionBrewer = new CraftPotionBrewer(); // Paper
      private final CraftBotManager botManager = new CraftBotManager();
 +    private final CraftPhotographerManager photographerManager = new CraftPhotographerManager();
 
      // Paper start - Folia region threading API
      private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler();
-@@ -3125,4 +3127,11 @@ public final class CraftServer implements Server {
+@@ -3163,4 +3165,11 @@ public final class CraftServer implements Server {
          return botManager;
      }
      // Leaves end - Bot API