Add support for dry_foliage colormap and the leaf_litter block

Author: TBlueF

core/src/main/java/de/bluecolored/bluemap/core/resources/BlockColorCalculatorFactory.java

@@ -51,8 +51,9 @@ public class BlockColorCalculatorFactory {
             BLEND_MIN_Z = - BLEND_RADIUS_H,
             BLEND_MAX_Z =   BLEND_RADIUS_H;
 
-    private final int[] foliageMap = new int[65536];
-    private final int[] grassMap = new int[65536];
+    private int[] foliageMap = new int[0];
+    private int[] dryFoliageMap = new int[0];
+    private int[] grassMap = new int[0];
 
     private final Map<String, ColorFunction> blockColorMap;
 
@@ -76,6 +77,9 @@ public void load(Path configFile) throws IOException {
                     case "@foliage":
                         colorFunction = BlockColorCalculator::getBlendedFoliageColor;
                         break;
+                    case "@dry_foliage":
+                        colorFunction = BlockColorCalculator::getBlendedDryFoliageColor;
+                        break;
                     case "@grass":
                         colorFunction = BlockColorCalculator::getBlendedGrassColor;
                         break;
@@ -100,12 +104,19 @@ public void load(Path configFile) throws IOException {
         }
     }
 
-    public void setFoliageMap(BufferedImage foliageMap) {
-        foliageMap.getRGB(0, 0, 256, 256, this.foliageMap, 0, 256);
+    public void setFoliageMap(BufferedImage map) {
+        this.foliageMap = new int[65536];
+        map.getRGB(0, 0, 256, 256, this.foliageMap, 0, 256);
+    }
+
+    public void setDryFoliageMap(BufferedImage map) {
+        this.dryFoliageMap = new int[65536];
+        map.getRGB(0, 0, 256, 256, this.dryFoliageMap, 0, 256);
     }
 
-    public void setGrassMap(BufferedImage grassMap) {
-        grassMap.getRGB(0, 0, 256, 256, this.grassMap, 0, 256);
+    public void setGrassMap(BufferedImage map) {
+        this.grassMap = new int[65536];
+        map.getRGB(0, 0, 256, 256, this.grassMap, 0, 256);
     }
 
     public BlockColorCalculator createCalculator() {
@@ -181,6 +192,29 @@ public Color getFoliageColor(Biome biome, Color target) {
             return target.overlay(biome.getOverlayFoliageColor());
         }
 
+        public Color getBlendedDryFoliageColor(BlockNeighborhood block, Color target) {
+            target.set(0, 0, 0, 0, true);
+
+            int x, y, z;
+
+            Biome biome;
+            for (y = BLEND_MIN_Y; y <= BLEND_MAX_Y; y++) {
+                for (x = BLEND_MIN_X; x <= BLEND_MAX_X; x++) {
+                    for (z = BLEND_MIN_Z; z <= BLEND_MAX_Z; z++) {
+                        biome = block.getNeighborBlock(x, y, z).getBiome();
+                        target.add(getDryFoliageColor(biome, tempColor));
+                    }
+                }
+            }
+
+            return target.flatten();
+        }
+
+        public Color getDryFoliageColor(Biome biome, Color target) {
+            getColorFromMap(biome, dryFoliageMap, 0xff8f5f33, target);
+            return target.overlay(biome.getOverlayFoliageColor());
+        }
+
         public Color getBlendedGrassColor(BlockNeighborhood block, Color target) {
             target.set(0, 0, 0, 0, true);
 

core/src/main/java/de/bluecolored/bluemap/core/resources/pack/resourcepack/ResourcePack.java

@@ -322,12 +322,16 @@ private void bake() throws IOException, InterruptedException {
         }
 
         BufferedImage foliage = new ResourcePath<BufferedImage>("minecraft:colormap/foliage").getResource(colormaps::get);
-        if (foliage == null) throw new IOException("Failed to bake resource-pack: No foliage-colormap found!");
-        this.colorCalculatorFactory.setFoliageMap(foliage);
+        if (foliage != null)
+            this.colorCalculatorFactory.setFoliageMap(foliage);
+
+        BufferedImage dryFoliage = new ResourcePath<BufferedImage>("minecraft:colormap/dry_foliage").getResource(colormaps::get);
+        if (dryFoliage != null)
+            this.colorCalculatorFactory.setDryFoliageMap(dryFoliage);
 
         BufferedImage grass = new ResourcePath<BufferedImage>("minecraft:colormap/grass").getResource(colormaps::get);
-        if (grass == null) throw new IOException("Failed to bake resource-pack: No grass-colormap found!");
-        this.colorCalculatorFactory.setGrassMap(grass);
+        if (grass != null)
+            this.colorCalculatorFactory.setGrassMap(grass);
 
         // invoke extensions
         for (ResourcePackExtension extension : resourcePackExtensions.values()) {

core/src/main/resourceExtensions/assets/minecraft/blockColors.json

@@ -65,5 +65,6 @@
     "minecraft:purple_shulker_box": "#8932b8",
     "minecraft:magenta_shulker_box": "#c74ebd",
     "minecraft:pink_shulker_box": "#f38baa",
-    "minecraft:pale_oak_leaves": "#ffffff"
+    "minecraft:pale_oak_leaves": "#ffffff",
+    "minecraft:leaf_litter": "@dry_foliage"
 }