Skip to content

Commit

Permalink
Add pale garden biome, pale oak leaves, pale oak logs, pale moss bloc…
Browse files Browse the repository at this point in the history
…k and pale hanging moss.
  • Loading branch information
leMaik committed Oct 27, 2024
1 parent d9fe92f commit c05bfac
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 13 additions & 0 deletions chunky/src/java/se/llbit/chunky/resources/Texture.java
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
1 change: 1 addition & 0 deletions chunky/src/java/se/llbit/chunky/world/biome/Biomes.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit c05bfac

Please sign in to comment.