Updated Upstream (Bukkit/CraftBukkit)

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:
3a54fb16 SPIGOT-7296: Add ItemFlag#HIDE_ARMOR_TRIM

CraftBukkit Changes:
55056ad80 SPIGOT-7295: Fix Sniffer data defined in incorrect position

patches/api/Add-new-HIDE_UPGRADES-ItemFlag.patch

@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Tue, 14 Mar 2023 19:37:29 -0700
-Subject: [PATCH] Add new HIDE_UPGRADES ItemFlag
-
-
-diff --git a/src/main/java/org/bukkit/inventory/ItemFlag.java b/src/main/java/org/bukkit/inventory/ItemFlag.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/inventory/ItemFlag.java
-+++ b/src/main/java/org/bukkit/inventory/ItemFlag.java
-@@ -0,0 +0,0 @@ public enum ItemFlag {
-     /**
-      * Setting to show/hide dyes from coloured leather armour
-      */
--    HIDE_DYE;
-+    HIDE_DYE,
-+    // Paper start
-+    /**
-+     * Setting to show/hide armor trim information.
-+     */
-+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20
-+    HIDE_UPGRADES;
-     // Paper start
-     /**
-      * Setting to show/hide item-specific information, including, but not limited to:

patches/api/Fix-upstream-javadocs.patch

@@ -442,6 +442,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      /**
       * Sets the entities armor to the provided array of ItemStacks
+diff --git a/src/main/java/org/bukkit/inventory/ItemFlag.java b/src/main/java/org/bukkit/inventory/ItemFlag.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/inventory/ItemFlag.java
++++ b/src/main/java/org/bukkit/inventory/ItemFlag.java
+@@ -0,0 +0,0 @@ public enum ItemFlag {
+      */
+     HIDE_DYE,
+     /**
+-     * Setting to show/hide armor trim from leather armor.
++     * Setting to show/hide armor trim from armor.
+      */
+     HIDE_ARMOR_TRIM;
+ }
 diff --git a/src/main/java/org/bukkit/inventory/PlayerInventory.java b/src/main/java/org/bukkit/inventory/PlayerInventory.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/inventory/PlayerInventory.java

patches/api/Mark-experimental-api-as-such.patch

@@ -1221,6 +1221,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  public interface ChiseledBookshelfInventory extends Inventory {
  
      @Nullable
+diff --git a/src/main/java/org/bukkit/inventory/ItemFlag.java b/src/main/java/org/bukkit/inventory/ItemFlag.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/inventory/ItemFlag.java
++++ b/src/main/java/org/bukkit/inventory/ItemFlag.java
+@@ -0,0 +0,0 @@ public enum ItemFlag {
+     /**
+      * Setting to show/hide armor trim from armor.
+      */
++    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20
+     HIDE_ARMOR_TRIM;
+ }
 diff --git a/src/main/java/org/bukkit/inventory/SmithingTransformRecipe.java b/src/main/java/org/bukkit/inventory/SmithingTransformRecipe.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/inventory/SmithingTransformRecipe.java

patches/api/Replace-ItemFlag.HIDE_POTION_EFFECTS.patch

@@ -17,9 +17,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    @Deprecated // Paper
      HIDE_POTION_EFFECTS,
      /**
-      * Setting to show/hide dyes from coloured leather armour
+      * Setting to show/hide dyes from colored leather armor.
+@@ -0,0 +0,0 @@ public enum ItemFlag {
       */
-     HIDE_DYE;
+     @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20
+     HIDE_ARMOR_TRIM;
 +    // Paper start
 +    /**
 +     * Setting to show/hide item-specific information, including, but not limited to:

patches/server/Fix-sniffer.patch

@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Tue, 14 Mar 2023 20:03:21 -0700
-Subject: [PATCH] Fix sniffer
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-@@ -0,0 +0,0 @@ public class Sniffer extends Animal {
- 
-     public Sniffer(EntityType<? extends Animal> type, Level world) {
-         super(type, world);
--        this.entityData.define(DATA_STATE, Sniffer.State.IDLING);
--        this.entityData.define(DATA_DROP_SEED_AT_TICK, 0);
-+        // Paper - move to defineSyncedData
-         this.getNavigation().setCanFloat(true);
-         this.setPathfindingMalus(BlockPathTypes.WATER, -2.0F);
-     }
- 
-+    // Paper start
-+    @Override
-+    protected void defineSynchedData() {
-+        super.defineSynchedData();
-+        this.entityData.define(DATA_STATE, Sniffer.State.IDLING);
-+        this.entityData.define(DATA_DROP_SEED_AT_TICK, 0);
-+    }
-+    // Paper end
-+
-     @Override
-     protected float getStandingEyeHeight(Pose pose, EntityDimensions dimensions) {
-         return this.getDimensions(pose).height * 0.6F;
-@@ -0,0 +0,0 @@ public class Sniffer extends Animal {
- 
-     @Override
-     public Brain<Sniffer> getBrain() {
--        return super.getBrain();
-+        return (Brain<Sniffer>) super.getBrain(); // Paper - decompile issue
-     }
- 
-     @Override

work/Bukkit

@@ -1 +1 @@
-Subproject commit fdef9473fc0cc3873104306f5ec24e587ad3e962
+Subproject commit 3a54fb167d6354b6e39f5027bcde56641f487b8f

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 968d28df0410e2a4ff04fbbd09e7c6bf91c3cd69
+Subproject commit 55056ad80314cca1c910c9b79f31a1b6a4c629f6