Add missing pale oak blocks.

chunky-dev · Oct 26, 2024 · 07f16f1 · 07f16f1
1 parent 2c743ff
commit 07f16f1
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 1 deletion.
diff --git a/chunky/src/java/se/llbit/chunky/block/MinecraftBlockProvider.java b/chunky/src/java/se/llbit/chunky/block/MinecraftBlockProvider.java
@@ -1128,6 +1128,24 @@ private static void addBlocks(Texture texture, String... names) {
     addBlock("pale_oak_leaves", (name, tag) -> new UntintedLeaves(name, Texture.paleOakLeaves));
     addBlock("pale_oak_log", (name, tag) -> log(tag, Texture.paleOakLog, Texture.paleOakLogTop));
     addBlock("pale_hanging_moss", (name, tag) -> new SpriteBlock(name, tag.get("Properties").get("tip").stringValue().equals("true") ? Texture.paleHangingMossTip : Texture.paleHangingMoss));
+    addBlock("pale_oak_button", (name, tag) -> button(tag, Texture.paleOakPlanks));
+    addBlock("pale_oak_planks", Texture.paleOakPlanks);
+    addBlock("pale_oak_slab", (name, tag) -> slab(tag, Texture.paleOakPlanks));
+    addBlock("pale_oak_stairs", (name, tag) -> stairs(tag, Texture.paleOakPlanks));
+    addBlock("pale_oak_pressure_plate", (name, tag) -> new PressurePlate(name, Texture.sprucePlanks));
+    addBlock("pale_oak_fence", (name, tag) -> fence(tag, Texture.paleOakPlanks));
+    addBlock("pale_oak_fence_gate", (name, tag) -> fenceGate(tag, Texture.paleOakPlanks));
+    addBlock("pale_oak_trapdoor", (name, tag) -> trapdoor(tag, Texture.paleOakTrapdoor));
+    addBlock("pale_oak_door", (name, tag) -> door(tag, Texture.paleOakDoorTop, Texture.paleOakDoorBottom));
+    addBlock("stripped_pale_oak_log", (name, tag) -> log(tag, Texture.strippedPaleOakLog, Texture.strippedPaleOakLogTop));
+    addBlock("stripped_pale_oak_wood", (name, tag) -> log(tag, Texture.strippedPaleOakLog, Texture.strippedPaleOakLog));
+    addBlock("pale_oak_wood", (name, tag) -> log(tag, Texture.paleOakLog, Texture.paleOakLog));
+    addBlock("pale_oak_sapling", (name, tag) -> new SpriteBlock(name, Texture.paleOakSapling));
+    addBlock("potted_pale_oak_sapling", (name, tag) -> new FlowerPot(name, FlowerPotModel.Kind.PALE_OAK_SAPLING));
+    addBlock("pale_oak_sign", (name, tag) -> sign(tag, "pale_oak"));
+    addBlock("pale_oak_wall_sign", (name, tag) -> wallSign(tag, "pale_oak"));
+    addBlock("pale_oak_hanging_sign", (name, tag) -> hangingSign(tag, "pale_oak"));
+    addBlock("pale_oak_wall_hanging_sign", (name, tag) -> wallHangingSign(tag, "pale_oak"));
   }
 
   @Override

diff --git a/chunky/src/java/se/llbit/chunky/entity/HangingSignEntity.java b/chunky/src/java/se/llbit/chunky/entity/HangingSignEntity.java
@@ -374,6 +374,8 @@ public static Texture textureFromMaterial(String material) {
         return Texture.bambooHangingSign;
       case "cherry":
         return Texture.cherryHangingSign;
+      case "pale_oak":
+        return Texture.paleOakHangingSign;
       default:
         throw new IllegalArgumentException("Unknown hanging sign material: " + material);
     }

diff --git a/chunky/src/java/se/llbit/chunky/entity/SignEntity.java b/chunky/src/java/se/llbit/chunky/entity/SignEntity.java
@@ -639,6 +639,8 @@ public static Texture textureFromMaterial(String material) {
         return Texture.bambooSignPost;
       case "cherry":
         return Texture.cherrySignPost;
+      case "pale_oak":
+        return Texture.paleOakSignPost;
       default:
         throw new IllegalArgumentException("Unknown sign material: " + material);
     }

diff --git a/chunky/src/java/se/llbit/chunky/model/minecraft/FlowerPotModel.java b/chunky/src/java/se/llbit/chunky/model/minecraft/FlowerPotModel.java
@@ -68,7 +68,8 @@ public enum Kind {
     FLOWERING_AZALEA_BUSH,
     MANGROVE_PROPAGULE,
     TORCHFLOWER,
-    CHERRY_SAPLING
+    CHERRY_SAPLING,
+    PALE_OAK_SAPLING
   }
 
   private static final Texture flowerpot = Texture.flowerPot;
@@ -616,6 +617,9 @@ public FlowerPotModel(Kind kind) {
           case TORCHFLOWER:
             Arrays.fill(textures, flowerPotTex.length, textures.length, Texture.torchflower);
             break;
+          case PALE_OAK_SAPLING:
+            Arrays.fill(textures, flowerPotTex.length, textures.length, Texture.paleOakSapling);
+            break;
         }
         break;
     }

diff --git a/chunky/src/java/se/llbit/chunky/resources/Texture.java b/chunky/src/java/se/llbit/chunky/resources/Texture.java
@@ -1524,6 +1524,24 @@ public class Texture {
   public static final Texture paleHangingMoss = new Texture();
   @TexturePath("assets/minecraft/textures/block/pale_hanging_moss_tip")
   public static final Texture paleHangingMossTip = new Texture();
+  @TexturePath("assets/minecraft/textures/block/pale_oak_planks")
+  public static final Texture paleOakPlanks = new Texture();
+  @TexturePath("assets/minecraft/textures/block/pale_oak_trapdoor")
+  public static final Texture paleOakTrapdoor = new Texture();
+  @TexturePath("assets/minecraft/textures/block/pale_oak_door_top")
+  public static final Texture paleOakDoorTop = new Texture();
+  @TexturePath("assets/minecraft/textures/block/pale_oak_door_bottom")
+  public static final Texture paleOakDoorBottom = new Texture();
+  @TexturePath("assets/minecraft/textures/block/stripped_pale_oak_log")
+  public static final Texture strippedPaleOakLog = new Texture();
+  @TexturePath("assets/minecraft/textures/block/stripped_pale_oak_log_top")
+  public static final Texture strippedPaleOakLogTop = new Texture();
+  @TexturePath("assets/minecraft/textures/block/pale_oak_sapling")
+  public static final Texture paleOakSapling = new Texture();
+  @TexturePath("assets/minecraft/textures/entity/signs/pale_oak")
+  public static final Texture paleOakSignPost = new Texture();
+  @TexturePath("assets/minecraft/textures/entity/signs/hanging/pale_oak")
+  public static final Texture paleOakHangingSign = new Texture();
 
   /** Banner base texture. */
   public static final Texture bannerBase = new Texture();