Skip to content

Commit

Permalink
Merge branch '1.21.2' into 1.21.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@AViewFromTheTop
AViewFromTheTop committed Feb 4, 2025
2 parents 4ac6fd0 + a572c54 commit 5c1748c
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 26 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ hi
- Wildflowers generate in biomes in the `wilderwild:feature/has_wildflowers` and `wilderwild:feature/has_sparse_wildflowers` tags.
- Added Clovers.
- Clovers generate in biomes in the `wilderwild:feature/has_clovers` tag.
- Fixed Wilder Wild's blocks having incorrect flammability values.

# Music
- Added three new tracks by Willow/pictochats_.
Expand Down
51 changes: 25 additions & 26 deletions src/main/java/net/frozenblock/wilderwild/registry/WWBlocks.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1885,22 +1885,21 @@ private static void registerComposting() {
private static void registerFlammability() {
WWConstants.logWithModId("Registering Flammability for", WWConstants.UNSTABLE_LOGGING);
var flammableBlockRegistry = FlammableBlockRegistry.getDefaultInstance();
flammableBlockRegistry.add(POLLEN, 200, 60);
flammableBlockRegistry.add(SEEDING_DANDELION, 100, 60);
flammableBlockRegistry.add(WILDFLOWERS, 100, 60);
flammableBlockRegistry.add(CARNATION, 100, 60);
flammableBlockRegistry.add(CATTAIL, 100, 60);
flammableBlockRegistry.add(DATURA, 100, 60);
flammableBlockRegistry.add(MILKWEED, 100, 60);
flammableBlockRegistry.add(MARIGOLD, 100, 60);
flammableBlockRegistry.add(YELLOW_HIBISCUS, 100, 60);
flammableBlockRegistry.add(WHITE_HIBISCUS, 100, 60);
flammableBlockRegistry.add(PINK_HIBISCUS, 100, 60);
flammableBlockRegistry.add(PURPLE_HIBISCUS, 100, 60);
flammableBlockRegistry.add(TUMBLEWEED, 100, 60);
flammableBlockRegistry.add(TUMBLEWEED_PLANT, 100, 60);
flammableBlockRegistry.add(BUSH, 90, 40);
flammableBlockRegistry.add(MYCELIUM_GROWTH, 100, 60);
flammableBlockRegistry.add(POLLEN, 60, 100);
flammableBlockRegistry.add(SEEDING_DANDELION, 60, 100);
flammableBlockRegistry.add(CARNATION, 60, 100);
flammableBlockRegistry.add(CATTAIL, 60, 100);
flammableBlockRegistry.add(DATURA, 60, 100);
flammableBlockRegistry.add(MILKWEED, 60, 100);
flammableBlockRegistry.add(MARIGOLD, 60, 100);
flammableBlockRegistry.add(YELLOW_HIBISCUS, 60, 100);
flammableBlockRegistry.add(WHITE_HIBISCUS, 60, 100);
flammableBlockRegistry.add(PINK_HIBISCUS, 60, 100);
flammableBlockRegistry.add(PURPLE_HIBISCUS, 60, 100);
flammableBlockRegistry.add(TUMBLEWEED, 60, 100);
flammableBlockRegistry.add(TUMBLEWEED_PLANT, 60, 100);
flammableBlockRegistry.add(BUSH, 40, 90);
flammableBlockRegistry.add(MYCELIUM_GROWTH, 60, 100);

flammableBlockRegistry.add(HOLLOWED_BIRCH_LOG, 5, 5);
flammableBlockRegistry.add(HOLLOWED_CHERRY_LOG, 5, 5);
Expand Down Expand Up @@ -1936,7 +1935,7 @@ private static void registerFlammability() {
flammableBlockRegistry.add(BAOBAB_FENCE_GATE, 5, 20);
flammableBlockRegistry.add(BAOBAB_PRESSURE_PLATE, 5, 20);
flammableBlockRegistry.add(BAOBAB_TRAPDOOR, 5, 20);
flammableBlockRegistry.add(BAOBAB_LEAVES, 100, 60);
flammableBlockRegistry.add(BAOBAB_LEAVES, 30, 60);
flammableBlockRegistry.add(BAOBAB_BUTTON, 5, 20);
flammableBlockRegistry.add(BAOBAB_SIGN, 5, 20);
flammableBlockRegistry.add(BAOBAB_WALL_SIGN, 5, 20);
Expand All @@ -1957,7 +1956,7 @@ private static void registerFlammability() {
flammableBlockRegistry.add(WILLOW_FENCE_GATE, 5, 20);
flammableBlockRegistry.add(WILLOW_PRESSURE_PLATE, 5, 20);
flammableBlockRegistry.add(WILLOW_TRAPDOOR, 5, 20);
flammableBlockRegistry.add(WILLOW_LEAVES, 100, 60);
flammableBlockRegistry.add(WILLOW_LEAVES, 30, 60);
flammableBlockRegistry.add(WILLOW_BUTTON, 5, 20);
flammableBlockRegistry.add(WILLOW_SIGN, 5, 20);
flammableBlockRegistry.add(WILLOW_WALL_SIGN, 5, 20);
Expand All @@ -1978,7 +1977,7 @@ private static void registerFlammability() {
flammableBlockRegistry.add(CYPRESS_FENCE_GATE, 5, 20);
flammableBlockRegistry.add(CYPRESS_PRESSURE_PLATE, 5, 20);
flammableBlockRegistry.add(CYPRESS_TRAPDOOR, 5, 20);
flammableBlockRegistry.add(CYPRESS_LEAVES, 100, 60);
flammableBlockRegistry.add(CYPRESS_LEAVES, 30, 60);
flammableBlockRegistry.add(CYPRESS_BUTTON, 5, 20);
flammableBlockRegistry.add(CYPRESS_SIGN, 5, 20);
flammableBlockRegistry.add(CYPRESS_WALL_SIGN, 5, 20);
Expand All @@ -1999,7 +1998,7 @@ private static void registerFlammability() {
flammableBlockRegistry.add(PALM_FENCE_GATE, 5, 20);
flammableBlockRegistry.add(PALM_PRESSURE_PLATE, 5, 20);
flammableBlockRegistry.add(PALM_TRAPDOOR, 5, 20);
flammableBlockRegistry.add(PALM_FRONDS, 100, 60);
flammableBlockRegistry.add(PALM_FRONDS, 30, 60);
flammableBlockRegistry.add(PALM_BUTTON, 5, 20);
flammableBlockRegistry.add(PALM_SIGN, 5, 20);
flammableBlockRegistry.add(PALM_WALL_SIGN, 5, 20);
Expand All @@ -2020,12 +2019,12 @@ private static void registerFlammability() {
flammableBlockRegistry.add(MAPLE_FENCE_GATE, 5, 20);
flammableBlockRegistry.add(MAPLE_PRESSURE_PLATE, 5, 20);
flammableBlockRegistry.add(MAPLE_TRAPDOOR, 5, 20);
flammableBlockRegistry.add(YELLOW_MAPLE_LEAVES, 100, 60);
flammableBlockRegistry.add(ORANGE_MAPLE_LEAVES, 100, 60);
flammableBlockRegistry.add(RED_MAPLE_LEAVES, 100, 60);
flammableBlockRegistry.add(YELLOW_MAPLE_LEAF_LITTER, 200, 60);
flammableBlockRegistry.add(ORANGE_MAPLE_LEAF_LITTER, 200, 60);
flammableBlockRegistry.add(RED_MAPLE_LEAF_LITTER, 200, 60);
flammableBlockRegistry.add(YELLOW_MAPLE_LEAVES, 30, 60);
flammableBlockRegistry.add(ORANGE_MAPLE_LEAVES, 30, 60);
flammableBlockRegistry.add(RED_MAPLE_LEAVES, 30, 60);
flammableBlockRegistry.add(YELLOW_MAPLE_LEAF_LITTER, 60, 100);
flammableBlockRegistry.add(ORANGE_MAPLE_LEAF_LITTER, 60, 100);
flammableBlockRegistry.add(RED_MAPLE_LEAF_LITTER, 60, 100);
flammableBlockRegistry.add(MAPLE_BUTTON, 5, 20);
flammableBlockRegistry.add(MAPLE_SIGN, 5, 20);
flammableBlockRegistry.add(MAPLE_WALL_SIGN, 5, 20);
Expand Down

0 comments on commit 5c1748c

Please sign in to comment.