Deploying to Daydream-API

daydream-api/paper-patches/features/0004-Add-PlayerInteractManager.patch

@@ -198,10 +198,10 @@ index 0000000000000000000000000000000000000000..af8d728a2a8dc1ca0e853da5db6dbb51
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 0e9fee0ffcb97aeb2dfd3c89301f75f6bb4e9e1c..683065839f4bacd18188118d5a787708c81622ac 100644
+index f5d261c01c79b2f6bcbe69e590141a692cf7fae0..00ee81ed102fabc79d12e4c4971faa78f527ad61 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -61,6 +61,16 @@ import org.jetbrains.annotations.Nullable;
+@@ -63,6 +63,16 @@ import org.jetbrains.annotations.Nullable;
   */
  public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginMessageRecipient, net.kyori.adventure.identity.Identified, net.kyori.adventure.bossbar.BossBarViewer, com.destroystokyo.paper.network.NetworkClient { // Paper
 

daydream-api/paper-patches/features/0007-Add-more-Advancement-API.patch

@@ -1398,10 +1398,10 @@ index f9bc179da071e7bd57cefc50d6763317fb643b74..1da6a39e7decac009527a24e10b25ad1
 +    // Daydream end - (feature) Add more Advancement API
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 683065839f4bacd18188118d5a787708c81622ac..c7a5992442d087c5388d8bed03cb6ddb20c9c3f6 100644
+index 00ee81ed102fabc79d12e4c4971faa78f527ad61..e7805f763ae23971ceea36265502257fb0e0b45c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3378,6 +3378,46 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3380,6 +3380,46 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @NotNull
      public AdvancementProgress getAdvancementProgress(@NotNull Advancement advancement);
 

daydream-api/paper-patches/features/0008-Add-Packet-API.patch

@@ -1024,10 +1024,10 @@ index 6fba6948e937b079bedf3cc08d7659cf50c927d5..6e65ebccf9c037dba1179dfb697ce565
       * Gets the amount of ticks this entity has lived for.
       * <p>
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 892e1703f951ccb6a2d970164529aa7b1f303710..367054cd58120eb795419f0f55d070a7f608f361 100644
+index e7805f763ae23971ceea36265502257fb0e0b45c..065888eefc711bcfa9d68d80d754d5b8b09f8107 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1094,6 +1094,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1096,6 +1096,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void sendEquipmentChange(@NotNull LivingEntity entity, @NotNull Map<EquipmentSlot, ItemStack> items);
 

daydream-api/paper-patches/features/0012-Add-Client-Detector.patch

@@ -123,10 +123,10 @@ index 0000000000000000000000000000000000000000..963d3aa970ef24bafd2aaa17bde4b8c2
 +    NEOFORGE,
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index a675aad451521c148f459705748ae5137789a358..1cf2403d640d5b54b6733c0893a2f1035f99708a 100644
+index 065888eefc711bcfa9d68d80d754d5b8b09f8107..46e9eedf74a14986115e691120c00900a6c80b75 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3875,6 +3875,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3877,6 +3877,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      String getClientBrandName();
      // Paper end
 

daydream-api/paper-patches/files/src/main/java/org/bukkit/entity/Player.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -467,6 +_,23 @@
+@@ -469,6 +_,23 @@
       */
      public boolean performCommand(@NotNull String command);
 
@@ -24,7 +24,7 @@
      /**
       * Returns true if the entity is supported by a block.
       *
-@@ -1777,6 +_,24 @@
+@@ -1779,6 +_,24 @@
      @Nullable
      public GameMode getPreviousGameMode();
 
@@ -49,7 +49,7 @@
      /**
       * Sets the current time on the player's client. When relative is true the
       * player's time will be kept synchronized to its world time with the
-@@ -2039,6 +_,22 @@
+@@ -2041,6 +_,22 @@
       */
      public void setAllowFlight(boolean flight);
 
@@ -72,7 +72,7 @@
      // Paper start - flying fall damage
      /**
       * Allows you to enable fall damage while {@link #getAllowFlight()} is {@code true}
-@@ -2817,6 +_,23 @@
+@@ -2819,6 +_,23 @@
      }
      // Paper end - more resource pack API
 
@@ -96,7 +96,7 @@
      /**
       * Request that the player's client download and include another resource pack.
       * <p>
-@@ -3499,6 +_,16 @@
+@@ -3501,6 +_,16 @@
          return net.kyori.adventure.text.event.HoverEvent.showEntity(op.apply(net.kyori.adventure.text.event.HoverEvent.ShowEntity.of(this.getType().getKey(), this.getUniqueId(), this.displayName())));
      }
      // Paper end

daydream-api/paper-patches/files/src/main/java/org/bukkit/event/player/PlayerChangedMainHandEvent.java.patch

@@ -1,39 +1,27 @@
 --- a/src/main/java/org/bukkit/event/player/PlayerChangedMainHandEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerChangedMainHandEvent.java
-@@ -12,7 +_,7 @@
+@@ -16,7 +_,7 @@
 
      private static final HandlerList handlers = new HandlerList();
      //
--    private final MainHand mainHand;
-+    private MainHand mainHand; // Daydream - Settable Player Arm (remove final)
+-    private final MainHand newMainHand;
++    private MainHand newMainHand; // Daydream - Settable Player Arm (remove final)
 
-     public PlayerChangedMainHandEvent(@NotNull Player who, @NotNull MainHand mainHand) {
+     public PlayerChangedMainHandEvent(@NotNull Player who, @NotNull MainHand newMainHand) {
          super(who);
-@@ -27,8 +_,29 @@
-      */
-     @NotNull
-     public MainHand getMainHand() {
-+        return mainHand == MainHand.LEFT ? MainHand.RIGHT : MainHand.LEFT; // Daydream - Fix method implementation
-+    }
-+
-+    // Daydream start - Settable Player Arm
-+    /**
-+     * Gets the new main hand of the player.
-+     *
-+     * @return the new {@link MainHand} of the player
-+     */
-+    @NotNull
-+    public MainHand getNewMainHand() {
-         return mainHand;
+@@ -47,6 +_,17 @@
+     public MainHand getNewMainHand() {
+         return newMainHand;
      }
 +
++    // Daydream start - Settable Player Arm
 +    /**
 +     * 플레이어의 주로 사용하는 손을 변경합니다.
 +     *
 +     * @param mainHand 주로 사용하는 손
 +     */
 +    public void setNewMainHand(final @NotNull MainHand mainHand) {
-+        this.mainHand = mainHand;
++        this.newMainHand = mainHand;
 +    }
 +    // Daydream end - Settable Player Arm
 

gradle.properties

@@ -3,7 +3,7 @@ version = 1.21.4-R0.1-SNAPSHOT
 
 mcVersion = 1.21.4
 
-paperCommit = fb5b173c6a742c584413c8fc8b7c871d79234756
+paperCommit = 7e21cb818132116efc5305777eb6d72f07431294
 
 org.gradle.configuration-cache = true
 org.gradle.caching = true