Add overrides for backwards compatibility (testing needed) and reorder a bit

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

@@ -86,6 +86,74 @@ public interface NonVanillaCustomItemData extends CustomItemData {
         @Override
         Builder name(@NonNull String name);
 
+        @Override
+        Builder customItemOptions(@NonNull CustomItemOptions customItemOptions);
+
+        @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);
+
+        @Override
+        Builder hat(boolean isHat);
+
+        @Override
+        Builder foil(boolean isFoil);
+
+        @Override
+        Builder edible(boolean isEdible);
+
+        @Override
+        Builder canAlwaysEat(boolean canAlwaysEat);
+
+        @Override
+        default Builder tool(boolean isTool) {
+            return displayHandheld(isTool);
+        }
+
         Builder identifier(@NonNull String identifier);
 
         Builder javaId(@NonNegative int javaId);

core/src/main/java/org/geysermc/geyser/item/GeyserNonVanillaCustomItemData.java

@@ -105,6 +105,16 @@ public final class GeyserNonVanillaCustomItemData extends GeyserCustomItemData i
             return this;
         }
 
+        @Override
+        public Builder displayName(@NonNull String displayName) {
+            return (Builder) super.displayName(displayName);
+        }
+
+        @Override
+        public Builder icon(@NonNull String icon) {
+            return (Builder) super.icon(icon);
+        }
+
         @Override
         public Builder allowOffhand(boolean allowOffhand) {
             return (Builder) super.allowOffhand(allowOffhand);
@@ -116,13 +126,13 @@ public final class GeyserNonVanillaCustomItemData extends GeyserCustomItemData i
         }
 
         @Override
-        public Builder displayName(@NonNull String displayName) {
+        public Builder creativeCategory(int creativeCategory) {
-            return (Builder) super.displayName(displayName);
+            return (Builder) super.creativeCategory(creativeCategory);
         }
 
         @Override
-        public Builder icon(@NonNull String icon) {
+        public Builder creativeGroup(@Nullable String creativeGroup) {
-            return (Builder) super.icon(icon);
+            return (Builder) super.creativeGroup(creativeGroup);
         }
 
         @Override
@@ -140,6 +150,61 @@ public final class GeyserNonVanillaCustomItemData extends GeyserCustomItemData i
             return (Builder) super.tags(tags);
         }
 
+        @Override
+        public Builder stackSize(int stackSize) {
+            return (Builder) super.stackSize(stackSize);
+        }
+
+        @Override
+        public Builder maxDamage(int maxDamage) {
+            return (Builder) super.maxDamage(maxDamage);
+        }
+
+        @Override
+        public Builder attackDamage(int attackDamage) {
+            return (Builder) super.attackDamage(attackDamage);
+        }
+
+        @Override
+        public Builder toolType(@Nullable String toolType) {
+            return (Builder) super.toolType(toolType);
+        }
+
+        @Override
+        public Builder toolTier(@Nullable String toolTier) {
+            return (Builder) super.toolTier(toolTier);
+        }
+
+        @Override
+        public Builder armorType(@Nullable String armorType) {
+            return (Builder) super.armorType(armorType);
+        }
+
+        @Override
+        public Builder protectionValue(int protectionValue) {
+            return (Builder) super.protectionValue(protectionValue);
+        }
+
+        @Override
+        public Builder hat(boolean isHat) {
+            return (Builder) super.hat(isHat);
+        }
+
+        @Override
+        public Builder foil(boolean isFoil) {
+            return (Builder) super.foil(isFoil);
+        }
+
+        @Override
+        public Builder edible(boolean isEdible) {
+            return (Builder) super.edible(isEdible);
+        }
+
+        @Override
+        public Builder canAlwaysEat(boolean canAlwaysEat) {
+            return (Builder) super.canAlwaysEat(canAlwaysEat);
+        }
+
         @Override
         public Builder identifier(@NonNull String identifier) {
             this.identifier = identifier;
@@ -164,16 +229,6 @@ public final class GeyserNonVanillaCustomItemData extends GeyserCustomItemData i
             return this;
         }
 
-        @Override
-        public Builder creativeCategory(int creativeCategory) {
-            return (Builder) super.creativeCategory(creativeCategory);
-        }
-
-        @Override
-        public Builder creativeGroup(@Nullable String creativeGroup) {
-            return (Builder) super.creativeGroup(creativeGroup);
-        }
-
         @Override
         public Builder chargeable(boolean isChargeable) {
             this.chargeable = isChargeable;