Merge pull request #358 from FTBTeam/bugfix/scale-entity-icons

[1.21] Add support for default image size to fix large resource packs

Author: desht

common/src/main/java/dev/ftb/mods/ftbchunks/client/gui/SliceCreationGUI.java

@@ -168,7 +168,7 @@ public void drawBackground(GuiGraphics graphics, Theme theme, int x, int y, int
         for (SliceControlBox controlBox : sliceControlBoxes) {
             slices.add(new EntityImageIcon.ChildIconData(Optional.empty(), controlBox.createSlice(), Optional.of(new EntityImageIcon.Offset(controlBox.offsetXText.getIntValue(), controlBox.offsetYText.getIntValue()))));
         }
-        new EntityImageIcon(sliceControlBox.texture, sliceControlBox.createSlice(), slices).draw(graphics, x + 2, y + 2, imageSizeX.getIntValue(), imageSizeY.getIntValue());
+        new EntityImageIcon(sliceControlBox.texture, sliceControlBox.createSlice(), slices, null).draw(graphics, x + 2, y + 2, imageSizeX.getIntValue(), imageSizeY.getIntValue());
     }
 
     @Override
@@ -329,6 +329,7 @@ private SimpleButton createExportButton() {
                             box.createSlice(),
                             Optional.of(new EntityImageIcon.Offset(box.offsetXText.getIntValue(), box.offsetYText.getIntValue())))).toList(),
                     EntityIcons.WidthHeight.DEFAULT,
+                    Optional.empty(),
                     1,
                     true);
 

common/src/main/java/dev/ftb/mods/ftbchunks/client/mapicon/EntityIcons.java

@@ -81,7 +81,7 @@ protected Map<EntityType<?>, EntityIconSettings> prepare(ResourceManager resourc
                 ResourceLocation rl = FTBChunksAPI.rl(basePath + ".png");
                 Optional<Resource> pic = resourceManager.getResource(rl);
                 if (pic.isPresent()) {
-                    entityIconSettings = new EntityIconSettings(false, Optional.of(rl), Optional.empty(), List.of(), WidthHeight.DEFAULT, 1D, true);
+                    entityIconSettings = new EntityIconSettings(false, Optional.of(rl), Optional.empty(), List.of(), WidthHeight.DEFAULT, Optional.empty(), 1D, true);
                 }
             }
 
@@ -159,7 +159,7 @@ public static Optional<EntityIconSettings> getSettings(EntityType<?> entityType)
     private static Icon getOrCreateIcon(EntityType<?> entityType, ResourceLocation texture, EntityIconSettings settings) {
         return ICON_CACHE
                 .computeIfAbsent(entityType, i -> new HashMap<>())
-                .computeIfAbsent(texture, t -> new EntityImageIcon(t, settings.mainSlice.orElse(null), settings.children));
+                .computeIfAbsent(texture, t -> new EntityImageIcon(t, settings.mainSlice.orElse(null), settings.children, settings.defaultImageSize.orElse(null)));
     }
 
     @Override
