Add potted bamboo

Author: leMaik

chunky/src/java/se/llbit/chunky/model/FlowerPotModel.java

@@ -105,6 +105,52 @@ public enum Kind {
           new Vector4(0, 1, 0, 1)),
   };
 
+  private static Quad[] bamboo = {
+      new Quad(
+          new Vector3(7 / 16.0, 16 / 16.0, 9 / 16.0),
+          new Vector3(9 / 16.0, 16 / 16.0, 9 / 16.0),
+          new Vector3(7 / 16.0, 16 / 16.0, 7 / 16.0),
+          new Vector4(13 / 16.0, 15 / 16.0, 1 - 0 / 16.0, 1 - 2 / 16.0)),
+      new Quad(
+          new Vector3(7 / 16.0, 0 / 16.0, 7 / 16.0),
+          new Vector3(9 / 16.0, 0 / 16.0, 7 / 16.0),
+          new Vector3(7 / 16.0, 0 / 16.0, 9 / 16.0),
+          new Vector4(13 / 16.0, 15 / 16.0, 4 / 16.0, 6 / 16.0)),
+      new Quad(
+        new Vector3(7 / 16.0, 0 / 16.0, 7 / 16.0),
+        new Vector3(7 / 16.0, 0 / 16.0, 9 / 16.0),
+        new Vector3(7 / 16.0, 16 / 16.0, 7 / 16.0),
+        new Vector4(6 / 16.0, 8 / 16.0, 0 / 16.0, 16 / 16.0)),
+      new Quad(
+        new Vector3(9 / 16.0, 0 / 16.0, 9 / 16.0),
+        new Vector3(9 / 16.0, 0 / 16.0, 7 / 16.0),
+        new Vector3(9 / 16.0, 16 / 16.0, 9 / 16.0),
+        new Vector4(6 / 16.0, 8 / 16.0, 0 / 16.0, 16 / 16.0)),
+      new Quad(
+        new Vector3(9 / 16.0, 0 / 16.0, 7 / 16.0),
+        new Vector3(7 / 16.0, 0 / 16.0, 7 / 16.0),
+        new Vector3(9 / 16.0, 16 / 16.0, 7 / 16.0),
+        new Vector4(6 / 16.0, 8 / 16.0, 0 / 16.0, 16 / 16.0)),
+      new Quad(
+        new Vector3(7 / 16.0, 0 / 16.0, 9 / 16.0),
+        new Vector3(9 / 16.0, 0 / 16.0, 9 / 16.0),
+        new Vector3(7 / 16.0, 16 / 16.0, 9 / 16.0),
+        new Vector4(6 / 16.0, 8 / 16.0, 0 / 16.0, 16 / 16.0))
+  };
+
+  private static Quad[] bambooLeaf = {
+      new Quad(
+          new Vector3(16 / 16.0, 2 / 16.0, 8 / 16.0),
+          new Vector3(0 / 16.0, 2 / 16.0, 8 / 16.0),
+          new Vector3(16 / 16.0, 18 / 16.0, 8 / 16.0),
+          new Vector4(0 / 16.0, 16 / 16.0, 0 / 16.0, 16 / 16.0)),
+      new Quad(
+        new Vector3(0 / 16.0, 2 / 16.0, 8 / 16.0),
+        new Vector3(16 / 16.0, 2 / 16.0, 8 / 16.0),
+        new Vector3(0 / 16.0, 18 / 16.0, 8 / 16.0),
+        new Vector4(16 / 16.0, 0 / 16.0, 0 / 16.0, 16 / 16.0))
+  };
+
   private static final Texture[] tex = {
       Texture.flowerPot, Texture.flowerPot, Texture.flowerPot, Texture.flowerPot, Texture.dirt,
   };
@@ -197,7 +243,8 @@ public static boolean intersect(Ray ray, Scene scene, Kind kind) {
         hit |= intersect(flowerSmall, ray, Texture.oxeyeDaisy);
         break;
       case BAMBOO:
-        // TODO(1.14): upcoming block change
+        hit |= intersect(bamboo, ray, Texture.bambooStalk);
+        hit |= intersect(bambooLeaf, ray, Texture.bambooSingleLeaf);
         break;
       case CORNFLOWER:
         hit |= intersect(flowerSmall, ray, Texture.cornflower);

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

@@ -769,6 +769,7 @@ public class Texture {
   public static final Texture bambooStalk = new Texture();
   public static final Texture bambooSmallLeaves = new Texture();
   public static final Texture bambooLargeLeaves = new Texture();
+  public static final Texture bambooSingleLeaf = new Texture();
 
   // [1.15]
   public static final Texture honeyBlockTop = new Texture();

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

@@ -3343,6 +3343,7 @@ public class TexturePackLoader {
     addSimpleTexture("assets/minecraft/textures/block/bamboo_stalk", Texture.bambooStalk);
     addSimpleTexture("assets/minecraft/textures/block/bamboo_small_leaves", Texture.bambooSmallLeaves);
     addSimpleTexture("assets/minecraft/textures/block/bamboo_large_leaves", Texture.bambooLargeLeaves);
+    addSimpleTexture("assets/minecraft/textures/block/bamboo_singleleaf", Texture.bambooSingleLeaf);
 
     addSimpleTexture("assets/minecraft/textures/block/honey_block_top", Texture.honeyBlockTop);
     addSimpleTexture("assets/minecraft/textures/block/honey_block_side", Texture.honeyBlockSide);