compile fixes and equipOnInteract

Author: notTamion

paper-api/src/main/java/io/papermc/paper/datacomponent/item/Equippable.java

@@ -96,6 +96,14 @@ static Equippable.Builder equippable(final EquipmentSlot slot) {
     @Contract(pure = true)
     boolean damageOnHurt();
 
+    /**
+     * Checks if the item should be equipped when interacting with an entity.
+     *
+     * @return true if it equips on interact, false otherwise
+     */
+    @Contract(pure = true)
+    boolean equipOnInteract();
+
     /**
      * Builder for {@link Equippable}.
      */
@@ -165,5 +173,14 @@ interface Builder extends DataComponentBuilder<Equippable> {
          */
         @Contract(value = "_ -> this", mutates = "this")
         Builder damageOnHurt(boolean damageOnHurt);
+
+        /**
+         * Sets whether the item should be equipped when interacting with an entity.
+         *
+         * @param equipOnInteract true if it equips on interact
+         * @return the builder for chaining
+         */
+        @Contract(value = "_ -> this", mutates = "this")
+        Builder equipOnInteract(boolean equipOnInteract);
     }
 }

paper-api/src/main/java/org/bukkit/inventory/meta/components/EquippableComponent.java

@@ -150,4 +150,18 @@ public interface EquippableComponent extends ConfigurationSerializable {
      * @param damage whether the item will be damaged
      */
     void setDamageOnHurt(boolean damage);
+
+    /**
+     * Gets if the item should be equipped when interacting with an entity.
+     *
+     * @return whether the item equips on interact
+     */
+    boolean isEquipOnInteract();
+
+    /**
+     * Sets if the item should be equipped when interacting with an entity.
+     *
+     * @param equip whether the item equips on interact
+     */
+    void setEquipOnInteract(boolean equip);
 }

paper-server/patches/sources/net/minecraft/world/entity/Entity.java.patch

@@ -553,6 +553,19 @@
              BlockPos blockPos = this.mainSupportingBlockPos.get();
              if (!(yOffset > 1.0E-5F)) {
                  return blockPos;
+@@ -1338,6 +_,12 @@
+             || this.level().isRainingAt(BlockPos.containing(blockPos.getX(), this.getBoundingBox().maxY, blockPos.getZ()));
+     }
+ 
++    // Paper start - Bubble Column API
++    public boolean isInBubbleColumn() {
++        return this.getInBlockState().is(Blocks.BUBBLE_COLUMN);
++    }
++    // Paper end - Bubble Column API
++
+     public boolean isInWaterOrRain() {
+         return this.isInWater() || this.isInRain();
+     }
 @@ -1519,6 +_,7 @@
          this.setXRot(Mth.clamp(xRot, -90.0F, 90.0F) % 360.0F);
          this.yRotO = this.getYRot();

paper-server/src/main/java/io/papermc/paper/datacomponent/item/PaperEquippable.java

@@ -80,6 +80,11 @@ public boolean damageOnHurt() {
         return this.impl.damageOnHurt();
     }
 
+    @Override
+    public boolean equipOnInteract() {
+        return this.impl.equipOnInteract();
+    }
+
     @Override
     public Builder toBuilder() {
         return new BuilderImpl(this.slot())
@@ -89,7 +94,8 @@ public Builder toBuilder() {
             .allowedEntities(this.allowedEntities())
             .dispensable(this.dispensable())
             .swappable(this.swappable())
-            .damageOnHurt(this.damageOnHurt());
+            .damageOnHurt(this.damageOnHurt())
+            .equipOnInteract(this.equipOnInteract());
     }
 
 
@@ -103,6 +109,7 @@ static final class BuilderImpl implements Builder {
         private boolean dispensable = true;
         private boolean swappable = true;
         private boolean damageOnHurt = true;
+        private boolean equipOnInteract;
 
         BuilderImpl(final EquipmentSlot equipmentSlot) {
             this.equipmentSlot = CraftEquipmentSlot.getNMS(equipmentSlot);
@@ -155,6 +162,12 @@ public Builder damageOnHurt(final boolean damageOnHurt) {
             return this;
         }
 
+        @Override
+        public Builder equipOnInteract(final boolean equipOnInteract) {
+            this.equipOnInteract = equipOnInteract;
+            return this;
+        }
+
         @Override
         public Equippable build() {
             return new PaperEquippable(
@@ -166,7 +179,8 @@ public Equippable build() {
                     this.allowedEntities,
                     this.dispensable,
                     this.swappable,
-                    this.damageOnHurt
+                    this.damageOnHurt,
+                    this.equipOnInteract
                 )
             );
         }

paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java

@@ -3117,7 +3117,7 @@ public com.destroystokyo.paper.profile.PlayerProfile createProfile(@NotNull UUID
     }
 
     @Override
-    public com.destroystokyo.paper.profile.PlayerProfile createProfile(@NonnNotNullull String name) {
+    public com.destroystokyo.paper.profile.PlayerProfile createProfile(@NotNull String name) {
         return createProfile(null, name);
     }
 

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java

@@ -1158,12 +1158,12 @@ public boolean isInWaterOrRain() {
 
     @Override
     public boolean isInWaterOrBubbleColumn() {
-        return getHandle().isInWaterOrBubble();
+        return getHandle().isInBubbleColumn() || getHandle().isInWater();
     }
 
     @Override
     public boolean isInWaterOrRainOrBubbleColumn() {
-        return getHandle().isInWaterRainOrBubble();
+        return getHandle().isInBubbleColumn() || getHandle().isInWaterOrRain();
     }
 
     @Override

paper-server/src/main/java/org/bukkit/craftbukkit/inventory/components/CraftEquippableComponent.java

@@ -207,6 +207,16 @@ public void setDamageOnHurt(boolean damage) {
         this.handle = new Equippable(this.handle.slot(), this.handle.equipSound(), this.handle.assetId(), this.handle.cameraOverlay(), this.handle.allowedEntities(), this.handle.dispensable(), this.handle.swappable(), damage, this.handle.equipOnInteract());
     }
 
+    @Override
+    public boolean isEquipOnInteract() {
+        return this.handle.equipOnInteract();
+    }
+
+    @Override
+    public void setEquipOnInteract(final boolean equip) {
+        this.handle = new Equippable(this.handle.slot(), this.handle.equipSound(), this.handle.assetId(), this.handle.cameraOverlay(), this.handle.allowedEntities(), this.handle.dispensable(), this.handle.swappable(), this.handle.damageOnHurt(), equip);
+    }
+
     @Override
     public int hashCode() {
         int hash = 7;