@@ -175,12 +175,13 @@ public record EntityIconSettings(
             Optional<EntityImageIcon.Slice> mainSlice,
             List<EntityImageIcon.ChildIconData> children,
             WidthHeight widthHeight,
+            Optional<EntityIcons.WidthHeight> defaultImageSize,
             double scale,
             boolean defaultEnabled) {
 
         private static final EntityIconSettings OLD_HIDDEN = new EntityIconSettings(
                 false, Optional.empty(), Optional.empty(),
-                List.of(), WidthHeight.DEFAULT, 1D, true
+                List.of(), WidthHeight.DEFAULT, Optional.empty(), 1D, true
         );
 
         public static final Codec<EntityIconSettings> CODEC = RecordCodecBuilder.<EntityIconSettings>create(builder ->
@@ -190,6 +191,7 @@ public record EntityIconSettings(
                                 EntityImageIcon.Slice.CODEC.optionalFieldOf("slice").forGetter(entityIconData -> entityIconData.mainSlice),
                                 EntityImageIcon.ChildIconData.CODEC.listOf().optionalFieldOf("children", List.of()).forGetter(entityIconData -> entityIconData.children),
                                 WidthHeight.CODEC.optionalFieldOf("size", WidthHeight.DEFAULT).forGetter(s -> s.widthHeight),
+                                WidthHeight.CODEC.optionalFieldOf("default_image_size").forGetter(s -> s.defaultImageSize),
                                 Codec.DOUBLE.optionalFieldOf("scale", 1D).forGetter(s -> s.scale),
                                 Codec.BOOL.optionalFieldOf("default_enabled", true).forGetter(s -> s.defaultEnabled))
                         .apply(builder, EntityIconSettings::new)

common/src/main/java/dev/ftb/mods/ftbchunks/client/mapicon/EntityImageIcon.java

@@ -20,10 +20,13 @@ public class EntityImageIcon extends Icon {
     private final List<ChildIconData> children;
     private final Icon mainIcon;
     private final List<Icon> childIcons;
+    @Nullable
+    private final EntityIcons.WidthHeight defaultImageSize;
 
-    public EntityImageIcon(ResourceLocation mainTexture, @Nullable Slice mainSlice, List<ChildIconData> children) {
+    public EntityImageIcon(ResourceLocation mainTexture, @Nullable Slice mainSlice, List<ChildIconData> children, @Nullable EntityIcons.WidthHeight defaultImageSize) {
         this.mainSlice = mainSlice;
         this.children = children;
+        this.defaultImageSize = defaultImageSize;
 
         mainIcon = createIcon(mainTexture, mainSlice);
         childIcons = children.stream().map(childIconData -> createIcon(childIconData.texture.orElse(mainTexture), childIconData.slice)).toList();
@@ -101,9 +104,21 @@ private Icon createIcon(ResourceLocation texture, @Nullable Slice slice) {
         try {
             ImageIcon imageIcon = new ImageIcon(texture);
             if (slice != null) {
+
                 int textureWidth = load.getImage().getWidth();
                 int textureHeight = load.getImage().getHeight();
-                return imageIcon.withUV(slice.x, slice.y, slice.width, slice.height, textureWidth, textureHeight);
+                if (defaultImageSize != null) {
+                    int defaultTextureWidth = defaultImageSize.width();
+                    int defaultTextureHeight = defaultImageSize.height();
+
+                    float scaleX = (float) textureWidth / defaultTextureWidth;
+                    float scaleY = (float) textureHeight / defaultTextureHeight;
+                    return imageIcon.withUV(slice.x * scaleX, slice.y * scaleY, slice.width * scaleX, slice.height * scaleY, textureWidth, textureHeight);
+                } else {
+                    return imageIcon.withUV(slice.x, slice.y, slice.width, slice.height, textureWidth, textureHeight);
+                }
+
+
             }
             return imageIcon;
         } catch (Exception e) {

common/src/main/resources/assets/ftbchunks/textures/faces/minecraft/allay.json

@@ -5,5 +5,9 @@
     "y": 5,
     "width": 5,
     "height": 5
+  },
+  "default_image_size": {
+    "width": 32,
+    "height": 32
   }
 }

common/src/main/resources/assets/ftbchunks/textures/faces/minecraft/armadillo.json

@@ -5,5 +5,9 @@
     "y": 10,
     "width": 10,
     "height": 10
+  },
+  "default_image_size": {
+    "width": 64,
+    "height": 64
   }
 }

common/src/main/resources/assets/ftbchunks/textures/faces/minecraft/bee.json

@@ -5,5 +5,9 @@
     "y": 10,
     "width": 9,
     "height": 7
+  },
+  "default_image_size": {
+    "width": 64,
+    "height": 64
   }
 }

common/src/main/resources/assets/ftbchunks/textures/faces/minecraft/blaze.json

@@ -5,5 +5,9 @@
     "y": 8,
     "width": 8,
     "height": 8
+  },
+  "default_image_size": {
+    "width": 64,
+    "height": 32
   }
 }

common/src/main/resources/assets/ftbchunks/textures/faces/minecraft/breeze.json

@@ -5,5 +5,9 @@
     "y": 8,
     "width": 10,
     "height": 8
+  },
+  "default_image_size": {
+    "width": 32,
+    "height": 32
   }
 }

common/src/main/resources/assets/ftbchunks/textures/faces/minecraft/cave_spider.json

@@ -5,5 +5,9 @@
     "y": 12,
     "width": 8,
     "height": 8
+  },
+  "default_image_size": {
+    "width": 64,
+    "height": 32
   }
 }

common/src/main/resources/assets/ftbchunks/textures/faces/minecraft/cod.json

@@ -1,4 +1,8 @@
 {
   "default_enabled": false,
-  "texture": "ftbchunks:textures/faces/minecraft/cod.png"
+  "texture": "ftbchunks:textures/faces/minecraft/cod.png",
+  "default_image_size": {
+    "width": 16,
+    "height": 16
+  }
 }