Skip to content

Commit 6dcfa4c

Browse files
committed
Fix dry-leaves overlay color
1 parent 9040f3e commit 6dcfa4c

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ public Color getBlendedDryFoliageColor(BlockNeighborhood block, Color target) {
227227

228228
public Color getDryFoliageColor(Biome biome, Color target) {
229229
getColorFromMap(biome, dryFoliageMap, 0xff8f5f33, target);
230-
return target.overlay(biome.getOverlayFoliageColor());
230+
return target.overlay(biome.getOverlayDryFoliageColor());
231231
}
232232

233233
public Color getBlendedGrassColor(BlockNeighborhood block, Color target) {

core/src/main/java/de/bluecolored/bluemap/core/resources/pack/datapack/biome/DatapackBiome.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
*/
2525
package de.bluecolored.bluemap.core.resources.pack.datapack.biome;
2626

27-
import de.bluecolored.bluemap.core.logger.Logger;
2827
import de.bluecolored.bluemap.core.resources.adapter.PostDeserialize;
2928
import de.bluecolored.bluemap.core.util.Key;
3029
import de.bluecolored.bluemap.core.util.math.Color;
@@ -60,6 +59,11 @@ public Color getOverlayFoliageColor() {
6059
return data.effects.foliageColor;
6160
}
6261

62+
@Override
63+
public Color getOverlayDryFoliageColor() {
64+
return data.effects.dryFoliageColor;
65+
}
66+
6367
@Override
6468
public Color getOverlayGrassColor() {
6569
return data.effects.grassColor;
@@ -86,6 +90,7 @@ public static class Effects {
8690

8791
private Color waterColor = Biome.DEFAULT.getWaterColor();
8892
private Color foliageColor = Biome.DEFAULT.getOverlayFoliageColor();
93+
private Color dryFoliageColor = Biome.DEFAULT.getOverlayDryFoliageColor();
8994
private Color grassColor = Biome.DEFAULT.getOverlayGrassColor();
9095
private GrassColorModifier grassColorModifier = Biome.DEFAULT.getGrassColorModifier();
9196

core/src/main/java/de/bluecolored/bluemap/core/world/biome/Biome.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ public interface Biome extends Keyed {
4141

4242
Color getOverlayFoliageColor();
4343

44+
Color getOverlayDryFoliageColor();
45+
4446
Color getOverlayGrassColor();
4547

4648
GrassColorModifier getGrassColorModifier();
@@ -53,6 +55,7 @@ class Default implements Biome {
5355
private final float temperature = 0.5f;
5456
private final Color waterColor = new Color().set(4159204 | 0xFF000000).premultiplied();
5557
private final Color overlayFoliageColor = new Color().premultiplied();
58+
private final Color overlayDryFoliageColor = new Color().premultiplied();
5659
private final Color overlayGrassColor = new Color().premultiplied();
5760
private final GrassColorModifier grassColorModifier = GrassColorModifier.NONE;
5861

0 commit comments

Comments
 (0)