Bye bye render offsets

Author: eclipseisoffline

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

@@ -140,8 +140,6 @@ default CustomItemDefinition.Builder toDefinition(Identifier javaItem) {
                 .displayHandheld(displayHandheld())
                 .creativeCategory(creativeCategory().isEmpty() ? CreativeCategory.NONE : CreativeCategory.values()[creativeCategory().getAsInt()])
                 .creativeGroup(creativeGroup())
-                .textureSize(textureSize())
-                .renderOffsets(renderOffsets())
                 .tags(tags())
             );
 

api/src/main/java/org/geysermc/geyser/api/item/custom/v2/CustomItemBedrockOptions.java

@@ -87,25 +87,6 @@ public interface CustomItemBedrockOptions {
     @Nullable
     String creativeGroup();
 
-    /**
-     * Gets the item's texture size. This is to resize the item if the texture is not 16x16.
-     *
-     * @deprecated resizing is done with render offsets, which are deprecated in favour of attachables.
-     * @return the item's texture size
-     */
-    @Deprecated
-    int textureSize();
-
-    /**
-     * Gets the item's render offsets. If it is null, the item will be rendered normally, with no offsets.
-     *
-     * @deprecated attachables are now preferred instead of using render offsets.
-     * @return the item's render offsets
-     */
-    @Nullable
-    @Deprecated
-    CustomRenderOffsets renderOffsets();
-
     /**
      * Gets the item's set of tags that can be used in Molang.
      * Equivalent to "tag:some_tag"
@@ -133,12 +114,6 @@ interface Builder {
 
         Builder creativeGroup(@Nullable String creativeGroup);
 
-        @Deprecated
-        Builder textureSize(int textureSize);
-
-        @Deprecated
-        Builder renderOffsets(@Nullable CustomRenderOffsets renderOffsets);
-
         Builder tags(@Nullable Set<String> tags);
 
         CustomItemBedrockOptions build();

core/src/main/java/org/geysermc/geyser/item/custom/GeyserCustomItemBedrockOptions.java

@@ -36,8 +36,7 @@
 import java.util.Set;
 
 public record GeyserCustomItemBedrockOptions(@Nullable String icon, boolean allowOffhand, boolean displayHandheld, int protectionValue,
-                                             @NonNull CreativeCategory creativeCategory, @Nullable String creativeGroup,
-                                             int textureSize, @Nullable CustomRenderOffsets renderOffsets, @NonNull Set<String> tags) implements CustomItemBedrockOptions {
+                                             @NonNull CreativeCategory creativeCategory, @Nullable String creativeGroup, @NonNull Set<String> tags) implements CustomItemBedrockOptions {
 
     public static class Builder implements CustomItemBedrockOptions.Builder {
         private String icon = null;
@@ -46,8 +45,6 @@ public static class Builder implements CustomItemBedrockOptions.Builder {
         private int protectionValue = 0;
         private CreativeCategory creativeCategory = CreativeCategory.NONE;
         private String creativeGroup = null;
-        private int textureSize = 16;
-        private CustomRenderOffsets renderOffsets = null;
         private Set<String> tags = new HashSet<>();
 
         @Override
@@ -86,20 +83,6 @@ public Builder creativeGroup(@Nullable String creativeGroup) {
             return this;
         }
 
-        @Override
-        @Deprecated
-        public Builder textureSize(int textureSize) {
-            this.textureSize = textureSize;
-            return this;
-        }
-
-        @Override
-        @Deprecated
-        public Builder renderOffsets(@Nullable CustomRenderOffsets renderOffsets) {
-            this.renderOffsets = renderOffsets;
-            return this;
-        }
-
         @Override
         public Builder tags(@Nullable Set<String> tags) {
             this.tags = Objects.requireNonNullElseGet(tags, Set::of);
@@ -109,7 +92,7 @@ public Builder tags(@Nullable Set<String> tags) {
         @Override
         public CustomItemBedrockOptions build() {
             return new GeyserCustomItemBedrockOptions(icon, allowOffhand, displayHandheld, protectionValue,
-                creativeCategory, creativeGroup, textureSize, renderOffsets, tags);
+                creativeCategory, creativeGroup, tags);
         }
     }
 }

core/src/main/java/org/geysermc/geyser/registry/populator/CustomItemRegistryPopulator.java

@@ -286,8 +286,6 @@ private static NbtMapBuilder createComponentNbt(CustomItemDefinition customItemD
             computeUseCooldownProperties(useCooldown, componentBuilder);
         }
 
-        computeRenderOffsets(customItemDefinition.bedrockOptions(), componentBuilder);
-
         componentBuilder.putCompound("item_properties", itemProperties.build());
         builder.putCompound("components", componentBuilder.build());
 
@@ -560,27 +558,6 @@ private static void computeUseCooldownProperties(UseCooldown cooldown, NbtMapBui
         );
     }
 
-    private static void computeRenderOffsets(CustomItemBedrockOptions bedrockOptions, NbtMapBuilder componentBuilder) {
-        // TODO remove this one day when, probably when removing the old format, as render offsets are deprecated
-        CustomRenderOffsets renderOffsets = bedrockOptions.renderOffsets();
-        if (renderOffsets != null) {
-            componentBuilder.remove("minecraft:render_offsets");
-            componentBuilder.putCompound("minecraft:render_offsets", toNbtMap(renderOffsets));
-        } else if (bedrockOptions.textureSize() != 16 && !componentBuilder.containsKey("minecraft:render_offsets")) {
-            float scale1 = (float) (0.075 / (bedrockOptions.textureSize() / 16f));
-            float scale2 = (float) (0.125 / (bedrockOptions.textureSize() / 16f));
-            float scale3 = (float) (0.075 / (bedrockOptions.textureSize() / 16f * 2.4f));
-
-            componentBuilder.putCompound("minecraft:render_offsets",
-                NbtMap.builder().putCompound("main_hand", NbtMap.builder()
-                        .putCompound("first_person", xyzToScaleList(scale3, scale3, scale3))
-                        .putCompound("third_person", xyzToScaleList(scale1, scale2, scale1)).build())
-                    .putCompound("off_hand", NbtMap.builder()
-                        .putCompound("first_person", xyzToScaleList(scale1, scale2, scale1))
-                        .putCompound("third_person", xyzToScaleList(scale1, scale2, scale1)).build()).build());
-        }
-    }
-
     private static NbtMap toNbtMap(CustomRenderOffsets renderOffsets) {
         NbtMapBuilder builder = NbtMap.builder();