Move various settings from NonVanillaCustomItemData to CustomItemData and allow use in JSON mappings

api/src/main/java/org/geysermc/geyser/api/item/custom/CustomItemData.java

@@ -25,6 +25,7 @@
 
 package org.geysermc.geyser.api.item.custom;
 
+import org.checkerframework.checker.index.qual.NonNegative;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.geysermc.geyser.api.GeyserApi;
@@ -114,6 +115,103 @@ public interface CustomItemData {
      */
     @NonNull Set<String> tags();
 
+    /**
+     * Gets the stack size of the item.
+     *
+     * Returns 0 if not set. When not set (or 0), takes the Java item stack count when based of a vanilla item, or uses 64 when porting a modded item.
+     *
+     * @return the stack size of the item
+     */
+    @NonNegative
+    int stackSize();
+
+    /**
+     * Gets the max damage of the item.
+     *
+     * Returns -1 if not set. When not set (or below 0), takes the Java item max damage when based of a vanilla item, or uses 0 when porting a modded item.
+     *
+     * @return the max damage of the item
+     */
+    int maxDamage();
+
+    /**
+     * Gets the attack damage of the item.
+     * This is purely visual, and only applied to tools
+     *
+     * Returns 0 if not set. When 0, takes the Java item attack damage when based of a vanilla item, or uses 0 when porting a modded item.
+     *
+     * @return the attack damage of the item
+     */
+    int attackDamage();
+
+    /**
+     * Gets the tool type of the item.
+     *
+     * @return the tool type of the item
+     */
+    @Nullable String toolType();
+
+    /**
+     * Gets the tool tier of the item.
+     *
+     * @return the tool tier of the item
+     */
+    @Nullable String toolTier();
+
+    /**
+     * Gets the armor type of the item.
+     *
+     * @return the armor type of the item
+     */
+    @Nullable String armorType();
+
+    /**
+     * Gets the armor protection value of the item.
+     *
+     * @return the armor protection value of the item
+     */
+    int protectionValue();
+
+    /**
+     * Gets if the item is a hat. This is used to determine if the item should be rendered on the player's head, and
+     * normally allow the player to equip it. This is not meant for armor.
+     *
+     * @return if the item is a hat
+     */
+    boolean isHat();
+
+    /**
+     * Gets if the item is a foil. This is used to determine if the item should be rendered with an enchantment glint effect.
+     *
+     * @return if the item is a foil
+     */
+    boolean isFoil();
+
+    /**
+     * Gets if the item is edible.
+     *
+     * @return if the item is edible
+     */
+    boolean isEdible();
+
+    /**
+     * Gets if the food item can always be eaten.
+     *
+     * @return if the item is allowed to be eaten all the time
+     */
+    boolean canAlwaysEat();
+
+    /**
+     * @deprecated Use {@link #displayHandheld()} instead.
+     * Gets if the item is a tool. This is used to set the render type of the item, if the item is handheld.
+     *
+     * @return if the item is a tool
+     */
+    @Deprecated
+    default boolean isTool() {
+        return displayHandheld();
+    }
+
     static CustomItemData.Builder builder() {
         return GeyserApi.api().provider(CustomItemData.Builder.class);
     }
@@ -144,6 +242,36 @@ interface Builder {
 
         Builder tags(@Nullable Set<String> tags);
 
+        Builder stackSize(@NonNegative int stackSize);
+
+        Builder maxDamage(int maxDamage);
+
+        Builder attackDamage(int attackDamage);
+
+        Builder toolType(@Nullable String toolType);
+
+        Builder toolTier(@Nullable String toolTier);
+
+        Builder armorType(@Nullable String armorType);
+
+        Builder protectionValue(int protectionValue);
+
+        Builder hat(boolean isHat);
+
+        Builder foil(boolean isFoil);
+
+        Builder edible(boolean isEdible);
+
+        Builder canAlwaysEat(boolean canAlwaysEat);
+
+        /**
+         * @deprecated Use {@link #displayHandheld(boolean)} instead.
+         */
+        @Deprecated
+        default Builder tool(boolean isTool) {
+            return displayHandheld(isTool);
+        }
+
         CustomItemData build();
     }
 }

api/src/main/java/org/geysermc/geyser/api/item/custom/NonVanillaCustomItemData.java

