Replace blocks that use the GrassTintedSpriteModel with the TintedSpriteBlock and remove special handling of certain blocks in the 2d surface map. Fix incorrect surface map colors and biome color blending on the 2d surface map.

Author: leMaik

chunky/src/java/se/llbit/chunky/block/Block.java

@@ -1,10 +1,10 @@
 package se.llbit.chunky.block;
 
 import se.llbit.chunky.entity.Entity;
-import se.llbit.chunky.model.TexturedBlockModel;
 import se.llbit.chunky.renderer.scene.Scene;
 import se.llbit.chunky.resources.Texture;
 import se.llbit.chunky.world.Material;
+import se.llbit.chunky.world.biome.Biome;
 import se.llbit.json.JsonString;
 import se.llbit.json.JsonValue;
 import se.llbit.math.AABB;
@@ -13,11 +13,10 @@
 import se.llbit.nbt.CompoundTag;
 import se.llbit.nbt.Tag;
 
-import java.util.List;
 import java.util.Random;
 
 public abstract class Block extends Material {
-  private final static AABB block =  new AABB(0, 1, 0, 1,0, 1);
+  private final static AABB block = new AABB(0, 1, 0, 1, 0, 1);
 
   /**
    * Set to true if there is a local intersection model for this block. If this is set to
@@ -46,6 +45,7 @@ public int faceCount() {
 
   /**
    * Sample a random point on this block. Coordinates are normalized to be in [0, 1].
+   *
    * @param loc  Location vector where the point is stored.
    * @param rand Random number source.
    */
@@ -103,7 +103,7 @@ public boolean isBlockEntity() {
 
   public Entity toBlockEntity(Vector3 position, CompoundTag entityTag) {
     throw new Error("This block type can not be converted to a block entity: "
-        + getClass().getSimpleName());
+      + getClass().getSimpleName());
   }
 
   public boolean isEntity() {
@@ -121,7 +121,7 @@ public boolean isBlockWithEntity() {
 
   public Entity toEntity(Vector3 position) {
     throw new Error("This block type can not be converted to an entity: "
-        + getClass().getSimpleName());
+      + getClass().getSimpleName());
   }
 
   /**
@@ -139,7 +139,8 @@ public boolean isModifiedByBlockEntity() {
    * block.
    * This is used to handle legacy blocks that used to have information stored in block entities
    * but are blocks now (e.g. colored beds).
-   * @param blockTag Tag of this block (not to be modified)
+   *
+   * @param blockTag  Tag of this block (not to be modified)
    * @param entityTag Block entity data
    * @return A new tag that will be used to create a new block that will replace this block
    */
@@ -156,9 +157,11 @@ public boolean isBiomeDependant() {
 
   /**
    * Get the color to be used for this block on the surface map.
+   *
+   * @param biome Biome to return the color for (for tinted blocks)
    * @return ARGB color representing this block
    */
-  public int getMapColor() {
+  public int getMapColor(Biome biome) {
     return texture.getAvgColor();
   }
 }

chunky/src/java/se/llbit/chunky/block/MinecraftBlockProvider.java

@@ -1377,9 +1377,9 @@ public Block getBlockByTag(String namespacedName, Tag tag) {
         return new SpriteBlock(name, Texture.cobweb);
       case "grass":
       case "short_grass": // since 1.20.3-pre2
-        return new Grass();
+        return new TintedSpriteBlock(name, Texture.tallGrass, Tint.BIOME_GRASS);
       case "fern":
-        return new Fern();
+        return new TintedSpriteBlock(name, Texture.fern, Tint.BIOME_GRASS);
       case "dead_bush":
         return new SpriteBlock(name, Texture.deadBush);
       case "seagrass":
@@ -2372,7 +2372,7 @@ public Block getBlockByTag(String namespacedName, Tag tag) {
       case "redstone_wire":
         return redstoneWire(tag);
       case "sugar_cane":
-        return new SugarCane(); // tinted since 1.7.2 (13w36a)
+        return new TintedSpriteBlock(name, Texture.sugarCane, Tint.BIOME_GRASS); // tinted since 1.7.2 (13w36a)
       case "kelp":
         return new SpriteBlock(name, Texture.kelp);
       case "kelp_plant":

chunky/src/java/se/llbit/chunky/block/minecraft/Fern.java

@@ -21,6 +21,7 @@
 import se.llbit.chunky.block.AbstractModelBlock;
 import se.llbit.chunky.model.minecraft.GrassBlockModel;
 import se.llbit.chunky.resources.Texture;
+import se.llbit.chunky.world.biome.Biome;
 
 public class GrassBlock extends AbstractModelBlock {
 
@@ -30,4 +31,9 @@ public GrassBlock() {
     opaque = true;
     solid = true;
   }
+
+  @Override
+  public int getMapColor(Biome biome) {
+    return biome.grassColor | 0xFF000000;
+  }
 }

chunky/src/java/se/llbit/chunky/block/minecraft/Grass.java

@@ -18,18 +18,16 @@
 
 package se.llbit.chunky.block.minecraft;
 
-import se.llbit.chunky.block.AbstractModelBlock;
-import se.llbit.chunky.model.GrassTintedSpriteModel;
+import se.llbit.chunky.model.Tint;
 import se.llbit.chunky.resources.Texture;
 
-public class LargeFern extends AbstractModelBlock {
+public class LargeFern extends TintedSpriteBlock {
 
   public LargeFern(String half) {
     super("large_fern",
-        half.equals("upper")
-            ? Texture.largeFernTop
-            : Texture.largeFernBottom);
-    solid = false;
-    model = new GrassTintedSpriteModel(texture);
+      half.equals("upper")
+        ? Texture.largeFernTop
+        : Texture.largeFernBottom,
+      Tint.BIOME_GRASS);
   }
 }

chunky/src/java/se/llbit/chunky/block/minecraft/GrassBlock.java

@@ -3,6 +3,7 @@
 import se.llbit.chunky.block.AbstractModelBlock;
 import se.llbit.chunky.model.minecraft.LeafLitterModel;
 import se.llbit.chunky.resources.Texture;
+import se.llbit.chunky.world.biome.Biome;
 
 public class LeafLitter extends AbstractModelBlock {
   private final String description;
@@ -14,7 +15,7 @@ public LeafLitter(String facing, int segmentAmount) {
   }
 
   @Override
-  public int getMapColor() {
+  public int getMapColor(Biome biome) {
     return 0xAA7B5334;
   }
 

chunky/src/java/se/llbit/chunky/block/minecraft/LargeFern.java

@@ -21,6 +21,7 @@
 import se.llbit.chunky.block.AbstractModelBlock;
 import se.llbit.chunky.model.minecraft.LeafModel;
 import se.llbit.chunky.resources.Texture;
+import se.llbit.chunky.world.biome.Biome;
 
 public class Leaves extends AbstractModelBlock {
 
@@ -35,4 +36,9 @@ public Leaves(String name, Texture texture, int tint) {
     solid = false;
     this.model = new LeafModel(texture, tint);
   }
+
+  @Override
+  public int getMapColor(Biome biome) {
+    return biome.foliageColor | 0xFF000000;
+  }
 }

chunky/src/java/se/llbit/chunky/block/minecraft/LeafLitter.java

@@ -18,18 +18,16 @@
 
 package se.llbit.chunky.block.minecraft;
 
-import se.llbit.chunky.block.AbstractModelBlock;
-import se.llbit.chunky.model.GrassTintedSpriteModel;
+import se.llbit.chunky.model.Tint;
 import se.llbit.chunky.resources.Texture;
 
-public class TallGrass extends AbstractModelBlock {
+public class TallGrass extends TintedSpriteBlock {
 
   public TallGrass(String half) {
     super("tall_grass",
-        half.equals("upper")
-            ? Texture.doubleTallGrassTop
-            : Texture.doubleTallGrassBottom);
-    solid = false;
-    model = new GrassTintedSpriteModel(texture);
+      half.equals("upper")
+        ? Texture.doubleTallGrassTop
+        : Texture.doubleTallGrassBottom,
+      Tint.BIOME_GRASS);
   }
 }