Add support for sweet berry bush, cornflower, lily of the valley, wither rose and bamboo saplings.

Author: leMaik

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

@@ -320,11 +320,11 @@ private Block blockFromTag(String name) {
             case "oxeye_daisy":
                 return new SpriteBlock(name, Texture.oxeyeDaisy);
             case "cornflower":
-                return new UnknownBlock(name);
+                return new SpriteBlock(name, Texture.cornflower);
             case "lily_of_the_valley":
-                return new UnknownBlock(name);
+                return new SpriteBlock(name, Texture.lilyOfTheValley);
             case "wither_rose":
-                return new UnknownBlock(name);
+                return new SpriteBlock(name, Texture.witherRose);
             case "brown_mushroom":
                 return new SpriteBlock(name, Texture.brownMushroom);
             case "red_mushroom":
@@ -1250,8 +1250,7 @@ private Block blockFromTag(String name) {
                 // TODO
                 return new UnknownBlock(name);
             case "bamboo_sapling":
-                // TODO
-                return new UnknownBlock(name);
+                return new SpriteBlock(name, Texture.bambooSapling);
             case "cake": {
                 int bites = stringToInt(tag.get("Properties").get("bites"), 0);
                 return new Cake(bites);
@@ -1497,9 +1496,10 @@ private Block blockFromTag(String name) {
             case "lantern":
                 // TODO
                 return new UnknownBlock(name);
-            case "sweet_berry_bush":
-                // TODO
-                return new UnknownBlock(name);
+            case "sweet_berry_bush": {
+                int age = stringToInt(tag.get("Properties").get("age"), 3);
+                return new SweetBerryBush(age);
+            }
             case "campfire":
                 // TODO
                 return new UnknownBlock(name);

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

@@ -0,0 +1,23 @@
+package se.llbit.chunky.block;
+
+import se.llbit.chunky.resources.Texture;
+
+public class SweetBerryBush extends SpriteBlock {
+    public SweetBerryBush(int age) {
+        super("sweet_berry_bush", getTextureByAge(age));
+    }
+
+    protected static Texture getTextureByAge(int age) {
+        switch (age) {
+            case 0:
+                return Texture.sweetBerryBushStage0;
+            case 1:
+                return Texture.sweetBerryBushStage1;
+            case 2:
+                return Texture.sweetBerryBushStage2;
+            case 3:
+            default:
+                return Texture.sweetBerryBushStage3;
+        }
+    }
+}

chunky/src/java/se/llbit/chunky/resources/Texture.java

@@ -749,6 +749,14 @@ public class Texture {
   public static final Texture smokerBottom = new Texture();
   public static final Texture smokerFrontOn = new Texture();
   public static final Texture smokerFront = new Texture();
+  public static final Texture sweetBerryBushStage0 = new Texture();
+  public static final Texture sweetBerryBushStage1 = new Texture();
+  public static final Texture sweetBerryBushStage2 = new Texture();
+  public static final Texture sweetBerryBushStage3 = new Texture();
+  public static final Texture cornflower = new Texture();
+  public static final Texture lilyOfTheValley = new Texture();
+  public static final Texture witherRose = new Texture();
+  public static final Texture bambooSapling = new Texture();
 
   /** Banner base texture. */
   public static final Texture bannerBase = new Texture();

chunky/src/java/se/llbit/chunky/resources/TexturePackLoader.java

@@ -3314,6 +3314,24 @@ public class TexturePackLoader {
         new SimpleTexture("assets/minecraft/textures/block/smoker_front_on",
             Texture.smokerFrontOn));
 
+    addSimpleTexture("assets/minecraft/textures/block/sweet_berry_bush_stage0", Texture.sweetBerryBushStage0);
+    addSimpleTexture("assets/minecraft/textures/block/sweet_berry_bush_stage1", Texture.sweetBerryBushStage1);
+    addSimpleTexture("assets/minecraft/textures/block/sweet_berry_bush_stage2", Texture.sweetBerryBushStage2);
+    addSimpleTexture("assets/minecraft/textures/block/sweet_berry_bush_stage3", Texture.sweetBerryBushStage3);
+
+    addSimpleTexture("assets/minecraft/textures/block/cornflower", Texture.cornflower);
+    addSimpleTexture("assets/minecraft/textures/block/lily_of_the_valley", Texture.lilyOfTheValley);
+    addSimpleTexture("assets/minecraft/textures/block/wither_rose", Texture.witherRose);
+    addSimpleTexture("assets/minecraft/textures/block/bamboo_stage0", Texture.bambooSapling);
+  }
+
+  private static void addSimpleTexture(String file, Texture texture) {
+    String[] path = file.split("/");
+    addSimpleTexture(path[path.length - 1], file, texture);
+  }
+
+  private static void addSimpleTexture(String name, String file, Texture texture) {
+    allTextures.put(name, new SimpleTexture(file, texture));
   }
 
   private static String[] texturePacks = { };