@@ -50,56 +50,6 @@ public interface NonVanillaCustomItemData extends CustomItemData {
      */
     @NonNegative int javaId();
 
-    /**
-     * Gets the stack size of the item.
-     *
-     * @return the stack size of the item
-     */
-    @NonNegative int stackSize();
-
-    /**
-     * Gets the max damage of the item.
-     *
-     * @return the max damage of the item
-     */
-    int maxDamage();
-
-    /**
-     * Gets the attack damage of the item.
-     * This is purely visual, and only applied to tools
-     *
-     * @return the attack damage of the item
-     */
-    int attackDamage();
-
-    /**
-     * Gets the tool type of the item.
-     *
-     * @return the tool type of the item
-     */
-    @Nullable String toolType();
-
-    /**
-     * Gets the tool tier of the item.
-     *
-     * @return the tool tier of the item
-     */
-    @Nullable String toolTier();
-
-    /**
-     * Gets the armor type of the item.
-     *
-     * @return the armor type of the item
-     */
-    @Nullable String armorType();
-
-    /**
-     * Gets the armor protection value of the item.
-     *
-     * @return the armor protection value of the item
-     */
-    int protectionValue();
-
     /**
      * Gets the item's translation string.
      *
@@ -114,53 +64,13 @@ public interface NonVanillaCustomItemData extends CustomItemData {
      */
     @Nullable Set<String> repairMaterials();
 
-    /**
-     * Gets if the item is a hat. This is used to determine if the item should be rendered on the player's head, and
-     * normally allow the player to equip it. This is not meant for armor.
-     *
-     * @return if the item is a hat
-     */
-    boolean isHat();
-
-    /**
-     * Gets if the item is a foil. This is used to determine if the item should be rendered with an enchantment glint effect.
-     *
-     * @return if the item is a foil
-     */
-    boolean isFoil();
-
-    /**
-     * Gets if the item is edible.
-     *
-     * @return if the item is edible
-     */
-    boolean isEdible();
-
-    /**
-     * Gets if the food item can always be eaten.
-     *
-     * @return if the item is allowed to be eaten all the time
-     */
-    boolean canAlwaysEat();
-
     /**
      * Gets if the item is chargable, like a bow.
      *
      * @return if the item should act like a chargable item
      */
     boolean isChargeable();
 
-    /**
-     * @deprecated Use {@link #displayHandheld()} instead.
-     * Gets if the item is a tool. This is used to set the render type of the item, if the item is handheld.
-     *
-     * @return if the item is a tool
-     */
-    @Deprecated
-    default boolean isTool() {
-        return displayHandheld();
-    }
-
     /**
      * Gets the block the item places.
      *
@@ -176,77 +86,85 @@ interface Builder extends CustomItemData.Builder {
         @Override
         Builder name(@NonNull String name);
 
-        Builder identifier(@NonNull String identifier);
+        @Override
+        Builder customItemOptions(@NonNull CustomItemOptions customItemOptions);
 
-        Builder javaId(@NonNegative int javaId);
+        @Override
+        Builder displayName(@NonNull String displayName);
+
+        @Override
+        Builder icon(@NonNull String icon);
+
+        @Override
+        Builder allowOffhand(boolean allowOffhand);
 
+        @Override
+        Builder displayHandheld(boolean displayHandheld);
+
+        @Override
+        Builder creativeCategory(int creativeCategory);
+
+        @Override
+        Builder creativeGroup(@Nullable String creativeGroup);
+
+        @Override
+        Builder textureSize(int textureSize);
+
+        @Override
+        Builder renderOffsets(@Nullable CustomRenderOffsets renderOffsets);
+
+        @Override
+        Builder tags(@Nullable Set<String> tags);
+
+        @Override
         Builder stackSize(@NonNegative int stackSize);
 
+        @Override
         Builder maxDamage(int maxDamage);
 
+        @Override
         Builder attackDamage(int attackDamage);
 
+        @Override
         Builder toolType(@Nullable String toolType);
 
+        @Override
         Builder toolTier(@Nullable String toolTier);
 
+        @Override
         Builder armorType(@Nullable String armorType);
 
+        @Override
         Builder protectionValue(int protectionValue);
 
-        Builder translationString(@Nullable String translationString);
-
-        Builder repairMaterials(@Nullable Set<String> repairMaterials);
-
+        @Override
         Builder hat(boolean isHat);
 
+        @Override
         Builder foil(boolean isFoil);
 
+        @Override
         Builder edible(boolean isEdible);
 
+        @Override
         Builder canAlwaysEat(boolean canAlwaysEat);
 
-        Builder chargeable(boolean isChargeable);
-
-        Builder block(String block);
-
-        /**
-         * @deprecated Use {@link #displayHandheld(boolean)} instead.
-         */
-        @Deprecated
+        @Override
         default Builder tool(boolean isTool) {
             return displayHandheld(isTool);
         }
 
-        @Override
-        Builder creativeCategory(int creativeCategory);
-
-        @Override
-        Builder creativeGroup(@Nullable String creativeGroup);
-
-        @Override
-        Builder customItemOptions(@NonNull CustomItemOptions customItemOptions);
-
-        @Override
-        Builder displayName(@NonNull String displayName);
-
-        @Override
-        Builder icon(@NonNull String icon);
+        Builder identifier(@NonNull String identifier);
 
-        @Override
-        Builder allowOffhand(boolean allowOffhand);
+        Builder javaId(@NonNegative int javaId);
 
-        @Override
-        Builder displayHandheld(boolean displayHandheld);
+        Builder translationString(@Nullable String translationString);
 
-        @Override
-        Builder textureSize(int textureSize);
+        Builder repairMaterials(@Nullable Set<String> repairMaterials);
 
-        @Override
-        Builder renderOffsets(@Nullable CustomRenderOffsets renderOffsets);
+        Builder chargeable(boolean isChargeable);
 
-        @Override
-        Builder tags(@Nullable Set<String> tags);
+        Builder block(String block);
 
         NonVanillaCustomItemData build();
     }