Skip to content

Commit a572c54

Browse files
AViewFromTheTopAViewFromTheTop
committed
Merge branch 'master' into 1.21.2
2 parents 75c126e + e3aa319 commit a572c54

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ hi
8080
- Wildflowers generate in biomes in the `wilderwild:feature/has_wildflowers` and `wilderwild:feature/has_sparse_wildflowers` tags.
8181
- Added Clovers.
8282
- Clovers generate in biomes in the `wilderwild:feature/has_clovers` tag.
83+
- Fixed Wilder Wild's blocks having incorrect flammability values.
8384

8485
# Music
8586
- Added three new tracks by Willow/pictochats_.

‎src/main/java/net/frozenblock/wilderwild/registry/WWBlocks.java

+25-26
Original file line numberDiff line numberDiff line change
@@ -1839,22 +1839,21 @@ private static void registerComposting() {
18391839
private static void registerFlammability() {
18401840
WWConstants.logWithModId("Registering Flammability for", WWConstants.UNSTABLE_LOGGING);
18411841
var flammableBlockRegistry = FlammableBlockRegistry.getDefaultInstance();
1842-
flammableBlockRegistry.add(POLLEN, 200, 60);
1843-
flammableBlockRegistry.add(SEEDING_DANDELION, 100, 60);
1844-
flammableBlockRegistry.add(WILDFLOWERS, 100, 60);
1845-
flammableBlockRegistry.add(CARNATION, 100, 60);
1846-
flammableBlockRegistry.add(CATTAIL, 100, 60);
1847-
flammableBlockRegistry.add(DATURA, 100, 60);
1848-
flammableBlockRegistry.add(MILKWEED, 100, 60);
1849-
flammableBlockRegistry.add(MARIGOLD, 100, 60);
1850-
flammableBlockRegistry.add(YELLOW_HIBISCUS, 100, 60);
1851-
flammableBlockRegistry.add(WHITE_HIBISCUS, 100, 60);
1852-
flammableBlockRegistry.add(PINK_HIBISCUS, 100, 60);
1853-
flammableBlockRegistry.add(PURPLE_HIBISCUS, 100, 60);
1854-
flammableBlockRegistry.add(TUMBLEWEED, 100, 60);
1855-
flammableBlockRegistry.add(TUMBLEWEED_PLANT, 100, 60);
1856-
flammableBlockRegistry.add(BUSH, 90, 40);
1857-
flammableBlockRegistry.add(MYCELIUM_GROWTH, 100, 60);
1842+
flammableBlockRegistry.add(POLLEN, 60, 100);
1843+
flammableBlockRegistry.add(SEEDING_DANDELION, 60, 100);
1844+
flammableBlockRegistry.add(CARNATION, 60, 100);
1845+
flammableBlockRegistry.add(CATTAIL, 60, 100);
1846+
flammableBlockRegistry.add(DATURA, 60, 100);
1847+
flammableBlockRegistry.add(MILKWEED, 60, 100);
1848+
flammableBlockRegistry.add(MARIGOLD, 60, 100);
1849+
flammableBlockRegistry.add(YELLOW_HIBISCUS, 60, 100);
1850+
flammableBlockRegistry.add(WHITE_HIBISCUS, 60, 100);
1851+
flammableBlockRegistry.add(PINK_HIBISCUS, 60, 100);
1852+
flammableBlockRegistry.add(PURPLE_HIBISCUS, 60, 100);
1853+
flammableBlockRegistry.add(TUMBLEWEED, 60, 100);
1854+
flammableBlockRegistry.add(TUMBLEWEED_PLANT, 60, 100);
1855+
flammableBlockRegistry.add(BUSH, 40, 90);
1856+
flammableBlockRegistry.add(MYCELIUM_GROWTH, 60, 100);
18581857

18591858
flammableBlockRegistry.add(HOLLOWED_BIRCH_LOG, 5, 5);
18601859
flammableBlockRegistry.add(HOLLOWED_CHERRY_LOG, 5, 5);
@@ -1890,7 +1889,7 @@ private static void registerFlammability() {
18901889
flammableBlockRegistry.add(BAOBAB_FENCE_GATE, 5, 20);
18911890
flammableBlockRegistry.add(BAOBAB_PRESSURE_PLATE, 5, 20);
18921891
flammableBlockRegistry.add(BAOBAB_TRAPDOOR, 5, 20);
1893-
flammableBlockRegistry.add(BAOBAB_LEAVES, 100, 60);
1892+
flammableBlockRegistry.add(BAOBAB_LEAVES, 30, 60);
18941893
flammableBlockRegistry.add(BAOBAB_BUTTON, 5, 20);
18951894
flammableBlockRegistry.add(BAOBAB_SIGN, 5, 20);
18961895
flammableBlockRegistry.add(BAOBAB_WALL_SIGN, 5, 20);
@@ -1911,7 +1910,7 @@ private static void registerFlammability() {
19111910
flammableBlockRegistry.add(WILLOW_FENCE_GATE, 5, 20);
19121911
flammableBlockRegistry.add(WILLOW_PRESSURE_PLATE, 5, 20);
19131912
flammableBlockRegistry.add(WILLOW_TRAPDOOR, 5, 20);
1914-
flammableBlockRegistry.add(WILLOW_LEAVES, 100, 60);
1913+
flammableBlockRegistry.add(WILLOW_LEAVES, 30, 60);
19151914
flammableBlockRegistry.add(WILLOW_BUTTON, 5, 20);
19161915
flammableBlockRegistry.add(WILLOW_SIGN, 5, 20);
19171916
flammableBlockRegistry.add(WILLOW_WALL_SIGN, 5, 20);
@@ -1932,7 +1931,7 @@ private static void registerFlammability() {
19321931
flammableBlockRegistry.add(CYPRESS_FENCE_GATE, 5, 20);
19331932
flammableBlockRegistry.add(CYPRESS_PRESSURE_PLATE, 5, 20);
19341933
flammableBlockRegistry.add(CYPRESS_TRAPDOOR, 5, 20);
1935-
flammableBlockRegistry.add(CYPRESS_LEAVES, 100, 60);
1934+
flammableBlockRegistry.add(CYPRESS_LEAVES, 30, 60);
19361935
flammableBlockRegistry.add(CYPRESS_BUTTON, 5, 20);
19371936
flammableBlockRegistry.add(CYPRESS_SIGN, 5, 20);
19381937
flammableBlockRegistry.add(CYPRESS_WALL_SIGN, 5, 20);
@@ -1953,7 +1952,7 @@ private static void registerFlammability() {
19531952
flammableBlockRegistry.add(PALM_FENCE_GATE, 5, 20);
19541953
flammableBlockRegistry.add(PALM_PRESSURE_PLATE, 5, 20);
19551954
flammableBlockRegistry.add(PALM_TRAPDOOR, 5, 20);
1956-
flammableBlockRegistry.add(PALM_FRONDS, 100, 60);
1955+
flammableBlockRegistry.add(PALM_FRONDS, 30, 60);
19571956
flammableBlockRegistry.add(PALM_BUTTON, 5, 20);
19581957
flammableBlockRegistry.add(PALM_SIGN, 5, 20);
19591958
flammableBlockRegistry.add(PALM_WALL_SIGN, 5, 20);
@@ -1974,12 +1973,12 @@ private static void registerFlammability() {
19741973
flammableBlockRegistry.add(MAPLE_FENCE_GATE, 5, 20);
19751974
flammableBlockRegistry.add(MAPLE_PRESSURE_PLATE, 5, 20);
19761975
flammableBlockRegistry.add(MAPLE_TRAPDOOR, 5, 20);
1977-
flammableBlockRegistry.add(YELLOW_MAPLE_LEAVES, 100, 60);
1978-
flammableBlockRegistry.add(ORANGE_MAPLE_LEAVES, 100, 60);
1979-
flammableBlockRegistry.add(RED_MAPLE_LEAVES, 100, 60);
1980-
flammableBlockRegistry.add(YELLOW_MAPLE_LEAF_LITTER, 200, 60);
1981-
flammableBlockRegistry.add(ORANGE_MAPLE_LEAF_LITTER, 200, 60);
1982-
flammableBlockRegistry.add(RED_MAPLE_LEAF_LITTER, 200, 60);
1976+
flammableBlockRegistry.add(YELLOW_MAPLE_LEAVES, 30, 60);
1977+
flammableBlockRegistry.add(ORANGE_MAPLE_LEAVES, 30, 60);
1978+
flammableBlockRegistry.add(RED_MAPLE_LEAVES, 30, 60);
1979+
flammableBlockRegistry.add(YELLOW_MAPLE_LEAF_LITTER, 60, 100);
1980+
flammableBlockRegistry.add(ORANGE_MAPLE_LEAF_LITTER, 60, 100);
1981+
flammableBlockRegistry.add(RED_MAPLE_LEAF_LITTER, 60, 100);
19831982
flammableBlockRegistry.add(MAPLE_BUTTON, 5, 20);
19841983
flammableBlockRegistry.add(MAPLE_SIGN, 5, 20);
19851984
flammableBlockRegistry.add(MAPLE_WALL_SIGN, 5, 20);

0 commit comments

Comments
 (0)