From c05bfac8804db7e25508cc7ca526fb58244bc7ab Mon Sep 17 00:00:00 2001
From: Maik Marschner <leMaik@leMaik.de>
Date: Fri, 25 Oct 2024 01:05:31 +0200
Subject: [PATCH] Add pale garden biome, pale oak leaves, pale oak logs, pale
 moss block and pale hanging moss.

---
 .../llbit/chunky/block/MinecraftBlockProvider.java  |  6 ++++++
 .../src/java/se/llbit/chunky/resources/Texture.java | 13 +++++++++++++
 .../java/se/llbit/chunky/world/biome/Biomes.java    |  1 +
 3 files changed, 20 insertions(+)

diff --git a/chunky/src/java/se/llbit/chunky/block/MinecraftBlockProvider.java b/chunky/src/java/se/llbit/chunky/block/MinecraftBlockProvider.java
index 96dd0b8823..cb38c29e08 100644
--- a/chunky/src/java/se/llbit/chunky/block/MinecraftBlockProvider.java
+++ b/chunky/src/java/se/llbit/chunky/block/MinecraftBlockProvider.java
@@ -1122,6 +1122,12 @@ private static void addBlocks(Texture texture, String... names) {
     addBlock("vault", (name, tag) -> new Vault(tag.get("Properties").get("facing").stringValue("north"), tag.get("Properties").get("ominous").stringValue().equals("true"), tag.get("Properties").get("vault_state").stringValue("active")));
     addBlock("heavy_core", (name, tag) -> new HeavyCore());
     addBlock("trial_spawner", (name, tag) -> new TrialSpawner(tag.get("Properties").get("ominous").stringValue().equals("true"), tag.get("Properties").get("trial_spawner_state").stringValue("active")));
+
+    // Winter drop (1.22?)
+    addBlock("pale_moss_block", Texture.paleMossBlock);
+    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));
   }
 
   @Override
diff --git a/chunky/src/java/se/llbit/chunky/resources/Texture.java b/chunky/src/java/se/llbit/chunky/resources/Texture.java
index 72809051b0..11219fd338 100644
--- a/chunky/src/java/se/llbit/chunky/resources/Texture.java
+++ b/chunky/src/java/se/llbit/chunky/resources/Texture.java
@@ -1512,6 +1512,19 @@ public class Texture {
   @TexturePath("assets/minecraft/textures/block/trial_spawner_top_ejecting_reward_ominous")
   public static final Texture trialSpawnerTopEjectingRewardOminous = new Texture();
 
+  @TexturePath("assets/minecraft/textures/block/pale_moss_block")
+  public static final Texture paleMossBlock = new Texture();
+  @TexturePath("assets/minecraft/textures/block/pale_oak_leaves")
+  public static final Texture paleOakLeaves = new Texture();
+  @TexturePath("assets/minecraft/textures/block/pale_oak_log")
+  public static final Texture paleOakLog= new Texture();
+  @TexturePath("assets/minecraft/textures/block/pale_oak_log_top")
+  public static final Texture paleOakLogTop = new Texture();
+  @TexturePath("assets/minecraft/textures/block/pale_hanging_moss")
+  public static final Texture paleHangingMoss = new Texture();
+  @TexturePath("assets/minecraft/textures/block/pale_hanging_moss_tip")
+  public static final Texture paleHangingMossTip = new Texture();
+
   /** Banner base texture. */
   public static final Texture bannerBase = new Texture();
 
diff --git a/chunky/src/java/se/llbit/chunky/world/biome/Biomes.java b/chunky/src/java/se/llbit/chunky/world/biome/Biomes.java
index a40724cead..7ed5a748d9 100644
--- a/chunky/src/java/se/llbit/chunky/world/biome/Biomes.java
+++ b/chunky/src/java/se/llbit/chunky/world/biome/Biomes.java
@@ -148,6 +148,7 @@ public class Biomes {
   private static final Biome deepDark = register(Biome.create("minecraft:deep_dark", "Deep Dark", 0.8, 0.4).mapColor(0x7E7E7E).defaultColors(0x91BD59, 0x77AB2F));
   private static final Biome mangroveSwamp = register(Biome.create("minecraft:mangrove_swamp", "Mangrove Swamp", 0.8, 0.9).defaultColors(0x6A7039, 0x8DB127).waterColor(0x3A7A6A).mapColor(0x07F9B2).swamp());
   private static final Biome cherryGrove = register(Biome.create("minecraft:cherry_grove", "Cherry Grove", 0.5, 0.8).mapColor(0xFCCBE7).defaultColors(0x91BD59, 0x77AB2F));
+  private static final Biome paleGarden = register(Biome.create("minecraft:pale_garden", "Pale Garden", 0.7, 0.8).mapColor(0xB9B9B9).grassColor(0x778272).foliageColor(0x878D76).waterColor(0x76889D));
 
   /**
    * Pre-1.18 biomes, i.e. before the biomes palette was introduced.