diff --git a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 index a4fbb47d50..55b30470bc 100644 --- a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 +++ b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 @@ -1,4 +1,4 @@ -// 1.20.2 2023-11-24T04:00:51.8359012 Registries +// 1.20.2 2023-11-24T19:04:00.2074554 Registries a09ddf53150a7fcf8767a311dd5cf040fa2e9221 data/biomesoplenty/damage_type/bramble.json 2d0eab2cc85c4c6397fdc41dd0cedefbc4a7a150 data/biomesoplenty/damage_type/fumarole.json 42e40aad7b302a8852edbfd224ed40d346601171 data/biomesoplenty/worldgen/biome/auroral_garden.json @@ -69,19 +69,19 @@ a4d5101a19a38da4f42164b672b74766edb26bc9 data/biomesoplenty/worldgen/configured_ 002c55f5e2c8d1f8e4dc04266adb4716b5d17763 data/biomesoplenty/worldgen/configured_feature/acacia_bush_tree.json 6a4e15b136ce5f0d2672ba43c13f628fb7febd6a data/biomesoplenty/worldgen/configured_feature/acacia_twiglet.json d5b35b4d78f4ece7de470e07042aa6b0d37b967f data/biomesoplenty/worldgen/configured_feature/acacia_twiglet_small.json -3f292137bd1a407316fb5936fa0db860c186a6d8 data/biomesoplenty/worldgen/configured_feature/aspen_tree.json +10b6a4f3088fa78727126850b7a7784ed405c775 data/biomesoplenty/worldgen/configured_feature/aspen_tree.json 14386c8cb811e1cd0d768ba7fe5b06642e0471c7 data/biomesoplenty/worldgen/configured_feature/big_dripleaf.json 9e764721494e61fc108e60fa5e2b3c44158b736f data/biomesoplenty/worldgen/configured_feature/big_flowering_oak_tree.json 6daca73a676ee4d50214f10ac4edcd280e7e5f41 data/biomesoplenty/worldgen/configured_feature/big_hellbark_tree.json 79724649599f043d4a030a7f56968e793c3fbcfb data/biomesoplenty/worldgen/configured_feature/big_jacaranda_tree.json d8f898c01f52e2d8f378d8a4005a044a83cd8194 data/biomesoplenty/worldgen/configured_feature/big_magic_tree.json -34ca043ad45845b35a6bbd94702c53fcbcc59b2c data/biomesoplenty/worldgen/configured_feature/big_maple_tree.json d49b8c41ec1593cbc50b100564c17893bbf19109 data/biomesoplenty/worldgen/configured_feature/big_oak_tree.json -030337995c2b1b0f227fc8218fc56380bb1d9b43 data/biomesoplenty/worldgen/configured_feature/big_orange_autumn_tree.json +04c894dd5c8f20e547ad7d73029bd4010d878964 data/biomesoplenty/worldgen/configured_feature/big_orange_maple_tree.json 5de30280c59be0ab1b3afa9d6d1f8bddf0f7740e data/biomesoplenty/worldgen/configured_feature/big_origin_tree.json c83316a10fc95c59d6634799cd3c6a2fdd1db724 data/biomesoplenty/worldgen/configured_feature/big_pumpkin.json 468e2ec8f1bcf182d282b6c31054e8697b77ac03 data/biomesoplenty/worldgen/configured_feature/big_rainbow_birch_tree.json -2254d63dce2f4d6cc2c28fe04d6ba30c47860275 data/biomesoplenty/worldgen/configured_feature/big_yellow_autumn_tree.json +a416c17ee2244dedb531f7097a3322161829f134 data/biomesoplenty/worldgen/configured_feature/big_red_maple_tree.json +dd7a0cbfe1cc76293e56757a210363820e3eca76 data/biomesoplenty/worldgen/configured_feature/big_yellow_maple_tree.json 8dc29fab085a97f7cc338ad6f532aedb5e06626f data/biomesoplenty/worldgen/configured_feature/blackstone_bulb.json 8cd0f919bae6a6ead8b70a215626c0d8e97e1b65 data/biomesoplenty/worldgen/configured_feature/blackstone_spines.json 4564cde04d7e88f215e3e439702e48a3682e7a52 data/biomesoplenty/worldgen/configured_feature/black_sand_splatter.json @@ -113,7 +113,7 @@ b35f010f25e98eb3652c4d177268e089638b85a1 data/biomesoplenty/worldgen/configured_ 5a0dcec2ace77b2e1ea31534938a3ec5cda18b58 data/biomesoplenty/worldgen/configured_feature/disk_mud.json d9b7c38b6c87551455bd1a8db476426235ac25e7 data/biomesoplenty/worldgen/configured_feature/disk_orange_sand.json 7f2e0e858755f8995d0b42fc1215c455024a0158 data/biomesoplenty/worldgen/configured_feature/disk_white_sand.json -ab8202abe0f4fd7271d89630400aaf831a9f075a data/biomesoplenty/worldgen/configured_feature/disk_white_sand_extra.json +9c5b20eeb266c9321da8c00c4a2399edd61b94ac data/biomesoplenty/worldgen/configured_feature/disk_white_sand_extra.json 3dae5b2ef0083880df71c23055035a7419d6b29b data/biomesoplenty/worldgen/configured_feature/dripstone_splatter.json 4e41d0e05784172880bed9933f984af09933c869 data/biomesoplenty/worldgen/configured_feature/dying_tree.json 4acbdd9bf7bf6740488eec2ad2b414f9a7045a65 data/biomesoplenty/worldgen/configured_feature/dying_tree_wasteland.json @@ -180,8 +180,7 @@ a8aa7c8ae1c6881f8951d829a780767d266906cc data/biomesoplenty/worldgen/configured_ cbf357d01e5e843837ea1b2a6f1a2d1525a685be data/biomesoplenty/worldgen/configured_feature/magic_tree.json 647617b685cbd6cdbb5b44aa89a28f06d9525d54 data/biomesoplenty/worldgen/configured_feature/mahogany_tree.json 6b40860f0e9a088d066a68e06f0f38529cc13c27 data/biomesoplenty/worldgen/configured_feature/mangrove_twiglet_tree.json -897657163bc2f1e21cbba330fe7f62538a0e22f4 data/biomesoplenty/worldgen/configured_feature/maple_tree.json -ecbdea41fa15b74dd161c9750931db19ebd9b48d data/biomesoplenty/worldgen/configured_feature/maple_twiglet_tree.json +225cec36fb7e434d76ecbf6fae24646df1203c62 data/biomesoplenty/worldgen/configured_feature/maple_twiglet_tree.json b5e4c509d7abd098aa93dadce54a8533dc692d63 data/biomesoplenty/worldgen/configured_feature/medium_glowshroom_cave.json 172efe6d9b7c70c459409e0b454ffc27bd7c7735 data/biomesoplenty/worldgen/configured_feature/mossy_black_sand_splatter.json d6d5e186672bad3ad86b6c611d6b2bd3d4aee3a3 data/biomesoplenty/worldgen/configured_feature/moss_splatter.json @@ -194,7 +193,7 @@ d0604daa873d67e12bd3f0ce62d7994671c5b124 data/biomesoplenty/worldgen/configured_ f9a397d007b98bf36c83d256856fd0fcc45d3a37 data/biomesoplenty/worldgen/configured_feature/nether_vines.json 6141c480c606ffa99a495c76b5a9b59ffebfb789 data/biomesoplenty/worldgen/configured_feature/oak_bush.json 6227de33c6e00775d2282294f22bfe801c230003 data/biomesoplenty/worldgen/configured_feature/obsidian_splatter.json -7ba420e4154ed2388480e95e90cfb832ec7ea5bd data/biomesoplenty/worldgen/configured_feature/orange_autumn_tree.json +d84eace93fe69db121fbb9b463722b79ec880756 data/biomesoplenty/worldgen/configured_feature/orange_maple_tree.json 804e17d2b58c6ee81752502031c495f7afd9c6df data/biomesoplenty/worldgen/configured_feature/origin_tree.json c74a28589ed20ccfef672e76e920fe34718514ea data/biomesoplenty/worldgen/configured_feature/palm_tree.json a6006f89a7bb7901089c8c9f972ce05c37615246 data/biomesoplenty/worldgen/configured_feature/patch_barley.json @@ -225,6 +224,7 @@ da5c3cbdc433227b19d5c658b734b81f147c52a6 data/biomesoplenty/worldgen/configured_ ef3b4755f3a08311557b110c0b1d74e66a382de1 data/biomesoplenty/worldgen/configured_feature/redwood_tree.json 5f892b69008cd4e57b0f751d616dc05f383c56a2 data/biomesoplenty/worldgen/configured_feature/redwood_tree_large.json 82652f13f09b2570031e190c5c022c59857156ff data/biomesoplenty/worldgen/configured_feature/redwood_tree_medium.json +7659fd827b0d9d99e4c525015907cc6fb77e1846 data/biomesoplenty/worldgen/configured_feature/red_maple_tree.json 61eba40b086095f3fc829a884a99acfdef4c0603 data/biomesoplenty/worldgen/configured_feature/rooted_stump.json 94105b8f6aa9fc34ae8733630cb0396148d22757 data/biomesoplenty/worldgen/configured_feature/rose_bush.json fb35719093d27bc608542dc902383d7e788f187c data/biomesoplenty/worldgen/configured_feature/scattered_rocks.json @@ -272,7 +272,7 @@ d6dd1c0f2df75191098f1c740f68a15eb30ea75e data/biomesoplenty/worldgen/configured_ 47557e3af86dd7d440314f0b782a83ae2b095416 data/biomesoplenty/worldgen/configured_feature/trees_lavender_field.json da92b358ef1cd592d3cf980abe497a8d49791562 data/biomesoplenty/worldgen/configured_feature/trees_lavender_forest.json 5889f8d18aa98f2749e21a9b1989d48f1216f350 data/biomesoplenty/worldgen/configured_feature/trees_lush_desert.json -458ab9b43ca57ceddb8b2d18319a9076d8d93fdd data/biomesoplenty/worldgen/configured_feature/trees_maple_forest.json +73bc4d46f326c6189d391ecf8fda48a1af980bfb data/biomesoplenty/worldgen/configured_feature/trees_maple_forest.json 4454b47782000d92e8ac72bae03ca931cf4aa72e data/biomesoplenty/worldgen/configured_feature/trees_muskeg.json 236cbc7ba1dcc8d0cc3d79c2dbeaf4d5061f5d85 data/biomesoplenty/worldgen/configured_feature/trees_mystic_grove.json 2503ef988f6e20ae77e503df120341a92737e931 data/biomesoplenty/worldgen/configured_feature/trees_old_growth_dead_forest.json @@ -285,12 +285,12 @@ d4fae18de258c757c164eb84fe2030accbf94b2c data/biomesoplenty/worldgen/configured_ 95892f94d589f712d97f9b33b3b0d9518266c040 data/biomesoplenty/worldgen/configured_feature/trees_rainforest_floodplain.json bf541c17022068e4679cb496b24e8e0cc0c437e8 data/biomesoplenty/worldgen/configured_feature/trees_redwood_forest.json a4fd2cddf6d33adc3b3ee36c61d8abc60eeaf22b data/biomesoplenty/worldgen/configured_feature/trees_scrubland.json -de27192be7ad30aa127031553087312d75701dec data/biomesoplenty/worldgen/configured_feature/trees_seasonal_forest.json -d3cc8e3e259956721f9c898f26b82c75b3f0daed data/biomesoplenty/worldgen/configured_feature/trees_seasonal_orchard.json -4dcd62cc5becd67caccd960d7a4d21fcee94e959 data/biomesoplenty/worldgen/configured_feature/trees_seasonal_pumpkin_patch.json +550e4350d5d189145ed852f894f789405bb0f22b data/biomesoplenty/worldgen/configured_feature/trees_seasonal_forest.json +cf39ea65f0f723b4ef342e35c9eab27fc8a87c8d data/biomesoplenty/worldgen/configured_feature/trees_seasonal_orchard.json +8b971a958d2ca8bb6d881e7e7950c8b3bcf60954 data/biomesoplenty/worldgen/configured_feature/trees_seasonal_pumpkin_patch.json 5b7de709e8e8433bf6c352e7ecdab52ce58910db data/biomesoplenty/worldgen/configured_feature/trees_snowblossom_grove.json a163b4897c68b965e8c8fdcd2f28daa563684085 data/biomesoplenty/worldgen/configured_feature/trees_snowy_coniferous_forest.json -35ddb92ef62e30ae2005933dd132fc3d2ad8e7b3 data/biomesoplenty/worldgen/configured_feature/trees_snowy_maple_forest.json +b5ed5bc4164947567f150047925a679e068957a9 data/biomesoplenty/worldgen/configured_feature/trees_snowy_maple_forest.json 8a80a42aee701cfb732b05ccc78af242f38c6f04 data/biomesoplenty/worldgen/configured_feature/trees_tropics.json 6c0a2311616d08840806ddb715f0e4ab050cc565 data/biomesoplenty/worldgen/configured_feature/trees_tundra.json 20e1c30099522a69e050ab61411e77b20cab748f data/biomesoplenty/worldgen/configured_feature/trees_undergrowth.json @@ -305,23 +305,23 @@ c089be4ad226d6e009849b0746e9cdaaa554e357 data/biomesoplenty/worldgen/configured_ 94d9ca631042b0643762b7d777a3c5f07f101452 data/biomesoplenty/worldgen/configured_feature/water_lake.json da7fdf2fefeceacdabd57f178effbd7977ab5cbc data/biomesoplenty/worldgen/configured_feature/webbing.json 92eb9907663ee16ddc7e7c2f1ba5f3a54c83a235 data/biomesoplenty/worldgen/configured_feature/willow_tree.json -b35b1698615f8cb2b55434dd93d2b399a18b82f5 data/biomesoplenty/worldgen/configured_feature/yellow_autumn_tree.json +c548e3e1710931daabe90c90b6b7ad46c66bedda data/biomesoplenty/worldgen/configured_feature/yellow_maple_tree.json 8e6232109853baaff3ad94b3d71ab48a4bb8485c data/biomesoplenty/worldgen/placed_feature/acacia_bush_tree.json 581470e919aac08a1a1d6a59099383d4cb13c6e7 data/biomesoplenty/worldgen/placed_feature/acacia_twiglet.json 5b240cfa80edf39078866602b63410068a2dae30 data/biomesoplenty/worldgen/placed_feature/acacia_twiglet_small.json -ab65b5ae27d2ab21817807dade795d830fde571e data/biomesoplenty/worldgen/placed_feature/aspen_tree.json +176edb4fcaa5785050c8543834fc6c30848fe124 data/biomesoplenty/worldgen/placed_feature/aspen_tree.json 7395a3d04e360d03dc998ebc9cf6b8d66e41433d data/biomesoplenty/worldgen/placed_feature/big_dripleaf.json ea928d87f641694fd67f7dd56ffb25f2cf02d033 data/biomesoplenty/worldgen/placed_feature/big_flowering_tree.json 0e5d77a2ea27daea073139ed83382706b1562332 data/biomesoplenty/worldgen/placed_feature/big_hellbark_tree.json 5a928663e78ecc9e86dcd824e6fc6b98fe94f142 data/biomesoplenty/worldgen/placed_feature/big_jacaranda_tree.json 6040b6b63aa6697cee07ca162873af8a3932535c data/biomesoplenty/worldgen/placed_feature/big_magic_tree.json -1c0694c53ca293285077e02cd47736eb0f8628aa data/biomesoplenty/worldgen/placed_feature/big_maple_tree.json 716ca9a3e810a0d3b21da1fd7f92715f87aae259 data/biomesoplenty/worldgen/placed_feature/big_oak_tree.json -03dc9823ed4fdc717e064a1d564690180c0308c6 data/biomesoplenty/worldgen/placed_feature/big_orange_autumn_tree.json +adc312bfb997b7785eb748a913d5f6b65f05c344 data/biomesoplenty/worldgen/placed_feature/big_orange_maple_tree.json cc705f3ae64e1dbc7f4b8123ebf54c5ad23c8487 data/biomesoplenty/worldgen/placed_feature/big_origin_tree.json 6d93a10737b9c720145916bee2786495204ef95a data/biomesoplenty/worldgen/placed_feature/big_pumpkin.json 6e1fa395fd8e17d2e19a97252054b6e984ffc56e data/biomesoplenty/worldgen/placed_feature/big_rainbow_birch_tree.json -93244a27e85c6a6f0ef32f0a7d7f04ccb03798c3 data/biomesoplenty/worldgen/placed_feature/big_yellow_autumn_tree.json +9af87c1dfbdf9f8a8c49d44dacc5bbe3b511fc95 data/biomesoplenty/worldgen/placed_feature/big_red_maple_tree.json +65f9f5f81ce2d83cd19f66d6fdc87bc82d3c8dcd data/biomesoplenty/worldgen/placed_feature/big_yellow_maple_tree.json d9d496d449d1330832df03f9f2b48fb72fa27a65 data/biomesoplenty/worldgen/placed_feature/blackstone_bulbs.json bf62b71732e94f33a565750e8ab572bc69575b37 data/biomesoplenty/worldgen/placed_feature/blackstone_spines.json 8857d64a26488413623d52c58b32dd41ffddacd4 data/biomesoplenty/worldgen/placed_feature/blood_lake.json @@ -351,7 +351,7 @@ a2f8cccd05ff5aa08ae22aad133e5933b1ce1d27 data/biomesoplenty/worldgen/placed_feat b2e4600421d378ee817c7d441569c14249e33150 data/biomesoplenty/worldgen/placed_feature/disk_mud.json bb9887bbd2f5382ff6d012dd793419f99f0a0cde data/biomesoplenty/worldgen/placed_feature/disk_orange_sand.json a79a43b2350e6eef3daed3a575b57ee0217526d9 data/biomesoplenty/worldgen/placed_feature/disk_white_sand.json -9cb1b70972e55379819d986c94bd6cb64b342376 data/biomesoplenty/worldgen/placed_feature/disk_white_sand_extra.json +28bed1ae4e3cf69b778983d2f2487342baa361ec data/biomesoplenty/worldgen/placed_feature/disk_white_sand_extra.json 93ebeb932529e0412da7a81b35ebc3f4ec6c1705 data/biomesoplenty/worldgen/placed_feature/dripstone_splatter.json 269cf00674447e4dd65dfbdd3d707584d9fee76b data/biomesoplenty/worldgen/placed_feature/dying_tree.json cbcf035bd0bb9e25ecb5bc2209d26e8c5c33d09e data/biomesoplenty/worldgen/placed_feature/dying_tree_wasteland.json @@ -426,8 +426,7 @@ ad6f8ad60a22582d92a6dca5af350728836630fe data/biomesoplenty/worldgen/placed_feat 5e72df8af65151233e58ae82d70e3608d17d3247 data/biomesoplenty/worldgen/placed_feature/magic_tree.json d4c78a6dce9de78cec8397ce50521d3cab7aa81a data/biomesoplenty/worldgen/placed_feature/mahogany_tree.json 310ad4881f726e29281bcf006b7925efad369979 data/biomesoplenty/worldgen/placed_feature/mangrove_twiglet_tree.json -0ebf318439997158bbd4fbc67f16f4504a1fa415 data/biomesoplenty/worldgen/placed_feature/maple_tree_checked.json -38c26ca3f586e17344836404a3f8f0c9fc2b4842 data/biomesoplenty/worldgen/placed_feature/maple_twiglet_tree.json +b807943bef7f953103a7fbc886ac863ddd5fa40d data/biomesoplenty/worldgen/placed_feature/maple_twiglet_tree.json 6ed110fd6b332428a4bdf1553ca79df1a66483e0 data/biomesoplenty/worldgen/placed_feature/medium_glowshroom_cave.json 970ad165a8dd090681858d579f27dc1500800a6b data/biomesoplenty/worldgen/placed_feature/mossy_black_sand_splatter.json d04d7ec12bdeab3c76c39218cea745e4e7ef5128 data/biomesoplenty/worldgen/placed_feature/moss_splatter.json @@ -438,7 +437,7 @@ a0515b53a5b94f2ed1d7dbd87db0585612d83dda data/biomesoplenty/worldgen/placed_feat 1a38b33f693e7e19b9e5975269ae2ab5cf1c2472 data/biomesoplenty/worldgen/placed_feature/nether_vines.json 062fefe110d24798d1df521817e98394fe648a62 data/biomesoplenty/worldgen/placed_feature/oak_bush.json 2669995131b210204c99f3f718cae309ba9e822f data/biomesoplenty/worldgen/placed_feature/obsidian_splatter.json -b769a2fd11d5a9394c87b20b8e44016ad51608a3 data/biomesoplenty/worldgen/placed_feature/orange_autumn_tree.json +6d835a889e8990d74ebdda359eeffe112d42ec54 data/biomesoplenty/worldgen/placed_feature/orange_maple_tree.json 1cde0a46b6ec712310f3b43e560eefce76b2ed94 data/biomesoplenty/worldgen/placed_feature/origin_tree.json c57381ac642f9d4ab844bca8a90bf5caa3b853b7 data/biomesoplenty/worldgen/placed_feature/palm_tree.json 00a69cee8b2d101cb84ae03d194a53e9063d94dc data/biomesoplenty/worldgen/placed_feature/patch_barley.json @@ -501,6 +500,7 @@ db09e9654c16f52e231da2d5b8f06e7939ea5d69 data/biomesoplenty/worldgen/placed_feat 11e26339d0c1be09f94db502d5da6a780af69e7d data/biomesoplenty/worldgen/placed_feature/redwood_tree.json 533e34ae4c72988e17c56a8ea3e9a1c0be589525 data/biomesoplenty/worldgen/placed_feature/redwood_tree_large.json bdd38bc5e78901e5b03829f46618a726afd46821 data/biomesoplenty/worldgen/placed_feature/redwood_tree_medium.json +5e3b4b3bdb5fd1d24614f3de504376cbbfd639e3 data/biomesoplenty/worldgen/placed_feature/red_maple_tree_checked.json 6e57a42f792b89b2c4ece030790f1479c8554a23 data/biomesoplenty/worldgen/placed_feature/rooted_stump.json 8a50a613bc8f2eec3e30ff813619c129f8f71610 data/biomesoplenty/worldgen/placed_feature/rose_bush_extra.json 7592899a595e84131274bc0f9eee90130eeeb934 data/biomesoplenty/worldgen/placed_feature/rose_bush_normal.json @@ -587,4 +587,4 @@ e34784ff0d14e646050483f4fdd2fcc6bca1c476 data/biomesoplenty/worldgen/placed_feat 0b057d6da91c4cd6af8e45f1ebb60c48396fd399 data/biomesoplenty/worldgen/placed_feature/wasteland_grass_2.json 327f02db90a45e1d4783ba85853195413b7f3e26 data/biomesoplenty/worldgen/placed_feature/webbing.json b2dadd4d33c8341c91d39d207e848f0c27479b1d data/biomesoplenty/worldgen/placed_feature/willow_tree.json -4744f75a0e90eaf9f650182b093be18ac5c05f07 data/biomesoplenty/worldgen/placed_feature/yellow_autumn_tree.json +d933b99c1bb1f8149ae6c56ab3cbfd36ff62d512 data/biomesoplenty/worldgen/placed_feature/yellow_maple_tree.json diff --git a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/aspen_tree.json b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/aspen_tree.json index 8cd4cf30e7..4618786b4b 100644 --- a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/aspen_tree.json +++ b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/aspen_tree.json @@ -11,7 +11,7 @@ "foliage_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "biomesoplenty:yellow_autumn_leaves", + "Name": "biomesoplenty:yellow_maple_leaves", "Properties": { "distance": "7", "persistent": "false", diff --git a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/big_orange_autumn_tree.json b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/big_orange_maple_tree.json similarity index 92% rename from src/generated/resources/data/biomesoplenty/worldgen/configured_feature/big_orange_autumn_tree.json rename to src/generated/resources/data/biomesoplenty/worldgen/configured_feature/big_orange_maple_tree.json index 367b5e6fda..652c23dc13 100644 --- a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/big_orange_autumn_tree.json +++ b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/big_orange_maple_tree.json @@ -13,7 +13,7 @@ "foliage_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "biomesoplenty:orange_autumn_leaves", + "Name": "biomesoplenty:orange_maple_leaves", "Properties": { "distance": "7", "persistent": "false", @@ -38,7 +38,7 @@ "trunk_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "minecraft:dark_oak_log", + "Name": "biomesoplenty:maple_log", "Properties": { "axis": "y" } diff --git a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/big_maple_tree.json b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/big_red_maple_tree.json similarity index 92% rename from src/generated/resources/data/biomesoplenty/worldgen/configured_feature/big_maple_tree.json rename to src/generated/resources/data/biomesoplenty/worldgen/configured_feature/big_red_maple_tree.json index 64ebe21589..1f9238a37e 100644 --- a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/big_maple_tree.json +++ b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/big_red_maple_tree.json @@ -13,7 +13,7 @@ "foliage_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "biomesoplenty:maple_leaves", + "Name": "biomesoplenty:red_maple_leaves", "Properties": { "distance": "7", "persistent": "false", @@ -38,7 +38,7 @@ "trunk_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "minecraft:oak_log", + "Name": "biomesoplenty:maple_log", "Properties": { "axis": "y" } diff --git a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/big_yellow_autumn_tree.json b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/big_yellow_maple_tree.json similarity index 92% rename from src/generated/resources/data/biomesoplenty/worldgen/configured_feature/big_yellow_autumn_tree.json rename to src/generated/resources/data/biomesoplenty/worldgen/configured_feature/big_yellow_maple_tree.json index bacec86729..96aed2358a 100644 --- a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/big_yellow_autumn_tree.json +++ b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/big_yellow_maple_tree.json @@ -13,7 +13,7 @@ "foliage_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "biomesoplenty:yellow_autumn_leaves", + "Name": "biomesoplenty:yellow_maple_leaves", "Properties": { "distance": "7", "persistent": "false", @@ -38,7 +38,7 @@ "trunk_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "minecraft:birch_log", + "Name": "biomesoplenty:maple_log", "Properties": { "axis": "y" } diff --git a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/disk_white_sand_extra.json b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/disk_white_sand_extra.json index 98c3321b93..adbfad38f0 100644 --- a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/disk_white_sand_extra.json +++ b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/disk_white_sand_extra.json @@ -1,12 +1,12 @@ { "type": "minecraft:disk", "config": { - "half_height": 1, + "half_height": 4, "radius": { "type": "minecraft:uniform", "value": { - "max_inclusive": 6, - "min_inclusive": 2 + "max_inclusive": 8, + "min_inclusive": 6 } }, "state_provider": { @@ -22,7 +22,13 @@ "type": "minecraft:matching_blocks", "blocks": [ "minecraft:dirt", - "minecraft:grass_block" + "minecraft:grass_block", + "minecraft:mycelium", + "minecraft:sand", + "minecraft:sandstone", + "minecraft:gravel", + "minecraft:clay", + "biomesoplenty:origin_grass_block" ] } } diff --git a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/maple_twiglet_tree.json b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/maple_twiglet_tree.json index 65cd1f3a90..109b1c25f2 100644 --- a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/maple_twiglet_tree.json +++ b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/maple_twiglet_tree.json @@ -11,7 +11,7 @@ "foliage_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "biomesoplenty:maple_leaves", + "Name": "biomesoplenty:red_maple_leaves", "Properties": { "distance": "7", "persistent": "false", @@ -38,7 +38,7 @@ "trunk_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "minecraft:oak_log", + "Name": "biomesoplenty:maple_log", "Properties": { "axis": "y" } diff --git a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/orange_autumn_tree.json b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/orange_maple_tree.json similarity index 92% rename from src/generated/resources/data/biomesoplenty/worldgen/configured_feature/orange_autumn_tree.json rename to src/generated/resources/data/biomesoplenty/worldgen/configured_feature/orange_maple_tree.json index b508003eb9..f74062afe9 100644 --- a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/orange_autumn_tree.json +++ b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/orange_maple_tree.json @@ -11,7 +11,7 @@ "foliage_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "biomesoplenty:orange_autumn_leaves", + "Name": "biomesoplenty:orange_maple_leaves", "Properties": { "distance": "7", "persistent": "false", @@ -41,7 +41,7 @@ "trunk_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "minecraft:dark_oak_log", + "Name": "biomesoplenty:maple_log", "Properties": { "axis": "y" } diff --git a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/maple_tree.json b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/red_maple_tree.json similarity index 92% rename from src/generated/resources/data/biomesoplenty/worldgen/configured_feature/maple_tree.json rename to src/generated/resources/data/biomesoplenty/worldgen/configured_feature/red_maple_tree.json index ef9a399bbc..f0ce1be4a5 100644 --- a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/maple_tree.json +++ b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/red_maple_tree.json @@ -11,7 +11,7 @@ "foliage_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "biomesoplenty:maple_leaves", + "Name": "biomesoplenty:red_maple_leaves", "Properties": { "distance": "7", "persistent": "false", @@ -41,7 +41,7 @@ "trunk_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "minecraft:oak_log", + "Name": "biomesoplenty:maple_log", "Properties": { "axis": "y" } diff --git a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/trees_maple_forest.json b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/trees_maple_forest.json index 86a91d2f7b..8e5cd238fe 100644 --- a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/trees_maple_forest.json +++ b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/trees_maple_forest.json @@ -1,7 +1,7 @@ { "type": "minecraft:random_selector", "config": { - "default": "biomesoplenty:maple_tree_checked", + "default": "biomesoplenty:red_maple_tree_checked", "features": [ { "chance": 0.1, @@ -9,7 +9,7 @@ }, { "chance": 0.3, - "feature": "biomesoplenty:big_maple_tree" + "feature": "biomesoplenty:big_red_maple_tree" } ] } diff --git a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/trees_seasonal_forest.json b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/trees_seasonal_forest.json index 8748fec2a5..f98a3d613f 100644 --- a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/trees_seasonal_forest.json +++ b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/trees_seasonal_forest.json @@ -1,7 +1,7 @@ { "type": "minecraft:random_selector", "config": { - "default": "biomesoplenty:orange_autumn_tree", + "default": "biomesoplenty:orange_maple_tree", "features": [ { "chance": 0.05, @@ -13,23 +13,23 @@ }, { "chance": 0.2, - "feature": "biomesoplenty:maple_tree_checked" + "feature": "biomesoplenty:red_maple_tree_checked" }, { "chance": 0.3, - "feature": "biomesoplenty:yellow_autumn_tree" + "feature": "biomesoplenty:yellow_maple_tree" }, { "chance": 0.1, - "feature": "biomesoplenty:big_maple_tree" + "feature": "biomesoplenty:big_red_maple_tree" }, { "chance": 0.1, - "feature": "biomesoplenty:big_yellow_autumn_tree" + "feature": "biomesoplenty:big_yellow_maple_tree" }, { "chance": 0.1, - "feature": "biomesoplenty:big_orange_autumn_tree" + "feature": "biomesoplenty:big_orange_maple_tree" } ] } diff --git a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/trees_seasonal_orchard.json b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/trees_seasonal_orchard.json index 129a800bde..073db10e4c 100644 --- a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/trees_seasonal_orchard.json +++ b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/trees_seasonal_orchard.json @@ -5,7 +5,7 @@ "features": [ { "chance": 0.05, - "feature": "biomesoplenty:big_yellow_autumn_tree" + "feature": "biomesoplenty:big_yellow_maple_tree" } ] } diff --git a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/trees_seasonal_pumpkin_patch.json b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/trees_seasonal_pumpkin_patch.json index 23242f6ef6..c5068ef06f 100644 --- a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/trees_seasonal_pumpkin_patch.json +++ b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/trees_seasonal_pumpkin_patch.json @@ -9,11 +9,11 @@ }, { "chance": 0.1, - "feature": "biomesoplenty:orange_autumn_tree" + "feature": "biomesoplenty:orange_maple_tree" }, { "chance": 0.05, - "feature": "biomesoplenty:big_orange_autumn_tree" + "feature": "biomesoplenty:big_orange_maple_tree" } ] } diff --git a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/trees_snowy_maple_forest.json b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/trees_snowy_maple_forest.json index 25da79a615..43e768b2dc 100644 --- a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/trees_snowy_maple_forest.json +++ b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/trees_snowy_maple_forest.json @@ -1,7 +1,7 @@ { "type": "minecraft:random_selector", "config": { - "default": "biomesoplenty:maple_tree_checked", + "default": "biomesoplenty:red_maple_tree_checked", "features": [ { "chance": 0.2, @@ -9,7 +9,7 @@ }, { "chance": 0.1, - "feature": "biomesoplenty:big_maple_tree" + "feature": "biomesoplenty:big_red_maple_tree" } ] } diff --git a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/yellow_autumn_tree.json b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/yellow_maple_tree.json similarity index 92% rename from src/generated/resources/data/biomesoplenty/worldgen/configured_feature/yellow_autumn_tree.json rename to src/generated/resources/data/biomesoplenty/worldgen/configured_feature/yellow_maple_tree.json index ed047ee26a..23516f1589 100644 --- a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/yellow_autumn_tree.json +++ b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/yellow_maple_tree.json @@ -11,7 +11,7 @@ "foliage_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "biomesoplenty:yellow_autumn_leaves", + "Name": "biomesoplenty:yellow_maple_leaves", "Properties": { "distance": "7", "persistent": "false", @@ -41,7 +41,7 @@ "trunk_provider": { "type": "minecraft:simple_state_provider", "state": { - "Name": "minecraft:birch_log", + "Name": "biomesoplenty:maple_log", "Properties": { "axis": "y" } diff --git a/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/aspen_tree.json b/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/aspen_tree.json index fe2f90490c..b2c8502c62 100644 --- a/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/aspen_tree.json +++ b/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/aspen_tree.json @@ -6,7 +6,7 @@ "predicate": { "type": "minecraft:would_survive", "state": { - "Name": "biomesoplenty:yellow_autumn_sapling", + "Name": "biomesoplenty:yellow_maple_sapling", "Properties": { "stage": "0" } diff --git a/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/big_orange_autumn_tree.json b/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/big_orange_autumn_tree.json deleted file mode 100644 index e552dc7258..0000000000 --- a/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/big_orange_autumn_tree.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "feature": "biomesoplenty:big_orange_autumn_tree", - "placement": [ - { - "type": "minecraft:block_predicate_filter", - "predicate": { - "type": "minecraft:would_survive", - "state": { - "Name": "biomesoplenty:orange_autumn_sapling", - "Properties": { - "stage": "0" - } - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/big_orange_maple_tree.json b/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/big_orange_maple_tree.json new file mode 100644 index 0000000000..18274e5c53 --- /dev/null +++ b/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/big_orange_maple_tree.json @@ -0,0 +1,17 @@ +{ + "feature": "biomesoplenty:big_orange_maple_tree", + "placement": [ + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:would_survive", + "state": { + "Name": "biomesoplenty:orange_maple_sapling", + "Properties": { + "stage": "0" + } + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/maple_tree_checked.json b/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/big_red_maple_tree.json similarity index 71% rename from src/generated/resources/data/biomesoplenty/worldgen/placed_feature/maple_tree_checked.json rename to src/generated/resources/data/biomesoplenty/worldgen/placed_feature/big_red_maple_tree.json index 2f7e4feece..60c8878351 100644 --- a/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/maple_tree_checked.json +++ b/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/big_red_maple_tree.json @@ -1,12 +1,12 @@ { - "feature": "biomesoplenty:maple_tree", + "feature": "biomesoplenty:big_red_maple_tree", "placement": [ { "type": "minecraft:block_predicate_filter", "predicate": { "type": "minecraft:would_survive", "state": { - "Name": "biomesoplenty:maple_sapling", + "Name": "biomesoplenty:red_maple_sapling", "Properties": { "stage": "0" } diff --git a/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/big_yellow_autumn_tree.json b/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/big_yellow_autumn_tree.json deleted file mode 100644 index 19d5475630..0000000000 --- a/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/big_yellow_autumn_tree.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "feature": "biomesoplenty:big_yellow_autumn_tree", - "placement": [ - { - "type": "minecraft:block_predicate_filter", - "predicate": { - "type": "minecraft:would_survive", - "state": { - "Name": "biomesoplenty:yellow_autumn_sapling", - "Properties": { - "stage": "0" - } - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/big_yellow_maple_tree.json b/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/big_yellow_maple_tree.json new file mode 100644 index 0000000000..ada56c08fc --- /dev/null +++ b/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/big_yellow_maple_tree.json @@ -0,0 +1,17 @@ +{ + "feature": "biomesoplenty:big_yellow_maple_tree", + "placement": [ + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:would_survive", + "state": { + "Name": "biomesoplenty:yellow_maple_sapling", + "Properties": { + "stage": "0" + } + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/disk_white_sand_extra.json b/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/disk_white_sand_extra.json index 475ef5df96..809142aff8 100644 --- a/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/disk_white_sand_extra.json +++ b/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/disk_white_sand_extra.json @@ -3,14 +3,14 @@ "placement": [ { "type": "minecraft:count", - "count": 8 + "count": 75 }, { "type": "minecraft:in_square" }, { "type": "minecraft:heightmap", - "heightmap": "OCEAN_FLOOR_WG" + "heightmap": "OCEAN_FLOOR" }, { "type": "minecraft:block_predicate_filter", diff --git a/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/maple_twiglet_tree.json b/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/maple_twiglet_tree.json index 0594b62698..459c2bd0fa 100644 --- a/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/maple_twiglet_tree.json +++ b/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/maple_twiglet_tree.json @@ -6,7 +6,7 @@ "predicate": { "type": "minecraft:would_survive", "state": { - "Name": "biomesoplenty:maple_sapling", + "Name": "biomesoplenty:red_maple_sapling", "Properties": { "stage": "0" } diff --git a/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/orange_autumn_tree.json b/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/orange_maple_tree.json similarity index 70% rename from src/generated/resources/data/biomesoplenty/worldgen/placed_feature/orange_autumn_tree.json rename to src/generated/resources/data/biomesoplenty/worldgen/placed_feature/orange_maple_tree.json index 9df29290a4..b74c545a7a 100644 --- a/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/orange_autumn_tree.json +++ b/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/orange_maple_tree.json @@ -1,12 +1,12 @@ { - "feature": "biomesoplenty:orange_autumn_tree", + "feature": "biomesoplenty:orange_maple_tree", "placement": [ { "type": "minecraft:block_predicate_filter", "predicate": { "type": "minecraft:would_survive", "state": { - "Name": "biomesoplenty:orange_autumn_sapling", + "Name": "biomesoplenty:orange_maple_sapling", "Properties": { "stage": "0" } diff --git a/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/big_maple_tree.json b/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/red_maple_tree_checked.json similarity index 71% rename from src/generated/resources/data/biomesoplenty/worldgen/placed_feature/big_maple_tree.json rename to src/generated/resources/data/biomesoplenty/worldgen/placed_feature/red_maple_tree_checked.json index 89907cec6f..48f9b26979 100644 --- a/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/big_maple_tree.json +++ b/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/red_maple_tree_checked.json @@ -1,12 +1,12 @@ { - "feature": "biomesoplenty:big_maple_tree", + "feature": "biomesoplenty:red_maple_tree", "placement": [ { "type": "minecraft:block_predicate_filter", "predicate": { "type": "minecraft:would_survive", "state": { - "Name": "biomesoplenty:maple_sapling", + "Name": "biomesoplenty:red_maple_sapling", "Properties": { "stage": "0" } diff --git a/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/yellow_autumn_tree.json b/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/yellow_maple_tree.json similarity index 70% rename from src/generated/resources/data/biomesoplenty/worldgen/placed_feature/yellow_autumn_tree.json rename to src/generated/resources/data/biomesoplenty/worldgen/placed_feature/yellow_maple_tree.json index 4482caf27c..96d9c7607c 100644 --- a/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/yellow_autumn_tree.json +++ b/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/yellow_maple_tree.json @@ -1,12 +1,12 @@ { - "feature": "biomesoplenty:yellow_autumn_tree", + "feature": "biomesoplenty:yellow_maple_tree", "placement": [ { "type": "minecraft:block_predicate_filter", "predicate": { "type": "minecraft:would_survive", "state": { - "Name": "biomesoplenty:yellow_autumn_sapling", + "Name": "biomesoplenty:yellow_maple_sapling", "Properties": { "stage": "0" } diff --git a/src/main/java/biomesoplenty/api/block/BOPBlockSetTypes.java b/src/main/java/biomesoplenty/api/block/BOPBlockSetTypes.java index d11c352eb0..43f140ec10 100644 --- a/src/main/java/biomesoplenty/api/block/BOPBlockSetTypes.java +++ b/src/main/java/biomesoplenty/api/block/BOPBlockSetTypes.java @@ -13,6 +13,7 @@ public class BOPBlockSetTypes { public static final BlockSetType FIR = register(new BlockSetType(BOPAPI.MOD_ID + ":fir")); public static final BlockSetType PINE = register(new BlockSetType(BOPAPI.MOD_ID + ":pine")); + public static final BlockSetType MAPLE = register(new BlockSetType(BOPAPI.MOD_ID + ":maple")); public static final BlockSetType REDWOOD = register(new BlockSetType(BOPAPI.MOD_ID + ":redwood")); public static final BlockSetType MAHOGANY = register(new BlockSetType(BOPAPI.MOD_ID + ":mahogany")); public static final BlockSetType JACARANDA = register(new BlockSetType(BOPAPI.MOD_ID + ":jacaranda")); diff --git a/src/main/java/biomesoplenty/api/block/BOPBlocks.java b/src/main/java/biomesoplenty/api/block/BOPBlocks.java index df4b0d8376..3eea049c80 100644 --- a/src/main/java/biomesoplenty/api/block/BOPBlocks.java +++ b/src/main/java/biomesoplenty/api/block/BOPBlocks.java @@ -99,12 +99,6 @@ public class BOPBlocks public static RegistryObject SNOWBLOSSOM_LEAVES; public static RegistryObject RAINBOW_BIRCH_SAPLING; public static RegistryObject RAINBOW_BIRCH_LEAVES; - public static RegistryObject YELLOW_AUTUMN_SAPLING; - public static RegistryObject YELLOW_AUTUMN_LEAVES; - public static RegistryObject ORANGE_AUTUMN_SAPLING; - public static RegistryObject ORANGE_AUTUMN_LEAVES; - public static RegistryObject MAPLE_SAPLING; - public static RegistryObject MAPLE_LEAVES; public static RegistryObject FIR_SAPLING; public static RegistryObject FIR_LEAVES; public static RegistryObject FIR_LOG; @@ -143,6 +137,29 @@ public class BOPBlocks public static RegistryObject PINE_WALL_SIGN; public static RegistryObject PINE_HANGING_SIGN; public static RegistryObject PINE_WALL_HANGING_SIGN; + public static RegistryObject RED_MAPLE_SAPLING; + public static RegistryObject RED_MAPLE_LEAVES; + public static RegistryObject ORANGE_MAPLE_SAPLING; + public static RegistryObject ORANGE_MAPLE_LEAVES; + public static RegistryObject YELLOW_MAPLE_SAPLING; + public static RegistryObject YELLOW_MAPLE_LEAVES; + public static RegistryObject MAPLE_LOG; + public static RegistryObject STRIPPED_MAPLE_LOG; + public static RegistryObject MAPLE_WOOD; + public static RegistryObject STRIPPED_MAPLE_WOOD; + public static RegistryObject MAPLE_PLANKS; + public static RegistryObject MAPLE_SLAB; + public static RegistryObject MAPLE_STAIRS; + public static RegistryObject MAPLE_FENCE; + public static RegistryObject MAPLE_FENCE_GATE; + public static RegistryObject MAPLE_DOOR; + public static RegistryObject MAPLE_TRAPDOOR; + public static RegistryObject MAPLE_PRESSURE_PLATE; + public static RegistryObject MAPLE_BUTTON; + public static RegistryObject MAPLE_SIGN; + public static RegistryObject MAPLE_WALL_SIGN; + public static RegistryObject MAPLE_HANGING_SIGN; + public static RegistryObject MAPLE_WALL_HANGING_SIGN; public static RegistryObject REDWOOD_SAPLING; public static RegistryObject REDWOOD_LEAVES; public static RegistryObject REDWOOD_LOG; @@ -363,11 +380,11 @@ public class BOPBlocks public static RegistryObject POTTED_FLOWERING_OAK_SAPLING; public static RegistryObject POTTED_SNOWBLOSSOM_SAPLING; public static RegistryObject POTTED_RAINBOW_BIRCH_SAPLING; - public static RegistryObject POTTED_YELLOW_AUTUMN_SAPLING; - public static RegistryObject POTTED_ORANGE_AUTUMN_SAPLING; - public static RegistryObject POTTED_MAPLE_SAPLING; public static RegistryObject POTTED_FIR_SAPLING; public static RegistryObject POTTED_PINE_SAPLING; + public static RegistryObject POTTED_RED_MAPLE_SAPLING; + public static RegistryObject POTTED_ORANGE_MAPLE_SAPLING; + public static RegistryObject POTTED_YELLOW_MAPLE_SAPLING; public static RegistryObject POTTED_REDWOOD_SAPLING; public static RegistryObject POTTED_MAHOGANY_SAPLING; public static RegistryObject POTTED_JACARANDA_SAPLING; diff --git a/src/main/java/biomesoplenty/api/block/BOPWoodTypes.java b/src/main/java/biomesoplenty/api/block/BOPWoodTypes.java index 69be81dba9..a87be70e61 100644 --- a/src/main/java/biomesoplenty/api/block/BOPWoodTypes.java +++ b/src/main/java/biomesoplenty/api/block/BOPWoodTypes.java @@ -13,6 +13,7 @@ public class BOPWoodTypes { public static final WoodType FIR = register(new WoodType(BOPAPI.MOD_ID + ":fir", BOPBlockSetTypes.FIR)); public static final WoodType PINE = register(new WoodType(BOPAPI.MOD_ID + ":pine", BOPBlockSetTypes.PINE)); + public static final WoodType MAPLE = register(new WoodType(BOPAPI.MOD_ID + ":maple", BOPBlockSetTypes.MAPLE)); public static final WoodType REDWOOD = register(new WoodType(BOPAPI.MOD_ID + ":redwood", BOPBlockSetTypes.REDWOOD)); public static final WoodType MAHOGANY = register(new WoodType(BOPAPI.MOD_ID + ":mahogany", BOPBlockSetTypes.MAHOGANY)); public static final WoodType JACARANDA = register(new WoodType(BOPAPI.MOD_ID + ":jacaranda", BOPBlockSetTypes.JACARANDA)); diff --git a/src/main/java/biomesoplenty/api/item/BOPItems.java b/src/main/java/biomesoplenty/api/item/BOPItems.java index d78d413ccf..2db9f69dd3 100644 --- a/src/main/java/biomesoplenty/api/item/BOPItems.java +++ b/src/main/java/biomesoplenty/api/item/BOPItems.java @@ -18,6 +18,8 @@ public class BOPItems public static RegistryObject FIR_HANGING_SIGN; public static RegistryObject PINE_SIGN; public static RegistryObject PINE_HANGING_SIGN; + public static RegistryObject MAPLE_SIGN; + public static RegistryObject MAPLE_HANGING_SIGN; public static RegistryObject REDWOOD_SIGN; public static RegistryObject REDWOOD_HANGING_SIGN; public static RegistryObject MAHOGANY_SIGN; @@ -41,6 +43,8 @@ public class BOPItems public static RegistryObject FIR_CHEST_BOAT; public static RegistryObject PINE_BOAT; public static RegistryObject PINE_CHEST_BOAT; + public static RegistryObject MAPLE_BOAT; + public static RegistryObject MAPLE_CHEST_BOAT; public static RegistryObject REDWOOD_BOAT; public static RegistryObject REDWOOD_CHEST_BOAT; public static RegistryObject MAHOGANY_BOAT; diff --git a/src/main/java/biomesoplenty/client/handler/ParticleFactoryHandler.java b/src/main/java/biomesoplenty/client/handler/ParticleFactoryHandler.java index cbbd306ee2..ed6f113c74 100644 --- a/src/main/java/biomesoplenty/client/handler/ParticleFactoryHandler.java +++ b/src/main/java/biomesoplenty/client/handler/ParticleFactoryHandler.java @@ -33,17 +33,17 @@ public static void registerParticleFactories(RegisterParticleProvidersEvent even return new LeafParticle(p_277218_, p_277219_, p_277220_, p_277221_, p_277215_); }; }); - event.registerSpriteSet(ModParticles.YELLOW_AUTUMN_LEAVES.get(), (p_277215_) -> { + event.registerSpriteSet(ModParticles.RED_MAPLE_LEAVES.get(), (p_277215_) -> { return (p_277217_, p_277218_, p_277219_, p_277220_, p_277221_, p_277222_, p_277223_, p_277224_) -> { return new LargeLeafParticle(p_277218_, p_277219_, p_277220_, p_277221_, p_277215_); }; }); - event.registerSpriteSet(ModParticles.ORANGE_AUTUMN_LEAVES.get(), (p_277215_) -> { + event.registerSpriteSet(ModParticles.ORANGE_MAPLE_LEAVES.get(), (p_277215_) -> { return (p_277217_, p_277218_, p_277219_, p_277220_, p_277221_, p_277222_, p_277223_, p_277224_) -> { return new LargeLeafParticle(p_277218_, p_277219_, p_277220_, p_277221_, p_277215_); }; }); - event.registerSpriteSet(ModParticles.MAPLE_LEAVES.get(), (p_277215_) -> { + event.registerSpriteSet(ModParticles.YELLOW_MAPLE_LEAVES.get(), (p_277215_) -> { return (p_277217_, p_277218_, p_277219_, p_277220_, p_277221_, p_277222_, p_277223_, p_277224_) -> { return new LargeLeafParticle(p_277218_, p_277219_, p_277220_, p_277221_, p_277215_); }; diff --git a/src/main/java/biomesoplenty/common/block/OrangeAutumnLeavesBlock.java b/src/main/java/biomesoplenty/common/block/OrangeMapleLeavesBlock.java similarity index 87% rename from src/main/java/biomesoplenty/common/block/OrangeAutumnLeavesBlock.java rename to src/main/java/biomesoplenty/common/block/OrangeMapleLeavesBlock.java index 9542df35b6..2797a33f05 100644 --- a/src/main/java/biomesoplenty/common/block/OrangeAutumnLeavesBlock.java +++ b/src/main/java/biomesoplenty/common/block/OrangeMapleLeavesBlock.java @@ -13,9 +13,9 @@ import net.minecraft.world.level.block.LeavesBlock; import net.minecraft.world.level.block.state.BlockState; -public class OrangeAutumnLeavesBlock extends LeavesBlock +public class OrangeMapleLeavesBlock extends LeavesBlock { - public OrangeAutumnLeavesBlock(Properties p_273704_) + public OrangeMapleLeavesBlock(Properties p_273704_) { super(p_273704_); } @@ -30,7 +30,7 @@ public void animateTick(BlockState p_272714_, Level p_272837_, BlockPos p_273218 BlockState blockstate = p_272837_.getBlockState(blockpos); if (!isFaceFull(blockstate.getCollisionShape(p_272837_, blockpos), Direction.UP)) { - ParticleUtils.spawnParticleBelow(p_272837_, p_273218_, p_273360_, ModParticles.ORANGE_AUTUMN_LEAVES.get()); + ParticleUtils.spawnParticleBelow(p_272837_, p_273218_, p_273360_, ModParticles.ORANGE_MAPLE_LEAVES.get()); } } } diff --git a/src/main/java/biomesoplenty/common/block/MapleLeavesBlock.java b/src/main/java/biomesoplenty/common/block/RedMapleLeavesBlock.java similarity index 88% rename from src/main/java/biomesoplenty/common/block/MapleLeavesBlock.java rename to src/main/java/biomesoplenty/common/block/RedMapleLeavesBlock.java index 042cc9c0b7..f7ba9be669 100644 --- a/src/main/java/biomesoplenty/common/block/MapleLeavesBlock.java +++ b/src/main/java/biomesoplenty/common/block/RedMapleLeavesBlock.java @@ -13,9 +13,9 @@ import net.minecraft.world.level.block.LeavesBlock; import net.minecraft.world.level.block.state.BlockState; -public class MapleLeavesBlock extends LeavesBlock +public class RedMapleLeavesBlock extends LeavesBlock { - public MapleLeavesBlock(Properties p_273704_) + public RedMapleLeavesBlock(Properties p_273704_) { super(p_273704_); } @@ -30,7 +30,7 @@ public void animateTick(BlockState p_272714_, Level p_272837_, BlockPos p_273218 BlockState blockstate = p_272837_.getBlockState(blockpos); if (!isFaceFull(blockstate.getCollisionShape(p_272837_, blockpos), Direction.UP)) { - ParticleUtils.spawnParticleBelow(p_272837_, p_273218_, p_273360_, ModParticles.MAPLE_LEAVES.get()); + ParticleUtils.spawnParticleBelow(p_272837_, p_273218_, p_273360_, ModParticles.RED_MAPLE_LEAVES.get()); } } } diff --git a/src/main/java/biomesoplenty/common/block/YellowAutumnLeavesBlock.java b/src/main/java/biomesoplenty/common/block/YellowMapleLeavesBlock.java similarity index 87% rename from src/main/java/biomesoplenty/common/block/YellowAutumnLeavesBlock.java rename to src/main/java/biomesoplenty/common/block/YellowMapleLeavesBlock.java index 788cad72b4..3d8051300b 100644 --- a/src/main/java/biomesoplenty/common/block/YellowAutumnLeavesBlock.java +++ b/src/main/java/biomesoplenty/common/block/YellowMapleLeavesBlock.java @@ -13,9 +13,9 @@ import net.minecraft.world.level.block.LeavesBlock; import net.minecraft.world.level.block.state.BlockState; -public class YellowAutumnLeavesBlock extends LeavesBlock +public class YellowMapleLeavesBlock extends LeavesBlock { - public YellowAutumnLeavesBlock(Properties p_273704_) + public YellowMapleLeavesBlock(Properties p_273704_) { super(p_273704_); } @@ -30,7 +30,7 @@ public void animateTick(BlockState p_272714_, Level p_272837_, BlockPos p_273218 BlockState blockstate = p_272837_.getBlockState(blockpos); if (!isFaceFull(blockstate.getCollisionShape(p_272837_, blockpos), Direction.UP)) { - ParticleUtils.spawnParticleBelow(p_272837_, p_273218_, p_273360_, ModParticles.YELLOW_AUTUMN_LEAVES.get()); + ParticleUtils.spawnParticleBelow(p_272837_, p_273218_, p_273360_, ModParticles.YELLOW_MAPLE_LEAVES.get()); } } } diff --git a/src/main/java/biomesoplenty/common/block/trees/OrangeAutumnTree.java b/src/main/java/biomesoplenty/common/block/trees/OrangeMapleTree.java similarity index 87% rename from src/main/java/biomesoplenty/common/block/trees/OrangeAutumnTree.java rename to src/main/java/biomesoplenty/common/block/trees/OrangeMapleTree.java index 4593ab9f5d..3704883b3a 100644 --- a/src/main/java/biomesoplenty/common/block/trees/OrangeAutumnTree.java +++ b/src/main/java/biomesoplenty/common/block/trees/OrangeMapleTree.java @@ -10,11 +10,11 @@ import net.minecraft.world.level.block.grower.AbstractTreeGrower; import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; -public class OrangeAutumnTree extends AbstractTreeGrower +public class OrangeMapleTree extends AbstractTreeGrower { @Override protected ResourceKey> getConfiguredFeature(RandomSource random, boolean flowers) { - return (random.nextInt(10) == 0 ? BOPTreeFeatures.BIG_ORANGE_AUTUMN_TREE : BOPTreeFeatures.ORANGE_AUTUMN_TREE); + return (random.nextInt(10) == 0 ? BOPTreeFeatures.BIG_ORANGE_MAPLE_TREE : BOPTreeFeatures.ORANGE_MAPLE_TREE); } } \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/block/trees/MapleTree.java b/src/main/java/biomesoplenty/common/block/trees/RedMapleTree.java similarity index 80% rename from src/main/java/biomesoplenty/common/block/trees/MapleTree.java rename to src/main/java/biomesoplenty/common/block/trees/RedMapleTree.java index 1391dd0592..4166f2f66d 100644 --- a/src/main/java/biomesoplenty/common/block/trees/MapleTree.java +++ b/src/main/java/biomesoplenty/common/block/trees/RedMapleTree.java @@ -10,11 +10,11 @@ import net.minecraft.world.level.block.grower.AbstractTreeGrower; import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; -public class MapleTree extends AbstractTreeGrower +public class RedMapleTree extends AbstractTreeGrower { @Override protected ResourceKey> getConfiguredFeature(RandomSource random, boolean flowers) { - return (random.nextInt(10) == 0 ? BOPTreeFeatures.BIG_MAPLE_TREE : BOPTreeFeatures.MAPLE_TREE); + return (random.nextInt(10) == 0 ? BOPTreeFeatures.BIG_RED_MAPLE_TREE : BOPTreeFeatures.RED_MAPLE_TREE); } } \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/block/trees/YellowAutumnTree.java b/src/main/java/biomesoplenty/common/block/trees/YellowMapleTree.java similarity index 74% rename from src/main/java/biomesoplenty/common/block/trees/YellowAutumnTree.java rename to src/main/java/biomesoplenty/common/block/trees/YellowMapleTree.java index 8a9484f4c9..28dc4e18d3 100644 --- a/src/main/java/biomesoplenty/common/block/trees/YellowAutumnTree.java +++ b/src/main/java/biomesoplenty/common/block/trees/YellowMapleTree.java @@ -10,11 +10,11 @@ import net.minecraft.world.level.block.grower.AbstractTreeGrower; import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; -public class YellowAutumnTree extends AbstractTreeGrower +public class YellowMapleTree extends AbstractTreeGrower { @Override protected ResourceKey> getConfiguredFeature(RandomSource random, boolean flowers) { - return (random.nextInt(10) == 0 ? (random.nextInt(5) == 0 ? BOPTreeFeatures.ASPEN_TREE : BOPTreeFeatures.BIG_YELLOW_AUTUMN_TREE) : BOPTreeFeatures.YELLOW_AUTUMN_TREE); + return (random.nextInt(10) == 0 ? BOPTreeFeatures.BIG_YELLOW_MAPLE_TREE : BOPTreeFeatures.YELLOW_MAPLE_TREE); } } \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/entity/BoatBOP.java b/src/main/java/biomesoplenty/common/entity/BoatBOP.java index 60c62a57a0..3c0207c4fd 100644 --- a/src/main/java/biomesoplenty/common/entity/BoatBOP.java +++ b/src/main/java/biomesoplenty/common/entity/BoatBOP.java @@ -116,6 +116,8 @@ public Item getDropItem() return BOPItems.FIR_BOAT.get(); case PINE: return BOPItems.PINE_BOAT.get(); + case MAPLE: + return BOPItems.MAPLE_BOAT.get(); case REDWOOD: return BOPItems.REDWOOD_BOAT.get(); case MAHOGANY: @@ -163,6 +165,7 @@ public enum ModelType { FIR("fir", BOPBlocks.FIR_PLANKS.get()), PINE("pine", BOPBlocks.PINE_PLANKS.get()), + MAPLE("maple", BOPBlocks.MAPLE_PLANKS.get()), REDWOOD("redwood", BOPBlocks.REDWOOD_PLANKS.get()), MAHOGANY("mahogany", BOPBlocks.MAHOGANY_PLANKS.get()), JACARANDA("jacaranda", BOPBlocks.JACARANDA_PLANKS.get()), diff --git a/src/main/java/biomesoplenty/common/entity/ChestBoatBOP.java b/src/main/java/biomesoplenty/common/entity/ChestBoatBOP.java index fe86f28075..9a7545bd06 100644 --- a/src/main/java/biomesoplenty/common/entity/ChestBoatBOP.java +++ b/src/main/java/biomesoplenty/common/entity/ChestBoatBOP.java @@ -112,6 +112,8 @@ public Item getDropItem() return BOPItems.FIR_CHEST_BOAT.get(); case PINE: return BOPItems.PINE_CHEST_BOAT.get(); + case MAPLE: + return BOPItems.MAPLE_CHEST_BOAT.get(); case REDWOOD: return BOPItems.REDWOOD_CHEST_BOAT.get(); case MAHOGANY: diff --git a/src/main/java/biomesoplenty/common/worldgen/feature/BOPMiscOverworldFeatures.java b/src/main/java/biomesoplenty/common/worldgen/feature/BOPMiscOverworldFeatures.java index 19ac9ee374..2d3c565bc8 100644 --- a/src/main/java/biomesoplenty/common/worldgen/feature/BOPMiscOverworldFeatures.java +++ b/src/main/java/biomesoplenty/common/worldgen/feature/BOPMiscOverworldFeatures.java @@ -66,7 +66,7 @@ public static void bootstrap(BootstapContext> context) register(context, BOPMiscOverworldFeatures.DISK_GRAVEL_EXTRA, Feature.DISK, new DiskConfiguration(RuleBasedBlockStateProvider.simple(Blocks.GRAVEL), BlockPredicate.matchesBlocks(List.of(Blocks.DIRT, Blocks.GRASS_BLOCK)), UniformInt.of(1, 4), 2)); register(context, BOPMiscOverworldFeatures.DISK_ORANGE_SAND, Feature.DISK, new DiskConfiguration(RuleBasedBlockStateProvider.simple(BOPBlocks.ORANGE_SAND.get()), BlockPredicate.matchesBlocks(List.of(Blocks.DIRT, Blocks.GRASS_BLOCK)), UniformInt.of(2, 6), 2)); register(context, BOPMiscOverworldFeatures.DISK_WHITE_SAND, Feature.DISK, new DiskConfiguration(RuleBasedBlockStateProvider.simple(BOPBlocks.WHITE_SAND.get()), BlockPredicate.matchesBlocks(List.of(Blocks.DIRT, Blocks.GRASS_BLOCK)), UniformInt.of(2, 6), 2)); - register(context, BOPMiscOverworldFeatures.DISK_WHITE_SAND_EXTRA, Feature.DISK, new DiskConfiguration(RuleBasedBlockStateProvider.simple(BOPBlocks.WHITE_SAND.get()), BlockPredicate.matchesBlocks(List.of(Blocks.DIRT, Blocks.GRASS_BLOCK)), UniformInt.of(2, 6), 1)); + register(context, BOPMiscOverworldFeatures.DISK_WHITE_SAND_EXTRA, Feature.DISK, new DiskConfiguration(RuleBasedBlockStateProvider.simple(BOPBlocks.WHITE_SAND.get()), BlockPredicate.matchesBlocks(List.of(Blocks.DIRT, Blocks.GRASS_BLOCK, Blocks.MYCELIUM, Blocks.SAND, Blocks.SANDSTONE, Blocks.GRAVEL, Blocks.CLAY, BOPBlocks.ORIGIN_GRASS_BLOCK.get())), UniformInt.of(6, 8), 4)); register(context, BOPMiscOverworldFeatures.DISK_HOT_SPRING_GRAVEL, Feature.DISK, new DiskConfiguration(RuleBasedBlockStateProvider.simple(Blocks.GRAVEL), BlockPredicate.matchesBlocks(List.of(Blocks.DIRT, Blocks.COARSE_DIRT, Blocks.PODZOL, Blocks.GRASS_BLOCK, Blocks.SAND, Blocks.CLAY, Blocks.ANDESITE, Blocks.GRANITE, Blocks.DIORITE, Blocks.STONE)), UniformInt.of(8, 8), 4)); register(context, BOPMiscOverworldFeatures.DISK_HOT_SPRING_CALCITE, Feature.DISK, new DiskConfiguration(RuleBasedBlockStateProvider.simple(Blocks.CALCITE), BlockPredicate.matchesBlocks(List.of(Blocks.DIRT, Blocks.COARSE_DIRT, Blocks.PODZOL, Blocks.GRASS_BLOCK, Blocks.SAND, Blocks.GRAVEL, Blocks.CLAY, Blocks.ANDESITE, Blocks.GRANITE, Blocks.DIORITE, Blocks.STONE)), UniformInt.of(6, 7), 3)); diff --git a/src/main/java/biomesoplenty/common/worldgen/feature/BOPTreeFeatures.java b/src/main/java/biomesoplenty/common/worldgen/feature/BOPTreeFeatures.java index 80886a2302..2f275d1406 100644 --- a/src/main/java/biomesoplenty/common/worldgen/feature/BOPTreeFeatures.java +++ b/src/main/java/biomesoplenty/common/worldgen/feature/BOPTreeFeatures.java @@ -34,24 +34,25 @@ public class BOPTreeFeatures public static final ResourceKey> FLOWERING_OAK_TREE_BEES = createKey("flowering_oak_tree_bees"); public static final ResourceKey> JACARANDA_TREE = createKey("jacaranda_tree"); public static final ResourceKey> JACARANDA_TREE_BEES = createKey("jacaranda_tree_bees"); - public static final ResourceKey> MAPLE_TREE = createKey("maple_tree"); - public static final ResourceKey> ORANGE_AUTUMN_TREE = createKey("orange_autumn_tree"); + public static final ResourceKey> RED_MAPLE_TREE = createKey("red_maple_tree"); + public static final ResourceKey> ORANGE_MAPLE_TREE = createKey("orange_maple_tree"); + public static final ResourceKey> YELLOW_MAPLE_TREE = createKey("yellow_maple_tree"); public static final ResourceKey> ORIGIN_TREE = createKey("origin_tree"); public static final ResourceKey> RAINBOW_BIRCH_TREE = createKey("rainbow_birch_tree"); public static final ResourceKey> SMALL_DEAD_TREE = createKey("small_dead_tree"); public static final ResourceKey> SNOWBLOSSOM_TREE = createKey("snowblossom_tree"); public static final ResourceKey> WILLOW_TREE = createKey("willow_tree"); - public static final ResourceKey> YELLOW_AUTUMN_TREE = createKey("yellow_autumn_tree"); + public static final ResourceKey> ASPEN_TREE = createKey("aspen_tree"); public static final ResourceKey> BIG_FLOWERING_OAK_TREE = createKey("big_flowering_oak_tree"); public static final ResourceKey> BIG_HELLBARK_TREE = createKey("big_hellbark_tree"); public static final ResourceKey> BIG_JACARANDA_TREE = createKey("big_jacaranda_tree"); - public static final ResourceKey> BIG_MAPLE_TREE = createKey("big_maple_tree"); + public static final ResourceKey> BIG_RED_MAPLE_TREE = createKey("big_red_maple_tree"); + public static final ResourceKey> BIG_ORANGE_MAPLE_TREE = createKey("big_orange_maple_tree"); + public static final ResourceKey> BIG_YELLOW_MAPLE_TREE = createKey("big_yellow_maple_tree"); public static final ResourceKey> BIG_OAK_TREE = createKey("big_oak_tree"); - public static final ResourceKey> BIG_ORANGE_AUTUMN_TREE = createKey("big_orange_autumn_tree"); public static final ResourceKey> BIG_ORIGIN_TREE = createKey("big_origin_tree"); public static final ResourceKey> BIG_RAINBOW_BIRCH_TREE = createKey("big_rainbow_birch_tree"); - public static final ResourceKey> BIG_YELLOW_AUTUMN_TREE = createKey("big_yellow_autumn_tree"); public static final ResourceKey> DYING_TREE = createKey("dying_tree"); public static final ResourceKey> DYING_TREE_WASTELAND = createKey("dying_tree_wasteland"); public static final ResourceKey> GIANT_TREE = createKey("giant_tree"); @@ -102,23 +103,23 @@ public static void bootstrap(BootstapContext> context) register(context, BOPTreeFeatures.FLOWERING_OAK_TREE_BEES, BOPBaseFeatures.BASIC_TREE, new BasicTreeConfiguration.Builder().trunk(BlockStateProvider.simple(Blocks.OAK_LOG)).foliage(BlockStateProvider.simple(Blocks.OAK_LEAVES)).altFoliage(BlockStateProvider.simple(BOPBlocks.FLOWERING_OAK_LEAVES.get())).decorator(new BeehiveDecorator(0.05f)).build()); register(context, BOPTreeFeatures.JACARANDA_TREE, BOPBaseFeatures.BASIC_TREE, new BasicTreeConfiguration.Builder().trunk(BlockStateProvider.simple(BOPBlocks.JACARANDA_LOG.get())).foliage(BlockStateProvider.simple(BOPBlocks.JACARANDA_LEAVES.get())).hanging(BlockStateProvider.simple(BOPBlocks.JACARANDA_LEAVES.get())).build()); register(context, BOPTreeFeatures.JACARANDA_TREE_BEES, BOPBaseFeatures.BASIC_TREE, new BasicTreeConfiguration.Builder().trunk(BlockStateProvider.simple(BOPBlocks.JACARANDA_LOG.get())).foliage(BlockStateProvider.simple(BOPBlocks.JACARANDA_LEAVES.get())).hanging(BlockStateProvider.simple(BOPBlocks.JACARANDA_LEAVES.get())).decorator(new BeehiveDecorator(0.02f)).build()); - register(context, BOPTreeFeatures.MAPLE_TREE, BOPBaseFeatures.BASIC_TREE, new BasicTreeConfiguration.Builder().foliage(BlockStateProvider.simple(BOPBlocks.MAPLE_LEAVES.get())).minHeight(5).maxHeight(10).build()); - register(context, BOPTreeFeatures.ORANGE_AUTUMN_TREE, BOPBaseFeatures.BASIC_TREE, new BasicTreeConfiguration.Builder().trunk(BlockStateProvider.simple(Blocks.DARK_OAK_LOG)).foliage(BlockStateProvider.simple(BOPBlocks.ORANGE_AUTUMN_LEAVES.get())).minHeight(5).maxHeight(8).build()); + register(context, BOPTreeFeatures.RED_MAPLE_TREE, BOPBaseFeatures.BASIC_TREE, new BasicTreeConfiguration.Builder().trunk(BlockStateProvider.simple(BOPBlocks.MAPLE_LOG.get())).foliage(BlockStateProvider.simple(BOPBlocks.RED_MAPLE_LEAVES.get())).minHeight(5).maxHeight(10).build()); + register(context, BOPTreeFeatures.ORANGE_MAPLE_TREE, BOPBaseFeatures.BASIC_TREE, new BasicTreeConfiguration.Builder().trunk(BlockStateProvider.simple(BOPBlocks.MAPLE_LOG.get())).foliage(BlockStateProvider.simple(BOPBlocks.ORANGE_MAPLE_LEAVES.get())).minHeight(5).maxHeight(8).build()); + register(context, BOPTreeFeatures.YELLOW_MAPLE_TREE, BOPBaseFeatures.BASIC_TREE, new BasicTreeConfiguration.Builder().trunk(BlockStateProvider.simple(BOPBlocks.MAPLE_LOG.get())).foliage(BlockStateProvider.simple(BOPBlocks.YELLOW_MAPLE_LEAVES.get())).minHeight(5).maxHeight(8).build()); register(context, BOPTreeFeatures.ORIGIN_TREE, BOPBaseFeatures.BASIC_TREE, new BasicTreeConfiguration.Builder().trunk(BlockStateProvider.simple(Blocks.OAK_LOG)).foliage(BlockStateProvider.simple(BOPBlocks.ORIGIN_LEAVES.get())).minHeight(5).maxHeight(8).build()); register(context, BOPTreeFeatures.RAINBOW_BIRCH_TREE, BOPBaseFeatures.BASIC_TREE, new BasicTreeConfiguration.Builder().trunk(BlockStateProvider.simple(Blocks.BIRCH_LOG)).foliage(BlockStateProvider.simple(BOPBlocks.RAINBOW_BIRCH_LEAVES.get())).build()); register(context, BOPTreeFeatures.SMALL_DEAD_TREE, BOPBaseFeatures.BASIC_TREE, new BasicTreeConfiguration.Builder().trunk(BlockStateProvider.simple(BOPBlocks.DEAD_LOG.get())).foliage(BlockStateProvider.simple(BOPBlocks.DEAD_LEAVES.get())).build()); register(context, BOPTreeFeatures.WILLOW_TREE, BOPBaseFeatures.BASIC_TREE, new BasicTreeConfiguration.Builder().trunk(BlockStateProvider.simple(BOPBlocks.WILLOW_LOG.get())).foliage(BlockStateProvider.simple(BOPBlocks.WILLOW_LEAVES.get())).vine(BlockStateProvider.simple(BOPBlocks.WILLOW_VINE.get())).minHeight(6).maxHeight(10).leavesOffset(0).maxLeavesRadius(2).build()); - register(context, BOPTreeFeatures.YELLOW_AUTUMN_TREE, BOPBaseFeatures.BASIC_TREE, new BasicTreeConfiguration.Builder().trunk(BlockStateProvider.simple(Blocks.BIRCH_LOG)).foliage(BlockStateProvider.simple(BOPBlocks.YELLOW_AUTUMN_LEAVES.get())).minHeight(5).maxHeight(8).build()); - register(context, BOPTreeFeatures.ASPEN_TREE, BOPBaseFeatures.POPLAR_TREE, new PoplarTreeConfiguration.Builder().trunk(BlockStateProvider.simple(Blocks.BIRCH_LOG)).foliage(BlockStateProvider.simple(BOPBlocks.YELLOW_AUTUMN_LEAVES.get())).maxHeight(20).build()); + register(context, BOPTreeFeatures.ASPEN_TREE, BOPBaseFeatures.POPLAR_TREE, new PoplarTreeConfiguration.Builder().trunk(BlockStateProvider.simple(Blocks.BIRCH_LOG)).foliage(BlockStateProvider.simple(BOPBlocks.YELLOW_MAPLE_LEAVES.get())).maxHeight(20).build()); register(context, BOPTreeFeatures.BIG_FLOWERING_OAK_TREE, BOPBaseFeatures.BIG_TREE, new BigTreeConfiguration.Builder().trunk(BlockStateProvider.simple(Blocks.OAK_LOG)).foliage(BlockStateProvider.simple(Blocks.OAK_LEAVES)).altFoliage(BlockStateProvider.simple(BOPBlocks.FLOWERING_OAK_LEAVES.get())).build()); register(context, BOPTreeFeatures.BIG_HELLBARK_TREE, BOPBaseFeatures.BIG_TREE, new BigTreeConfiguration.Builder().trunk(BlockStateProvider.simple(BOPBlocks.HELLBARK_LOG.get())).foliage(BlockStateProvider.simple(BOPBlocks.HELLBARK_LEAVES.get())).maxHeight(10).foliageHeight(2).build()); register(context, BOPTreeFeatures.BIG_JACARANDA_TREE, BOPBaseFeatures.BIG_TREE, new BigTreeConfiguration.Builder().trunk(BlockStateProvider.simple(BOPBlocks.JACARANDA_LOG.get())).foliage(BlockStateProvider.simple(BOPBlocks.JACARANDA_LEAVES.get())).hanging(BlockStateProvider.simple(BOPBlocks.JACARANDA_LEAVES.get())).build()); - register(context, BOPTreeFeatures.BIG_MAPLE_TREE, BOPBaseFeatures.BIG_TREE, new BigTreeConfiguration.Builder().foliage(BlockStateProvider.simple(BOPBlocks.MAPLE_LEAVES.get())).build()); + register(context, BOPTreeFeatures.BIG_RED_MAPLE_TREE, BOPBaseFeatures.BIG_TREE, new BigTreeConfiguration.Builder().trunk(BlockStateProvider.simple(BOPBlocks.MAPLE_LOG.get())).foliage(BlockStateProvider.simple(BOPBlocks.RED_MAPLE_LEAVES.get())).build()); + register(context, BOPTreeFeatures.BIG_ORANGE_MAPLE_TREE, BOPBaseFeatures.BIG_TREE, new BigTreeConfiguration.Builder().trunk(BlockStateProvider.simple(BOPBlocks.MAPLE_LOG.get())).foliage(BlockStateProvider.simple(BOPBlocks.ORANGE_MAPLE_LEAVES.get())).build()); + register(context, BOPTreeFeatures.BIG_YELLOW_MAPLE_TREE, BOPBaseFeatures.BIG_TREE, new BigTreeConfiguration.Builder().trunk(BlockStateProvider.simple(BOPBlocks.MAPLE_LOG.get())).foliage(BlockStateProvider.simple(BOPBlocks.YELLOW_MAPLE_LEAVES.get())).build()); register(context, BOPTreeFeatures.BIG_OAK_TREE, BOPBaseFeatures.BIG_TREE, new BigTreeConfiguration.Builder().build()); - register(context, BOPTreeFeatures.BIG_ORANGE_AUTUMN_TREE, BOPBaseFeatures.BIG_TREE, new BigTreeConfiguration.Builder().trunk(BlockStateProvider.simple(Blocks.DARK_OAK_LOG)).foliage(BlockStateProvider.simple(BOPBlocks.ORANGE_AUTUMN_LEAVES.get())).build()); register(context, BOPTreeFeatures.BIG_ORIGIN_TREE, BOPBaseFeatures.BIG_TREE, new BigTreeConfiguration.Builder().trunk(BlockStateProvider.simple(Blocks.OAK_LOG)).foliage(BlockStateProvider.simple(BOPBlocks.ORIGIN_LEAVES.get())).build()); register(context, BOPTreeFeatures.BIG_RAINBOW_BIRCH_TREE, BOPBaseFeatures.BIG_TREE, new BigTreeConfiguration.Builder().trunk(BlockStateProvider.simple(Blocks.BIRCH_LOG)).foliage(BlockStateProvider.simple(BOPBlocks.RAINBOW_BIRCH_LEAVES.get())).build()); - register(context, BOPTreeFeatures.BIG_YELLOW_AUTUMN_TREE, BOPBaseFeatures.BIG_TREE, new BigTreeConfiguration.Builder().trunk(BlockStateProvider.simple(Blocks.BIRCH_LOG)).foliage(BlockStateProvider.simple(BOPBlocks.YELLOW_AUTUMN_LEAVES.get())).build()); register(context, BOPTreeFeatures.DYING_TREE, BOPBaseFeatures.BIG_TREE, new BigTreeConfiguration.Builder().trunk(BlockStateProvider.simple(BOPBlocks.DEAD_LOG.get())).foliage(BlockStateProvider.simple(BOPBlocks.DEAD_LEAVES.get())).maxHeight(10).foliageHeight(2).build()); register(context, BOPTreeFeatures.DYING_TREE_WASTELAND, BOPBaseFeatures.BIG_TREE, new BigTreeConfiguration.Builder().trunk(BlockStateProvider.simple(BOPBlocks.DEAD_LOG.get())).foliage(BlockStateProvider.simple(BOPBlocks.DEAD_LEAVES.get())).maxHeight(10).foliageHeight(1).build()); register(context, BOPTreeFeatures.GIANT_TREE, BOPBaseFeatures.BIG_TREE, new BigTreeConfiguration.Builder().trunk(BlockStateProvider.simple(Blocks.DARK_OAK_LOG)).foliage(BlockStateProvider.simple(Blocks.DARK_OAK_LEAVES.defaultBlockState().setValue(LeavesBlock.PERSISTENT, true))).minHeight(15).maxHeight(20).trunkWidth(4).build()); @@ -150,7 +151,7 @@ public static void bootstrap(BootstapContext> context) register(context, BOPTreeFeatures.HELLBARK_TREE, BOPBaseFeatures.TWIGLET_TREE, new TwigletTreeConfiguration.Builder().trunk(BlockStateProvider.simple(BOPBlocks.HELLBARK_LOG.get())).foliage(BlockStateProvider.simple(BOPBlocks.HELLBARK_LEAVES.get())).minHeight(3).maxHeight(7).leafChance(0.75F,1.0F).build()); register(context, BOPTreeFeatures.JUNGLE_TWIGLET_TREE, BOPBaseFeatures.TWIGLET_TREE, new TwigletTreeConfiguration.Builder().trunk(BlockStateProvider.simple(Blocks.JUNGLE_LOG)).foliage(BlockStateProvider.simple(Blocks.JUNGLE_LEAVES)).trunkFruit(BlockStateProvider.simple(Blocks.COCOA)).minHeight(1).maxHeight(2).build()); register(context, BOPTreeFeatures.MANGROVE_TWIGLET_TREE, BOPBaseFeatures.TWIGLET_TREE, new TwigletTreeConfiguration.Builder().trunk(BlockStateProvider.simple(Blocks.MANGROVE_LOG)).foliage(BlockStateProvider.simple(Blocks.MANGROVE_LEAVES)).minHeight(1).maxHeight(2).build()); - register(context, BOPTreeFeatures.MAPLE_TWIGLET_TREE, BOPBaseFeatures.TWIGLET_TREE, new TwigletTreeConfiguration.Builder().foliage(BlockStateProvider.simple(BOPBlocks.MAPLE_LEAVES.get())).minHeight(1).maxHeight(2).build()); + register(context, BOPTreeFeatures.MAPLE_TWIGLET_TREE, BOPBaseFeatures.TWIGLET_TREE, new TwigletTreeConfiguration.Builder().trunk(BlockStateProvider.simple(BOPBlocks.MAPLE_LOG.get())).foliage(BlockStateProvider.simple(BOPBlocks.RED_MAPLE_LEAVES.get())).minHeight(1).maxHeight(2).build()); register(context, BOPTreeFeatures.SPRUCE_TWIGLET_TREE, BOPBaseFeatures.TWIGLET_TREE, new TwigletTreeConfiguration.Builder().trunk(BlockStateProvider.simple(Blocks.SPRUCE_LOG)).foliage(BlockStateProvider.simple(Blocks.SPRUCE_LEAVES)).minHeight(1).maxHeight(2).build()); register(context, BOPTreeFeatures.TALL_DEAD_TWIGLET_TREE, BOPBaseFeatures.TWIGLET_TREE, new TwigletTreeConfiguration.Builder().trunkFruit(BlockStateProvider.simple(BOPBlocks.DEAD_BRANCH.get())).leafChance(0.15F, 0.6F).trunk(BlockStateProvider.simple(BOPBlocks.DEAD_LOG.get())).foliage(BlockStateProvider.simple(BOPBlocks.DEAD_LEAVES.get())).minHeight(12).maxHeight(18).build()); register(context, BOPTreeFeatures.TALL_TWIGLET_TREE, BOPBaseFeatures.TWIGLET_TREE, new TwigletTreeConfiguration.Builder().minHeight(2).maxHeight(4).build()); diff --git a/src/main/java/biomesoplenty/common/worldgen/feature/BOPVegetationFeatures.java b/src/main/java/biomesoplenty/common/worldgen/feature/BOPVegetationFeatures.java index b3101731fe..d17bb8112f 100644 --- a/src/main/java/biomesoplenty/common/worldgen/feature/BOPVegetationFeatures.java +++ b/src/main/java/biomesoplenty/common/worldgen/feature/BOPVegetationFeatures.java @@ -166,12 +166,12 @@ public static void bootstrap(BootstapContext> context) final Holder BIG_FLOWERING_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.BIG_FLOWERING_TREE_CHECKED); final Holder BIG_JACARANDA_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.BIG_JACARANDA_TREE_CHECKED); final Holder BIG_MAGIC_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.BIG_MAGIC_TREE_CHECKED); - final Holder BIG_MAPLE_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.BIG_MAPLE_TREE_CHECKED); + final Holder BIG_RED_MAPLE_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.BIG_RED_MAPLE_TREE_CHECKED); final Holder BIG_OAK_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.BIG_OAK_TREE_CHECKED); - final Holder BIG_ORANGE_AUTUMN_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.BIG_ORANGE_AUTUMN_TREE_CHECKED); + final Holder BIG_ORANGE_MAPLE_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.BIG_ORANGE_MAPLE_TREE_CHECKED); final Holder BIG_ORIGIN_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.BIG_ORIGIN_TREE_CHECKED); final Holder BIG_RAINBOW_BIRCH_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.BIG_RAINBOW_BIRCH_TREE_CHECKED); - final Holder BIG_YELLOW_AUTUMN_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.BIG_YELLOW_AUTUMN_TREE_CHECKED); + final Holder BIG_YELLOW_MAPLE_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.BIG_YELLOW_MAPLE_TREE_CHECKED); final Holder CYPRESS_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.CYPRESS_TREE_CHECKED); final Holder CYPRESS_TREE_MEDIUM_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.CYPRESS_TREE_MEDIUM_CHECKED); final Holder DARK_OAK_POPLAR_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.DARK_OAK_POPLAR_TREE_CHECKED); @@ -194,10 +194,10 @@ public static void bootstrap(BootstapContext> context) final Holder MAGIC_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.MAGIC_TREE_CHECKED); final Holder MAHOGANY_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.MAHOGANY_TREE_CHECKED); final Holder MANGROVE_TWIGLET_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.MANGROVE_TWIGLET_TREE_CHECKED); - final Holder MAPLE_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.MAPLE_TREE_CHECKED); + final Holder RED_MAPLE_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.RED_MAPLE_TREE_CHECKED); final Holder MAPLE_TWIGLET_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.MAPLE_TWIGLET_TREE_CHECKED); final Holder OAK_BUSH_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.OAK_BUSH_CHECKED); - final Holder ORANGE_AUTUMN_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.ORANGE_AUTUMN_TREE_CHECKED); + final Holder ORANGE_MAPLE_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.ORANGE_MAPLE_TREE_CHECKED); final Holder ORIGIN_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.ORIGIN_TREE_CHECKED); final Holder PALM_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.PALM_TREE_CHECKED); final Holder PINE_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.PINE_TREE_CHECKED); @@ -219,7 +219,7 @@ public static void bootstrap(BootstapContext> context) final Holder TWIGLET_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.TWIGLET_TREE_CHECKED); final Holder UMBRAN_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.UMBRAN_TREE_CHECKED); final Holder WILLOW_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.WILLOW_TREE_CHECKED); - final Holder YELLOW_AUTUMN_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.YELLOW_AUTUMN_TREE_CHECKED); + final Holder YELLOW_MAPLE_TREE_CHECKED = placedFeatureGetter.getOrThrow(BOPTreePlacements.YELLOW_MAPLE_TREE_CHECKED); register(context, BOPVegetationFeatures.COLD_DESERT_ROCKS, Feature.FOREST_ROCK, new BlockStateConfiguration(Blocks.COBBLESTONE.defaultBlockState())); register(context, BOPVegetationFeatures.HIGH_GRASS, BOPBaseFeatures.HIGH_GRASS, NoneFeatureConfiguration.INSTANCE); @@ -325,7 +325,7 @@ public static void bootstrap(BootstapContext> context) register(context, BOPVegetationFeatures.TREES_LAVENDER_FIELD, Feature.RANDOM_SELECTOR, new RandomFeatureConfiguration(ImmutableList.of(new WeightedPlacedFeature(FLOWERING_OAK_TREE_BEES_CHECKED, 0.2F), new WeightedPlacedFeature(BIG_FLOWERING_TREE_CHECKED, 0.1F), new WeightedPlacedFeature(BIG_JACARANDA_TREE_CHECKED, 0.1F)), JACARANDA_TREE_BEES_CHECKED)); register(context, BOPVegetationFeatures.TREES_LAVENDER_FOREST, Feature.RANDOM_SELECTOR, new RandomFeatureConfiguration(ImmutableList.of(new WeightedPlacedFeature(BIG_FLOWERING_TREE_CHECKED, 0.25F)), BIG_JACARANDA_TREE_CHECKED)); register(context, BOPVegetationFeatures.TREES_LUSH_DESERT, Feature.RANDOM_SELECTOR, new RandomFeatureConfiguration(ImmutableList.of(new WeightedPlacedFeature(PALM_TREE_CHECKED, 0.1F), new WeightedPlacedFeature(ACACIA_BUSH_TREE_CHECKED, 0.4F), new WeightedPlacedFeature(SPARSE_ACACIA_TREE_CHECKED, 0.2F)), ACACIA_TWIGLET_CHECKED)); - register(context, BOPVegetationFeatures.TREES_MAPLE_FOREST, Feature.RANDOM_SELECTOR, new RandomFeatureConfiguration(ImmutableList.of(new WeightedPlacedFeature(TALL_SPRUCE_TREE_CHECKED, 0.1F), new WeightedPlacedFeature(BIG_MAPLE_TREE_CHECKED, 0.3F)), MAPLE_TREE_CHECKED)); + register(context, BOPVegetationFeatures.TREES_MAPLE_FOREST, Feature.RANDOM_SELECTOR, new RandomFeatureConfiguration(ImmutableList.of(new WeightedPlacedFeature(TALL_SPRUCE_TREE_CHECKED, 0.1F), new WeightedPlacedFeature(BIG_RED_MAPLE_TREE_CHECKED, 0.3F)), RED_MAPLE_TREE_CHECKED)); register(context, BOPVegetationFeatures.TREES_MEDITERRANEAN_FOREST, Feature.RANDOM_SELECTOR, new RandomFeatureConfiguration(ImmutableList.of(new WeightedPlacedFeature(SPARSE_OAK_TREE_CHECKED, 0.05F), new WeightedPlacedFeature(DARK_OAK_POPLAR_TREE_CHECKED, 0.2F), new WeightedPlacedFeature(SPRUCE_POPLAR_TREE_CHECKED, 0.4F), new WeightedPlacedFeature(FLOWERING_OAK_BUSH_CHECKED, 0.1F)), OAK_BUSH_CHECKED)); register(context, BOPVegetationFeatures.TREES_MUSKEG, Feature.RANDOM_SELECTOR, new RandomFeatureConfiguration(ImmutableList.of(new WeightedPlacedFeature(TALL_DEAD_TWIGLET_TREE_CHECKED, 0.1F)), DEAD_TWIGLET_TREE_CHECKED)); register(context, BOPVegetationFeatures.TREES_OLD_GROWTH_DEAD_FOREST, Feature.RANDOM_SELECTOR, new RandomFeatureConfiguration(ImmutableList.of(new WeightedPlacedFeature(DYING_TREE_CHECKED, 0.2F), new WeightedPlacedFeature(DEAD_TWIGLET_TREE_CHECKED, 0.3F), new WeightedPlacedFeature(TALL_SPRUCE_TREE_CHECKED, 0.1F), new WeightedPlacedFeature(SMALL_DEAD_TREE_CHECKED, 0.1F), new WeightedPlacedFeature(OAK_CHECKED, 0.05F)), TALL_DEAD_TWIGLET_TREE_CHECKED)); @@ -339,12 +339,12 @@ public static void bootstrap(BootstapContext> context) register(context, BOPVegetationFeatures.TREES_RAINFOREST_FLOODPLAIN, Feature.RANDOM_SELECTOR, new RandomFeatureConfiguration(ImmutableList.of(new WeightedPlacedFeature(SPARSE_OAK_TREE_CHECKED, 0.3F), new WeightedPlacedFeature(BIG_OAK_TREE_CHECKED, 0.1F)), OAK_BUSH_CHECKED)); register(context, BOPVegetationFeatures.TREES_REDWOOD_FOREST, Feature.RANDOM_SELECTOR, new RandomFeatureConfiguration(ImmutableList.of(new WeightedPlacedFeature(REDWOOD_TREE_CHECKED, 0.3f), new WeightedPlacedFeature(REDWOOD_TREE_LARGE_CHECKED, 0.5f)), REDWOOD_TREE_MEDIUM_CHECKED)); register(context, BOPVegetationFeatures.TREES_SCRUBLAND, Feature.RANDOM_SELECTOR, new RandomFeatureConfiguration(ImmutableList.of(new WeightedPlacedFeature(SPRUCE_TWIGLET_TREE_CHECKED, 0.3F), new WeightedPlacedFeature(TALL_TWIGLET_TREE_CHECKED, 0.1F)), ACACIA_TWIGLET_CHECKED)); - register(context, BOPVegetationFeatures.TREES_SEASONAL_FOREST, Feature.RANDOM_SELECTOR, new RandomFeatureConfiguration(ImmutableList.of(new WeightedPlacedFeature(OAK_CHECKED, 0.05F), new WeightedPlacedFeature(FANCY_OAK_CHECKED, 0.025F), new WeightedPlacedFeature(MAPLE_TREE_CHECKED, 0.2F), new WeightedPlacedFeature(YELLOW_AUTUMN_TREE_CHECKED, 0.3F), new WeightedPlacedFeature(BIG_MAPLE_TREE_CHECKED, 0.1F), new WeightedPlacedFeature(BIG_YELLOW_AUTUMN_TREE_CHECKED, 0.1F), new WeightedPlacedFeature(BIG_ORANGE_AUTUMN_TREE_CHECKED, 0.1F)), ORANGE_AUTUMN_TREE_CHECKED)); - register(context, BOPVegetationFeatures.TREES_SEASONAL_ORCHARD, Feature.RANDOM_SELECTOR, new RandomFeatureConfiguration(ImmutableList.of(new WeightedPlacedFeature(BIG_YELLOW_AUTUMN_TREE_CHECKED, 0.05F)), ASPEN_TREE_CHECKED)); - register(context, BOPVegetationFeatures.TREES_SEASONAL_PUMPKIN_PATCH, Feature.RANDOM_SELECTOR, new RandomFeatureConfiguration(ImmutableList.of(new WeightedPlacedFeature(OAK_BUSH_CHECKED, 0.2F), new WeightedPlacedFeature(ORANGE_AUTUMN_TREE_CHECKED, 0.1F), new WeightedPlacedFeature(BIG_ORANGE_AUTUMN_TREE_CHECKED, 0.05F)), TWIGLET_TREE_CHECKED)); + register(context, BOPVegetationFeatures.TREES_SEASONAL_FOREST, Feature.RANDOM_SELECTOR, new RandomFeatureConfiguration(ImmutableList.of(new WeightedPlacedFeature(OAK_CHECKED, 0.05F), new WeightedPlacedFeature(FANCY_OAK_CHECKED, 0.025F), new WeightedPlacedFeature(RED_MAPLE_TREE_CHECKED, 0.2F), new WeightedPlacedFeature(YELLOW_MAPLE_TREE_CHECKED, 0.3F), new WeightedPlacedFeature(BIG_RED_MAPLE_TREE_CHECKED, 0.1F), new WeightedPlacedFeature(BIG_YELLOW_MAPLE_TREE_CHECKED, 0.1F), new WeightedPlacedFeature(BIG_ORANGE_MAPLE_TREE_CHECKED, 0.1F)), ORANGE_MAPLE_TREE_CHECKED)); + register(context, BOPVegetationFeatures.TREES_SEASONAL_ORCHARD, Feature.RANDOM_SELECTOR, new RandomFeatureConfiguration(ImmutableList.of(new WeightedPlacedFeature(BIG_YELLOW_MAPLE_TREE_CHECKED, 0.05F)), ASPEN_TREE_CHECKED)); + register(context, BOPVegetationFeatures.TREES_SEASONAL_PUMPKIN_PATCH, Feature.RANDOM_SELECTOR, new RandomFeatureConfiguration(ImmutableList.of(new WeightedPlacedFeature(OAK_BUSH_CHECKED, 0.2F), new WeightedPlacedFeature(ORANGE_MAPLE_TREE_CHECKED, 0.1F), new WeightedPlacedFeature(BIG_ORANGE_MAPLE_TREE_CHECKED, 0.05F)), TWIGLET_TREE_CHECKED)); register(context, BOPVegetationFeatures.TREES_SNOWBLOSSOM_GROVE, Feature.TREE, snowblossom().build()); register(context, BOPVegetationFeatures.TREES_SNOWY_CONIFEROUS_FOREST, Feature.RANDOM_SELECTOR, new RandomFeatureConfiguration(ImmutableList.of(new WeightedPlacedFeature(FIR_TREE_CHECKED, 0.4F)), FIR_TREE_LARGE_CHECKED)); - register(context, BOPVegetationFeatures.TREES_SNOWY_MAPLE_FOREST, Feature.RANDOM_SELECTOR, new RandomFeatureConfiguration(ImmutableList.of(new WeightedPlacedFeature(TALL_SPRUCE_TREE_CHECKED, 0.2F), new WeightedPlacedFeature(BIG_MAPLE_TREE_CHECKED, 0.1F)), MAPLE_TREE_CHECKED)); + register(context, BOPVegetationFeatures.TREES_SNOWY_MAPLE_FOREST, Feature.RANDOM_SELECTOR, new RandomFeatureConfiguration(ImmutableList.of(new WeightedPlacedFeature(TALL_SPRUCE_TREE_CHECKED, 0.2F), new WeightedPlacedFeature(BIG_RED_MAPLE_TREE_CHECKED, 0.1F)), RED_MAPLE_TREE_CHECKED)); register(context, BOPVegetationFeatures.TREES_TROPICS, Feature.RANDOM_SELECTOR, new RandomFeatureConfiguration(ImmutableList.of(new WeightedPlacedFeature(JUNGLE_TWIGLET_TREE_CHECKED, 0.3F), new WeightedPlacedFeature(FLOWERING_OAK_TREE_CHECKED, 0.1F)), PALM_TREE_CHECKED)); register(context, BOPVegetationFeatures.TREES_TUNDRA, Feature.RANDOM_SELECTOR, new RandomFeatureConfiguration(ImmutableList.of(new WeightedPlacedFeature(DEAD_TWIGLET_TREE_SMALL_CHECKED, 0.1F)), MAPLE_TWIGLET_TREE_CHECKED)); register(context, BOPVegetationFeatures.TREES_WASTELAND, Feature.RANDOM_SELECTOR, new RandomFeatureConfiguration(ImmutableList.of(new WeightedPlacedFeature(DEAD_TREE_WASTELAND_CHECKED, 0.2F)), DYING_TREE_WASTELAND_CHECKED)); diff --git a/src/main/java/biomesoplenty/common/worldgen/placement/BOPMiscOverworldPlacements.java b/src/main/java/biomesoplenty/common/worldgen/placement/BOPMiscOverworldPlacements.java index 4da52c66f9..0c969632ea 100644 --- a/src/main/java/biomesoplenty/common/worldgen/placement/BOPMiscOverworldPlacements.java +++ b/src/main/java/biomesoplenty/common/worldgen/placement/BOPMiscOverworldPlacements.java @@ -92,7 +92,7 @@ public static void bootstrap(BootstapContext context) register(context, BOPMiscOverworldPlacements.DISK_MUD, DISK_MUD, List.of(CountPlacement.of(5), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP_TOP_SOLID, BlockPredicateFilter.forPredicate(BlockPredicate.matchesFluids(Fluids.WATER)), BiomeFilter.biome())); register(context, BOPMiscOverworldPlacements.DISK_ORANGE_SAND, DISK_ORANGE_SAND, List.of(CountPlacement.of(3), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP_TOP_SOLID, BlockPredicateFilter.forPredicate(BlockPredicate.matchesFluids(Fluids.WATER)), BiomeFilter.biome())); register(context, BOPMiscOverworldPlacements.DISK_WHITE_SAND, DISK_WHITE_SAND, List.of(CountPlacement.of(2), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP_TOP_SOLID, BlockPredicateFilter.forPredicate(BlockPredicate.matchesFluids(Fluids.WATER)), BiomeFilter.biome())); - register(context, BOPMiscOverworldPlacements.DISK_WHITE_SAND_EXTRA, DISK_WHITE_SAND_EXTRA, List.of(CountPlacement.of(8), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP_TOP_SOLID, BlockPredicateFilter.forPredicate(BlockPredicate.matchesFluids(Fluids.WATER)), BiomeFilter.biome())); + register(context, BOPMiscOverworldPlacements.DISK_WHITE_SAND_EXTRA, DISK_WHITE_SAND_EXTRA, List.of(CountPlacement.of(75), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP_OCEAN_FLOOR, BlockPredicateFilter.forPredicate(BlockPredicate.matchesFluids(Fluids.WATER)), BiomeFilter.biome())); register(context, BOPMiscOverworldPlacements.MOSSY_BLACK_SAND_SPLATTER, MOSSY_BLACK_SAND_SPLATTER, List.of(CountPlacement.of(5), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP_TOP_SOLID, BiomeFilter.biome())); register(context, BOPMiscOverworldPlacements.MUD_SPLATTER, MUD_SPLATTER, List.of(CountPlacement.of(1), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP_TOP_SOLID, BiomeFilter.biome())); register(context, BOPMiscOverworldPlacements.LAKE_WATER, LAKE_WATER, CountPlacement.of(1), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP_WORLD_SURFACE, BiomeFilter.biome()); diff --git a/src/main/java/biomesoplenty/common/worldgen/placement/BOPTreePlacements.java b/src/main/java/biomesoplenty/common/worldgen/placement/BOPTreePlacements.java index e4e82220e4..64eed87d7e 100644 --- a/src/main/java/biomesoplenty/common/worldgen/placement/BOPTreePlacements.java +++ b/src/main/java/biomesoplenty/common/worldgen/placement/BOPTreePlacements.java @@ -34,12 +34,12 @@ public class BOPTreePlacements public static final ResourceKey BIG_HELLBARK_TREE_CHECKED = createKey("big_hellbark_tree"); public static final ResourceKey BIG_JACARANDA_TREE_CHECKED = createKey("big_jacaranda_tree"); public static final ResourceKey BIG_MAGIC_TREE_CHECKED = createKey("big_magic_tree"); - public static final ResourceKey BIG_MAPLE_TREE_CHECKED = createKey("big_maple_tree"); + public static final ResourceKey BIG_RED_MAPLE_TREE_CHECKED = createKey("big_red_maple_tree"); public static final ResourceKey BIG_OAK_TREE_CHECKED = createKey("big_oak_tree"); - public static final ResourceKey BIG_ORANGE_AUTUMN_TREE_CHECKED = createKey("big_orange_autumn_tree"); + public static final ResourceKey BIG_ORANGE_MAPLE_TREE_CHECKED = createKey("big_orange_maple_tree"); public static final ResourceKey BIG_ORIGIN_TREE_CHECKED = createKey("big_origin_tree"); public static final ResourceKey BIG_RAINBOW_BIRCH_TREE_CHECKED = createKey("big_rainbow_birch_tree"); - public static final ResourceKey BIG_YELLOW_AUTUMN_TREE_CHECKED = createKey("big_yellow_autumn_tree"); + public static final ResourceKey BIG_YELLOW_MAPLE_TREE_CHECKED = createKey("big_yellow_maple_tree"); public static final ResourceKey CYPRESS_TREE_CHECKED = createKey("cypress_tree"); public static final ResourceKey CYPRESS_TREE_MEDIUM_CHECKED = createKey("cypress_tree_medium"); public static final ResourceKey DARK_OAK_POPLAR_TREE_CHECKED = createKey("dark_oak_poplar_tree"); @@ -63,10 +63,10 @@ public class BOPTreePlacements public static final ResourceKey MAGIC_TREE_CHECKED = createKey("magic_tree"); public static final ResourceKey MAHOGANY_TREE_CHECKED = createKey("mahogany_tree"); public static final ResourceKey MANGROVE_TWIGLET_TREE_CHECKED = createKey("mangrove_twiglet_tree"); - public static final ResourceKey MAPLE_TREE_CHECKED = createKey("maple_tree_checked"); + public static final ResourceKey RED_MAPLE_TREE_CHECKED = createKey("red_maple_tree_checked"); public static final ResourceKey MAPLE_TWIGLET_TREE_CHECKED = createKey("maple_twiglet_tree"); public static final ResourceKey OAK_BUSH_CHECKED = createKey("oak_bush"); - public static final ResourceKey ORANGE_AUTUMN_TREE_CHECKED = createKey("orange_autumn_tree"); + public static final ResourceKey ORANGE_MAPLE_TREE_CHECKED = createKey("orange_maple_tree"); public static final ResourceKey ORIGIN_TREE_CHECKED = createKey("origin_tree"); public static final ResourceKey PALM_TREE_CHECKED = createKey("palm_tree"); public static final ResourceKey PINE_TREE_CHECKED = createKey("pine_tree"); @@ -88,7 +88,7 @@ public class BOPTreePlacements public static final ResourceKey TWIGLET_TREE_CHECKED = createKey("twiglet_tree"); public static final ResourceKey UMBRAN_TREE_CHECKED = createKey("umbran_tree"); public static final ResourceKey WILLOW_TREE_CHECKED = createKey("willow_tree"); - public static final ResourceKey YELLOW_AUTUMN_TREE_CHECKED = createKey("yellow_autumn_tree"); + public static final ResourceKey YELLOW_MAPLE_TREE_CHECKED = createKey("yellow_maple_tree"); public static void bootstrap(BootstapContext context) { @@ -102,12 +102,12 @@ public static void bootstrap(BootstapContext context) final Holder> BIG_HELLBARK_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.BIG_HELLBARK_TREE); final Holder> BIG_JACARANDA_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.BIG_JACARANDA_TREE); final Holder> BIG_MAGIC_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.BIG_MAGIC_TREE); - final Holder> BIG_MAPLE_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.BIG_MAPLE_TREE); + final Holder> BIG_RED_MAPLE_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.BIG_RED_MAPLE_TREE); final Holder> BIG_OAK_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.BIG_OAK_TREE); - final Holder> BIG_ORANGE_AUTUMN_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.BIG_ORANGE_AUTUMN_TREE); + final Holder> BIG_ORANGE_MAPLE_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.BIG_ORANGE_MAPLE_TREE); final Holder> BIG_ORIGIN_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.BIG_ORIGIN_TREE); final Holder> BIG_RAINBOW_BIRCH_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.BIG_RAINBOW_BIRCH_TREE); - final Holder> BIG_YELLOW_AUTUMN_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.BIG_YELLOW_AUTUMN_TREE); + final Holder> BIG_YELLOW_MAPLE_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.BIG_YELLOW_MAPLE_TREE); final Holder> CYPRESS_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.CYPRESS_TREE); final Holder> CYPRESS_TREE_MEDIUM = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.CYPRESS_TREE_MEDIUM); final Holder> DARK_OAK_POPLAR_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.DARK_OAK_POPLAR_TREE); @@ -131,14 +131,14 @@ public static void bootstrap(BootstapContext context) final Holder> MAGIC_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.MAGIC_TREE); final Holder> MAHOGANY_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.MAHOGANY_TREE); final Holder> MANGROVE_TWIGLET_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.MANGROVE_TWIGLET_TREE); - final Holder> MAPLE_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.MAPLE_TREE); final Holder> MAPLE_TWIGLET_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.MAPLE_TWIGLET_TREE); final Holder> OAK_BUSH = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.OAK_BUSH); - final Holder> ORANGE_AUTUMN_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.ORANGE_AUTUMN_TREE); + final Holder> ORANGE_MAPLE_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.ORANGE_MAPLE_TREE); final Holder> ORIGIN_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.ORIGIN_TREE); final Holder> PALM_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.PALM_TREE); final Holder> PINE_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.PINE_TREE); final Holder> RAINBOW_BIRCH_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.RAINBOW_BIRCH_TREE); + final Holder> RED_MAPLE_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.RED_MAPLE_TREE); final Holder> REDWOOD_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.REDWOOD_TREE); final Holder> REDWOOD_TREE_LARGE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.REDWOOD_TREE_LARGE); final Holder> REDWOOD_TREE_MEDIUM = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.REDWOOD_TREE_MEDIUM); @@ -156,22 +156,22 @@ public static void bootstrap(BootstapContext context) final Holder> TWIGLET_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.TWIGLET_TREE); final Holder> UMBRAN_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.UMBRAN_TREE); final Holder> WILLOW_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.WILLOW_TREE); - final Holder> YELLOW_AUTUMN_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.YELLOW_AUTUMN_TREE); + final Holder> YELLOW_MAPLE_TREE = configuredFeatureGetter.getOrThrow(BOPTreeFeatures.YELLOW_MAPLE_TREE); register(context, BOPTreePlacements.ACACIA_BUSH_TREE_CHECKED, ACACIA_BUSH_TREE, List.of(BlockPredicateFilter.forPredicate(BlockPredicate.matchesBlocks(new BlockPos(0, -1, 0), BOPBlocks.ORANGE_SAND.get())))); register(context, BOPTreePlacements.ACACIA_TWIGLET_CHECKED, ACACIA_TWIGLET, List.of(BlockPredicateFilter.forPredicate(BlockPredicate.anyOf(BlockPredicate.matchesBlocks(new BlockPos(0, -1, 0), BOPBlocks.ORANGE_SAND.get()))))); register(context, BOPTreePlacements.ACACIA_TWIGLET_SMALL_CHECKED, ACACIA_TWIGLET_SMALL, List.of(BlockPredicateFilter.forPredicate(BlockPredicate.anyOf(BlockPredicate.matchesBlocks(new BlockPos(0, -1, 0), Blocks.SAND, BOPBlocks.ORANGE_SAND.get()))))); - register(context, BOPTreePlacements.ASPEN_TREE_CHECKED, ASPEN_TREE, List.of(PlacementUtils.filteredByBlockSurvival(BOPBlocks.YELLOW_AUTUMN_SAPLING.get()))); + register(context, BOPTreePlacements.ASPEN_TREE_CHECKED, ASPEN_TREE, List.of(PlacementUtils.filteredByBlockSurvival(BOPBlocks.YELLOW_MAPLE_SAPLING.get()))); register(context, BOPTreePlacements.BIG_FLOWERING_TREE_CHECKED, BIG_FLOWERING_OAK_TREE, List.of(PlacementUtils.filteredByBlockSurvival(BOPBlocks.FLOWERING_OAK_SAPLING.get()))); register(context, BOPTreePlacements.BIG_HELLBARK_TREE_CHECKED, BIG_HELLBARK_TREE, List.of(PlacementUtils.filteredByBlockSurvival(BOPBlocks.HELLBARK_SAPLING.get()))); register(context, BOPTreePlacements.BIG_JACARANDA_TREE_CHECKED, BIG_JACARANDA_TREE, List.of(PlacementUtils.filteredByBlockSurvival(BOPBlocks.JACARANDA_SAPLING.get()))); register(context, BOPTreePlacements.BIG_MAGIC_TREE_CHECKED, BIG_MAGIC_TREE, List.of(PlacementUtils.filteredByBlockSurvival(BOPBlocks.MAGIC_SAPLING.get()))); - register(context, BOPTreePlacements.BIG_MAPLE_TREE_CHECKED, BIG_MAPLE_TREE, List.of(PlacementUtils.filteredByBlockSurvival(BOPBlocks.MAPLE_SAPLING.get()))); + register(context, BOPTreePlacements.BIG_RED_MAPLE_TREE_CHECKED, BIG_RED_MAPLE_TREE, List.of(PlacementUtils.filteredByBlockSurvival(BOPBlocks.RED_MAPLE_SAPLING.get()))); register(context, BOPTreePlacements.BIG_OAK_TREE_CHECKED, BIG_OAK_TREE, List.of(PlacementUtils.filteredByBlockSurvival(Blocks.OAK_SAPLING))); - register(context, BOPTreePlacements.BIG_ORANGE_AUTUMN_TREE_CHECKED, BIG_ORANGE_AUTUMN_TREE, List.of(PlacementUtils.filteredByBlockSurvival(BOPBlocks.ORANGE_AUTUMN_SAPLING.get()))); + register(context, BOPTreePlacements.BIG_ORANGE_MAPLE_TREE_CHECKED, BIG_ORANGE_MAPLE_TREE, List.of(PlacementUtils.filteredByBlockSurvival(BOPBlocks.ORANGE_MAPLE_SAPLING.get()))); register(context, BOPTreePlacements.BIG_ORIGIN_TREE_CHECKED, BIG_ORIGIN_TREE, List.of(PlacementUtils.filteredByBlockSurvival(Blocks.OAK_SAPLING))); register(context, BOPTreePlacements.BIG_RAINBOW_BIRCH_TREE_CHECKED, BIG_RAINBOW_BIRCH_TREE, List.of(PlacementUtils.filteredByBlockSurvival(BOPBlocks.RAINBOW_BIRCH_SAPLING.get()))); - register(context, BOPTreePlacements.BIG_YELLOW_AUTUMN_TREE_CHECKED, BIG_YELLOW_AUTUMN_TREE, List.of(PlacementUtils.filteredByBlockSurvival(BOPBlocks.YELLOW_AUTUMN_SAPLING.get()))); + register(context, BOPTreePlacements.BIG_YELLOW_MAPLE_TREE_CHECKED, BIG_YELLOW_MAPLE_TREE, List.of(PlacementUtils.filteredByBlockSurvival(BOPBlocks.YELLOW_MAPLE_SAPLING.get()))); register(context, BOPTreePlacements.CYPRESS_TREE_CHECKED, CYPRESS_TREE); register(context, BOPTreePlacements.CYPRESS_TREE_MEDIUM_CHECKED, CYPRESS_TREE_MEDIUM); register(context, BOPTreePlacements.DARK_OAK_POPLAR_TREE_CHECKED, DARK_OAK_POPLAR_TREE, List.of(PlacementUtils.filteredByBlockSurvival(Blocks.DARK_OAK_SAPLING))); @@ -195,10 +195,10 @@ public static void bootstrap(BootstapContext context) register(context, BOPTreePlacements.MAGIC_TREE_CHECKED, MAGIC_TREE, List.of(PlacementUtils.filteredByBlockSurvival(BOPBlocks.MAGIC_SAPLING.get()))); register(context, BOPTreePlacements.MAHOGANY_TREE_CHECKED, MAHOGANY_TREE, List.of(PlacementUtils.filteredByBlockSurvival(BOPBlocks.MAHOGANY_SAPLING.get()))); register(context, BOPTreePlacements.MANGROVE_TWIGLET_TREE_CHECKED, MANGROVE_TWIGLET_TREE, List.of(PlacementUtils.filteredByBlockSurvival(Blocks.OAK_SAPLING))); - register(context, BOPTreePlacements.MAPLE_TREE_CHECKED, MAPLE_TREE, List.of(PlacementUtils.filteredByBlockSurvival(BOPBlocks.MAPLE_SAPLING.get()))); - register(context, BOPTreePlacements.MAPLE_TWIGLET_TREE_CHECKED, MAPLE_TWIGLET_TREE, List.of(PlacementUtils.filteredByBlockSurvival(BOPBlocks.MAPLE_SAPLING.get()))); + register(context, BOPTreePlacements.RED_MAPLE_TREE_CHECKED, RED_MAPLE_TREE, List.of(PlacementUtils.filteredByBlockSurvival(BOPBlocks.RED_MAPLE_SAPLING.get()))); + register(context, BOPTreePlacements.MAPLE_TWIGLET_TREE_CHECKED, MAPLE_TWIGLET_TREE, List.of(PlacementUtils.filteredByBlockSurvival(BOPBlocks.RED_MAPLE_SAPLING.get()))); register(context, BOPTreePlacements.OAK_BUSH_CHECKED, OAK_BUSH, List.of(PlacementUtils.filteredByBlockSurvival(Blocks.OAK_SAPLING))); - register(context, BOPTreePlacements.ORANGE_AUTUMN_TREE_CHECKED, ORANGE_AUTUMN_TREE, List.of(PlacementUtils.filteredByBlockSurvival(BOPBlocks.ORANGE_AUTUMN_SAPLING.get()))); + register(context, BOPTreePlacements.ORANGE_MAPLE_TREE_CHECKED, ORANGE_MAPLE_TREE, List.of(PlacementUtils.filteredByBlockSurvival(BOPBlocks.ORANGE_MAPLE_SAPLING.get()))); register(context, BOPTreePlacements.ORIGIN_TREE_CHECKED, ORIGIN_TREE, List.of(PlacementUtils.filteredByBlockSurvival(Blocks.OAK_SAPLING))); register(context, BOPTreePlacements.PALM_TREE_CHECKED, PALM_TREE, List.of(PlacementUtils.filteredByBlockSurvival(BOPBlocks.PALM_SAPLING.get()))); register(context, BOPTreePlacements.PINE_TREE_CHECKED, PINE_TREE, List.of(PlacementUtils.filteredByBlockSurvival(BOPBlocks.FIR_SAPLING.get()))); @@ -220,7 +220,7 @@ public static void bootstrap(BootstapContext context) register(context, BOPTreePlacements.TWIGLET_TREE_CHECKED, TWIGLET_TREE, List.of(PlacementUtils.filteredByBlockSurvival(Blocks.OAK_SAPLING))); register(context, BOPTreePlacements.UMBRAN_TREE_CHECKED, UMBRAN_TREE, List.of(PlacementUtils.filteredByBlockSurvival(BOPBlocks.UMBRAN_SAPLING.get()))); register(context, BOPTreePlacements.WILLOW_TREE_CHECKED, WILLOW_TREE, List.of(PlacementUtils.filteredByBlockSurvival(BOPBlocks.WILLOW_SAPLING.get()))); - register(context, BOPTreePlacements.YELLOW_AUTUMN_TREE_CHECKED, YELLOW_AUTUMN_TREE, List.of(PlacementUtils.filteredByBlockSurvival(BOPBlocks.YELLOW_AUTUMN_SAPLING.get()))); + register(context, BOPTreePlacements.YELLOW_MAPLE_TREE_CHECKED, YELLOW_MAPLE_TREE, List.of(PlacementUtils.filteredByBlockSurvival(BOPBlocks.YELLOW_MAPLE_SAPLING.get()))); } protected static void register(BootstapContext context, ResourceKey placedFeatureKey, Holder> configuredFeature, PlacementModifier... modifiers) diff --git a/src/main/java/biomesoplenty/init/ModBlocks.java b/src/main/java/biomesoplenty/init/ModBlocks.java index 16b94718fe..f04761dc86 100644 --- a/src/main/java/biomesoplenty/init/ModBlocks.java +++ b/src/main/java/biomesoplenty/init/ModBlocks.java @@ -156,12 +156,6 @@ public static void registerBlocks() SNOWBLOSSOM_LEAVES = registerBlock(() -> new SnowblossomLeavesBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).mapColor(MapColor.SNOW).strength(0.2F).randomTicks().sound(SoundType.CHERRY_LEAVES).noOcclusion().isValidSpawn(ModBlocks::ocelotOrParrot).isSuffocating(ModBlocks::never).isViewBlocking(ModBlocks::never).ignitedByLava().isRedstoneConductor(ModBlocks::never)), "snowblossom_leaves"); RAINBOW_BIRCH_SAPLING = registerBlock(() -> new SaplingBlockBOP(new RainbowBirchTree(), BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().instabreak().sound(SoundType.GRASS).lightLevel((state) -> 1).emissiveRendering((state, world, pos) -> true)), "rainbow_birch_sapling"); RAINBOW_BIRCH_LEAVES = registerBlock(() -> new LeavesBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isValidSpawn(ModBlocks::ocelotOrParrot).isSuffocating(ModBlocks::never).isViewBlocking(ModBlocks::never).ignitedByLava().isRedstoneConductor(ModBlocks::never).lightLevel((state) -> 1).emissiveRendering((state, world, pos) -> true)), "rainbow_birch_leaves"); - YELLOW_AUTUMN_SAPLING = registerBlock(() -> new SaplingBlockBOP(new YellowAutumnTree(), BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_YELLOW).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().instabreak().sound(SoundType.GRASS)), "yellow_autumn_sapling"); - YELLOW_AUTUMN_LEAVES = registerBlock(() -> new YellowAutumnLeavesBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).mapColor(MapColor.TERRACOTTA_YELLOW).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isValidSpawn(ModBlocks::ocelotOrParrot).isSuffocating(ModBlocks::never).isViewBlocking(ModBlocks::never).ignitedByLava().isRedstoneConductor(ModBlocks::never)), "yellow_autumn_leaves"); - ORANGE_AUTUMN_SAPLING = registerBlock(() -> new SaplingBlockBOP(new OrangeAutumnTree(), BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_ORANGE).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().instabreak().sound(SoundType.GRASS)), "orange_autumn_sapling"); - ORANGE_AUTUMN_LEAVES = registerBlock(() -> new OrangeAutumnLeavesBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).mapColor(MapColor.TERRACOTTA_ORANGE).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isValidSpawn(ModBlocks::ocelotOrParrot).isSuffocating(ModBlocks::never).isViewBlocking(ModBlocks::never).ignitedByLava().isRedstoneConductor(ModBlocks::never)), "orange_autumn_leaves"); - MAPLE_SAPLING = registerBlock(() -> new SaplingBlockBOP(new MapleTree(), BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().instabreak().sound(SoundType.GRASS)), "maple_sapling"); - MAPLE_LEAVES = registerBlock(() -> new MapleLeavesBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).mapColor(MapColor.COLOR_RED).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isValidSpawn(ModBlocks::ocelotOrParrot).isSuffocating(ModBlocks::never).isViewBlocking(ModBlocks::never).ignitedByLava().isRedstoneConductor(ModBlocks::never)), "maple_leaves"); FIR_SAPLING = registerBlock(() -> new SaplingBlockBOP(new FirTree(), BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().instabreak().sound(SoundType.GRASS)), "fir_sapling"); FIR_LEAVES = registerBlock(() -> new LeavesBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isValidSpawn(ModBlocks::ocelotOrParrot).isSuffocating(ModBlocks::never).isViewBlocking(ModBlocks::never).ignitedByLava().isRedstoneConductor(ModBlocks::never)), "fir_leaves"); @@ -203,6 +197,30 @@ public static void registerBlocks() PINE_HANGING_SIGN = registerBlockNoBlockItem(() -> new CeilingHangingSignBlockBOP(BlockBehaviour.Properties.of().mapColor(PINE_PLANKS.get().defaultMapColor()).instrument(NoteBlockInstrument.BASS).ignitedByLava().forceSolidOn().noCollission().strength(1.0F).sound(SoundType.WOOD), BOPWoodTypes.PINE), "pine_hanging_sign"); PINE_WALL_HANGING_SIGN = registerBlockNoBlockItem(() -> new WallHangingSignBlockBOP(BlockBehaviour.Properties.of().mapColor(PINE_PLANKS.get().defaultMapColor()).instrument(NoteBlockInstrument.BASS).ignitedByLava().forceSolidOn().noCollission().strength(1.0F).sound(SoundType.WOOD).lootFrom(PINE_HANGING_SIGN), BOPWoodTypes.PINE), "pine_wall_hanging_sign"); + RED_MAPLE_SAPLING = registerBlock(() -> new SaplingBlockBOP(new RedMapleTree(), BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().instabreak().sound(SoundType.GRASS)), "red_maple_sapling"); + RED_MAPLE_LEAVES = registerBlock(() -> new RedMapleLeavesBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).mapColor(MapColor.COLOR_RED).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isValidSpawn(ModBlocks::ocelotOrParrot).isSuffocating(ModBlocks::never).isViewBlocking(ModBlocks::never).ignitedByLava().isRedstoneConductor(ModBlocks::never)), "red_maple_leaves"); + ORANGE_MAPLE_SAPLING = registerBlock(() -> new SaplingBlockBOP(new OrangeMapleTree(), BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_ORANGE).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().instabreak().sound(SoundType.GRASS)), "orange_maple_sapling"); + ORANGE_MAPLE_LEAVES = registerBlock(() -> new OrangeMapleLeavesBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).mapColor(MapColor.TERRACOTTA_ORANGE).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isValidSpawn(ModBlocks::ocelotOrParrot).isSuffocating(ModBlocks::never).isViewBlocking(ModBlocks::never).ignitedByLava().isRedstoneConductor(ModBlocks::never)), "orange_maple_leaves"); + YELLOW_MAPLE_SAPLING = registerBlock(() -> new SaplingBlockBOP(new YellowMapleTree(), BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_YELLOW).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().instabreak().sound(SoundType.GRASS)), "yellow_maple_sapling"); + YELLOW_MAPLE_LEAVES = registerBlock(() -> new YellowMapleLeavesBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).mapColor(MapColor.TERRACOTTA_YELLOW).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isValidSpawn(ModBlocks::ocelotOrParrot).isSuffocating(ModBlocks::never).isViewBlocking(ModBlocks::never).ignitedByLava().isRedstoneConductor(ModBlocks::never)), "yellow_maple_leaves"); + MAPLE_LOG = registerBlock(() -> log(MapColor.DIRT, MapColor.TERRACOTTA_BROWN), "maple_log"); + MAPLE_WOOD = registerBlock(() -> new RotatedPillarBlock(BlockBehaviour.Properties.of().instrument(NoteBlockInstrument.BASS).ignitedByLava().mapColor(MapColor.DIRT).strength(2.0F).sound(SoundType.WOOD)), "maple_wood"); + STRIPPED_MAPLE_LOG = registerBlock(() -> log(MapColor.DIRT, MapColor.DIRT), "stripped_maple_log"); + STRIPPED_MAPLE_WOOD = registerBlock(() -> new RotatedPillarBlock(BlockBehaviour.Properties.of().instrument(NoteBlockInstrument.BASS).ignitedByLava().mapColor(MapColor.DIRT).strength(2.0F).sound(SoundType.WOOD)), "stripped_maple_wood"); + MAPLE_PLANKS = registerBlock(() -> new Block(BlockBehaviour.Properties.of().instrument(NoteBlockInstrument.BASS).ignitedByLava().mapColor(MapColor.DIRT).strength(2.0F, 3.0F).sound(SoundType.WOOD)), "maple_planks"); + MAPLE_STAIRS = registerBlock(() -> new StairBlock(MAPLE_PLANKS.get()::defaultBlockState, Block.Properties.copy(MAPLE_PLANKS.get())), "maple_stairs"); + MAPLE_SLAB = registerBlock(() -> new SlabBlock(BlockBehaviour.Properties.of().instrument(NoteBlockInstrument.BASS).ignitedByLava().mapColor(MapColor.DIRT).strength(2.0F, 3.0F).sound(SoundType.WOOD)), "maple_slab"); + MAPLE_FENCE = registerBlock(() -> new FenceBlock(BlockBehaviour.Properties.of().instrument(NoteBlockInstrument.BASS).ignitedByLava().forceSolidOn().mapColor(MAPLE_PLANKS.get().defaultMapColor()).strength(2.0F, 3.0F).sound(SoundType.WOOD)), "maple_fence"); + MAPLE_FENCE_GATE = registerBlock(() -> new FenceGateBlock(BlockBehaviour.Properties.of().instrument(NoteBlockInstrument.BASS).ignitedByLava().forceSolidOn().mapColor(MAPLE_PLANKS.get().defaultMapColor()).strength(2.0F, 3.0F).sound(SoundType.WOOD), BOPWoodTypes.MAPLE), "maple_fence_gate"); + MAPLE_DOOR = registerBlock(() -> new DoorBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).instrument(NoteBlockInstrument.BASS).ignitedByLava().mapColor(MAPLE_PLANKS.get().defaultMapColor()).strength(3.0F).sound(SoundType.WOOD).noOcclusion(), BOPBlockSetTypes.MAPLE), "maple_door"); + MAPLE_TRAPDOOR = registerBlock(() -> new TrapDoorBlock(BlockBehaviour.Properties.of().instrument(NoteBlockInstrument.BASS).ignitedByLava().mapColor(MapColor.DIRT).strength(3.0F).sound(SoundType.WOOD).noOcclusion(), BOPBlockSetTypes.MAPLE), "maple_trapdoor"); + MAPLE_PRESSURE_PLATE = registerBlock(() -> new PressurePlateBlock(PressurePlateBlock.Sensitivity.EVERYTHING, BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).instrument(NoteBlockInstrument.BASS).ignitedByLava().forceSolidOn().mapColor(MAPLE_PLANKS.get().defaultMapColor()).noCollission().strength(0.5F).sound(SoundType.WOOD), BOPBlockSetTypes.MAPLE), "maple_pressure_plate"); + MAPLE_BUTTON = registerBlock(() -> new ButtonBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).noCollission().strength(0.5F).sound(SoundType.WOOD), BOPBlockSetTypes.MAPLE, 30, true), "maple_button"); + MAPLE_SIGN = registerBlockNoBlockItem(() -> new StandingSignBlockBOP(BlockBehaviour.Properties.of().mapColor(MAPLE_PLANKS.get().defaultMapColor()).instrument(NoteBlockInstrument.BASS).ignitedByLava().forceSolidOn().noCollission().strength(1.0F).sound(SoundType.WOOD), BOPWoodTypes.MAPLE), "maple_sign"); + MAPLE_WALL_SIGN = registerBlockNoBlockItem(() -> new WallSignBlockBOP(BlockBehaviour.Properties.of().mapColor(MAPLE_PLANKS.get().defaultMapColor()).instrument(NoteBlockInstrument.BASS).ignitedByLava().forceSolidOn().noCollission().strength(1.0F).sound(SoundType.WOOD).lootFrom(MAPLE_SIGN), BOPWoodTypes.MAPLE), "maple_wall_sign"); + MAPLE_HANGING_SIGN = registerBlockNoBlockItem(() -> new CeilingHangingSignBlockBOP(BlockBehaviour.Properties.of().mapColor(MAPLE_PLANKS.get().defaultMapColor()).instrument(NoteBlockInstrument.BASS).ignitedByLava().forceSolidOn().noCollission().strength(1.0F).sound(SoundType.WOOD), BOPWoodTypes.MAPLE), "maple_hanging_sign"); + MAPLE_WALL_HANGING_SIGN = registerBlockNoBlockItem(() -> new WallHangingSignBlockBOP(BlockBehaviour.Properties.of().mapColor(MAPLE_PLANKS.get().defaultMapColor()).instrument(NoteBlockInstrument.BASS).ignitedByLava().forceSolidOn().noCollission().strength(1.0F).sound(SoundType.WOOD).lootFrom(MAPLE_HANGING_SIGN), BOPWoodTypes.MAPLE), "maple_wall_hanging_sign"); + REDWOOD_SAPLING = registerBlock(() -> new SaplingBlockBOP(new RedwoodTree(), BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().instabreak().sound(SoundType.GRASS)), "redwood_sapling"); REDWOOD_LEAVES = registerBlock(() -> new LeavesBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).pushReaction(PushReaction.DESTROY).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isValidSpawn(ModBlocks::ocelotOrParrot).isSuffocating(ModBlocks::never).isViewBlocking(ModBlocks::never).ignitedByLava().isRedstoneConductor(ModBlocks::never)), "redwood_leaves"); REDWOOD_LOG = registerBlock(() -> log(MapColor.TERRACOTTA_ORANGE, MapColor.TERRACOTTA_ORANGE), "redwood_log"); @@ -431,11 +449,11 @@ public static void registerBlocks() POTTED_FLOWERING_OAK_SAPLING = registerBlock(() -> new FlowerPotBlock(FLOWERING_OAK_SAPLING.get(), BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).instabreak()), "potted_flowering_oak_sapling"); POTTED_SNOWBLOSSOM_SAPLING = registerBlock(() -> new FlowerPotBlock(SNOWBLOSSOM_SAPLING.get(), BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).instabreak()), "potted_snowblossom_sapling"); POTTED_RAINBOW_BIRCH_SAPLING = registerBlock(() -> new FlowerPotBlock(RAINBOW_BIRCH_SAPLING.get(), BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).instabreak().lightLevel((state) -> 1).emissiveRendering((state, world, pos) -> true)), "potted_rainbow_birch_sapling"); - POTTED_YELLOW_AUTUMN_SAPLING = registerBlock(() -> new FlowerPotBlock(YELLOW_AUTUMN_SAPLING.get(), BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).instabreak()), "potted_yellow_autumn_sapling"); - POTTED_ORANGE_AUTUMN_SAPLING = registerBlock(() -> new FlowerPotBlock(ORANGE_AUTUMN_SAPLING.get(), BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).instabreak()), "potted_orange_autumn_sapling"); - POTTED_MAPLE_SAPLING = registerBlock(() -> new FlowerPotBlock(MAPLE_SAPLING.get(), BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).instabreak()), "potted_maple_sapling"); POTTED_FIR_SAPLING = registerBlock(() -> new FlowerPotBlock(FIR_SAPLING.get(), BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).instabreak()), "potted_fir_sapling"); POTTED_PINE_SAPLING = registerBlock(() -> new FlowerPotBlock(PINE_SAPLING.get(), BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).instabreak()), "potted_pine_sapling"); + POTTED_RED_MAPLE_SAPLING = registerBlock(() -> new FlowerPotBlock(RED_MAPLE_SAPLING.get(), BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).instabreak()), "potted_red_maple_sapling"); + POTTED_ORANGE_MAPLE_SAPLING = registerBlock(() -> new FlowerPotBlock(ORANGE_MAPLE_SAPLING.get(), BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).instabreak()), "potted_orange_maple_sapling"); + POTTED_YELLOW_MAPLE_SAPLING = registerBlock(() -> new FlowerPotBlock(YELLOW_MAPLE_SAPLING.get(), BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).instabreak()), "potted_yellow_maple_sapling"); POTTED_REDWOOD_SAPLING = registerBlock(() -> new FlowerPotBlock(REDWOOD_SAPLING.get(), BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).instabreak()), "potted_redwood_sapling"); POTTED_MAHOGANY_SAPLING = registerBlock(() -> new FlowerPotBlock(MAHOGANY_SAPLING.get(), BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).instabreak()), "potted_mahogany_sapling"); POTTED_JACARANDA_SAPLING = registerBlock(() -> new FlowerPotBlock(JACARANDA_SAPLING.get(), BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).instabreak()), "potted_jacaranda_sapling"); @@ -465,6 +483,7 @@ public static void registerWoodTypes() { Sheets.addWoodType(BOPWoodTypes.FIR); Sheets.addWoodType(BOPWoodTypes.PINE); + Sheets.addWoodType(BOPWoodTypes.MAPLE); Sheets.addWoodType(BOPWoodTypes.REDWOOD); Sheets.addWoodType(BOPWoodTypes.MAHOGANY); Sheets.addWoodType(BOPWoodTypes.JACARANDA); @@ -489,11 +508,11 @@ public static void setRenderTypes() ItemBlockRenderTypes.setRenderLayer(FLOWERING_OAK_LEAVES.get(), transparentRenderType); ItemBlockRenderTypes.setRenderLayer(SNOWBLOSSOM_LEAVES.get(), transparentRenderType); ItemBlockRenderTypes.setRenderLayer(RAINBOW_BIRCH_LEAVES.get(), transparentRenderType); - ItemBlockRenderTypes.setRenderLayer(YELLOW_AUTUMN_LEAVES.get(), transparentRenderType); - ItemBlockRenderTypes.setRenderLayer(ORANGE_AUTUMN_LEAVES.get(), transparentRenderType); - ItemBlockRenderTypes.setRenderLayer(MAPLE_LEAVES.get(), transparentRenderType); ItemBlockRenderTypes.setRenderLayer(FIR_LEAVES.get(), transparentRenderType); ItemBlockRenderTypes.setRenderLayer(PINE_LEAVES.get(), transparentRenderType); + ItemBlockRenderTypes.setRenderLayer(RED_MAPLE_LEAVES.get(), transparentRenderType); + ItemBlockRenderTypes.setRenderLayer(ORANGE_MAPLE_LEAVES.get(), transparentRenderType); + ItemBlockRenderTypes.setRenderLayer(YELLOW_MAPLE_LEAVES.get(), transparentRenderType); ItemBlockRenderTypes.setRenderLayer(REDWOOD_LEAVES.get(), transparentRenderType); ItemBlockRenderTypes.setRenderLayer(MAHOGANY_LEAVES.get(), transparentRenderType); ItemBlockRenderTypes.setRenderLayer(JACARANDA_LEAVES.get(), transparentRenderType); @@ -508,11 +527,11 @@ public static void setRenderTypes() ItemBlockRenderTypes.setRenderLayer(FLOWERING_OAK_SAPLING.get(), cutoutRenderType); ItemBlockRenderTypes.setRenderLayer(SNOWBLOSSOM_SAPLING.get(), cutoutRenderType); ItemBlockRenderTypes.setRenderLayer(RAINBOW_BIRCH_SAPLING.get(), cutoutRenderType); - ItemBlockRenderTypes.setRenderLayer(YELLOW_AUTUMN_SAPLING.get(), cutoutRenderType); - ItemBlockRenderTypes.setRenderLayer(ORANGE_AUTUMN_SAPLING.get(), cutoutRenderType); - ItemBlockRenderTypes.setRenderLayer(MAPLE_SAPLING.get(), cutoutRenderType); ItemBlockRenderTypes.setRenderLayer(FIR_SAPLING.get(), cutoutRenderType); ItemBlockRenderTypes.setRenderLayer(PINE_SAPLING.get(), cutoutRenderType); + ItemBlockRenderTypes.setRenderLayer(RED_MAPLE_SAPLING.get(), cutoutRenderType); + ItemBlockRenderTypes.setRenderLayer(ORANGE_MAPLE_SAPLING.get(), cutoutRenderType); + ItemBlockRenderTypes.setRenderLayer(YELLOW_MAPLE_SAPLING.get(), cutoutRenderType); ItemBlockRenderTypes.setRenderLayer(REDWOOD_SAPLING.get(), cutoutRenderType); ItemBlockRenderTypes.setRenderLayer(MAHOGANY_SAPLING.get(), cutoutRenderType); ItemBlockRenderTypes.setRenderLayer(JACARANDA_SAPLING.get(), cutoutRenderType); @@ -610,11 +629,11 @@ public static void setRenderTypes() ItemBlockRenderTypes.setRenderLayer(POTTED_FLOWERING_OAK_SAPLING.get(), cutoutRenderType); ItemBlockRenderTypes.setRenderLayer(POTTED_SNOWBLOSSOM_SAPLING.get(), cutoutRenderType); ItemBlockRenderTypes.setRenderLayer(POTTED_RAINBOW_BIRCH_SAPLING.get(), cutoutRenderType); - ItemBlockRenderTypes.setRenderLayer(POTTED_YELLOW_AUTUMN_SAPLING.get(), cutoutRenderType); - ItemBlockRenderTypes.setRenderLayer(POTTED_ORANGE_AUTUMN_SAPLING.get(), cutoutRenderType); - ItemBlockRenderTypes.setRenderLayer(POTTED_MAPLE_SAPLING.get(), cutoutRenderType); ItemBlockRenderTypes.setRenderLayer(POTTED_FIR_SAPLING.get(), cutoutRenderType); ItemBlockRenderTypes.setRenderLayer(POTTED_PINE_SAPLING.get(), cutoutRenderType); + ItemBlockRenderTypes.setRenderLayer(POTTED_RED_MAPLE_SAPLING.get(), cutoutRenderType); + ItemBlockRenderTypes.setRenderLayer(POTTED_ORANGE_MAPLE_SAPLING.get(), cutoutRenderType); + ItemBlockRenderTypes.setRenderLayer(POTTED_YELLOW_MAPLE_SAPLING.get(), cutoutRenderType); ItemBlockRenderTypes.setRenderLayer(POTTED_REDWOOD_SAPLING.get(), cutoutRenderType); ItemBlockRenderTypes.setRenderLayer(POTTED_MAHOGANY_SAPLING.get(), cutoutRenderType); ItemBlockRenderTypes.setRenderLayer(POTTED_JACARANDA_SAPLING.get(), cutoutRenderType); @@ -642,12 +661,12 @@ public static void setRenderTypes() public static void registerBlockEntities() { BOPBlockEntities.SIGN = registerBlockEntityType("sign", SignBlockEntityBOP::new, - () -> List.of(FIR_SIGN.get(), PINE_SIGN.get(), REDWOOD_SIGN.get(), MAHOGANY_SIGN.get(), JACARANDA_SIGN.get(), PALM_SIGN.get(), WILLOW_SIGN.get(), DEAD_SIGN.get(), MAGIC_SIGN.get(), UMBRAN_SIGN.get(), HELLBARK_SIGN.get(), - FIR_WALL_SIGN.get(), PINE_WALL_SIGN.get(), REDWOOD_WALL_SIGN.get(), MAHOGANY_WALL_SIGN.get(), JACARANDA_WALL_SIGN.get(), PALM_WALL_SIGN.get(), WILLOW_WALL_SIGN.get(), DEAD_WALL_SIGN.get(), MAGIC_WALL_SIGN.get(), UMBRAN_WALL_SIGN.get(), HELLBARK_WALL_SIGN.get())); + () -> List.of(FIR_SIGN.get(), PINE_SIGN.get(), MAPLE_SIGN.get(), REDWOOD_SIGN.get(), MAHOGANY_SIGN.get(), JACARANDA_SIGN.get(), PALM_SIGN.get(), WILLOW_SIGN.get(), DEAD_SIGN.get(), MAGIC_SIGN.get(), UMBRAN_SIGN.get(), HELLBARK_SIGN.get(), + FIR_WALL_SIGN.get(), PINE_WALL_SIGN.get(), MAPLE_WALL_SIGN.get(), REDWOOD_WALL_SIGN.get(), MAHOGANY_WALL_SIGN.get(), JACARANDA_WALL_SIGN.get(), PALM_WALL_SIGN.get(), WILLOW_WALL_SIGN.get(), DEAD_WALL_SIGN.get(), MAGIC_WALL_SIGN.get(), UMBRAN_WALL_SIGN.get(), HELLBARK_WALL_SIGN.get())); BOPBlockEntities.HANGING_SIGN = registerBlockEntityType("hanging_sign", HangingSignBlockEntityBOP::new, - () -> List.of(FIR_HANGING_SIGN.get(), PINE_HANGING_SIGN.get(), REDWOOD_HANGING_SIGN.get(), MAHOGANY_HANGING_SIGN.get(), JACARANDA_HANGING_SIGN.get(), PALM_HANGING_SIGN.get(), WILLOW_HANGING_SIGN.get(), DEAD_HANGING_SIGN.get(), MAGIC_HANGING_SIGN.get(), UMBRAN_HANGING_SIGN.get(), HELLBARK_HANGING_SIGN.get(), - FIR_WALL_HANGING_SIGN.get(), PINE_WALL_HANGING_SIGN.get(), REDWOOD_WALL_HANGING_SIGN.get(), MAHOGANY_WALL_HANGING_SIGN.get(), JACARANDA_WALL_HANGING_SIGN.get(), PALM_WALL_HANGING_SIGN.get(), WILLOW_WALL_HANGING_SIGN.get(), DEAD_WALL_HANGING_SIGN.get(), MAGIC_WALL_HANGING_SIGN.get(), UMBRAN_WALL_HANGING_SIGN.get(), HELLBARK_WALL_HANGING_SIGN.get())); + () -> List.of(FIR_HANGING_SIGN.get(), PINE_HANGING_SIGN.get(), MAPLE_HANGING_SIGN.get(), REDWOOD_HANGING_SIGN.get(), MAHOGANY_HANGING_SIGN.get(), JACARANDA_HANGING_SIGN.get(), PALM_HANGING_SIGN.get(), WILLOW_HANGING_SIGN.get(), DEAD_HANGING_SIGN.get(), MAGIC_HANGING_SIGN.get(), UMBRAN_HANGING_SIGN.get(), HELLBARK_HANGING_SIGN.get(), + FIR_WALL_HANGING_SIGN.get(), PINE_WALL_HANGING_SIGN.get(), MAPLE_WALL_HANGING_SIGN.get(), REDWOOD_WALL_HANGING_SIGN.get(), MAHOGANY_WALL_HANGING_SIGN.get(), JACARANDA_WALL_HANGING_SIGN.get(), PALM_WALL_HANGING_SIGN.get(), WILLOW_WALL_HANGING_SIGN.get(), DEAD_WALL_HANGING_SIGN.get(), MAGIC_WALL_HANGING_SIGN.get(), UMBRAN_WALL_HANGING_SIGN.get(), HELLBARK_WALL_HANGING_SIGN.get())); } private static RotatedPillarBlock log(MapColor MapColor, MapColor MapColor2) { diff --git a/src/main/java/biomesoplenty/init/ModCreativeTab.java b/src/main/java/biomesoplenty/init/ModCreativeTab.java index 839757c133..c3aada1ff3 100644 --- a/src/main/java/biomesoplenty/init/ModCreativeTab.java +++ b/src/main/java/biomesoplenty/init/ModCreativeTab.java @@ -25,8 +25,8 @@ public class ModCreativeTab private static final List> BLOCK_BLACKLIST = ImmutableList.of(BOPBlocks.BLOOD, BOPBlocks.HIGH_GRASS_PLANT, BOPBlocks.SPANISH_MOSS_PLANT, BOPBlocks.GLOWWORM_SILK_STRAND, BOPBlocks.HANGING_COBWEB_STRAND, BOPBlocks.FLESH_TENDONS_STRAND, BOPBlocks.POTTED_ORIGIN_SAPLING, BOPBlocks.POTTED_FLOWERING_OAK_SAPLING, BOPBlocks.POTTED_SNOWBLOSSOM_SAPLING, BOPBlocks.POTTED_RAINBOW_BIRCH_SAPLING, - BOPBlocks.POTTED_YELLOW_AUTUMN_SAPLING, BOPBlocks.POTTED_ORANGE_AUTUMN_SAPLING, BOPBlocks.POTTED_MAPLE_SAPLING, BOPBlocks.POTTED_FIR_SAPLING, - BOPBlocks.POTTED_PINE_SAPLING, BOPBlocks.POTTED_REDWOOD_SAPLING, BOPBlocks.POTTED_MAHOGANY_SAPLING, BOPBlocks.POTTED_JACARANDA_SAPLING, + BOPBlocks.POTTED_FIR_SAPLING, BOPBlocks.POTTED_PINE_SAPLING, BOPBlocks.POTTED_RED_MAPLE_SAPLING, BOPBlocks.POTTED_ORANGE_MAPLE_SAPLING, + BOPBlocks.POTTED_YELLOW_MAPLE_SAPLING, BOPBlocks.POTTED_REDWOOD_SAPLING, BOPBlocks.POTTED_MAHOGANY_SAPLING, BOPBlocks.POTTED_JACARANDA_SAPLING, BOPBlocks.POTTED_PALM_SAPLING, BOPBlocks.POTTED_WILLOW_SAPLING, BOPBlocks.POTTED_DEAD_SAPLING, BOPBlocks.POTTED_MAGIC_SAPLING, BOPBlocks.POTTED_UMBRAN_SAPLING, BOPBlocks.POTTED_HELLBARK_SAPLING, BOPBlocks.POTTED_ROSE, BOPBlocks.POTTED_VIOLET, BOPBlocks.POTTED_LAVENDER, BOPBlocks.POTTED_WILDFLOWER, BOPBlocks.POTTED_ORANGE_COSMOS, BOPBlocks.POTTED_PINK_DAFFODIL, BOPBlocks.POTTED_PINK_HIBISCUS, BOPBlocks.POTTED_GLOWFLOWER, diff --git a/src/main/java/biomesoplenty/init/ModItems.java b/src/main/java/biomesoplenty/init/ModItems.java index 9677394dd2..9271650e61 100644 --- a/src/main/java/biomesoplenty/init/ModItems.java +++ b/src/main/java/biomesoplenty/init/ModItems.java @@ -42,6 +42,8 @@ private static void registerItems() FIR_HANGING_SIGN = registerItem(() -> new HangingSignItem(BOPBlocks.FIR_HANGING_SIGN.get(), BOPBlocks.FIR_WALL_HANGING_SIGN.get(), (new Item.Properties()).stacksTo(16)), "fir_hanging_sign"); PINE_SIGN = registerItem(() -> new SignItem((new Item.Properties()).stacksTo(16), BOPBlocks.PINE_SIGN.get(), BOPBlocks.PINE_WALL_SIGN.get()), "pine_sign"); PINE_HANGING_SIGN = registerItem(() -> new HangingSignItem(BOPBlocks.PINE_HANGING_SIGN.get(), BOPBlocks.PINE_WALL_HANGING_SIGN.get(), (new Item.Properties()).stacksTo(16)), "pine_hanging_sign"); + MAPLE_SIGN = registerItem(() -> new SignItem((new Item.Properties()).stacksTo(16), BOPBlocks.MAPLE_SIGN.get(), BOPBlocks.MAPLE_WALL_SIGN.get()), "maple_sign"); + MAPLE_HANGING_SIGN = registerItem(() -> new HangingSignItem(BOPBlocks.MAPLE_HANGING_SIGN.get(), BOPBlocks.MAPLE_WALL_HANGING_SIGN.get(), (new Item.Properties()).stacksTo(16)), "maple_hanging_sign"); REDWOOD_SIGN = registerItem(() -> new SignItem((new Item.Properties()).stacksTo(16), BOPBlocks.REDWOOD_SIGN.get(), BOPBlocks.REDWOOD_WALL_SIGN.get()), "redwood_sign"); REDWOOD_HANGING_SIGN = registerItem(() -> new HangingSignItem(BOPBlocks.REDWOOD_HANGING_SIGN.get(), BOPBlocks.REDWOOD_WALL_HANGING_SIGN.get(), (new Item.Properties()).stacksTo(16)), "redwood_hanging_sign"); MAHOGANY_SIGN = registerItem(() -> new SignItem((new Item.Properties()).stacksTo(16), BOPBlocks.MAHOGANY_SIGN.get(), BOPBlocks.MAHOGANY_WALL_SIGN.get()), "mahogany_sign"); @@ -65,6 +67,8 @@ private static void registerItems() FIR_CHEST_BOAT = registerItem(() -> new BoatItemBOP(true, BoatBOP.ModelType.FIR, (new Item.Properties()).stacksTo(1)), "fir_chest_boat"); PINE_BOAT = registerItem(() -> new BoatItemBOP(false, BoatBOP.ModelType.PINE, (new Item.Properties()).stacksTo(1)), "pine_boat"); PINE_CHEST_BOAT = registerItem(() -> new BoatItemBOP(true, BoatBOP.ModelType.PINE, (new Item.Properties()).stacksTo(1)), "pine_chest_boat"); + MAPLE_BOAT = registerItem(() -> new BoatItemBOP(false, BoatBOP.ModelType.MAPLE, (new Item.Properties()).stacksTo(1)), "maple_boat"); + MAPLE_CHEST_BOAT = registerItem(() -> new BoatItemBOP(true, BoatBOP.ModelType.MAPLE, (new Item.Properties()).stacksTo(1)), "maple_chest_boat"); REDWOOD_BOAT = registerItem(() -> new BoatItemBOP(false, BoatBOP.ModelType.REDWOOD, (new Item.Properties()).stacksTo(1)), "redwood_boat"); REDWOOD_CHEST_BOAT = registerItem(() -> new BoatItemBOP(true, BoatBOP.ModelType.REDWOOD, (new Item.Properties()).stacksTo(1)), "redwood_chest_boat"); MAHOGANY_BOAT = registerItem(() -> new BoatItemBOP(false, BoatBOP.ModelType.MAHOGANY, (new Item.Properties()).stacksTo(1)), "mahogany_boat"); diff --git a/src/main/java/biomesoplenty/init/ModParticles.java b/src/main/java/biomesoplenty/init/ModParticles.java index 6706a60a6d..3328d3eb19 100644 --- a/src/main/java/biomesoplenty/init/ModParticles.java +++ b/src/main/java/biomesoplenty/init/ModParticles.java @@ -19,9 +19,9 @@ public class ModParticles public static final RegistryObject GLOWWORM = register("glowworm", () -> new SimpleParticleType(false)); public static final RegistryObject JACARANDA_LEAVES = register("jacaranda_leaves", () -> new SimpleParticleType(false)); public static final RegistryObject SNOWBLOSSOM_LEAVES = register("snowblossom_leaves", () -> new SimpleParticleType(false)); - public static final RegistryObject YELLOW_AUTUMN_LEAVES = register("yellow_autumn_leaves", () -> new SimpleParticleType(false)); - public static final RegistryObject ORANGE_AUTUMN_LEAVES = register("orange_autumn_leaves", () -> new SimpleParticleType(false)); - public static final RegistryObject MAPLE_LEAVES = register("maple_leaves", () -> new SimpleParticleType(false)); + public static final RegistryObject RED_MAPLE_LEAVES = register("red_maple_leaves", () -> new SimpleParticleType(false)); + public static final RegistryObject ORANGE_MAPLE_LEAVES = register("orange_maple_leaves", () -> new SimpleParticleType(false)); + public static final RegistryObject YELLOW_MAPLE_LEAVES = register("yellow_maple_leaves", () -> new SimpleParticleType(false)); public static void setup() {} diff --git a/src/main/java/biomesoplenty/init/ModVanillaCompat.java b/src/main/java/biomesoplenty/init/ModVanillaCompat.java index eb7d1f7d4d..a62edb2110 100644 --- a/src/main/java/biomesoplenty/init/ModVanillaCompat.java +++ b/src/main/java/biomesoplenty/init/ModVanillaCompat.java @@ -47,9 +47,6 @@ public ItemStack execute(BlockSource p_123561_, ItemStack p_123562_) { registerFlammable(BOPBlocks.FLOWERING_OAK_LEAVES.get(), 30, 60); registerFlammable(BOPBlocks.SNOWBLOSSOM_LEAVES.get(), 30, 60); registerFlammable(BOPBlocks.RAINBOW_BIRCH_LEAVES.get(), 30, 60); - registerFlammable(BOPBlocks.YELLOW_AUTUMN_LEAVES.get(), 30, 60); - registerFlammable(BOPBlocks.ORANGE_AUTUMN_LEAVES.get(), 30, 60); - registerFlammable(BOPBlocks.MAPLE_LEAVES.get(), 30, 60); registerFlammable(BOPBlocks.FIR_LEAVES.get(), 30, 60); registerFlammable(BOPBlocks.FIR_LOG.get(), 5, 5); registerFlammable(BOPBlocks.FIR_WOOD.get(), 5, 5); @@ -70,6 +67,18 @@ public ItemStack execute(BlockSource p_123561_, ItemStack p_123562_) { registerFlammable(BOPBlocks.PINE_STAIRS.get(), 5, 20); registerFlammable(BOPBlocks.PINE_FENCE.get(), 5, 20); registerFlammable(BOPBlocks.PINE_FENCE_GATE.get(), 5, 20); + registerFlammable(BOPBlocks.RED_MAPLE_LEAVES.get(), 30, 60); + registerFlammable(BOPBlocks.ORANGE_MAPLE_LEAVES.get(), 30, 60); + registerFlammable(BOPBlocks.YELLOW_MAPLE_LEAVES.get(), 30, 60); + registerFlammable(BOPBlocks.MAPLE_LOG.get(), 5, 5); + registerFlammable(BOPBlocks.MAPLE_WOOD.get(), 5, 5); + registerFlammable(BOPBlocks.STRIPPED_MAPLE_LOG.get(), 5, 5); + registerFlammable(BOPBlocks.STRIPPED_MAPLE_WOOD.get(), 5, 5); + registerFlammable(BOPBlocks.MAPLE_PLANKS.get(), 5, 20); + registerFlammable(BOPBlocks.MAPLE_SLAB.get(), 5, 20); + registerFlammable(BOPBlocks.MAPLE_STAIRS.get(), 5, 20); + registerFlammable(BOPBlocks.MAPLE_FENCE.get(), 5, 20); + registerFlammable(BOPBlocks.MAPLE_FENCE_GATE.get(), 5, 20); registerFlammable(BOPBlocks.REDWOOD_LEAVES.get(), 30, 60); registerFlammable(BOPBlocks.REDWOOD_LOG.get(), 5, 5); registerFlammable(BOPBlocks.REDWOOD_WOOD.get(), 5, 5); @@ -190,6 +199,8 @@ public ItemStack execute(BlockSource p_123561_, ItemStack p_123562_) { registerStrippable(BOPBlocks.FIR_WOOD.get(), BOPBlocks.STRIPPED_FIR_WOOD.get()); registerStrippable(BOPBlocks.PINE_LOG.get(), BOPBlocks.STRIPPED_PINE_LOG.get()); registerStrippable(BOPBlocks.PINE_WOOD.get(), BOPBlocks.STRIPPED_PINE_WOOD.get()); + registerStrippable(BOPBlocks.MAPLE_LOG.get(), BOPBlocks.STRIPPED_MAPLE_LOG.get()); + registerStrippable(BOPBlocks.MAPLE_WOOD.get(), BOPBlocks.STRIPPED_MAPLE_WOOD.get()); registerStrippable(BOPBlocks.REDWOOD_LOG.get(), BOPBlocks.STRIPPED_REDWOOD_LOG.get()); registerStrippable(BOPBlocks.REDWOOD_WOOD.get(), BOPBlocks.STRIPPED_REDWOOD_WOOD.get()); registerStrippable(BOPBlocks.MAHOGANY_LOG.get(), BOPBlocks.STRIPPED_MAHOGANY_LOG.get()); @@ -224,16 +235,16 @@ public ItemStack execute(BlockSource p_123561_, ItemStack p_123562_) { registerCompostable(0.3F, BOPBlocks.SNOWBLOSSOM_LEAVES.get()); registerCompostable(0.3F, BOPBlocks.RAINBOW_BIRCH_SAPLING.get()); registerCompostable(0.3F, BOPBlocks.RAINBOW_BIRCH_LEAVES.get()); - registerCompostable(0.3F, BOPBlocks.YELLOW_AUTUMN_SAPLING.get()); - registerCompostable(0.3F, BOPBlocks.YELLOW_AUTUMN_LEAVES.get()); - registerCompostable(0.3F, BOPBlocks.ORANGE_AUTUMN_SAPLING.get()); - registerCompostable(0.3F, BOPBlocks.ORANGE_AUTUMN_LEAVES.get()); - registerCompostable(0.3F, BOPBlocks.MAPLE_SAPLING.get()); - registerCompostable(0.3F, BOPBlocks.MAPLE_LEAVES.get()); registerCompostable(0.3F, BOPBlocks.FIR_SAPLING.get()); registerCompostable(0.3F, BOPBlocks.FIR_LEAVES.get()); registerCompostable(0.3F, BOPBlocks.PINE_SAPLING.get()); registerCompostable(0.3F, BOPBlocks.PINE_LEAVES.get()); + registerCompostable(0.3F, BOPBlocks.RED_MAPLE_SAPLING.get()); + registerCompostable(0.3F, BOPBlocks.RED_MAPLE_LEAVES.get()); + registerCompostable(0.3F, BOPBlocks.ORANGE_MAPLE_SAPLING.get()); + registerCompostable(0.3F, BOPBlocks.ORANGE_MAPLE_LEAVES.get()); + registerCompostable(0.3F, BOPBlocks.YELLOW_MAPLE_SAPLING.get()); + registerCompostable(0.3F, BOPBlocks.YELLOW_MAPLE_LEAVES.get()); registerCompostable(0.3F, BOPBlocks.REDWOOD_SAPLING.get()); registerCompostable(0.3F, BOPBlocks.REDWOOD_LEAVES.get()); registerCompostable(0.3F, BOPBlocks.MAHOGANY_SAPLING.get()); diff --git a/src/main/java/biomesoplenty/init/ModVillagerTrades.java b/src/main/java/biomesoplenty/init/ModVillagerTrades.java index 5a1cd7a240..3b09bc1359 100644 --- a/src/main/java/biomesoplenty/init/ModVillagerTrades.java +++ b/src/main/java/biomesoplenty/init/ModVillagerTrades.java @@ -27,11 +27,11 @@ public static void addWanderingVillagerTrades(WandererTradesEvent event) VillagerTrades.ItemListing[] WANDERING_TRADER_GENERIC = new VillagerTrades.ItemListing[]{ new ItemsForEmeralds(BOPBlocks.FLOWERING_OAK_SAPLING.get(), 5, 1, 8, 1), new ItemsForEmeralds(BOPBlocks.SNOWBLOSSOM_SAPLING.get(), 5, 1, 8, 1), - new ItemsForEmeralds(BOPBlocks.YELLOW_AUTUMN_SAPLING.get(), 5, 1, 8, 1), - new ItemsForEmeralds(BOPBlocks.ORANGE_AUTUMN_SAPLING.get(), 5, 1, 8, 1), - new ItemsForEmeralds(BOPBlocks.MAPLE_SAPLING.get(), 5, 1, 8, 1), new ItemsForEmeralds(BOPBlocks.FIR_SAPLING.get(), 5, 1, 8, 1), new ItemsForEmeralds(BOPBlocks.PINE_SAPLING.get(), 5, 1, 8, 1), + new ItemsForEmeralds(BOPBlocks.RED_MAPLE_SAPLING.get(), 5, 1, 8, 1), + new ItemsForEmeralds(BOPBlocks.ORANGE_MAPLE_SAPLING.get(), 5, 1, 8, 1), + new ItemsForEmeralds(BOPBlocks.YELLOW_MAPLE_SAPLING.get(), 5, 1, 8, 1), new ItemsForEmeralds(BOPBlocks.REDWOOD_SAPLING.get(), 5, 1, 8, 1), new ItemsForEmeralds(BOPBlocks.MAHOGANY_SAPLING.get(), 5, 1, 8, 1), new ItemsForEmeralds(BOPBlocks.JACARANDA_SAPLING.get(), 5, 1, 8, 1), diff --git a/src/main/resources/assets/biomesoplenty/blockstates/maple_button.json b/src/main/resources/assets/biomesoplenty/blockstates/maple_button.json new file mode 100644 index 0000000000..590ec0bdee --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/maple_button.json @@ -0,0 +1,28 @@ +{ + "variants": { + "face=floor,facing=east,powered=false": { "model": "biomesoplenty:block/maple_button", "y": 90 }, + "face=floor,facing=west,powered=false": { "model": "biomesoplenty:block/maple_button", "y": 270 }, + "face=floor,facing=south,powered=false": { "model": "biomesoplenty:block/maple_button", "y": 180 }, + "face=floor,facing=north,powered=false": { "model": "biomesoplenty:block/maple_button" }, + "face=wall,facing=east,powered=false": { "model": "biomesoplenty:block/maple_button", "uvlock": true, "x": 90, "y": 90 }, + "face=wall,facing=west,powered=false": { "model": "biomesoplenty:block/maple_button", "uvlock": true, "x": 90, "y": 270 }, + "face=wall,facing=south,powered=false": { "model": "biomesoplenty:block/maple_button", "uvlock": true, "x": 90, "y": 180 }, + "face=wall,facing=north,powered=false": { "model": "biomesoplenty:block/maple_button", "uvlock": true, "x": 90 }, + "face=ceiling,facing=east,powered=false": { "model": "biomesoplenty:block/maple_button", "x": 180, "y": 270 }, + "face=ceiling,facing=west,powered=false": { "model": "biomesoplenty:block/maple_button", "x": 180, "y": 90 }, + "face=ceiling,facing=south,powered=false": { "model": "biomesoplenty:block/maple_button", "x": 180 }, + "face=ceiling,facing=north,powered=false": { "model": "biomesoplenty:block/maple_button", "x": 180, "y": 180 }, + "face=floor,facing=east,powered=true": { "model": "biomesoplenty:block/maple_button_pressed", "y": 90 }, + "face=floor,facing=west,powered=true": { "model": "biomesoplenty:block/maple_button_pressed", "y": 270 }, + "face=floor,facing=south,powered=true": { "model": "biomesoplenty:block/maple_button_pressed", "y": 180 }, + "face=floor,facing=north,powered=true": { "model": "biomesoplenty:block/maple_button_pressed" }, + "face=wall,facing=east,powered=true": { "model": "biomesoplenty:block/maple_button_pressed", "uvlock": true, "x": 90, "y": 90 }, + "face=wall,facing=west,powered=true": { "model": "biomesoplenty:block/maple_button_pressed", "uvlock": true, "x": 90, "y": 270 }, + "face=wall,facing=south,powered=true": { "model": "biomesoplenty:block/maple_button_pressed", "uvlock": true, "x": 90, "y": 180 }, + "face=wall,facing=north,powered=true": { "model": "biomesoplenty:block/maple_button_pressed", "uvlock": true, "x": 90 }, + "face=ceiling,facing=east,powered=true": { "model": "biomesoplenty:block/maple_button_pressed", "x": 180, "y": 270 }, + "face=ceiling,facing=west,powered=true": { "model": "biomesoplenty:block/maple_button_pressed", "x": 180, "y": 90 }, + "face=ceiling,facing=south,powered=true": { "model": "biomesoplenty:block/maple_button_pressed", "x": 180 }, + "face=ceiling,facing=north,powered=true": { "model": "biomesoplenty:block/maple_button_pressed", "x": 180, "y": 180 } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/maple_door.json b/src/main/resources/assets/biomesoplenty/blockstates/maple_door.json new file mode 100644 index 0000000000..dd95940e14 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/maple_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { + "model": "biomesoplenty:block/maple_door_bottom_left" + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "biomesoplenty:block/maple_door_bottom_left_open", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "biomesoplenty:block/maple_door_bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "biomesoplenty:block/maple_door_bottom_right_open", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "biomesoplenty:block/maple_door_top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "biomesoplenty:block/maple_door_top_left_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "biomesoplenty:block/maple_door_top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "biomesoplenty:block/maple_door_top_right_open", + "y": 270 + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "biomesoplenty:block/maple_door_bottom_left", + "y": 270 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "biomesoplenty:block/maple_door_bottom_left_open" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "biomesoplenty:block/maple_door_bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "biomesoplenty:block/maple_door_bottom_right_open", + "y": 180 + }, + "facing=north,half=upper,hinge=left,open=false": { + "model": "biomesoplenty:block/maple_door_top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "biomesoplenty:block/maple_door_top_left_open" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "biomesoplenty:block/maple_door_top_right", + "y": 270 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "biomesoplenty:block/maple_door_top_right_open", + "y": 180 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "biomesoplenty:block/maple_door_bottom_left", + "y": 90 + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "biomesoplenty:block/maple_door_bottom_left_open", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "biomesoplenty:block/maple_door_bottom_right", + "y": 90 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "biomesoplenty:block/maple_door_bottom_right_open" + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "biomesoplenty:block/maple_door_top_left", + "y": 90 + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "biomesoplenty:block/maple_door_top_left_open", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "biomesoplenty:block/maple_door_top_right", + "y": 90 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "biomesoplenty:block/maple_door_top_right_open" + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "biomesoplenty:block/maple_door_bottom_left", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "biomesoplenty:block/maple_door_bottom_left_open", + "y": 270 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "biomesoplenty:block/maple_door_bottom_right", + "y": 180 + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "biomesoplenty:block/maple_door_bottom_right_open", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "biomesoplenty:block/maple_door_top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "biomesoplenty:block/maple_door_top_left_open", + "y": 270 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "biomesoplenty:block/maple_door_top_right", + "y": 180 + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "biomesoplenty:block/maple_door_top_right_open", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/blockstates/maple_fence.json b/src/main/resources/assets/biomesoplenty/blockstates/maple_fence.json new file mode 100644 index 0000000000..87011063e9 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/maple_fence.json @@ -0,0 +1,17 @@ +{ + "multipart": [ + { "apply": { "model": "biomesoplenty:block/maple_fence_post" }}, + { "when": { "north": "true" }, + "apply": { "model": "biomesoplenty:block/maple_fence_side", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "biomesoplenty:block/maple_fence_side", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "biomesoplenty:block/maple_fence_side", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "biomesoplenty:block/maple_fence_side", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/maple_fence_gate.json b/src/main/resources/assets/biomesoplenty/blockstates/maple_fence_gate.json new file mode 100644 index 0000000000..9a2e5222c2 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/maple_fence_gate.json @@ -0,0 +1,20 @@ +{ + "variants": { + "facing=south,in_wall=false,open=false": { "model": "biomesoplenty:block/maple_fence_gate", "uvlock": true }, + "facing=west,in_wall=false,open=false": { "model": "biomesoplenty:block/maple_fence_gate", "uvlock": true, "y": 90 }, + "facing=north,in_wall=false,open=false": { "model": "biomesoplenty:block/maple_fence_gate", "uvlock": true, "y": 180 }, + "facing=east,in_wall=false,open=false": { "model": "biomesoplenty:block/maple_fence_gate", "uvlock": true, "y": 270 }, + "facing=south,in_wall=false,open=true": { "model": "biomesoplenty:block/maple_fence_gate_open", "uvlock": true }, + "facing=west,in_wall=false,open=true": { "model": "biomesoplenty:block/maple_fence_gate_open", "uvlock": true, "y": 90 }, + "facing=north,in_wall=false,open=true": { "model": "biomesoplenty:block/maple_fence_gate_open", "uvlock": true, "y": 180 }, + "facing=east,in_wall=false,open=true": { "model": "biomesoplenty:block/maple_fence_gate_open", "uvlock": true, "y": 270 }, + "facing=south,in_wall=true,open=false": { "model": "biomesoplenty:block/maple_fence_gate_wall", "uvlock": true }, + "facing=west,in_wall=true,open=false": { "model": "biomesoplenty:block/maple_fence_gate_wall", "uvlock": true, "y": 90 }, + "facing=north,in_wall=true,open=false": { "model": "biomesoplenty:block/maple_fence_gate_wall", "uvlock": true, "y": 180 }, + "facing=east,in_wall=true,open=false": { "model": "biomesoplenty:block/maple_fence_gate_wall", "uvlock": true, "y": 270 }, + "facing=south,in_wall=true,open=true": { "model": "biomesoplenty:block/maple_fence_gate_wall_open", "uvlock": true }, + "facing=west,in_wall=true,open=true": { "model": "biomesoplenty:block/maple_fence_gate_wall_open", "uvlock": true, "y": 90 }, + "facing=north,in_wall=true,open=true": { "model": "biomesoplenty:block/maple_fence_gate_wall_open", "uvlock": true, "y": 180 }, + "facing=east,in_wall=true,open=true": { "model": "biomesoplenty:block/maple_fence_gate_wall_open", "uvlock": true, "y": 270 } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/maple_hanging_sign.json b/src/main/resources/assets/biomesoplenty/blockstates/maple_hanging_sign.json new file mode 100644 index 0000000000..2a063519b7 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/maple_hanging_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "biomesoplenty:block/maple_hanging_sign" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/blockstates/maple_leaves.json b/src/main/resources/assets/biomesoplenty/blockstates/maple_leaves.json deleted file mode 100644 index 722805bb8c..0000000000 --- a/src/main/resources/assets/biomesoplenty/blockstates/maple_leaves.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "biomesoplenty:block/maple_leaves" } - } -} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/maple_log.json b/src/main/resources/assets/biomesoplenty/blockstates/maple_log.json new file mode 100644 index 0000000000..2c2c3164de --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/maple_log.json @@ -0,0 +1,7 @@ +{ + "variants": { + "axis=y": { "model": "biomesoplenty:block/maple_log" }, + "axis=z": { "model": "biomesoplenty:block/maple_log", "x": 90 }, + "axis=x": { "model": "biomesoplenty:block/maple_log", "x": 90, "y": 90 } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/maple_planks.json b/src/main/resources/assets/biomesoplenty/blockstates/maple_planks.json new file mode 100644 index 0000000000..ab4523c611 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/maple_planks.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "biomesoplenty:block/maple_planks" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/maple_pressure_plate.json b/src/main/resources/assets/biomesoplenty/blockstates/maple_pressure_plate.json new file mode 100644 index 0000000000..64ebb162e1 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/maple_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "variants": { + "powered=false": { "model": "biomesoplenty:block/maple_pressure_plate" }, + "powered=true": { "model": "biomesoplenty:block/maple_pressure_plate_down" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/maple_sapling.json b/src/main/resources/assets/biomesoplenty/blockstates/maple_sapling.json deleted file mode 100644 index 1442251b9f..0000000000 --- a/src/main/resources/assets/biomesoplenty/blockstates/maple_sapling.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "biomesoplenty:block/maple_sapling" } - } -} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/maple_sign.json b/src/main/resources/assets/biomesoplenty/blockstates/maple_sign.json new file mode 100644 index 0000000000..42175bd19a --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/maple_sign.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "biomesoplenty:block/maple_sign" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/maple_slab.json b/src/main/resources/assets/biomesoplenty/blockstates/maple_slab.json new file mode 100644 index 0000000000..2d515f6da7 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/maple_slab.json @@ -0,0 +1,7 @@ +{ + "variants": { + "type=bottom": { "model": "biomesoplenty:block/maple_slab" }, + "type=top": { "model": "biomesoplenty:block/maple_slab_top" }, + "type=double": { "model": "biomesoplenty:block/maple_planks" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/maple_stairs.json b/src/main/resources/assets/biomesoplenty/blockstates/maple_stairs.json new file mode 100644 index 0000000000..d0568b8a71 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/maple_stairs.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "biomesoplenty:block/maple_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "biomesoplenty:block/maple_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "biomesoplenty:block/maple_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "biomesoplenty:block/maple_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "biomesoplenty:block/maple_stairs_outer" }, + "facing=west,half=bottom,shape=outer_right": { "model": "biomesoplenty:block/maple_stairs_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "biomesoplenty:block/maple_stairs_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "biomesoplenty:block/maple_stairs_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "biomesoplenty:block/maple_stairs_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "biomesoplenty:block/maple_stairs_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "biomesoplenty:block/maple_stairs_outer" }, + "facing=north,half=bottom,shape=outer_left": { "model": "biomesoplenty:block/maple_stairs_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "biomesoplenty:block/maple_stairs_inner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "biomesoplenty:block/maple_stairs_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "biomesoplenty:block/maple_stairs_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "biomesoplenty:block/maple_stairs_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "biomesoplenty:block/maple_stairs_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "biomesoplenty:block/maple_stairs_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "biomesoplenty:block/maple_stairs_inner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "biomesoplenty:block/maple_stairs_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "biomesoplenty:block/maple_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "biomesoplenty:block/maple_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "biomesoplenty:block/maple_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "biomesoplenty:block/maple_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "biomesoplenty:block/maple_stairs_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "biomesoplenty:block/maple_stairs_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "biomesoplenty:block/maple_stairs_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "biomesoplenty:block/maple_stairs_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "biomesoplenty:block/maple_stairs_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "biomesoplenty:block/maple_stairs_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "biomesoplenty:block/maple_stairs_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "biomesoplenty:block/maple_stairs_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "biomesoplenty:block/maple_stairs_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "biomesoplenty:block/maple_stairs_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "biomesoplenty:block/maple_stairs_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "biomesoplenty:block/maple_stairs_inner", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "biomesoplenty:block/maple_stairs_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "biomesoplenty:block/maple_stairs_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "biomesoplenty:block/maple_stairs_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "biomesoplenty:block/maple_stairs_inner", "x": 180, "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/maple_trapdoor.json b/src/main/resources/assets/biomesoplenty/blockstates/maple_trapdoor.json new file mode 100644 index 0000000000..82ffab4efb --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/maple_trapdoor.json @@ -0,0 +1,20 @@ +{ + "variants": { + "facing=north,half=bottom,open=false": { "model": "biomesoplenty:block/maple_trapdoor_bottom" }, + "facing=south,half=bottom,open=false": { "model": "biomesoplenty:block/maple_trapdoor_bottom", "y": 180 }, + "facing=east,half=bottom,open=false": { "model": "biomesoplenty:block/maple_trapdoor_bottom", "y": 90 }, + "facing=west,half=bottom,open=false": { "model": "biomesoplenty:block/maple_trapdoor_bottom", "y": 270 }, + "facing=north,half=top,open=false": { "model": "biomesoplenty:block/maple_trapdoor_top" }, + "facing=south,half=top,open=false": { "model": "biomesoplenty:block/maple_trapdoor_top", "y": 180 }, + "facing=east,half=top,open=false": { "model": "biomesoplenty:block/maple_trapdoor_top", "y": 90 }, + "facing=west,half=top,open=false": { "model": "biomesoplenty:block/maple_trapdoor_top", "y": 270 }, + "facing=north,half=bottom,open=true": { "model": "biomesoplenty:block/maple_trapdoor_open" }, + "facing=south,half=bottom,open=true": { "model": "biomesoplenty:block/maple_trapdoor_open", "y": 180 }, + "facing=east,half=bottom,open=true": { "model": "biomesoplenty:block/maple_trapdoor_open", "y": 90 }, + "facing=west,half=bottom,open=true": { "model": "biomesoplenty:block/maple_trapdoor_open", "y": 270 }, + "facing=north,half=top,open=true": { "model": "biomesoplenty:block/maple_trapdoor_open", "x": 180, "y": 180 }, + "facing=south,half=top,open=true": { "model": "biomesoplenty:block/maple_trapdoor_open", "x": 180, "y": 0 }, + "facing=east,half=top,open=true": { "model": "biomesoplenty:block/maple_trapdoor_open", "x": 180, "y": 270 }, + "facing=west,half=top,open=true": { "model": "biomesoplenty:block/maple_trapdoor_open", "x": 180, "y": 90 } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/maple_wall_hanging_sign.json b/src/main/resources/assets/biomesoplenty/blockstates/maple_wall_hanging_sign.json new file mode 100644 index 0000000000..2a063519b7 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/maple_wall_hanging_sign.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "biomesoplenty:block/maple_hanging_sign" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/blockstates/maple_wall_sign.json b/src/main/resources/assets/biomesoplenty/blockstates/maple_wall_sign.json new file mode 100644 index 0000000000..42175bd19a --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/maple_wall_sign.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "biomesoplenty:block/maple_sign" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/maple_wood.json b/src/main/resources/assets/biomesoplenty/blockstates/maple_wood.json new file mode 100644 index 0000000000..f927cb4417 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/maple_wood.json @@ -0,0 +1,7 @@ +{ + "variants": { + "axis=y": { "model": "biomesoplenty:block/maple_wood" }, + "axis=z": { "model": "biomesoplenty:block/maple_wood", "x": 90 }, + "axis=x": { "model": "biomesoplenty:block/maple_wood", "x": 90, "y": 90 } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/orange_autumn_leaves.json b/src/main/resources/assets/biomesoplenty/blockstates/orange_autumn_leaves.json deleted file mode 100644 index dbd4780633..0000000000 --- a/src/main/resources/assets/biomesoplenty/blockstates/orange_autumn_leaves.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "biomesoplenty:block/orange_autumn_leaves" } - } -} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/orange_autumn_sapling.json b/src/main/resources/assets/biomesoplenty/blockstates/orange_autumn_sapling.json deleted file mode 100644 index f3dd7e0264..0000000000 --- a/src/main/resources/assets/biomesoplenty/blockstates/orange_autumn_sapling.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "biomesoplenty:block/orange_autumn_sapling" } - } -} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/orange_maple_leaves.json b/src/main/resources/assets/biomesoplenty/blockstates/orange_maple_leaves.json new file mode 100644 index 0000000000..e2f756864a --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/orange_maple_leaves.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "biomesoplenty:block/orange_maple_leaves" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/orange_maple_sapling.json b/src/main/resources/assets/biomesoplenty/blockstates/orange_maple_sapling.json new file mode 100644 index 0000000000..8f002bfd0d --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/orange_maple_sapling.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "biomesoplenty:block/orange_maple_sapling" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/potted_maple_sapling.json b/src/main/resources/assets/biomesoplenty/blockstates/potted_maple_sapling.json deleted file mode 100644 index 13a29bf110..0000000000 --- a/src/main/resources/assets/biomesoplenty/blockstates/potted_maple_sapling.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "biomesoplenty:block/potted_maple_sapling" } - } -} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/potted_orange_autumn_sapling.json b/src/main/resources/assets/biomesoplenty/blockstates/potted_orange_autumn_sapling.json deleted file mode 100644 index 5686e51f56..0000000000 --- a/src/main/resources/assets/biomesoplenty/blockstates/potted_orange_autumn_sapling.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "biomesoplenty:block/potted_orange_autumn_sapling" } - } -} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/potted_orange_maple_sapling.json b/src/main/resources/assets/biomesoplenty/blockstates/potted_orange_maple_sapling.json new file mode 100644 index 0000000000..2427cad79c --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/potted_orange_maple_sapling.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "biomesoplenty:block/potted_orange_maple_sapling" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/potted_red_maple_sapling.json b/src/main/resources/assets/biomesoplenty/blockstates/potted_red_maple_sapling.json new file mode 100644 index 0000000000..0362481eab --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/potted_red_maple_sapling.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "biomesoplenty:block/potted_red_maple_sapling" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/potted_yellow_autumn_sapling.json b/src/main/resources/assets/biomesoplenty/blockstates/potted_yellow_autumn_sapling.json deleted file mode 100644 index e06c6b8118..0000000000 --- a/src/main/resources/assets/biomesoplenty/blockstates/potted_yellow_autumn_sapling.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "biomesoplenty:block/potted_yellow_autumn_sapling" } - } -} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/potted_yellow_maple_sapling.json b/src/main/resources/assets/biomesoplenty/blockstates/potted_yellow_maple_sapling.json new file mode 100644 index 0000000000..5a2731df4e --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/potted_yellow_maple_sapling.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "biomesoplenty:block/potted_yellow_maple_sapling" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/red_maple_leaves.json b/src/main/resources/assets/biomesoplenty/blockstates/red_maple_leaves.json new file mode 100644 index 0000000000..af52ef1009 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/red_maple_leaves.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "biomesoplenty:block/red_maple_leaves" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/red_maple_sapling.json b/src/main/resources/assets/biomesoplenty/blockstates/red_maple_sapling.json new file mode 100644 index 0000000000..1b300990d8 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/red_maple_sapling.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "biomesoplenty:block/red_maple_sapling" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/stripped_maple_log.json b/src/main/resources/assets/biomesoplenty/blockstates/stripped_maple_log.json new file mode 100644 index 0000000000..d730920be2 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/stripped_maple_log.json @@ -0,0 +1,7 @@ +{ + "variants": { + "axis=y": { "model": "biomesoplenty:block/stripped_maple_log" }, + "axis=z": { "model": "biomesoplenty:block/stripped_maple_log", "x": 90 }, + "axis=x": { "model": "biomesoplenty:block/stripped_maple_log", "x": 90, "y": 90 } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/stripped_maple_wood.json b/src/main/resources/assets/biomesoplenty/blockstates/stripped_maple_wood.json new file mode 100644 index 0000000000..67cd85433e --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/stripped_maple_wood.json @@ -0,0 +1,7 @@ +{ + "variants": { + "axis=y": { "model": "biomesoplenty:block/stripped_maple_wood" }, + "axis=z": { "model": "biomesoplenty:block/stripped_maple_wood", "x": 90 }, + "axis=x": { "model": "biomesoplenty:block/stripped_maple_wood", "x": 90, "y": 90 } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/yellow_autumn_leaves.json b/src/main/resources/assets/biomesoplenty/blockstates/yellow_autumn_leaves.json deleted file mode 100644 index dd7ec9b93e..0000000000 --- a/src/main/resources/assets/biomesoplenty/blockstates/yellow_autumn_leaves.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "biomesoplenty:block/yellow_autumn_leaves" } - } -} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/yellow_autumn_sapling.json b/src/main/resources/assets/biomesoplenty/blockstates/yellow_autumn_sapling.json deleted file mode 100644 index 1f4ab1a758..0000000000 --- a/src/main/resources/assets/biomesoplenty/blockstates/yellow_autumn_sapling.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "biomesoplenty:block/yellow_autumn_sapling" } - } -} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/yellow_maple_leaves.json b/src/main/resources/assets/biomesoplenty/blockstates/yellow_maple_leaves.json new file mode 100644 index 0000000000..b6a748b67f --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/yellow_maple_leaves.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "biomesoplenty:block/yellow_maple_leaves" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/yellow_maple_sapling.json b/src/main/resources/assets/biomesoplenty/blockstates/yellow_maple_sapling.json new file mode 100644 index 0000000000..3d6340c3c9 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/yellow_maple_sapling.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "biomesoplenty:block/yellow_maple_sapling" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/lang/en_us.json b/src/main/resources/assets/biomesoplenty/lang/en_us.json index 534d0b4858..4ac340109d 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_us.json +++ b/src/main/resources/assets/biomesoplenty/lang/en_us.json @@ -87,6 +87,8 @@ "item.biomesoplenty.magic_chest_boat": "Magic Boat with Chest", "item.biomesoplenty.mahogany_boat": "Mahogany Boat", "item.biomesoplenty.mahogany_chest_boat": "Mahogany Boat with Chest", + "item.biomesoplenty.maple_boat": "Maple Boat", + "item.biomesoplenty.maple_chest_boat": "Maple Boat with Chest", "item.biomesoplenty.music_disc_wanderer": "Music Disc", "item.biomesoplenty.music_disc_wanderer.desc": "Tim Rurkowski - Wanderer", "item.biomesoplenty.palm_boat": "Palm Boat", @@ -266,13 +268,26 @@ "block.biomesoplenty.mahogany_wall_sign": "Mahogany Wall Sign", "block.biomesoplenty.mahogany_wall_hanging_sign": "Mahogany Wall Hanging Sign", "block.biomesoplenty.mahogany_wood": "Mahogany Wood", - "block.biomesoplenty.maple_leaves": "Maple Leaves", - "block.biomesoplenty.maple_sapling": "Maple Sapling", + "block.biomesoplenty.maple_button": "Maple Button", + "block.biomesoplenty.maple_door": "Maple Door", + "block.biomesoplenty.maple_fence": "Maple Fence", + "block.biomesoplenty.maple_fence_gate": "Maple Fence Gate", + "block.biomesoplenty.maple_hanging_sign": "Maple Hanging Sign", + "block.biomesoplenty.maple_log": "Maple Log", + "block.biomesoplenty.maple_planks": "Maple Planks", + "block.biomesoplenty.maple_pressure_plate": "Maple Pressure Plate", + "block.biomesoplenty.maple_sign": "Maple Sign", + "block.biomesoplenty.maple_slab": "Maple Slab", + "block.biomesoplenty.maple_stairs": "Maple Stairs", + "block.biomesoplenty.maple_trapdoor": "Maple Trapdoor", + "block.biomesoplenty.maple_wall_sign": "Maple Wall Sign", + "block.biomesoplenty.maple_wall_hanging_sign": "Maple Wall Hanging Sign", + "block.biomesoplenty.maple_wood": "Maple Wood", "block.biomesoplenty.medium_rose_quartz_bud": "Medium Rose Quartz Bud", "block.biomesoplenty.mossy_black_sand": "Mossy Black Sand", - "block.biomesoplenty.orange_autumn_leaves": "Orange Autumn Leaves", - "block.biomesoplenty.orange_autumn_sapling": "Orange Autumn Sapling", "block.biomesoplenty.orange_cosmos": "Orange Cosmos", + "block.biomesoplenty.orange_maple_leaves": "Orange Maple Leaves", + "block.biomesoplenty.orange_maple_sapling": "Orange Maple Sapling", "block.biomesoplenty.orange_sand": "Orange Sand", "block.biomesoplenty.orange_sandstone": "Orange Sandstone", "block.biomesoplenty.orange_sandstone_slab": "Orange Sandstone Slab", @@ -329,8 +344,7 @@ "block.biomesoplenty.potted_lavender": "Potted Lavender", "block.biomesoplenty.potted_magic_sapling": "Potted Magic Sapling", "block.biomesoplenty.potted_mahogany_sapling": "Potted Mahogany Sapling", - "block.biomesoplenty.potted_maple_sapling": "Potted Maple Sapling", - "block.biomesoplenty.potted_orange_autumn_sapling": "Potted Orange Autumn Sapling", + "block.biomesoplenty.potted_orange_maple_sapling": "Potted Orange Maple Sapling", "block.biomesoplenty.potted_orange_cosmos": "Potted Orange Cosmos", "block.biomesoplenty.potted_origin_sapling": "Potted Origin Sapling", "block.biomesoplenty.potted_palm_sapling": "Potted Palm Sapling", @@ -339,6 +353,7 @@ "block.biomesoplenty.potted_pink_hibiscus": "Potted Pink Hibiscus", "block.biomesoplenty.potted_rainbow_birch_sapling": "Potted Rainbow Birch Sapling", "block.biomesoplenty.potted_redwood_sapling": "Potted Redwood Sapling", + "block.biomesoplenty.potted_red_maple_sapling": "Potted Red Maple Sapling", "block.biomesoplenty.potted_rose": "Potted Rose", "block.biomesoplenty.potted_sprout": "Potted Sprout", "block.biomesoplenty.potted_toadstool": "Potted Toadstool", @@ -348,10 +363,12 @@ "block.biomesoplenty.potted_wildflower": "Potted Wildflower", "block.biomesoplenty.potted_willow_sapling": "Potted Willow Sapling", "block.biomesoplenty.potted_wilted_lily": "Potted Wilted Lily", - "block.biomesoplenty.potted_yellow_autumn_sapling": "Potted Yellow Autumn Sapling", + "block.biomesoplenty.potted_yellow_maple_sapling": "Potted Yellow Maple Sapling", "block.biomesoplenty.pus_bubble": "Pus Bubble", "block.biomesoplenty.rainbow_birch_leaves": "Rainbow Birch Leaves", "block.biomesoplenty.rainbow_birch_sapling": "Rainbow Birch Sapling", + "block.biomesoplenty.red_maple_leaves": "Red Maple Leaves", + "block.biomesoplenty.red_maple_sapling": "Red Maple Sapling", "block.biomesoplenty.redwood_button": "Redwood Button", "block.biomesoplenty.redwood_door": "Redwood Door", "block.biomesoplenty.redwood_fence": "Redwood Fence", @@ -403,6 +420,8 @@ "block.biomesoplenty.stripped_magic_wood": "Stripped Magic Wood", "block.biomesoplenty.stripped_mahogany_log": "Stripped Mahogany Log", "block.biomesoplenty.stripped_mahogany_wood": "Stripped Mahogany Wood", + "block.biomesoplenty.stripped_maple_log": "Stripped Maple Log", + "block.biomesoplenty.stripped_maple_wood": "Stripped Maple Wood", "block.biomesoplenty.stripped_palm_log": "Stripped Palm Log", "block.biomesoplenty.stripped_palm_wood": "Stripped Palm Wood", "block.biomesoplenty.stripped_pine_log": "Stripped Pine Log", @@ -466,8 +485,8 @@ "block.biomesoplenty.willow_wall_hanging_sign": "Willow Wall Hanging Sign", "block.biomesoplenty.willow_wood": "Willow Wood", "block.biomesoplenty.wilted_lily": "Wilted Lily", - "block.biomesoplenty.yellow_autumn_leaves": "Yellow Autumn Leaves", - "block.biomesoplenty.yellow_autumn_sapling": "Yellow Autumn Sapling", + "block.biomesoplenty.yellow_maple_leaves": "Yellow Maple Leaves", + "block.biomesoplenty.yellow_maple_sapling": "Yellow Maple Sapling", "entity.biomesoplenty.boat": "Boat", "entity.biomesoplenty.chest_boat": "Boat with Chest", diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_button.json b/src/main/resources/assets/biomesoplenty/models/block/maple_button.json new file mode 100644 index 0000000000..d984f2224e --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_button.json @@ -0,0 +1,6 @@ +{ + "parent": "block/button", + "textures": { + "texture": "biomesoplenty:block/maple_planks" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_button_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/maple_button_inventory.json new file mode 100644 index 0000000000..cb1411ae23 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/button_inventory", + "textures": { + "texture": "biomesoplenty:block/maple_planks" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_button_pressed.json b/src/main/resources/assets/biomesoplenty/models/block/maple_button_pressed.json new file mode 100644 index 0000000000..39da167efb --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "block/button_pressed", + "textures": { + "texture": "biomesoplenty:block/maple_planks" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_door_bottom_left.json b/src/main/resources/assets/biomesoplenty/models/block/maple_door_bottom_left.json new file mode 100644 index 0000000000..27c1dd7546 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_door_bottom_left.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left", + "textures": { + "bottom": "biomesoplenty:block/maple_door_bottom", + "top": "biomesoplenty:block/maple_door_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_door_bottom_left_open.json b/src/main/resources/assets/biomesoplenty/models/block/maple_door_bottom_left_open.json new file mode 100644 index 0000000000..2aa520b557 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_door_bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "biomesoplenty:block/maple_door_bottom", + "top": "biomesoplenty:block/maple_door_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_door_bottom_right.json b/src/main/resources/assets/biomesoplenty/models/block/maple_door_bottom_right.json new file mode 100644 index 0000000000..06a11420a5 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_door_bottom_right.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right", + "textures": { + "bottom": "biomesoplenty:block/maple_door_bottom", + "top": "biomesoplenty:block/maple_door_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_door_bottom_right_open.json b/src/main/resources/assets/biomesoplenty/models/block/maple_door_bottom_right_open.json new file mode 100644 index 0000000000..7e7574409d --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_door_bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "biomesoplenty:block/maple_door_bottom", + "top": "biomesoplenty:block/maple_door_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_door_top_left.json b/src/main/resources/assets/biomesoplenty/models/block/maple_door_top_left.json new file mode 100644 index 0000000000..b518432576 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_door_top_left.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left", + "textures": { + "bottom": "biomesoplenty:block/maple_door_bottom", + "top": "biomesoplenty:block/maple_door_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_door_top_left_open.json b/src/main/resources/assets/biomesoplenty/models/block/maple_door_top_left_open.json new file mode 100644 index 0000000000..ba894473b6 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_door_top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "biomesoplenty:block/maple_door_bottom", + "top": "biomesoplenty:block/maple_door_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_door_top_right.json b/src/main/resources/assets/biomesoplenty/models/block/maple_door_top_right.json new file mode 100644 index 0000000000..287bd351ff --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_door_top_right.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right", + "textures": { + "bottom": "biomesoplenty:block/maple_door_bottom", + "top": "biomesoplenty:block/maple_door_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_door_top_right_open.json b/src/main/resources/assets/biomesoplenty/models/block/maple_door_top_right_open.json new file mode 100644 index 0000000000..7ab351fb62 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_door_top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "biomesoplenty:block/maple_door_bottom", + "top": "biomesoplenty:block/maple_door_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_fence_gate.json b/src/main/resources/assets/biomesoplenty/models/block/maple_fence_gate.json new file mode 100644 index 0000000000..b0495752de --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_fence_gate", + "textures": { + "texture": "biomesoplenty:block/maple_planks" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_fence_gate_open.json b/src/main/resources/assets/biomesoplenty/models/block/maple_fence_gate_open.json new file mode 100644 index 0000000000..cf43d3d703 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_fence_gate_open", + "textures": { + "texture": "biomesoplenty:block/maple_planks" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_fence_gate_wall.json b/src/main/resources/assets/biomesoplenty/models/block/maple_fence_gate_wall.json new file mode 100644 index 0000000000..d3ebd3298b --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_fence_gate_wall", + "textures": { + "texture": "biomesoplenty:block/maple_planks" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_fence_gate_wall_open.json b/src/main/resources/assets/biomesoplenty/models/block/maple_fence_gate_wall_open.json new file mode 100644 index 0000000000..0eac23ebc7 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_fence_gate_wall_open", + "textures": { + "texture": "biomesoplenty:block/maple_planks" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_fence_inventory.json b/src/main/resources/assets/biomesoplenty/models/block/maple_fence_inventory.json new file mode 100644 index 0000000000..5d19720e65 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_fence_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "biomesoplenty:block/maple_planks" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_fence_post.json b/src/main/resources/assets/biomesoplenty/models/block/maple_fence_post.json new file mode 100644 index 0000000000..102ad64d66 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_fence_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_post", + "textures": { + "texture": "biomesoplenty:block/maple_planks" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_fence_side.json b/src/main/resources/assets/biomesoplenty/models/block/maple_fence_side.json new file mode 100644 index 0000000000..545d5be749 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_fence_side.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_side", + "textures": { + "texture": "biomesoplenty:block/maple_planks" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_hanging_sign.json b/src/main/resources/assets/biomesoplenty/models/block/maple_hanging_sign.json new file mode 100644 index 0000000000..bc1649871f --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_hanging_sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "biomesoplenty:block/stripped_maple_log" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_log.json b/src/main/resources/assets/biomesoplenty/models/block/maple_log.json new file mode 100644 index 0000000000..dc7f84f8be --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_log.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "biomesoplenty:block/maple_log_top", + "side": "biomesoplenty:block/maple_log" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_planks.json b/src/main/resources/assets/biomesoplenty/models/block/maple_planks.json new file mode 100644 index 0000000000..81e885e0ed --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "biomesoplenty:block/maple_planks" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_pressure_plate.json b/src/main/resources/assets/biomesoplenty/models/block/maple_pressure_plate.json new file mode 100644 index 0000000000..98ba41f679 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "block/pressure_plate_up", + "textures": { + "texture": "biomesoplenty:block/maple_planks" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_pressure_plate_down.json b/src/main/resources/assets/biomesoplenty/models/block/maple_pressure_plate_down.json new file mode 100644 index 0000000000..4b35d424dc --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "block/pressure_plate_down", + "textures": { + "texture": "biomesoplenty:block/maple_planks" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_sign.json b/src/main/resources/assets/biomesoplenty/models/block/maple_sign.json new file mode 100644 index 0000000000..04be156b89 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_sign.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "biomesoplenty:block/maple_planks" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_slab.json b/src/main/resources/assets/biomesoplenty/models/block/maple_slab.json new file mode 100644 index 0000000000..459b9661e4 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab", + "textures": { + "bottom": "biomesoplenty:block/maple_planks", + "top": "biomesoplenty:block/maple_planks", + "side": "biomesoplenty:block/maple_planks" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_slab_top.json b/src/main/resources/assets/biomesoplenty/models/block/maple_slab_top.json new file mode 100644 index 0000000000..d5dd45f9d2 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab_top", + "textures": { + "bottom": "biomesoplenty:block/maple_planks", + "top": "biomesoplenty:block/maple_planks", + "side": "biomesoplenty:block/maple_planks" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_stairs.json b/src/main/resources/assets/biomesoplenty/models/block/maple_stairs.json new file mode 100644 index 0000000000..361cc1ddde --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "biomesoplenty:block/maple_planks", + "top": "biomesoplenty:block/maple_planks", + "side": "biomesoplenty:block/maple_planks" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_stairs_inner.json b/src/main/resources/assets/biomesoplenty/models/block/maple_stairs_inner.json new file mode 100644 index 0000000000..11730ddc74 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "biomesoplenty:block/maple_planks", + "top": "biomesoplenty:block/maple_planks", + "side": "biomesoplenty:block/maple_planks" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_stairs_outer.json b/src/main/resources/assets/biomesoplenty/models/block/maple_stairs_outer.json new file mode 100644 index 0000000000..d7fe3009e7 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "biomesoplenty:block/maple_planks", + "top": "biomesoplenty:block/maple_planks", + "side": "biomesoplenty:block/maple_planks" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_trapdoor_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/maple_trapdoor_bottom.json new file mode 100644 index 0000000000..c74b7f8458 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_trapdoor_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_orientable_trapdoor_bottom", + "textures": { + "texture": "biomesoplenty:block/maple_trapdoor" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_trapdoor_open.json b/src/main/resources/assets/biomesoplenty/models/block/maple_trapdoor_open.json new file mode 100644 index 0000000000..44c50d2a97 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_trapdoor_open.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_orientable_trapdoor_open", + "textures": { + "texture": "biomesoplenty:block/maple_trapdoor" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_trapdoor_top.json b/src/main/resources/assets/biomesoplenty/models/block/maple_trapdoor_top.json new file mode 100644 index 0000000000..45edd124ae --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_trapdoor_top.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_orientable_trapdoor_top", + "textures": { + "texture": "biomesoplenty:block/maple_trapdoor" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_wood.json b/src/main/resources/assets/biomesoplenty/models/block/maple_wood.json new file mode 100644 index 0000000000..1ef526bf48 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/maple_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "biomesoplenty:block/maple_log", + "side": "biomesoplenty:block/maple_log" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/orange_autumn_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/orange_autumn_sapling.json deleted file mode 100644 index 9008e99d61..0000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/orange_autumn_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "biomesoplenty:block/orange_autumn_sapling" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/orange_autumn_leaves.json b/src/main/resources/assets/biomesoplenty/models/block/orange_maple_leaves.json similarity index 50% rename from src/main/resources/assets/biomesoplenty/models/block/orange_autumn_leaves.json rename to src/main/resources/assets/biomesoplenty/models/block/orange_maple_leaves.json index 3ab8b10799..9137db9994 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/orange_autumn_leaves.json +++ b/src/main/resources/assets/biomesoplenty/models/block/orange_maple_leaves.json @@ -1,6 +1,6 @@ { "parent": "block/leaves", "textures": { - "all": "biomesoplenty:block/orange_autumn_leaves" + "all": "biomesoplenty:block/orange_maple_leaves" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/orange_maple_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/orange_maple_sapling.json new file mode 100644 index 0000000000..827b7b7ae0 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/orange_maple_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:block/orange_maple_sapling" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_orange_autumn_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/potted_orange_maple_sapling.json similarity index 56% rename from src/main/resources/assets/biomesoplenty/models/block/potted_orange_autumn_sapling.json rename to src/main/resources/assets/biomesoplenty/models/block/potted_orange_maple_sapling.json index 1da1e8a013..451ddc2be7 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/potted_orange_autumn_sapling.json +++ b/src/main/resources/assets/biomesoplenty/models/block/potted_orange_maple_sapling.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/flower_pot_cross", "textures": { - "plant": "biomesoplenty:block/orange_autumn_sapling" + "plant": "biomesoplenty:block/orange_maple_sapling" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_maple_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/potted_red_maple_sapling.json similarity index 57% rename from src/main/resources/assets/biomesoplenty/models/block/potted_maple_sapling.json rename to src/main/resources/assets/biomesoplenty/models/block/potted_red_maple_sapling.json index 8955dfce5b..67132038fd 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/potted_maple_sapling.json +++ b/src/main/resources/assets/biomesoplenty/models/block/potted_red_maple_sapling.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/flower_pot_cross", "textures": { - "plant": "biomesoplenty:block/maple_sapling" + "plant": "biomesoplenty:block/red_maple_sapling" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/potted_yellow_autumn_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/potted_yellow_maple_sapling.json similarity index 56% rename from src/main/resources/assets/biomesoplenty/models/block/potted_yellow_autumn_sapling.json rename to src/main/resources/assets/biomesoplenty/models/block/potted_yellow_maple_sapling.json index 2abf81ba62..cba3217aab 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/potted_yellow_autumn_sapling.json +++ b/src/main/resources/assets/biomesoplenty/models/block/potted_yellow_maple_sapling.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/flower_pot_cross", "textures": { - "plant": "biomesoplenty:block/yellow_autumn_sapling" + "plant": "biomesoplenty:block/yellow_maple_sapling" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_leaves.json b/src/main/resources/assets/biomesoplenty/models/block/red_maple_leaves.json similarity index 51% rename from src/main/resources/assets/biomesoplenty/models/block/maple_leaves.json rename to src/main/resources/assets/biomesoplenty/models/block/red_maple_leaves.json index a22820bacf..429986a8b3 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/maple_leaves.json +++ b/src/main/resources/assets/biomesoplenty/models/block/red_maple_leaves.json @@ -1,6 +1,6 @@ { "parent": "block/leaves", "textures": { - "all": "biomesoplenty:block/maple_leaves" + "all": "biomesoplenty:block/red_maple_leaves" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/maple_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/red_maple_sapling.json similarity index 50% rename from src/main/resources/assets/biomesoplenty/models/block/maple_sapling.json rename to src/main/resources/assets/biomesoplenty/models/block/red_maple_sapling.json index 9a1d67a300..962168112c 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/maple_sapling.json +++ b/src/main/resources/assets/biomesoplenty/models/block/red_maple_sapling.json @@ -1,6 +1,6 @@ { "parent": "block/cross", "textures": { - "cross": "biomesoplenty:block/maple_sapling" + "cross": "biomesoplenty:block/red_maple_sapling" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/stripped_maple_log.json b/src/main/resources/assets/biomesoplenty/models/block/stripped_maple_log.json new file mode 100644 index 0000000000..9d48ade491 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/stripped_maple_log.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "biomesoplenty:block/stripped_maple_log_top", + "side": "biomesoplenty:block/stripped_maple_log" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/stripped_maple_wood.json b/src/main/resources/assets/biomesoplenty/models/block/stripped_maple_wood.json new file mode 100644 index 0000000000..64428df7ad --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/stripped_maple_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "biomesoplenty:block/stripped_maple_log", + "side": "biomesoplenty:block/stripped_maple_log" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/yellow_autumn_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/yellow_autumn_sapling.json deleted file mode 100644 index 73365a1cfd..0000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/yellow_autumn_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "biomesoplenty:block/yellow_autumn_sapling" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/yellow_autumn_leaves.json b/src/main/resources/assets/biomesoplenty/models/block/yellow_maple_leaves.json similarity index 50% rename from src/main/resources/assets/biomesoplenty/models/block/yellow_autumn_leaves.json rename to src/main/resources/assets/biomesoplenty/models/block/yellow_maple_leaves.json index 26ffc41d75..c99618fbc0 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/yellow_autumn_leaves.json +++ b/src/main/resources/assets/biomesoplenty/models/block/yellow_maple_leaves.json @@ -1,6 +1,6 @@ { "parent": "block/leaves", "textures": { - "all": "biomesoplenty:block/yellow_autumn_leaves" + "all": "biomesoplenty:block/yellow_maple_leaves" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/yellow_maple_sapling.json b/src/main/resources/assets/biomesoplenty/models/block/yellow_maple_sapling.json new file mode 100644 index 0000000000..d83a83fb2a --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/yellow_maple_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:block/yellow_maple_sapling" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/maple_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/maple_boat.json similarity index 52% rename from src/main/resources/assets/biomesoplenty/models/item/maple_sapling.json rename to src/main/resources/assets/biomesoplenty/models/item/maple_boat.json index a191fa800b..20d1acf629 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/maple_sapling.json +++ b/src/main/resources/assets/biomesoplenty/models/item/maple_boat.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "biomesoplenty:block/maple_sapling" + "layer0": "biomesoplenty:item/maple_boat" } } diff --git a/src/main/resources/assets/biomesoplenty/models/item/maple_button.json b/src/main/resources/assets/biomesoplenty/models/item/maple_button.json new file mode 100644 index 0000000000..fc950396f0 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/maple_button.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/maple_button_inventory" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/maple_chest_boat.json b/src/main/resources/assets/biomesoplenty/models/item/maple_chest_boat.json new file mode 100644 index 0000000000..04ddea7bf5 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/maple_chest_boat.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "biomesoplenty:item/maple_chest_boat" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/maple_door.json b/src/main/resources/assets/biomesoplenty/models/item/maple_door.json new file mode 100644 index 0000000000..bf35f40b03 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/maple_door.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "biomesoplenty:item/maple_door" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/maple_fence.json b/src/main/resources/assets/biomesoplenty/models/item/maple_fence.json new file mode 100644 index 0000000000..690af0650a --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/maple_fence.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/maple_fence_inventory" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/maple_fence_gate.json b/src/main/resources/assets/biomesoplenty/models/item/maple_fence_gate.json new file mode 100644 index 0000000000..3cbbcc5969 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/maple_fence_gate.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/maple_fence_gate" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/maple_hanging_sign.json b/src/main/resources/assets/biomesoplenty/models/item/maple_hanging_sign.json new file mode 100644 index 0000000000..b380cb04c6 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/maple_hanging_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "biomesoplenty:item/maple_hanging_sign" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/item/maple_leaves.json b/src/main/resources/assets/biomesoplenty/models/item/maple_leaves.json deleted file mode 100644 index 30ac5118fa..0000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/maple_leaves.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "biomesoplenty:block/maple_leaves" -} diff --git a/src/main/resources/assets/biomesoplenty/models/item/maple_log.json b/src/main/resources/assets/biomesoplenty/models/item/maple_log.json new file mode 100644 index 0000000000..b701363f87 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/maple_log.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/maple_log" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/maple_planks.json b/src/main/resources/assets/biomesoplenty/models/item/maple_planks.json new file mode 100644 index 0000000000..aa3d712693 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/maple_planks.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/maple_planks" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/maple_pressure_plate.json b/src/main/resources/assets/biomesoplenty/models/item/maple_pressure_plate.json new file mode 100644 index 0000000000..a9cca2f5c8 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/maple_pressure_plate.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/maple_pressure_plate" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/maple_sign.json b/src/main/resources/assets/biomesoplenty/models/item/maple_sign.json new file mode 100644 index 0000000000..88348b98fc --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/maple_sign.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "biomesoplenty:item/maple_sign" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/maple_slab.json b/src/main/resources/assets/biomesoplenty/models/item/maple_slab.json new file mode 100644 index 0000000000..adfaa18572 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/maple_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/maple_slab" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/maple_stairs.json b/src/main/resources/assets/biomesoplenty/models/item/maple_stairs.json new file mode 100644 index 0000000000..56951183c1 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/maple_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/maple_stairs" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/maple_trapdoor.json b/src/main/resources/assets/biomesoplenty/models/item/maple_trapdoor.json new file mode 100644 index 0000000000..4e81dca5cc --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/maple_trapdoor.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/maple_trapdoor_bottom" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/maple_wood.json b/src/main/resources/assets/biomesoplenty/models/item/maple_wood.json new file mode 100644 index 0000000000..bc3c5c090e --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/maple_wood.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/maple_wood" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/orange_autumn_leaves.json b/src/main/resources/assets/biomesoplenty/models/item/orange_autumn_leaves.json deleted file mode 100644 index 74615adfdc..0000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/orange_autumn_leaves.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "biomesoplenty:block/orange_autumn_leaves" -} diff --git a/src/main/resources/assets/biomesoplenty/models/item/orange_autumn_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/orange_autumn_sapling.json deleted file mode 100644 index e2c6a82690..0000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/orange_autumn_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "biomesoplenty:block/orange_autumn_sapling" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/item/orange_maple_leaves.json b/src/main/resources/assets/biomesoplenty/models/item/orange_maple_leaves.json new file mode 100644 index 0000000000..85a51adabc --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/orange_maple_leaves.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/orange_maple_leaves" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/orange_maple_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/orange_maple_sapling.json new file mode 100644 index 0000000000..32f282d11f --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/orange_maple_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "biomesoplenty:block/orange_maple_sapling" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/potted_maple_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/potted_orange_maple_sapling.json similarity index 100% rename from src/main/resources/assets/biomesoplenty/models/item/potted_maple_sapling.json rename to src/main/resources/assets/biomesoplenty/models/item/potted_orange_maple_sapling.json diff --git a/src/main/resources/assets/biomesoplenty/models/item/potted_orange_autumn_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/potted_red_maple_sapling.json similarity index 100% rename from src/main/resources/assets/biomesoplenty/models/item/potted_orange_autumn_sapling.json rename to src/main/resources/assets/biomesoplenty/models/item/potted_red_maple_sapling.json diff --git a/src/main/resources/assets/biomesoplenty/models/item/potted_yellow_autumn_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/potted_yellow_maple_sapling.json similarity index 100% rename from src/main/resources/assets/biomesoplenty/models/item/potted_yellow_autumn_sapling.json rename to src/main/resources/assets/biomesoplenty/models/item/potted_yellow_maple_sapling.json diff --git a/src/main/resources/assets/biomesoplenty/models/item/red_maple_leaves.json b/src/main/resources/assets/biomesoplenty/models/item/red_maple_leaves.json new file mode 100644 index 0000000000..988ec74729 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/red_maple_leaves.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/red_maple_leaves" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/red_maple_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/red_maple_sapling.json new file mode 100644 index 0000000000..c2479c447f --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/red_maple_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "biomesoplenty:block/red_maple_sapling" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/stripped_maple_log.json b/src/main/resources/assets/biomesoplenty/models/item/stripped_maple_log.json new file mode 100644 index 0000000000..a7086a7e16 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/stripped_maple_log.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/stripped_maple_log" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/stripped_maple_wood.json b/src/main/resources/assets/biomesoplenty/models/item/stripped_maple_wood.json new file mode 100644 index 0000000000..49eca4011a --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/stripped_maple_wood.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/stripped_maple_wood" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/yellow_autumn_leaves.json b/src/main/resources/assets/biomesoplenty/models/item/yellow_autumn_leaves.json deleted file mode 100644 index b1ca33f100..0000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/yellow_autumn_leaves.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "biomesoplenty:block/yellow_autumn_leaves" -} diff --git a/src/main/resources/assets/biomesoplenty/models/item/yellow_autumn_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/yellow_autumn_sapling.json deleted file mode 100644 index 8e63c69bb8..0000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/yellow_autumn_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "biomesoplenty:block/yellow_autumn_sapling" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/item/yellow_maple_leaves.json b/src/main/resources/assets/biomesoplenty/models/item/yellow_maple_leaves.json new file mode 100644 index 0000000000..8e611eff3b --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/yellow_maple_leaves.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/yellow_maple_leaves" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/yellow_maple_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/yellow_maple_sapling.json new file mode 100644 index 0000000000..26a2a99488 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/yellow_maple_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "biomesoplenty:block/yellow_maple_sapling" + } +} diff --git a/src/main/resources/assets/biomesoplenty/particles/maple_leaves.json b/src/main/resources/assets/biomesoplenty/particles/maple_leaves.json deleted file mode 100644 index 0ea8870afb..0000000000 --- a/src/main/resources/assets/biomesoplenty/particles/maple_leaves.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "textures": [ - "biomesoplenty:maple_0", - "biomesoplenty:maple_1", - "biomesoplenty:maple_2", - "biomesoplenty:maple_3" - ] -} diff --git a/src/main/resources/assets/biomesoplenty/particles/orange_autumn_leaves.json b/src/main/resources/assets/biomesoplenty/particles/orange_autumn_leaves.json deleted file mode 100644 index 3d214f5da1..0000000000 --- a/src/main/resources/assets/biomesoplenty/particles/orange_autumn_leaves.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "textures": [ - "biomesoplenty:orange_autumn_0", - "biomesoplenty:orange_autumn_1", - "biomesoplenty:orange_autumn_2", - "biomesoplenty:orange_autumn_3" - ] -} diff --git a/src/main/resources/assets/biomesoplenty/particles/orange_maple_leaves.json b/src/main/resources/assets/biomesoplenty/particles/orange_maple_leaves.json new file mode 100644 index 0000000000..c60161a7d8 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/particles/orange_maple_leaves.json @@ -0,0 +1,8 @@ +{ + "textures": [ + "biomesoplenty:orange_maple_0", + "biomesoplenty:orange_maple_1", + "biomesoplenty:orange_maple_2", + "biomesoplenty:orange_maple_3" + ] +} diff --git a/src/main/resources/assets/biomesoplenty/particles/red_maple_leaves.json b/src/main/resources/assets/biomesoplenty/particles/red_maple_leaves.json new file mode 100644 index 0000000000..278c7479cc --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/particles/red_maple_leaves.json @@ -0,0 +1,8 @@ +{ + "textures": [ + "biomesoplenty:red_maple_0", + "biomesoplenty:red_maple_1", + "biomesoplenty:red_maple_2", + "biomesoplenty:red_maple_3" + ] +} diff --git a/src/main/resources/assets/biomesoplenty/particles/yellow_autumn_leaves.json b/src/main/resources/assets/biomesoplenty/particles/yellow_autumn_leaves.json deleted file mode 100644 index c3863acc19..0000000000 --- a/src/main/resources/assets/biomesoplenty/particles/yellow_autumn_leaves.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "textures": [ - "biomesoplenty:yellow_autumn_0", - "biomesoplenty:yellow_autumn_1", - "biomesoplenty:yellow_autumn_2", - "biomesoplenty:yellow_autumn_3" - ] -} diff --git a/src/main/resources/assets/biomesoplenty/particles/yellow_maple_leaves.json b/src/main/resources/assets/biomesoplenty/particles/yellow_maple_leaves.json new file mode 100644 index 0000000000..7a9b0f8e4b --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/particles/yellow_maple_leaves.json @@ -0,0 +1,8 @@ +{ + "textures": [ + "biomesoplenty:yellow_maple_0", + "biomesoplenty:yellow_maple_1", + "biomesoplenty:yellow_maple_2", + "biomesoplenty:yellow_maple_3" + ] +} diff --git a/src/main/resources/assets/biomesoplenty/shaders/block.properties b/src/main/resources/assets/biomesoplenty/shaders/block.properties index 4f86eb25d8..7516383aef 100644 --- a/src/main/resources/assets/biomesoplenty/shaders/block.properties +++ b/src/main/resources/assets/biomesoplenty/shaders/block.properties @@ -10,14 +10,14 @@ block.10031 = biomesoplenty:sprout biomesoplenty:dune_grass biomesoplenty:desert_grass biomesoplenty:dead_grass # Flowers and Plants -block.10059 = biomesoplenty:origin_sapling biomesoplenty:flowering_oak_sapling biomesoplenty:snowblossom_sapling biomesoplenty:rainbow_birch_sapling biomesoplenty:yellow_autumn_sapling biomesoplenty:orange_autumn_sapling biomesoplenty:maple_sapling biomesoplenty:fir_sapling biomesoplenty:pine_sapling biomesoplenty:redwood_sapling biomesoplenty:mahogany_sapling biomesoplenty:jacaranda_sapling biomesoplenty:palm_sapling biomesoplenty:willow_sapling biomesoplenty:dead_sapling biomesoplenty:magic_sapling biomesoplenty:umbran_sapling biomesoplenty:hellbark_sapling biomesoplenty:rose biomesoplenty:violet biomesoplenty:lavender biomesoplenty:wildflower biomesoplenty:orange_cosmos biomesoplenty:pink_daffodil biomesoplenty:pink_hibiscus biomesoplenty:white_petals biomesoplenty:glowflower biomesoplenty:wilted_lily biomesoplenty:burning_blossom biomesoplenty:bush biomesoplenty:clover biomesoplenty:tundra_shrub biomesoplenty:toadstool biomesoplenty:glowshroom biomesoplenty:hair +block.10059 = biomesoplenty:origin_sapling biomesoplenty:flowering_oak_sapling biomesoplenty:snowblossom_sapling biomesoplenty:rainbow_birch_sapling biomesoplenty:fir_sapling biomesoplenty:pine_sapling biomesoplenty:red_maple_sapling biomesoplenty:orange_maple_sapling biomesoplenty:yellow_maple_sapling biomesoplenty:redwood_sapling biomesoplenty:mahogany_sapling biomesoplenty:jacaranda_sapling biomesoplenty:palm_sapling biomesoplenty:willow_sapling biomesoplenty:dead_sapling biomesoplenty:magic_sapling biomesoplenty:umbran_sapling biomesoplenty:hellbark_sapling biomesoplenty:rose biomesoplenty:violet biomesoplenty:lavender biomesoplenty:wildflower biomesoplenty:orange_cosmos biomesoplenty:pink_daffodil biomesoplenty:pink_hibiscus biomesoplenty:white_petals biomesoplenty:glowflower biomesoplenty:wilted_lily biomesoplenty:burning_blossom biomesoplenty:bush biomesoplenty:clover biomesoplenty:tundra_shrub biomesoplenty:toadstool biomesoplenty:glowshroom biomesoplenty:hair # Tall Plants block.10175 = biomesoplenty:tall_lavender:half=lower biomesoplenty:blue_hydrangea:half=lower biomesoplenty:goldenrod:half=lower biomesoplenty:icy_iris:half=lower biomesoplenty:cattail:half=lower biomesoplenty:barley:half=lower biomesoplenty:reed:half=lower biomesoplenty:watergrass:half=lower biomesoplenty:sea_oats:half=lower block.10176 = biomesoplenty:tall_lavender:half=upper biomesoplenty:blue_hydrangea:half=upper biomesoplenty:goldenrod:half=upper biomesoplenty:icy_iris:half=upper biomesoplenty:cattail:half=upper biomesoplenty:barley:half=upper biomesoplenty:reed:half=upper biomesoplenty:watergrass:half=upper biomesoplenty:sea_oats:half=upper biomesoplenty:huge_clover_petal # Leaves -block.10018 = biomesoplenty:origin_leaves biomesoplenty:flowering_oak_leaves biomesoplenty:snowblossom_leaves biomesoplenty:rainbow_birch_leaves biomesoplenty:yellow_autumn_leaves biomesoplenty:orange_autumn_leaves biomesoplenty:maple_leaves biomesoplenty:fir_leaves biomesoplenty:pine_leaves biomesoplenty:redwood_leaves biomesoplenty:mahogany_leaves biomesoplenty:jacaranda_leaves biomesoplenty:palm_leaves biomesoplenty:willow_leaves biomesoplenty:dead_leaves biomesoplenty:magic_leaves biomesoplenty:umbran_leaves biomesoplenty:hellbark_leaves +block.10018 = biomesoplenty:origin_leaves biomesoplenty:flowering_oak_leaves biomesoplenty:snowblossom_leaves biomesoplenty:rainbow_birch_leaves biomesoplenty:fir_leaves biomesoplenty:pine_leaves biomesoplenty:red_maple_leaves biomesoplenty:orange_maple_leaves biomesoplenty:yellow_maple_leaves biomesoplenty:redwood_leaves biomesoplenty:mahogany_leaves biomesoplenty:jacaranda_leaves biomesoplenty:palm_leaves biomesoplenty:willow_leaves biomesoplenty:dead_leaves biomesoplenty:magic_leaves biomesoplenty:umbran_leaves biomesoplenty:hellbark_leaves # Vines block.10106 = biomesoplenty:willow_vine biomesoplenty:high_grass biomesoplenty:high_grass_plant biomesoplenty:spanish_moss biomesoplenty:spanish_moss_plant biomesoplenty:glowworm_silk biomesoplenty:glowworm_silk_strand biomesoplenty:hanging_cobweb biomesoplenty:hanging_cobweb_strand biomesoplenty:flesh_tendons biomesoplenty:flesh_tendons_strand diff --git a/src/main/resources/assets/biomesoplenty/textures/block/maple_door_bottom.png b/src/main/resources/assets/biomesoplenty/textures/block/maple_door_bottom.png new file mode 100644 index 0000000000..580d8b00be Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/maple_door_bottom.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/maple_door_top.png b/src/main/resources/assets/biomesoplenty/textures/block/maple_door_top.png new file mode 100644 index 0000000000..002eaa1003 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/maple_door_top.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/maple_log.png b/src/main/resources/assets/biomesoplenty/textures/block/maple_log.png new file mode 100644 index 0000000000..f0caf87139 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/maple_log.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/maple_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/maple_log_top.png new file mode 100644 index 0000000000..b1e437019e Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/maple_log_top.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/maple_planks.png b/src/main/resources/assets/biomesoplenty/textures/block/maple_planks.png new file mode 100644 index 0000000000..75bf5fde23 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/maple_planks.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/maple_sapling.png b/src/main/resources/assets/biomesoplenty/textures/block/maple_sapling.png deleted file mode 100644 index 178173644c..0000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/block/maple_sapling.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/maple_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/block/maple_trapdoor.png new file mode 100644 index 0000000000..c8b6c71045 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/maple_trapdoor.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/orange_autumn_sapling.png b/src/main/resources/assets/biomesoplenty/textures/block/orange_autumn_sapling.png deleted file mode 100644 index d02b041d37..0000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/block/orange_autumn_sapling.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/orange_autumn_leaves.png b/src/main/resources/assets/biomesoplenty/textures/block/orange_maple_leaves.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/block/orange_autumn_leaves.png rename to src/main/resources/assets/biomesoplenty/textures/block/orange_maple_leaves.png diff --git a/src/main/resources/assets/biomesoplenty/textures/block/orange_maple_sapling.png b/src/main/resources/assets/biomesoplenty/textures/block/orange_maple_sapling.png new file mode 100644 index 0000000000..7aa075b25f Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/orange_maple_sapling.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/maple_leaves.png b/src/main/resources/assets/biomesoplenty/textures/block/red_maple_leaves.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/block/maple_leaves.png rename to src/main/resources/assets/biomesoplenty/textures/block/red_maple_leaves.png diff --git a/src/main/resources/assets/biomesoplenty/textures/block/red_maple_sapling.png b/src/main/resources/assets/biomesoplenty/textures/block/red_maple_sapling.png new file mode 100644 index 0000000000..ebf9d23d74 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/red_maple_sapling.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_maple_log.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_maple_log.png new file mode 100644 index 0000000000..64c2727dda Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/stripped_maple_log.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_maple_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_maple_log_top.png new file mode 100644 index 0000000000..d122bb7895 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/stripped_maple_log_top.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/yellow_autumn_sapling.png b/src/main/resources/assets/biomesoplenty/textures/block/yellow_autumn_sapling.png deleted file mode 100644 index b921fbddff..0000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/block/yellow_autumn_sapling.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/yellow_autumn_leaves.png b/src/main/resources/assets/biomesoplenty/textures/block/yellow_maple_leaves.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/block/yellow_autumn_leaves.png rename to src/main/resources/assets/biomesoplenty/textures/block/yellow_maple_leaves.png diff --git a/src/main/resources/assets/biomesoplenty/textures/block/yellow_maple_sapling.png b/src/main/resources/assets/biomesoplenty/textures/block/yellow_maple_sapling.png new file mode 100644 index 0000000000..d335325c42 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/yellow_maple_sapling.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/entity/boat/maple.png b/src/main/resources/assets/biomesoplenty/textures/entity/boat/maple.png new file mode 100644 index 0000000000..ff393576ad Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/entity/boat/maple.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/entity/chest_boat/maple.png b/src/main/resources/assets/biomesoplenty/textures/entity/chest_boat/maple.png new file mode 100644 index 0000000000..d4501127b1 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/entity/chest_boat/maple.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/entity/signs/hanging/maple.png b/src/main/resources/assets/biomesoplenty/textures/entity/signs/hanging/maple.png new file mode 100644 index 0000000000..73867fc6c3 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/entity/signs/hanging/maple.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/entity/signs/maple.png b/src/main/resources/assets/biomesoplenty/textures/entity/signs/maple.png new file mode 100644 index 0000000000..59fac7b55b Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/entity/signs/maple.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/gui/hanging_signs/maple.png b/src/main/resources/assets/biomesoplenty/textures/gui/hanging_signs/maple.png new file mode 100644 index 0000000000..56b6387820 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/gui/hanging_signs/maple.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/item/maple_boat.png b/src/main/resources/assets/biomesoplenty/textures/item/maple_boat.png new file mode 100644 index 0000000000..c79ccd8434 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/item/maple_boat.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/item/maple_chest_boat.png b/src/main/resources/assets/biomesoplenty/textures/item/maple_chest_boat.png new file mode 100644 index 0000000000..380eeab1a8 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/item/maple_chest_boat.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/item/maple_door.png b/src/main/resources/assets/biomesoplenty/textures/item/maple_door.png new file mode 100644 index 0000000000..66060802bd Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/item/maple_door.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/item/maple_hanging_sign.png b/src/main/resources/assets/biomesoplenty/textures/item/maple_hanging_sign.png new file mode 100644 index 0000000000..fe76ce7ecc Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/item/maple_hanging_sign.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/item/maple_sign.png b/src/main/resources/assets/biomesoplenty/textures/item/maple_sign.png new file mode 100644 index 0000000000..e3063d0649 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/item/maple_sign.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/particle/orange_autumn_0.png b/src/main/resources/assets/biomesoplenty/textures/particle/orange_maple_0.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/particle/orange_autumn_0.png rename to src/main/resources/assets/biomesoplenty/textures/particle/orange_maple_0.png diff --git a/src/main/resources/assets/biomesoplenty/textures/particle/orange_autumn_1.png b/src/main/resources/assets/biomesoplenty/textures/particle/orange_maple_1.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/particle/orange_autumn_1.png rename to src/main/resources/assets/biomesoplenty/textures/particle/orange_maple_1.png diff --git a/src/main/resources/assets/biomesoplenty/textures/particle/orange_autumn_2.png b/src/main/resources/assets/biomesoplenty/textures/particle/orange_maple_2.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/particle/orange_autumn_2.png rename to src/main/resources/assets/biomesoplenty/textures/particle/orange_maple_2.png diff --git a/src/main/resources/assets/biomesoplenty/textures/particle/orange_autumn_3.png b/src/main/resources/assets/biomesoplenty/textures/particle/orange_maple_3.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/particle/orange_autumn_3.png rename to src/main/resources/assets/biomesoplenty/textures/particle/orange_maple_3.png diff --git a/src/main/resources/assets/biomesoplenty/textures/particle/maple_0.png b/src/main/resources/assets/biomesoplenty/textures/particle/red_maple_0.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/particle/maple_0.png rename to src/main/resources/assets/biomesoplenty/textures/particle/red_maple_0.png diff --git a/src/main/resources/assets/biomesoplenty/textures/particle/maple_1.png b/src/main/resources/assets/biomesoplenty/textures/particle/red_maple_1.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/particle/maple_1.png rename to src/main/resources/assets/biomesoplenty/textures/particle/red_maple_1.png diff --git a/src/main/resources/assets/biomesoplenty/textures/particle/maple_2.png b/src/main/resources/assets/biomesoplenty/textures/particle/red_maple_2.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/particle/maple_2.png rename to src/main/resources/assets/biomesoplenty/textures/particle/red_maple_2.png diff --git a/src/main/resources/assets/biomesoplenty/textures/particle/maple_3.png b/src/main/resources/assets/biomesoplenty/textures/particle/red_maple_3.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/particle/maple_3.png rename to src/main/resources/assets/biomesoplenty/textures/particle/red_maple_3.png diff --git a/src/main/resources/assets/biomesoplenty/textures/particle/yellow_autumn_0.png b/src/main/resources/assets/biomesoplenty/textures/particle/yellow_maple_0.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/particle/yellow_autumn_0.png rename to src/main/resources/assets/biomesoplenty/textures/particle/yellow_maple_0.png diff --git a/src/main/resources/assets/biomesoplenty/textures/particle/yellow_autumn_1.png b/src/main/resources/assets/biomesoplenty/textures/particle/yellow_maple_1.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/particle/yellow_autumn_1.png rename to src/main/resources/assets/biomesoplenty/textures/particle/yellow_maple_1.png diff --git a/src/main/resources/assets/biomesoplenty/textures/particle/yellow_autumn_2.png b/src/main/resources/assets/biomesoplenty/textures/particle/yellow_maple_2.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/particle/yellow_autumn_2.png rename to src/main/resources/assets/biomesoplenty/textures/particle/yellow_maple_2.png diff --git a/src/main/resources/assets/biomesoplenty/textures/particle/yellow_autumn_3.png b/src/main/resources/assets/biomesoplenty/textures/particle/yellow_maple_3.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/particle/yellow_autumn_3.png rename to src/main/resources/assets/biomesoplenty/textures/particle/yellow_maple_3.png diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/maple_planks.json b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/maple_planks.json new file mode 100644 index 0000000000..9334c445f7 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/maple_planks.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "biomesoplenty:maple_planks" + ] + }, + "criteria": { + "has_logs": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "biomesoplenty:maple_logs" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:maple_planks" + } + } + }, + "requirements": [ + [ + "has_logs", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/maple_slab.json b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/maple_slab.json new file mode 100644 index 0000000000..452c4b5daf --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/maple_slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "biomesoplenty:maple_slab" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "biomesoplenty:maple_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:maple_slab" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/maple_stairs.json b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/maple_stairs.json new file mode 100644 index 0000000000..4387c77377 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/maple_stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "biomesoplenty:maple_stairs" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "biomesoplenty:maple_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:maple_stairs" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/maple_wood.json b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/maple_wood.json new file mode 100644 index 0000000000..8e76df9018 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/maple_wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "biomesoplenty:maple_wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "biomesoplenty:maple_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:maple_wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/stripped_maple_wood.json b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/stripped_maple_wood.json new file mode 100644 index 0000000000..50c1345424 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/building_blocks/stripped_maple_wood.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "biomesoplenty:stripped_maple_wood" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "biomesoplenty:stripped_maple_log" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:stripped_maple_wood" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/decorations/maple_fence.json b/src/main/resources/data/biomesoplenty/advancements/recipes/decorations/maple_fence.json new file mode 100644 index 0000000000..5a2f23ec11 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/decorations/maple_fence.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "biomesoplenty:maple_fence" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "biomesoplenty:maple_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:maple_fence" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/decorations/maple_hanging_sign.json b/src/main/resources/data/biomesoplenty/advancements/recipes/decorations/maple_hanging_sign.json new file mode 100644 index 0000000000..e495969927 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/decorations/maple_hanging_sign.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stripped_logs": { + "conditions": { + "items": [ + { + "items": [ + "biomesoplenty:stripped_maple_log" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "biomesoplenty:maple_hanging_sign" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_stripped_logs", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "biomesoplenty:maple_hanging_sign" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/decorations/maple_sign.json b/src/main/resources/data/biomesoplenty/advancements/recipes/decorations/maple_sign.json new file mode 100644 index 0000000000..b6286782a5 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/decorations/maple_sign.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "biomesoplenty:maple_sign" + ] + }, + "criteria": { + "has_maple_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "biomesoplenty:maple_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:maple_sign" + } + } + }, + "requirements": [ + [ + "has_maple_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/redstone/maple_button.json b/src/main/resources/data/biomesoplenty/advancements/recipes/redstone/maple_button.json new file mode 100644 index 0000000000..18c5e40d53 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/redstone/maple_button.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "biomesoplenty:maple_button" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "biomesoplenty:maple_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:maple_button" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/redstone/maple_door.json b/src/main/resources/data/biomesoplenty/advancements/recipes/redstone/maple_door.json new file mode 100644 index 0000000000..fbfc190b9e --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/redstone/maple_door.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "biomesoplenty:maple_door" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "biomesoplenty:maple_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:maple_door" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/redstone/maple_fence_gate.json b/src/main/resources/data/biomesoplenty/advancements/recipes/redstone/maple_fence_gate.json new file mode 100644 index 0000000000..cb698f7e6e --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/redstone/maple_fence_gate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "biomesoplenty:maple_fence_gate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "biomesoplenty:maple_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:maple_fence_gate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/redstone/maple_pressure_plate.json b/src/main/resources/data/biomesoplenty/advancements/recipes/redstone/maple_pressure_plate.json new file mode 100644 index 0000000000..8444e04c2b --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/redstone/maple_pressure_plate.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "biomesoplenty:maple_pressure_plate" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "biomesoplenty:maple_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:maple_pressure_plate" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/redstone/maple_trapdoor.json b/src/main/resources/data/biomesoplenty/advancements/recipes/redstone/maple_trapdoor.json new file mode 100644 index 0000000000..10449bce7b --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/redstone/maple_trapdoor.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "biomesoplenty:maple_trapdoor" + ] + }, + "criteria": { + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "biomesoplenty:maple_planks" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:maple_trapdoor" + } + } + }, + "requirements": [ + [ + "has_planks", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/transportation/maple_boat.json b/src/main/resources/data/biomesoplenty/advancements/recipes/transportation/maple_boat.json new file mode 100644 index 0000000000..8b6ad23e26 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/transportation/maple_boat.json @@ -0,0 +1,28 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "biomesoplenty:maple_boat" + ] + }, + "criteria": { + "in_water": { + "trigger": "minecraft:enter_block", + "conditions": { + "block": "minecraft:water" + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:maple_boat" + } + } + }, + "requirements": [ + [ + "in_water", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/advancements/recipes/transportation/maple_chest_boat.json b/src/main/resources/data/biomesoplenty/advancements/recipes/transportation/maple_chest_boat.json new file mode 100644 index 0000000000..7e4d73501f --- /dev/null +++ b/src/main/resources/data/biomesoplenty/advancements/recipes/transportation/maple_chest_boat.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_boat": { + "conditions": { + "items": [ + { + "tag": "minecraft:boats" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "biomesoplenty:maple_chest_boat" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_boat", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "biomesoplenty:maple_chest_boat" + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_sapling.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_button.json similarity index 84% rename from src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_sapling.json rename to src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_button.json index fedf7df646..c7c891445e 100644 --- a/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_sapling.json +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_button.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "biomesoplenty:maple_sapling" + "name": "biomesoplenty:maple_button" } ], "conditions": [ diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_door.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_door.json new file mode 100644 index 0000000000..3c92ce02c6 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_door.json @@ -0,0 +1,28 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "biomesoplenty:maple_door", + "properties": { + "half": "lower" + } + } + ], + "name": "biomesoplenty:maple_door" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/orange_autumn_sapling.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_fence.json similarity index 82% rename from src/main/resources/data/biomesoplenty/loot_tables/blocks/orange_autumn_sapling.json rename to src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_fence.json index 1d6568172d..7d856cbdac 100644 --- a/src/main/resources/data/biomesoplenty/loot_tables/blocks/orange_autumn_sapling.json +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_fence.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "biomesoplenty:orange_autumn_sapling" + "name": "biomesoplenty:maple_fence" } ], "conditions": [ diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/yellow_autumn_sapling.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_fence_gate.json similarity index 82% rename from src/main/resources/data/biomesoplenty/loot_tables/blocks/yellow_autumn_sapling.json rename to src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_fence_gate.json index 4849fc89e8..28ff549e56 100644 --- a/src/main/resources/data/biomesoplenty/loot_tables/blocks/yellow_autumn_sapling.json +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_fence_gate.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "biomesoplenty:yellow_autumn_sapling" + "name": "biomesoplenty:maple_fence_gate" } ], "conditions": [ diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_hanging_sign.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_hanging_sign.json new file mode 100644 index 0000000000..5148d184f4 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_hanging_sign.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "biomesoplenty:maple_hanging_sign" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "biomesoplenty:blocks/maple_hanging_sign" +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_log.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_log.json new file mode 100644 index 0000000000..248f888fda --- /dev/null +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_log.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "biomesoplenty:maple_log" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_planks.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_planks.json new file mode 100644 index 0000000000..e2906fc10a --- /dev/null +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_planks.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "biomesoplenty:maple_planks" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_pressure_plate.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_pressure_plate.json new file mode 100644 index 0000000000..218e848c40 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_pressure_plate.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "biomesoplenty:maple_pressure_plate" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_sign.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_sign.json new file mode 100644 index 0000000000..1555021d53 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_sign.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "biomesoplenty:maple_sign" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_slab.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_slab.json new file mode 100644 index 0000000000..61300460af --- /dev/null +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_slab.json @@ -0,0 +1,32 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "biomesoplenty:maple_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "biomesoplenty:maple_slab" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_stairs.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_stairs.json new file mode 100644 index 0000000000..4b711b271e --- /dev/null +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_stairs.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "biomesoplenty:maple_stairs" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_trapdoor.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_trapdoor.json new file mode 100644 index 0000000000..fedbf19b1c --- /dev/null +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_trapdoor.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "biomesoplenty:maple_trapdoor" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_wood.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_wood.json new file mode 100644 index 0000000000..8ab0994968 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_wood.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "biomesoplenty:maple_wood" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/orange_autumn_leaves.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/orange_maple_leaves.json similarity index 97% rename from src/main/resources/data/biomesoplenty/loot_tables/blocks/orange_autumn_leaves.json rename to src/main/resources/data/biomesoplenty/loot_tables/blocks/orange_maple_leaves.json index 02509ce34f..d680f25ca8 100644 --- a/src/main/resources/data/biomesoplenty/loot_tables/blocks/orange_autumn_leaves.json +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/orange_maple_leaves.json @@ -35,7 +35,7 @@ ] } ], - "name": "biomesoplenty:orange_autumn_leaves" + "name": "biomesoplenty:orange_maple_leaves" }, { "type": "minecraft:item", @@ -54,7 +54,7 @@ ] } ], - "name": "biomesoplenty:orange_autumn_sapling" + "name": "biomesoplenty:orange_maple_sapling" } ] } diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/orange_maple_sapling.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/orange_maple_sapling.json new file mode 100644 index 0000000000..440641465f --- /dev/null +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/orange_maple_sapling.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "biomesoplenty:orange_maple_sapling" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/potted_yellow_autumn_sapling.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/potted_orange_maple_sapling.json similarity index 90% rename from src/main/resources/data/biomesoplenty/loot_tables/blocks/potted_yellow_autumn_sapling.json rename to src/main/resources/data/biomesoplenty/loot_tables/blocks/potted_orange_maple_sapling.json index 56d475cf12..4ebd9bf593 100644 --- a/src/main/resources/data/biomesoplenty/loot_tables/blocks/potted_yellow_autumn_sapling.json +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/potted_orange_maple_sapling.json @@ -20,7 +20,7 @@ "entries": [ { "type": "minecraft:item", - "name": "biomesoplenty:yellow_autumn_sapling" + "name": "biomesoplenty:orange_maple_sapling" } ], "conditions": [ diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/potted_maple_sapling.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/potted_red_maple_sapling.json similarity index 91% rename from src/main/resources/data/biomesoplenty/loot_tables/blocks/potted_maple_sapling.json rename to src/main/resources/data/biomesoplenty/loot_tables/blocks/potted_red_maple_sapling.json index 6c2cfceccc..c0bd77ea2e 100644 --- a/src/main/resources/data/biomesoplenty/loot_tables/blocks/potted_maple_sapling.json +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/potted_red_maple_sapling.json @@ -20,7 +20,7 @@ "entries": [ { "type": "minecraft:item", - "name": "biomesoplenty:maple_sapling" + "name": "biomesoplenty:red_maple_sapling" } ], "conditions": [ diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/potted_orange_autumn_sapling.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/potted_yellow_maple_sapling.json similarity index 90% rename from src/main/resources/data/biomesoplenty/loot_tables/blocks/potted_orange_autumn_sapling.json rename to src/main/resources/data/biomesoplenty/loot_tables/blocks/potted_yellow_maple_sapling.json index f770ada99b..91eb1420d2 100644 --- a/src/main/resources/data/biomesoplenty/loot_tables/blocks/potted_orange_autumn_sapling.json +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/potted_yellow_maple_sapling.json @@ -20,7 +20,7 @@ "entries": [ { "type": "minecraft:item", - "name": "biomesoplenty:orange_autumn_sapling" + "name": "biomesoplenty:yellow_maple_sapling" } ], "conditions": [ diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_leaves.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/red_maple_leaves.json similarity index 97% rename from src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_leaves.json rename to src/main/resources/data/biomesoplenty/loot_tables/blocks/red_maple_leaves.json index 2a3b30632f..390038396c 100644 --- a/src/main/resources/data/biomesoplenty/loot_tables/blocks/maple_leaves.json +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/red_maple_leaves.json @@ -35,7 +35,7 @@ ] } ], - "name": "biomesoplenty:maple_leaves" + "name": "biomesoplenty:red_maple_leaves" }, { "type": "minecraft:item", @@ -54,7 +54,7 @@ ] } ], - "name": "biomesoplenty:maple_sapling" + "name": "biomesoplenty:red_maple_sapling" } ] } diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/red_maple_sapling.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/red_maple_sapling.json new file mode 100644 index 0000000000..6f63fb25d9 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/red_maple_sapling.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "biomesoplenty:red_maple_sapling" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/stripped_maple_log.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/stripped_maple_log.json new file mode 100644 index 0000000000..407d013cc3 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/stripped_maple_log.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "biomesoplenty:stripped_maple_log" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/stripped_maple_wood.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/stripped_maple_wood.json new file mode 100644 index 0000000000..691c593af0 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/stripped_maple_wood.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "biomesoplenty:stripped_maple_wood" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/yellow_autumn_leaves.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/yellow_maple_leaves.json similarity index 97% rename from src/main/resources/data/biomesoplenty/loot_tables/blocks/yellow_autumn_leaves.json rename to src/main/resources/data/biomesoplenty/loot_tables/blocks/yellow_maple_leaves.json index f0d41668bc..7e030b24de 100644 --- a/src/main/resources/data/biomesoplenty/loot_tables/blocks/yellow_autumn_leaves.json +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/yellow_maple_leaves.json @@ -35,7 +35,7 @@ ] } ], - "name": "biomesoplenty:yellow_autumn_leaves" + "name": "biomesoplenty:yellow_maple_leaves" }, { "type": "minecraft:item", @@ -54,7 +54,7 @@ ] } ], - "name": "biomesoplenty:yellow_autumn_sapling" + "name": "biomesoplenty:yellow_maple_sapling" } ] } diff --git a/src/main/resources/data/biomesoplenty/loot_tables/blocks/yellow_maple_sapling.json b/src/main/resources/data/biomesoplenty/loot_tables/blocks/yellow_maple_sapling.json new file mode 100644 index 0000000000..b3150c7d1c --- /dev/null +++ b/src/main/resources/data/biomesoplenty/loot_tables/blocks/yellow_maple_sapling.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "biomesoplenty:yellow_maple_sapling" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/maple_boat.json b/src/main/resources/data/biomesoplenty/recipes/maple_boat.json new file mode 100644 index 0000000000..dcf5429f6b --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/maple_boat.json @@ -0,0 +1,16 @@ +{ + "type": "crafting_shaped", + "group": "boat", + "pattern": [ + "# #", + "###" + ], + "key": { + "#": { + "item": "biomesoplenty:maple_planks" + } + }, + "result": { + "item": "biomesoplenty:maple_boat" + } +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/maple_button.json b/src/main/resources/data/biomesoplenty/recipes/maple_button.json new file mode 100644 index 0000000000..57cf43a4aa --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/maple_button.json @@ -0,0 +1,12 @@ +{ + "type": "crafting_shapeless", + "group": "wooden_button", + "ingredients": [ + { + "item": "biomesoplenty:maple_planks" + } + ], + "result": { + "item": "biomesoplenty:maple_button" + } +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/maple_chest_boat.json b/src/main/resources/data/biomesoplenty/recipes/maple_chest_boat.json new file mode 100644 index 0000000000..7a152be075 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/maple_chest_boat.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "chest_boat", + "ingredients": [ + { + "item": "minecraft:chest" + }, + { + "item": "biomesoplenty:maple_boat" + } + ], + "result": { + "item": "biomesoplenty:maple_chest_boat" + } +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/maple_door.json b/src/main/resources/data/biomesoplenty/recipes/maple_door.json new file mode 100644 index 0000000000..f3fbbe0439 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/maple_door.json @@ -0,0 +1,18 @@ +{ + "type": "crafting_shaped", + "group": "wooden_door", + "pattern": [ + "##", + "##", + "##" + ], + "key": { + "#": { + "item": "biomesoplenty:maple_planks" + } + }, + "result": { + "item": "biomesoplenty:maple_door", + "count": 3 + } +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/maple_fence.json b/src/main/resources/data/biomesoplenty/recipes/maple_fence.json new file mode 100644 index 0000000000..d5e0feacad --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/maple_fence.json @@ -0,0 +1,20 @@ +{ + "type": "crafting_shaped", + "group": "wooden_fence", + "pattern": [ + "W#W", + "W#W" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "W": { + "item": "biomesoplenty:maple_planks" + } + }, + "result": { + "item": "biomesoplenty:maple_fence", + "count": 3 + } +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/maple_fence_gate.json b/src/main/resources/data/biomesoplenty/recipes/maple_fence_gate.json new file mode 100644 index 0000000000..55e310165d --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/maple_fence_gate.json @@ -0,0 +1,19 @@ +{ + "type": "crafting_shaped", + "group": "wooden_fence_gate", + "pattern": [ + "#W#", + "#W#" + ], + "key": { + "#": { + "item": "minecraft:stick" + }, + "W": { + "item": "biomesoplenty:maple_planks" + } + }, + "result": { + "item": "biomesoplenty:maple_fence_gate" + } +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/maple_hanging_sign.json b/src/main/resources/data/biomesoplenty/recipes/maple_hanging_sign.json new file mode 100644 index 0000000000..0937c40b10 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/maple_hanging_sign.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "group": "hanging_sign", + "key": { + "#": { + "item": "biomesoplenty:stripped_maple_log" + }, + "X": { + "item": "minecraft:chain" + } + }, + "pattern": [ + "X X", + "###", + "###" + ], + "result": { + "count": 6, + "item": "biomesoplenty:maple_hanging_sign" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/maple_planks.json b/src/main/resources/data/biomesoplenty/recipes/maple_planks.json new file mode 100644 index 0000000000..6857a373a0 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/maple_planks.json @@ -0,0 +1,13 @@ +{ + "type": "crafting_shapeless", + "group": "planks", + "ingredients": [ + { + "tag": "biomesoplenty:maple_logs" + } + ], + "result": { + "item": "biomesoplenty:maple_planks", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/maple_pressure_plate.json b/src/main/resources/data/biomesoplenty/recipes/maple_pressure_plate.json new file mode 100644 index 0000000000..9cf37feebb --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/maple_pressure_plate.json @@ -0,0 +1,15 @@ +{ + "type": "crafting_shaped", + "group": "wooden_pressure_plate", + "pattern": [ + "##" + ], + "key": { + "#": { + "item": "biomesoplenty:maple_planks" + } + }, + "result": { + "item": "biomesoplenty:maple_pressure_plate" + } +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/maple_sign.json b/src/main/resources/data/biomesoplenty/recipes/maple_sign.json new file mode 100644 index 0000000000..fa0a055fe9 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/maple_sign.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "wooden_sign", + "pattern": [ + "###", + "###", + " X " + ], + "key": { + "#": { + "item": "biomesoplenty:maple_planks" + }, + "X": { + "item": "minecraft:stick" + } + }, + "result": { + "item": "biomesoplenty:maple_sign", + "count": 3 + } +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/maple_slab.json b/src/main/resources/data/biomesoplenty/recipes/maple_slab.json new file mode 100644 index 0000000000..84d3281434 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/maple_slab.json @@ -0,0 +1,16 @@ +{ + "type": "crafting_shaped", + "group": "wooden_slab", + "pattern": [ + "###" + ], + "key": { + "#": { + "item": "biomesoplenty:maple_planks" + } + }, + "result": { + "item": "biomesoplenty:maple_slab", + "count": 6 + } +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/maple_stairs.json b/src/main/resources/data/biomesoplenty/recipes/maple_stairs.json new file mode 100644 index 0000000000..514999574c --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/maple_stairs.json @@ -0,0 +1,18 @@ +{ + "type": "crafting_shaped", + "group": "wooden_stairs", + "pattern": [ + "# ", + "## ", + "###" + ], + "key": { + "#": { + "item": "biomesoplenty:maple_planks" + } + }, + "result": { + "item": "biomesoplenty:maple_stairs", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/maple_trapdoor.json b/src/main/resources/data/biomesoplenty/recipes/maple_trapdoor.json new file mode 100644 index 0000000000..387ff9530f --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/maple_trapdoor.json @@ -0,0 +1,17 @@ +{ + "type": "crafting_shaped", + "group": "wooden_trapdoor", + "pattern": [ + "###", + "###" + ], + "key": { + "#": { + "item": "biomesoplenty:maple_planks" + } + }, + "result": { + "item": "biomesoplenty:maple_trapdoor", + "count": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/maple_wood.json b/src/main/resources/data/biomesoplenty/recipes/maple_wood.json new file mode 100644 index 0000000000..7ebdbc81f8 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/maple_wood.json @@ -0,0 +1,17 @@ +{ + "type": "crafting_shaped", + "group": "bark", + "pattern": [ + "##", + "##" + ], + "key": { + "#": { + "item": "biomesoplenty:maple_log" + } + }, + "result": { + "item": "biomesoplenty:maple_wood", + "count": 3 + } +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/recipes/stripped_maple_wood.json b/src/main/resources/data/biomesoplenty/recipes/stripped_maple_wood.json new file mode 100644 index 0000000000..dae92515f7 --- /dev/null +++ b/src/main/resources/data/biomesoplenty/recipes/stripped_maple_wood.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bark", + "pattern": [ + "##", + "##" + ], + "key": { + "#": { + "item": "biomesoplenty:stripped_maple_log" + } + }, + "result": { + "item": "biomesoplenty:stripped_maple_wood", + "count": 3 + } +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/tags/blocks/maple_logs.json b/src/main/resources/data/biomesoplenty/tags/blocks/maple_logs.json new file mode 100644 index 0000000000..fd3389952a --- /dev/null +++ b/src/main/resources/data/biomesoplenty/tags/blocks/maple_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "biomesoplenty:maple_log", + "biomesoplenty:maple_wood", + "biomesoplenty:stripped_maple_log", + "biomesoplenty:stripped_maple_wood" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/biomesoplenty/tags/items/maple_logs.json b/src/main/resources/data/biomesoplenty/tags/items/maple_logs.json new file mode 100644 index 0000000000..fd3389952a --- /dev/null +++ b/src/main/resources/data/biomesoplenty/tags/items/maple_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "biomesoplenty:maple_log", + "biomesoplenty:maple_wood", + "biomesoplenty:stripped_maple_log", + "biomesoplenty:stripped_maple_wood" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/fence_gates/wooden.json b/src/main/resources/data/forge/tags/blocks/fence_gates/wooden.json index 8daf196e6c..e299e8dbd6 100644 --- a/src/main/resources/data/forge/tags/blocks/fence_gates/wooden.json +++ b/src/main/resources/data/forge/tags/blocks/fence_gates/wooden.json @@ -3,6 +3,7 @@ "values": [ "biomesoplenty:fir_fence_gate", "biomesoplenty:pine_fence_gate", + "biomesoplenty:maple_fence_gate", "biomesoplenty:redwood_fence_gate", "biomesoplenty:mahogany_fence_gate", "biomesoplenty:jacaranda_fence_gate", diff --git a/src/main/resources/data/forge/tags/blocks/fences/wooden.json b/src/main/resources/data/forge/tags/blocks/fences/wooden.json index ea4610d441..4b28a49c6a 100644 --- a/src/main/resources/data/forge/tags/blocks/fences/wooden.json +++ b/src/main/resources/data/forge/tags/blocks/fences/wooden.json @@ -3,6 +3,7 @@ "values": [ "biomesoplenty:fir_fence", "biomesoplenty:pine_fence", + "biomesoplenty:maple_fence", "biomesoplenty:redwood_fence", "biomesoplenty:mahogany_fence", "biomesoplenty:jacaranda_fence", diff --git a/src/main/resources/data/forge/tags/items/fence_gates/wooden.json b/src/main/resources/data/forge/tags/items/fence_gates/wooden.json index 8daf196e6c..e299e8dbd6 100644 --- a/src/main/resources/data/forge/tags/items/fence_gates/wooden.json +++ b/src/main/resources/data/forge/tags/items/fence_gates/wooden.json @@ -3,6 +3,7 @@ "values": [ "biomesoplenty:fir_fence_gate", "biomesoplenty:pine_fence_gate", + "biomesoplenty:maple_fence_gate", "biomesoplenty:redwood_fence_gate", "biomesoplenty:mahogany_fence_gate", "biomesoplenty:jacaranda_fence_gate", diff --git a/src/main/resources/data/forge/tags/items/fences/wooden.json b/src/main/resources/data/forge/tags/items/fences/wooden.json index ea4610d441..4b28a49c6a 100644 --- a/src/main/resources/data/forge/tags/items/fences/wooden.json +++ b/src/main/resources/data/forge/tags/items/fences/wooden.json @@ -3,6 +3,7 @@ "values": [ "biomesoplenty:fir_fence", "biomesoplenty:pine_fence", + "biomesoplenty:maple_fence", "biomesoplenty:redwood_fence", "biomesoplenty:mahogany_fence", "biomesoplenty:jacaranda_fence", diff --git a/src/main/resources/data/minecraft/tags/blocks/ceiling_hanging_signs.json b/src/main/resources/data/minecraft/tags/blocks/ceiling_hanging_signs.json index e2c51baacb..b3f02ed6da 100644 --- a/src/main/resources/data/minecraft/tags/blocks/ceiling_hanging_signs.json +++ b/src/main/resources/data/minecraft/tags/blocks/ceiling_hanging_signs.json @@ -2,6 +2,7 @@ "values": [ "biomesoplenty:fir_hanging_sign", "biomesoplenty:pine_hanging_sign", + "biomesoplenty:maple_hanging_sign", "biomesoplenty:redwood_hanging_sign", "biomesoplenty:mahogany_hanging_sign", "biomesoplenty:jacaranda_hanging_sign", diff --git a/src/main/resources/data/minecraft/tags/blocks/fence_gates.json b/src/main/resources/data/minecraft/tags/blocks/fence_gates.json index 8daf196e6c..e299e8dbd6 100644 --- a/src/main/resources/data/minecraft/tags/blocks/fence_gates.json +++ b/src/main/resources/data/minecraft/tags/blocks/fence_gates.json @@ -3,6 +3,7 @@ "values": [ "biomesoplenty:fir_fence_gate", "biomesoplenty:pine_fence_gate", + "biomesoplenty:maple_fence_gate", "biomesoplenty:redwood_fence_gate", "biomesoplenty:mahogany_fence_gate", "biomesoplenty:jacaranda_fence_gate", diff --git a/src/main/resources/data/minecraft/tags/blocks/flower_pots.json b/src/main/resources/data/minecraft/tags/blocks/flower_pots.json index fe502ae632..93a495bb65 100644 --- a/src/main/resources/data/minecraft/tags/blocks/flower_pots.json +++ b/src/main/resources/data/minecraft/tags/blocks/flower_pots.json @@ -5,11 +5,11 @@ "biomesoplenty:potted_flowering_oak_sapling", "biomesoplenty:potted_snowblossom_sapling", "biomesoplenty:potted_rainbow_birch_sapling", - "biomesoplenty:potted_yellow_autumn_sapling", - "biomesoplenty:potted_orange_autumn_sapling", - "biomesoplenty:potted_maple_sapling", "biomesoplenty:potted_fir_sapling", "biomesoplenty:potted_pine_sapling", + "biomesoplenty:potted_red_maple_sapling", + "biomesoplenty:potted_orange_maple_sapling", + "biomesoplenty:potted_yellow_maple_sapling", "biomesoplenty:potted_redwood_sapling", "biomesoplenty:potted_mahogany_sapling", "biomesoplenty:potted_jacaranda_sapling", diff --git a/src/main/resources/data/minecraft/tags/blocks/leaves.json b/src/main/resources/data/minecraft/tags/blocks/leaves.json index 7d0449c548..3fb3249906 100644 --- a/src/main/resources/data/minecraft/tags/blocks/leaves.json +++ b/src/main/resources/data/minecraft/tags/blocks/leaves.json @@ -5,11 +5,11 @@ "biomesoplenty:flowering_oak_leaves", "biomesoplenty:snowblossom_leaves", "biomesoplenty:rainbow_birch_leaves", - "biomesoplenty:yellow_autumn_leaves", - "biomesoplenty:orange_autumn_leaves", - "biomesoplenty:maple_leaves", "biomesoplenty:fir_leaves", "biomesoplenty:pine_leaves", + "biomesoplenty:red_maple_leaves", + "biomesoplenty:orange_maple_leaves", + "biomesoplenty:yellow_maple_leaves", "biomesoplenty:redwood_leaves", "biomesoplenty:mahogany_leaves", "biomesoplenty:jacaranda_leaves", diff --git a/src/main/resources/data/minecraft/tags/blocks/logs.json b/src/main/resources/data/minecraft/tags/blocks/logs.json index 032b61640b..b13b080dac 100644 --- a/src/main/resources/data/minecraft/tags/blocks/logs.json +++ b/src/main/resources/data/minecraft/tags/blocks/logs.json @@ -3,6 +3,7 @@ "values": [ "#biomesoplenty:fir_logs", "#biomesoplenty:pine_logs", + "#biomesoplenty:maple_logs", "#biomesoplenty:redwood_logs", "#biomesoplenty:mahogany_logs", "#biomesoplenty:jacaranda_logs", diff --git a/src/main/resources/data/minecraft/tags/blocks/logs_that_burn.json b/src/main/resources/data/minecraft/tags/blocks/logs_that_burn.json index 4409f219c3..a586750eae 100644 --- a/src/main/resources/data/minecraft/tags/blocks/logs_that_burn.json +++ b/src/main/resources/data/minecraft/tags/blocks/logs_that_burn.json @@ -3,6 +3,7 @@ "values": [ "#biomesoplenty:fir_logs", "#biomesoplenty:pine_logs", + "#biomesoplenty:maple_logs", "#biomesoplenty:redwood_logs", "#biomesoplenty:mahogany_logs", "#biomesoplenty:jacaranda_logs", diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json index 30dfdf9164..27b17466db 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json @@ -5,11 +5,12 @@ "biomesoplenty:flowering_oak_leaves", "biomesoplenty:snowblossom_leaves", "biomesoplenty:rainbow_birch_leaves", - "biomesoplenty:yellow_autumn_leaves", - "biomesoplenty:orange_autumn_leaves", - "biomesoplenty:maple_leaves", "biomesoplenty:fir_leaves", + "biomesoplenty:pine_leaves", "biomesoplenty:redwood_leaves", + "biomesoplenty:red_maple_leaves", + "biomesoplenty:orange_maple_leaves", + "biomesoplenty:yellow_maple_leaves", "biomesoplenty:mahogany_leaves", "biomesoplenty:jacaranda_leaves", "biomesoplenty:palm_leaves", diff --git a/src/main/resources/data/minecraft/tags/blocks/overworld_natural_logs.json b/src/main/resources/data/minecraft/tags/blocks/overworld_natural_logs.json index cabbbc4700..1dac705c56 100644 --- a/src/main/resources/data/minecraft/tags/blocks/overworld_natural_logs.json +++ b/src/main/resources/data/minecraft/tags/blocks/overworld_natural_logs.json @@ -2,6 +2,7 @@ "values": [ "biomesoplenty:fir_log", "biomesoplenty:pine_log", + "biomesoplenty:maple_log", "biomesoplenty:redwood_log", "biomesoplenty:mahogany_log", "biomesoplenty:jacaranda_log", diff --git a/src/main/resources/data/minecraft/tags/blocks/planks.json b/src/main/resources/data/minecraft/tags/blocks/planks.json index bee1ade650..01e1a9f3ab 100644 --- a/src/main/resources/data/minecraft/tags/blocks/planks.json +++ b/src/main/resources/data/minecraft/tags/blocks/planks.json @@ -3,6 +3,7 @@ "values": [ "biomesoplenty:fir_planks", "biomesoplenty:pine_planks", + "biomesoplenty:maple_planks", "biomesoplenty:redwood_planks", "biomesoplenty:mahogany_planks", "biomesoplenty:jacaranda_planks", diff --git a/src/main/resources/data/minecraft/tags/blocks/saplings.json b/src/main/resources/data/minecraft/tags/blocks/saplings.json index 116c9c7098..f825f219b5 100644 --- a/src/main/resources/data/minecraft/tags/blocks/saplings.json +++ b/src/main/resources/data/minecraft/tags/blocks/saplings.json @@ -5,11 +5,11 @@ "biomesoplenty:flowering_oak_sapling", "biomesoplenty:snowblossom_sapling", "biomesoplenty:rainbow_birch_sapling", - "biomesoplenty:yellow_autumn_sapling", - "biomesoplenty:orange_autumn_sapling", - "biomesoplenty:maple_sapling", "biomesoplenty:fir_sapling", "biomesoplenty:pine_sapling", + "biomesoplenty:red_maple_sapling", + "biomesoplenty:orange_maple_sapling", + "biomesoplenty:yellow_maple_sapling", "biomesoplenty:redwood_sapling", "biomesoplenty:mahogany_sapling", "biomesoplenty:jacaranda_sapling", diff --git a/src/main/resources/data/minecraft/tags/blocks/slabs.json b/src/main/resources/data/minecraft/tags/blocks/slabs.json index d69946fa02..192589fd83 100644 --- a/src/main/resources/data/minecraft/tags/blocks/slabs.json +++ b/src/main/resources/data/minecraft/tags/blocks/slabs.json @@ -13,6 +13,7 @@ "biomesoplenty:brimstone_brick_slab", "biomesoplenty:fir_slab", "biomesoplenty:pine_slab", + "biomesoplenty:maple_slab", "biomesoplenty:redwood_slab", "biomesoplenty:mahogany_slab", "biomesoplenty:jacaranda_slab", diff --git a/src/main/resources/data/minecraft/tags/blocks/stairs.json b/src/main/resources/data/minecraft/tags/blocks/stairs.json index f94ba93332..cb733cbe60 100644 --- a/src/main/resources/data/minecraft/tags/blocks/stairs.json +++ b/src/main/resources/data/minecraft/tags/blocks/stairs.json @@ -10,6 +10,7 @@ "biomesoplenty:brimstone_brick_stairs", "biomesoplenty:fir_stairs", "biomesoplenty:pine_stairs", + "biomesoplenty:maple_stairs", "biomesoplenty:redwood_stairs", "biomesoplenty:mahogany_stairs", "biomesoplenty:jacaranda_stairs", diff --git a/src/main/resources/data/minecraft/tags/blocks/standing_signs.json b/src/main/resources/data/minecraft/tags/blocks/standing_signs.json index 35a986c8a1..cfd2c45417 100644 --- a/src/main/resources/data/minecraft/tags/blocks/standing_signs.json +++ b/src/main/resources/data/minecraft/tags/blocks/standing_signs.json @@ -3,6 +3,7 @@ "values": [ "biomesoplenty:fir_sign", "biomesoplenty:pine_sign", + "biomesoplenty:maple_sign", "biomesoplenty:redwood_sign", "biomesoplenty:mahogany_sign", "biomesoplenty:jacaranda_sign", diff --git a/src/main/resources/data/minecraft/tags/blocks/wall_hanging_signs.json b/src/main/resources/data/minecraft/tags/blocks/wall_hanging_signs.json index 8a1d772e99..ce2cfc9fbe 100644 --- a/src/main/resources/data/minecraft/tags/blocks/wall_hanging_signs.json +++ b/src/main/resources/data/minecraft/tags/blocks/wall_hanging_signs.json @@ -2,6 +2,7 @@ "values": [ "biomesoplenty:fir_wall_hanging_sign", "biomesoplenty:pine_wall_hanging_sign", + "biomesoplenty:maple_wall_hanging_sign", "biomesoplenty:redwood_wall_hanging_sign", "biomesoplenty:mahogany_wall_hanging_sign", "biomesoplenty:jacaranda_wall_hanging_sign", diff --git a/src/main/resources/data/minecraft/tags/blocks/wall_signs.json b/src/main/resources/data/minecraft/tags/blocks/wall_signs.json index dec449c918..c529ebc42f 100644 --- a/src/main/resources/data/minecraft/tags/blocks/wall_signs.json +++ b/src/main/resources/data/minecraft/tags/blocks/wall_signs.json @@ -3,6 +3,7 @@ "values": [ "biomesoplenty:fir_wall_sign", "biomesoplenty:pine_wall_sign", + "biomesoplenty:maple_wall_sign", "biomesoplenty:redwood_wall_sign", "biomesoplenty:mahogany_wall_sign", "biomesoplenty:jacaranda_wall_sign", diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_buttons.json b/src/main/resources/data/minecraft/tags/blocks/wooden_buttons.json index a6f666a936..083b8d4aec 100644 --- a/src/main/resources/data/minecraft/tags/blocks/wooden_buttons.json +++ b/src/main/resources/data/minecraft/tags/blocks/wooden_buttons.json @@ -3,6 +3,7 @@ "values": [ "biomesoplenty:fir_button", "biomesoplenty:pine_button", + "biomesoplenty:maple_button", "biomesoplenty:redwood_button", "biomesoplenty:mahogany_button", "biomesoplenty:jacaranda_button", diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_doors.json b/src/main/resources/data/minecraft/tags/blocks/wooden_doors.json index 0cc81a0d31..fdcc6c21f0 100644 --- a/src/main/resources/data/minecraft/tags/blocks/wooden_doors.json +++ b/src/main/resources/data/minecraft/tags/blocks/wooden_doors.json @@ -3,6 +3,7 @@ "values": [ "biomesoplenty:fir_door", "biomesoplenty:pine_door", + "biomesoplenty:maple_door", "biomesoplenty:redwood_door", "biomesoplenty:mahogany_door", "biomesoplenty:jacaranda_door", diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_fences.json b/src/main/resources/data/minecraft/tags/blocks/wooden_fences.json index ea4610d441..4b28a49c6a 100644 --- a/src/main/resources/data/minecraft/tags/blocks/wooden_fences.json +++ b/src/main/resources/data/minecraft/tags/blocks/wooden_fences.json @@ -3,6 +3,7 @@ "values": [ "biomesoplenty:fir_fence", "biomesoplenty:pine_fence", + "biomesoplenty:maple_fence", "biomesoplenty:redwood_fence", "biomesoplenty:mahogany_fence", "biomesoplenty:jacaranda_fence", diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json b/src/main/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json index 20afb71845..079b98da0f 100644 --- a/src/main/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json +++ b/src/main/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json @@ -3,6 +3,7 @@ "values": [ "biomesoplenty:fir_pressure_plate", "biomesoplenty:pine_pressure_plate", + "biomesoplenty:maple_pressure_plate", "biomesoplenty:redwood_pressure_plate", "biomesoplenty:mahogany_pressure_plate", "biomesoplenty:jacaranda_pressure_plate", diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_slabs.json b/src/main/resources/data/minecraft/tags/blocks/wooden_slabs.json index 1442c3c0e1..a3253709d0 100644 --- a/src/main/resources/data/minecraft/tags/blocks/wooden_slabs.json +++ b/src/main/resources/data/minecraft/tags/blocks/wooden_slabs.json @@ -3,6 +3,7 @@ "values": [ "biomesoplenty:fir_slab", "biomesoplenty:pine_slab", + "biomesoplenty:maple_slab", "biomesoplenty:redwood_slab", "biomesoplenty:mahogany_slab", "biomesoplenty:jacaranda_slab", diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_stairs.json b/src/main/resources/data/minecraft/tags/blocks/wooden_stairs.json index 7502e31548..5a6b3d9d30 100644 --- a/src/main/resources/data/minecraft/tags/blocks/wooden_stairs.json +++ b/src/main/resources/data/minecraft/tags/blocks/wooden_stairs.json @@ -3,6 +3,7 @@ "values": [ "biomesoplenty:fir_stairs", "biomesoplenty:pine_stairs", + "biomesoplenty:maple_stairs", "biomesoplenty:redwood_stairs", "biomesoplenty:mahogany_stairs", "biomesoplenty:jacaranda_stairs", diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_trapdoors.json b/src/main/resources/data/minecraft/tags/blocks/wooden_trapdoors.json index d5684c9ab2..3d5cc1697d 100644 --- a/src/main/resources/data/minecraft/tags/blocks/wooden_trapdoors.json +++ b/src/main/resources/data/minecraft/tags/blocks/wooden_trapdoors.json @@ -3,6 +3,7 @@ "values": [ "biomesoplenty:fir_trapdoor", "biomesoplenty:pine_trapdoor", + "biomesoplenty:maple_trapdoor", "biomesoplenty:redwood_trapdoor", "biomesoplenty:mahogany_trapdoor", "biomesoplenty:jacaranda_trapdoor", diff --git a/src/main/resources/data/minecraft/tags/items/boats.json b/src/main/resources/data/minecraft/tags/items/boats.json index 801634878d..9b8cadc936 100644 --- a/src/main/resources/data/minecraft/tags/items/boats.json +++ b/src/main/resources/data/minecraft/tags/items/boats.json @@ -3,6 +3,7 @@ "values": [ "biomesoplenty:fir_boat", "biomesoplenty:pine_boat", + "biomesoplenty:maple_boat", "biomesoplenty:redwood_boat", "biomesoplenty:mahogany_boat", "biomesoplenty:jacaranda_boat", diff --git a/src/main/resources/data/minecraft/tags/items/chest_boats.json b/src/main/resources/data/minecraft/tags/items/chest_boats.json index 8893d2248c..ba381232e5 100644 --- a/src/main/resources/data/minecraft/tags/items/chest_boats.json +++ b/src/main/resources/data/minecraft/tags/items/chest_boats.json @@ -2,6 +2,7 @@ "values": [ "biomesoplenty:fir_chest_boat", "biomesoplenty:pine_chest_boat", + "biomesoplenty:maple_chest_boat", "biomesoplenty:redwood_chest_boat", "biomesoplenty:mahogany_chest_boat", "biomesoplenty:jacaranda_chest_boat", diff --git a/src/main/resources/data/minecraft/tags/items/hanging_signs.json b/src/main/resources/data/minecraft/tags/items/hanging_signs.json index e2c51baacb..b3f02ed6da 100644 --- a/src/main/resources/data/minecraft/tags/items/hanging_signs.json +++ b/src/main/resources/data/minecraft/tags/items/hanging_signs.json @@ -2,6 +2,7 @@ "values": [ "biomesoplenty:fir_hanging_sign", "biomesoplenty:pine_hanging_sign", + "biomesoplenty:maple_hanging_sign", "biomesoplenty:redwood_hanging_sign", "biomesoplenty:mahogany_hanging_sign", "biomesoplenty:jacaranda_hanging_sign", diff --git a/src/main/resources/data/minecraft/tags/items/leaves.json b/src/main/resources/data/minecraft/tags/items/leaves.json index 7d0449c548..3fb3249906 100644 --- a/src/main/resources/data/minecraft/tags/items/leaves.json +++ b/src/main/resources/data/minecraft/tags/items/leaves.json @@ -5,11 +5,11 @@ "biomesoplenty:flowering_oak_leaves", "biomesoplenty:snowblossom_leaves", "biomesoplenty:rainbow_birch_leaves", - "biomesoplenty:yellow_autumn_leaves", - "biomesoplenty:orange_autumn_leaves", - "biomesoplenty:maple_leaves", "biomesoplenty:fir_leaves", "biomesoplenty:pine_leaves", + "biomesoplenty:red_maple_leaves", + "biomesoplenty:orange_maple_leaves", + "biomesoplenty:yellow_maple_leaves", "biomesoplenty:redwood_leaves", "biomesoplenty:mahogany_leaves", "biomesoplenty:jacaranda_leaves", diff --git a/src/main/resources/data/minecraft/tags/items/logs.json b/src/main/resources/data/minecraft/tags/items/logs.json index 032b61640b..b13b080dac 100644 --- a/src/main/resources/data/minecraft/tags/items/logs.json +++ b/src/main/resources/data/minecraft/tags/items/logs.json @@ -3,6 +3,7 @@ "values": [ "#biomesoplenty:fir_logs", "#biomesoplenty:pine_logs", + "#biomesoplenty:maple_logs", "#biomesoplenty:redwood_logs", "#biomesoplenty:mahogany_logs", "#biomesoplenty:jacaranda_logs", diff --git a/src/main/resources/data/minecraft/tags/items/logs_that_burn.json b/src/main/resources/data/minecraft/tags/items/logs_that_burn.json index 4409f219c3..a586750eae 100644 --- a/src/main/resources/data/minecraft/tags/items/logs_that_burn.json +++ b/src/main/resources/data/minecraft/tags/items/logs_that_burn.json @@ -3,6 +3,7 @@ "values": [ "#biomesoplenty:fir_logs", "#biomesoplenty:pine_logs", + "#biomesoplenty:maple_logs", "#biomesoplenty:redwood_logs", "#biomesoplenty:mahogany_logs", "#biomesoplenty:jacaranda_logs", diff --git a/src/main/resources/data/minecraft/tags/items/overworld_natural_logs.json b/src/main/resources/data/minecraft/tags/items/overworld_natural_logs.json index cabbbc4700..1dac705c56 100644 --- a/src/main/resources/data/minecraft/tags/items/overworld_natural_logs.json +++ b/src/main/resources/data/minecraft/tags/items/overworld_natural_logs.json @@ -2,6 +2,7 @@ "values": [ "biomesoplenty:fir_log", "biomesoplenty:pine_log", + "biomesoplenty:maple_log", "biomesoplenty:redwood_log", "biomesoplenty:mahogany_log", "biomesoplenty:jacaranda_log", diff --git a/src/main/resources/data/minecraft/tags/items/planks.json b/src/main/resources/data/minecraft/tags/items/planks.json index bee1ade650..01e1a9f3ab 100644 --- a/src/main/resources/data/minecraft/tags/items/planks.json +++ b/src/main/resources/data/minecraft/tags/items/planks.json @@ -3,6 +3,7 @@ "values": [ "biomesoplenty:fir_planks", "biomesoplenty:pine_planks", + "biomesoplenty:maple_planks", "biomesoplenty:redwood_planks", "biomesoplenty:mahogany_planks", "biomesoplenty:jacaranda_planks", diff --git a/src/main/resources/data/minecraft/tags/items/saplings.json b/src/main/resources/data/minecraft/tags/items/saplings.json index 116c9c7098..f825f219b5 100644 --- a/src/main/resources/data/minecraft/tags/items/saplings.json +++ b/src/main/resources/data/minecraft/tags/items/saplings.json @@ -5,11 +5,11 @@ "biomesoplenty:flowering_oak_sapling", "biomesoplenty:snowblossom_sapling", "biomesoplenty:rainbow_birch_sapling", - "biomesoplenty:yellow_autumn_sapling", - "biomesoplenty:orange_autumn_sapling", - "biomesoplenty:maple_sapling", "biomesoplenty:fir_sapling", "biomesoplenty:pine_sapling", + "biomesoplenty:red_maple_sapling", + "biomesoplenty:orange_maple_sapling", + "biomesoplenty:yellow_maple_sapling", "biomesoplenty:redwood_sapling", "biomesoplenty:mahogany_sapling", "biomesoplenty:jacaranda_sapling", diff --git a/src/main/resources/data/minecraft/tags/items/signs.json b/src/main/resources/data/minecraft/tags/items/signs.json index 35a986c8a1..cfd2c45417 100644 --- a/src/main/resources/data/minecraft/tags/items/signs.json +++ b/src/main/resources/data/minecraft/tags/items/signs.json @@ -3,6 +3,7 @@ "values": [ "biomesoplenty:fir_sign", "biomesoplenty:pine_sign", + "biomesoplenty:maple_sign", "biomesoplenty:redwood_sign", "biomesoplenty:mahogany_sign", "biomesoplenty:jacaranda_sign", diff --git a/src/main/resources/data/minecraft/tags/items/slabs.json b/src/main/resources/data/minecraft/tags/items/slabs.json index 9c2c59319e..3e8ab89c7c 100644 --- a/src/main/resources/data/minecraft/tags/items/slabs.json +++ b/src/main/resources/data/minecraft/tags/items/slabs.json @@ -13,6 +13,7 @@ "biomesoplenty:brimstone_brick_slab", "biomesoplenty:fir_slab", "biomesoplenty:pine_slab", + "biomesoplenty:maple_slab", "biomesoplenty:redwood_slab", "biomesoplenty:mahogany_slab", "biomesoplenty:jacaranda_slab", diff --git a/src/main/resources/data/minecraft/tags/items/stairs.json b/src/main/resources/data/minecraft/tags/items/stairs.json index f94ba93332..cb733cbe60 100644 --- a/src/main/resources/data/minecraft/tags/items/stairs.json +++ b/src/main/resources/data/minecraft/tags/items/stairs.json @@ -10,6 +10,7 @@ "biomesoplenty:brimstone_brick_stairs", "biomesoplenty:fir_stairs", "biomesoplenty:pine_stairs", + "biomesoplenty:maple_stairs", "biomesoplenty:redwood_stairs", "biomesoplenty:mahogany_stairs", "biomesoplenty:jacaranda_stairs", diff --git a/src/main/resources/data/minecraft/tags/items/wooden_buttons.json b/src/main/resources/data/minecraft/tags/items/wooden_buttons.json index a6f666a936..083b8d4aec 100644 --- a/src/main/resources/data/minecraft/tags/items/wooden_buttons.json +++ b/src/main/resources/data/minecraft/tags/items/wooden_buttons.json @@ -3,6 +3,7 @@ "values": [ "biomesoplenty:fir_button", "biomesoplenty:pine_button", + "biomesoplenty:maple_button", "biomesoplenty:redwood_button", "biomesoplenty:mahogany_button", "biomesoplenty:jacaranda_button", diff --git a/src/main/resources/data/minecraft/tags/items/wooden_doors.json b/src/main/resources/data/minecraft/tags/items/wooden_doors.json index 0cc81a0d31..fdcc6c21f0 100644 --- a/src/main/resources/data/minecraft/tags/items/wooden_doors.json +++ b/src/main/resources/data/minecraft/tags/items/wooden_doors.json @@ -3,6 +3,7 @@ "values": [ "biomesoplenty:fir_door", "biomesoplenty:pine_door", + "biomesoplenty:maple_door", "biomesoplenty:redwood_door", "biomesoplenty:mahogany_door", "biomesoplenty:jacaranda_door", diff --git a/src/main/resources/data/minecraft/tags/items/wooden_fences.json b/src/main/resources/data/minecraft/tags/items/wooden_fences.json index ea4610d441..4b28a49c6a 100644 --- a/src/main/resources/data/minecraft/tags/items/wooden_fences.json +++ b/src/main/resources/data/minecraft/tags/items/wooden_fences.json @@ -3,6 +3,7 @@ "values": [ "biomesoplenty:fir_fence", "biomesoplenty:pine_fence", + "biomesoplenty:maple_fence", "biomesoplenty:redwood_fence", "biomesoplenty:mahogany_fence", "biomesoplenty:jacaranda_fence", diff --git a/src/main/resources/data/minecraft/tags/items/wooden_pressure_plates.json b/src/main/resources/data/minecraft/tags/items/wooden_pressure_plates.json index 20afb71845..079b98da0f 100644 --- a/src/main/resources/data/minecraft/tags/items/wooden_pressure_plates.json +++ b/src/main/resources/data/minecraft/tags/items/wooden_pressure_plates.json @@ -3,6 +3,7 @@ "values": [ "biomesoplenty:fir_pressure_plate", "biomesoplenty:pine_pressure_plate", + "biomesoplenty:maple_pressure_plate", "biomesoplenty:redwood_pressure_plate", "biomesoplenty:mahogany_pressure_plate", "biomesoplenty:jacaranda_pressure_plate", diff --git a/src/main/resources/data/minecraft/tags/items/wooden_slabs.json b/src/main/resources/data/minecraft/tags/items/wooden_slabs.json index 1442c3c0e1..a3253709d0 100644 --- a/src/main/resources/data/minecraft/tags/items/wooden_slabs.json +++ b/src/main/resources/data/minecraft/tags/items/wooden_slabs.json @@ -3,6 +3,7 @@ "values": [ "biomesoplenty:fir_slab", "biomesoplenty:pine_slab", + "biomesoplenty:maple_slab", "biomesoplenty:redwood_slab", "biomesoplenty:mahogany_slab", "biomesoplenty:jacaranda_slab", diff --git a/src/main/resources/data/minecraft/tags/items/wooden_stairs.json b/src/main/resources/data/minecraft/tags/items/wooden_stairs.json index 7502e31548..5a6b3d9d30 100644 --- a/src/main/resources/data/minecraft/tags/items/wooden_stairs.json +++ b/src/main/resources/data/minecraft/tags/items/wooden_stairs.json @@ -3,6 +3,7 @@ "values": [ "biomesoplenty:fir_stairs", "biomesoplenty:pine_stairs", + "biomesoplenty:maple_stairs", "biomesoplenty:redwood_stairs", "biomesoplenty:mahogany_stairs", "biomesoplenty:jacaranda_stairs", diff --git a/src/main/resources/data/minecraft/tags/items/wooden_trapdoors.json b/src/main/resources/data/minecraft/tags/items/wooden_trapdoors.json index d5684c9ab2..3d5cc1697d 100644 --- a/src/main/resources/data/minecraft/tags/items/wooden_trapdoors.json +++ b/src/main/resources/data/minecraft/tags/items/wooden_trapdoors.json @@ -3,6 +3,7 @@ "values": [ "biomesoplenty:fir_trapdoor", "biomesoplenty:pine_trapdoor", + "biomesoplenty:maple_trapdoor", "biomesoplenty:redwood_trapdoor", "biomesoplenty:mahogany_trapdoor", "biomesoplenty:jacaranda_trapdoor", diff --git a/src/main/resources/data/sereneseasons/tags/blocks/autumn_crops.json b/src/main/resources/data/sereneseasons/tags/blocks/autumn_crops.json index 6312ac4535..129a373b3b 100644 --- a/src/main/resources/data/sereneseasons/tags/blocks/autumn_crops.json +++ b/src/main/resources/data/sereneseasons/tags/blocks/autumn_crops.json @@ -5,11 +5,11 @@ "biomesoplenty:flowering_oak_sapling", "biomesoplenty:snowblossom_sapling", "biomesoplenty:rainbow_birch_sapling", - "biomesoplenty:yellow_autumn_sapling", - "biomesoplenty:orange_autumn_sapling", - "biomesoplenty:maple_sapling", "biomesoplenty:fir_sapling", "biomesoplenty:pine_sapling", + "biomesoplenty:red_maple_sapling", + "biomesoplenty:orange_maple_sapling", + "biomesoplenty:yellow_maple_sapling", "biomesoplenty:redwood_sapling", "biomesoplenty:mahogany_sapling", "biomesoplenty:jacaranda_sapling", diff --git a/src/main/resources/data/sereneseasons/tags/blocks/spring_crops.json b/src/main/resources/data/sereneseasons/tags/blocks/spring_crops.json index d2f835dd06..d0fd554b8c 100644 --- a/src/main/resources/data/sereneseasons/tags/blocks/spring_crops.json +++ b/src/main/resources/data/sereneseasons/tags/blocks/spring_crops.json @@ -5,11 +5,11 @@ "biomesoplenty:flowering_oak_sapling", "biomesoplenty:snowblossom_sapling", "biomesoplenty:rainbow_birch_sapling", - "biomesoplenty:yellow_autumn_sapling", - "biomesoplenty:orange_autumn_sapling", - "biomesoplenty:maple_sapling", "biomesoplenty:fir_sapling", "biomesoplenty:pine_sapling", + "biomesoplenty:red_maple_sapling", + "biomesoplenty:orange_maple_sapling", + "biomesoplenty:yellow_maple_sapling", "biomesoplenty:redwood_sapling", "biomesoplenty:mahogany_sapling", "biomesoplenty:jacaranda_sapling", diff --git a/src/main/resources/data/sereneseasons/tags/blocks/summer_crops.json b/src/main/resources/data/sereneseasons/tags/blocks/summer_crops.json index 7446274a87..ab02be5b3f 100644 --- a/src/main/resources/data/sereneseasons/tags/blocks/summer_crops.json +++ b/src/main/resources/data/sereneseasons/tags/blocks/summer_crops.json @@ -5,11 +5,11 @@ "biomesoplenty:flowering_oak_sapling", "biomesoplenty:snowblossom_sapling", "biomesoplenty:rainbow_birch_sapling", - "biomesoplenty:yellow_autumn_sapling", - "biomesoplenty:orange_autumn_sapling", - "biomesoplenty:maple_sapling", "biomesoplenty:fir_sapling", "biomesoplenty:pine_sapling", + "biomesoplenty:red_maple_sapling", + "biomesoplenty:orange_maple_sapling", + "biomesoplenty:yellow_maple_sapling", "biomesoplenty:redwood_sapling", "biomesoplenty:mahogany_sapling", "biomesoplenty:jacaranda_sapling", diff --git a/src/main/resources/data/sereneseasons/tags/blocks/winter_crops.json b/src/main/resources/data/sereneseasons/tags/blocks/winter_crops.json index 6312ac4535..129a373b3b 100644 --- a/src/main/resources/data/sereneseasons/tags/blocks/winter_crops.json +++ b/src/main/resources/data/sereneseasons/tags/blocks/winter_crops.json @@ -5,11 +5,11 @@ "biomesoplenty:flowering_oak_sapling", "biomesoplenty:snowblossom_sapling", "biomesoplenty:rainbow_birch_sapling", - "biomesoplenty:yellow_autumn_sapling", - "biomesoplenty:orange_autumn_sapling", - "biomesoplenty:maple_sapling", "biomesoplenty:fir_sapling", "biomesoplenty:pine_sapling", + "biomesoplenty:red_maple_sapling", + "biomesoplenty:orange_maple_sapling", + "biomesoplenty:yellow_maple_sapling", "biomesoplenty:redwood_sapling", "biomesoplenty:mahogany_sapling", "biomesoplenty:jacaranda_sapling", diff --git a/src/main/resources/data/sereneseasons/tags/items/autumn_crops.json b/src/main/resources/data/sereneseasons/tags/items/autumn_crops.json index 6312ac4535..129a373b3b 100644 --- a/src/main/resources/data/sereneseasons/tags/items/autumn_crops.json +++ b/src/main/resources/data/sereneseasons/tags/items/autumn_crops.json @@ -5,11 +5,11 @@ "biomesoplenty:flowering_oak_sapling", "biomesoplenty:snowblossom_sapling", "biomesoplenty:rainbow_birch_sapling", - "biomesoplenty:yellow_autumn_sapling", - "biomesoplenty:orange_autumn_sapling", - "biomesoplenty:maple_sapling", "biomesoplenty:fir_sapling", "biomesoplenty:pine_sapling", + "biomesoplenty:red_maple_sapling", + "biomesoplenty:orange_maple_sapling", + "biomesoplenty:yellow_maple_sapling", "biomesoplenty:redwood_sapling", "biomesoplenty:mahogany_sapling", "biomesoplenty:jacaranda_sapling", diff --git a/src/main/resources/data/sereneseasons/tags/items/spring_crops.json b/src/main/resources/data/sereneseasons/tags/items/spring_crops.json index d2f835dd06..d0fd554b8c 100644 --- a/src/main/resources/data/sereneseasons/tags/items/spring_crops.json +++ b/src/main/resources/data/sereneseasons/tags/items/spring_crops.json @@ -5,11 +5,11 @@ "biomesoplenty:flowering_oak_sapling", "biomesoplenty:snowblossom_sapling", "biomesoplenty:rainbow_birch_sapling", - "biomesoplenty:yellow_autumn_sapling", - "biomesoplenty:orange_autumn_sapling", - "biomesoplenty:maple_sapling", "biomesoplenty:fir_sapling", "biomesoplenty:pine_sapling", + "biomesoplenty:red_maple_sapling", + "biomesoplenty:orange_maple_sapling", + "biomesoplenty:yellow_maple_sapling", "biomesoplenty:redwood_sapling", "biomesoplenty:mahogany_sapling", "biomesoplenty:jacaranda_sapling", diff --git a/src/main/resources/data/sereneseasons/tags/items/summer_crops.json b/src/main/resources/data/sereneseasons/tags/items/summer_crops.json index 7446274a87..ab02be5b3f 100644 --- a/src/main/resources/data/sereneseasons/tags/items/summer_crops.json +++ b/src/main/resources/data/sereneseasons/tags/items/summer_crops.json @@ -5,11 +5,11 @@ "biomesoplenty:flowering_oak_sapling", "biomesoplenty:snowblossom_sapling", "biomesoplenty:rainbow_birch_sapling", - "biomesoplenty:yellow_autumn_sapling", - "biomesoplenty:orange_autumn_sapling", - "biomesoplenty:maple_sapling", "biomesoplenty:fir_sapling", "biomesoplenty:pine_sapling", + "biomesoplenty:red_maple_sapling", + "biomesoplenty:orange_maple_sapling", + "biomesoplenty:yellow_maple_sapling", "biomesoplenty:redwood_sapling", "biomesoplenty:mahogany_sapling", "biomesoplenty:jacaranda_sapling", diff --git a/src/main/resources/data/sereneseasons/tags/items/winter_crops.json b/src/main/resources/data/sereneseasons/tags/items/winter_crops.json index 6312ac4535..129a373b3b 100644 --- a/src/main/resources/data/sereneseasons/tags/items/winter_crops.json +++ b/src/main/resources/data/sereneseasons/tags/items/winter_crops.json @@ -5,11 +5,11 @@ "biomesoplenty:flowering_oak_sapling", "biomesoplenty:snowblossom_sapling", "biomesoplenty:rainbow_birch_sapling", - "biomesoplenty:yellow_autumn_sapling", - "biomesoplenty:orange_autumn_sapling", - "biomesoplenty:maple_sapling", "biomesoplenty:fir_sapling", "biomesoplenty:pine_sapling", + "biomesoplenty:red_maple_sapling", + "biomesoplenty:orange_maple_sapling", + "biomesoplenty:yellow_maple_sapling", "biomesoplenty:redwood_sapling", "biomesoplenty:mahogany_sapling", "biomesoplenty:jacaranda_sapling",