Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add the Lush bee line #180

Merged
merged 4 commits into from
Feb 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
// 1.20.1 2024-12-20T17:33:23.6981192 Block States: forestry
// 1.20.1 2025-02-03T18:48:00.1908785 Block States: forestry
efb6cd9088f34afc855db97087b928d69c02ae5f assets/forestry/blockstates/apatite_ore.json
f57484d5f7156fddd1a540e02d9ddec37cb1f2bd assets/forestry/blockstates/arboretum_managed.json
f57484d5f7156fddd1a540e02d9ddec37cb1f2bd assets/forestry/blockstates/arboretum_manual.json
aefefee959bc56089baf6434decaf5ff1a8773a9 assets/forestry/blockstates/beehive_desert.json
c50532e817eb0fca568821f3ba6f8508ede25f8e assets/forestry/blockstates/beehive_end.json
5f79508faa764bc4ea549a822ac76d2ec54e9584 assets/forestry/blockstates/beehive_forest.json
d6b5189f8f956e35a8d291cba2ea63c216b65c81 assets/forestry/blockstates/beehive_jungle.json
6b396981380f9eac015c45838f809333d3b3ca0b assets/forestry/blockstates/beehive_lush.json
a17b43aaf5af570b8120a5b858ab5a54d6d615be assets/forestry/blockstates/beehive_meadows.json
ec82852b003aa43dd0955b5156afa9ead9941163 assets/forestry/blockstates/beehive_savanna.json
4181eb878799469af0824e65e6208eea1707568a assets/forestry/blockstates/beehive_snow.json
7f8074ed80475da630a24a79d57cfeafa5d76aa1 assets/forestry/blockstates/beehive_swamp.json
842ee3e006d7ee927a676bbac7d012e118a35e16 assets/forestry/blockstates/beehive_swarm.json
c15a10b7ebb4eed6ef9bafb7bd6aedf3b18ad1bb assets/forestry/blockstates/bog_earth.json
57a5c594a409429645981afee03237765ce35e59 assets/forestry/blockstates/deepslate_apatite_ore.json
fb0190d66aa7f0dfdac27daf22526880635b1f8b assets/forestry/blockstates/deepslate_tin_ore.json
Expand Down Expand Up @@ -193,6 +203,16 @@ a397f3eedb8d2435def474635b0a4dd23e252ce1 assets/forestry/blockstates/tree_wenge_
919cbbae5d037403b03b93c64acb7ec603f7f010 assets/forestry/blockstates/tree_zebrawood_default_leaves.json
919cbbae5d037403b03b93c64acb7ec603f7f010 assets/forestry/blockstates/tree_zebrawood_default_leaves_fruit.json
c1e2cc6f05bb5ed3019b2dd323646786b9148d65 assets/forestry/models/block/apatite_ore.json
13f7b6019854bd74306f1c2b57e01c39cc1337db assets/forestry/models/block/beehive_desert.json
3afffdc72c7390f9d02e307c7e1800c848d2d6e9 assets/forestry/models/block/beehive_end.json
f74b2c91e018425ed52b05740c114148c488ac20 assets/forestry/models/block/beehive_forest.json
0a267aaa75d0e0942b3d763cf02427e638e09f3d assets/forestry/models/block/beehive_jungle.json
0605f7abb55616d4911442285702298055fa9dc5 assets/forestry/models/block/beehive_lush.json
8d9a2cbc763ac50c871ef9bed6713e4a487825c2 assets/forestry/models/block/beehive_meadows.json
e68cb32ceb2edf15cc7f89c7444b2fd83127ffca assets/forestry/models/block/beehive_savanna.json
9165b90ce88c311a3731c42735f015e8d372e2a6 assets/forestry/models/block/beehive_snow.json
0b786c345265694430e4e513b229b3fdfdda299b assets/forestry/models/block/beehive_swamp.json
f3236b6e47025ac20dd397ae036e204f41177cfd assets/forestry/models/block/beehive_swarm.json
aaf770a5bcab152daa4ca1e85d8f1c7fcd2b2941 assets/forestry/models/block/bog_earth.json
7711405427982028dc577825c9bc40666cf2ceb1 assets/forestry/models/block/deepslate_apatite_ore.json
f26074de1c36c512ce65a02b23114ae7b076f906 assets/forestry/models/block/deepslate_tin_ore.json
Expand Down Expand Up @@ -311,6 +331,16 @@ f436e4fd30c90a5549aac5c4b8b179bf5b149f2e assets/forestry/models/block/tree_wenge
bf3d2203d55590dbdaeb064114a01d95aac3579a assets/forestry/models/block/tree_willow_default_leaves.json
dcb48dadb634675a8f8aee9fd202e404c9060698 assets/forestry/models/block/tree_zebrawood_default_leaves.json
f77d9f3afb7a1f72f9ae4c48d34b49d3b1dabbbb assets/forestry/models/item/apatite_ore.json
d0eef751812bbf2ce67e31b4dff72b5a311415f5 assets/forestry/models/item/beehive_desert.json
07d7836e31acab066077a5cc4e1e7704af7449ba assets/forestry/models/item/beehive_end.json
2164c31b692c28d0020e2c71313d8c42a5817325 assets/forestry/models/item/beehive_forest.json
b3cd02039ef025ff6429a3655944e22a8659ea01 assets/forestry/models/item/beehive_jungle.json
d04ddfe5198dbf6a289cca624a06df2774a8ec34 assets/forestry/models/item/beehive_lush.json
614c49deddd68f81f641a2f439f1f0e86f9410fe assets/forestry/models/item/beehive_meadows.json
93da685134a2cba3c2359f9fd4c3a80e7be22ee3 assets/forestry/models/item/beehive_savanna.json
eaf59827ef2dd8b360b6733535f342a25d54f8a4 assets/forestry/models/item/beehive_snow.json
f4cd9e4406b6b20e00ef3473f2a8ca5382612fab assets/forestry/models/item/beehive_swamp.json
f298a645d1724e252886ccd37847c92bac011d76 assets/forestry/models/item/beehive_swarm.json
d54cf546ef520cea5a3fe5f28b285829231acad7 assets/forestry/models/item/deepslate_apatite_ore.json
87de1938f8f93b1fd7f8b66d7fb33746e37c207c assets/forestry/models/item/deepslate_tin_ore.json
54e96bdcdfc8e4d9c286c03209781878ccc65268 assets/forestry/models/item/farm_control_brick.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2025-01-15T23:29:40.0926931 Loot Tables
// 1.20.1 2025-02-03T18:15:10.2026322 Loot Tables
41fb17dab11f0d0ac4c695eb706119b894401c59 data/forestry/loot_tables/blocks/acacia_desert_button.json
cd06ea8f3c3db3fc055cc6b07393f6aa938e0525 data/forestry/loot_tables/blocks/acacia_desert_door.json
0826e330e65982a3be8d6b9d0987e5fc526d62dd data/forestry/loot_tables/blocks/acacia_desert_fence.json
Expand Down Expand Up @@ -97,6 +97,7 @@ f7a93b91cdcc6f14ab4c0489a2b8e5156f21b7c0 data/forestry/loot_tables/blocks/beehiv
f1b817aba7dcf3fc0ddd08f4aa1f44c6512d1198 data/forestry/loot_tables/blocks/beehive_end.json
3d2a9207b55de3fcdd8431ffbe6016511d49d071 data/forestry/loot_tables/blocks/beehive_forest.json
41f7fb87de2d4f466bbd81da053410a1f960d2a9 data/forestry/loot_tables/blocks/beehive_jungle.json
329cac9841e11bf7f76b53e0fbbfdfe18c799436 data/forestry/loot_tables/blocks/beehive_lush.json
05dbcb7c32dc998788cb93323c3c10e63a53dded data/forestry/loot_tables/blocks/beehive_meadows.json
c9f20dea972ea84db298bc6da4b88b83c48f4f9b data/forestry/loot_tables/blocks/beehive_savanna.json
fda6aa38ac28800d33083c9975ee175e373b050e data/forestry/loot_tables/blocks/beehive_snow.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2025-01-15T23:55:41.4379445 Tags for minecraft:block mod id forestry
// 1.20.1 2025-02-03T18:15:10.2142988 Tags for minecraft:block mod id forestry
37a390e7a402ae2ce1addd2b8bbefd6229e8c7c6 data/forestry/tags/blocks/acacia_desert_logs.json
d38d236618a81cc1b2e0dbb4e4d7c11e43e522ea data/forestry/tags/blocks/balsa_logs.json
16059fb3cfd04606a73b78eaefbf7659417cb9d5 data/forestry/tags/blocks/baobab_logs.json
Expand All @@ -7,6 +7,7 @@ d38d236618a81cc1b2e0dbb4e4d7c11e43e522ea data/forestry/tags/blocks/balsa_logs.js
a7c007c7c6e32a913007fb71d57b7071baca9550 data/forestry/tags/blocks/cocobolo_logs.json
67f36c77c5893b9d657d5707452976bd7292c1b7 data/forestry/tags/blocks/ebony_logs.json
40fc28555ba86485c2fdf3bc327bb05602bd7cb5 data/forestry/tags/blocks/flowers/cacti.json
e1f99e2c30429c3a0b1d9a31f0c0c41db5496330 data/forestry/tags/blocks/flowers/cave.json
9ec5b3c6e6cf1ca04b004d599f0e1477525d6eaa data/forestry/tags/blocks/flowers/end.json
3d2b45c6d09b6ad2f7d9e988cae1be42464c3d4f data/forestry/tags/blocks/flowers/gourd.json
52d9237a861f244e608b27dc2ce2b3f74c0cf16b data/forestry/tags/blocks/flowers/jungle.json
Expand All @@ -21,6 +22,8 @@ a72c613d8786fc7756573ffec9c22f7ed2973d9e data/forestry/tags/blocks/flowers/vanil
a4e8097fff07f9a74259d6b5dd583f3437ff28a2 data/forestry/tags/blocks/grafter.json
5bf961f0fb31691326bd59df625f14f6c27424c8 data/forestry/tags/blocks/greenheart_logs.json
a433d512a27e91df207a3f220557a8882e9d4129 data/forestry/tags/blocks/hill_cherry_logs.json
c547bcea8bc1ab3a88bba8caaf4d02e7897efb12 data/forestry/tags/blocks/hive_grounds/cave_extra_replaceable.json
02d0d7f14f7fcab4acadaf6d779d37b734afe834 data/forestry/tags/blocks/hive_grounds/lush.json
8bb7638e4835f6c3a07cd7620655ab015c154fc1 data/forestry/tags/blocks/hive_grounds/modest.json
316eaacbc5d5ce516d9d3506a2f1b21e2d166bcf data/forestry/tags/blocks/hive_grounds/wintry.json
75a78e172fd774cde17a3d11c02dd4e1b9ea7041 data/forestry/tags/blocks/ipe_logs.json
Expand All @@ -36,7 +39,7 @@ c650452f3c2c7523b5d43f7a54ddebe133610760 data/forestry/tags/blocks/padauk_logs.j
24f3c0c5b75c3d2795315ab535de9a7cb30879c0 data/forestry/tags/blocks/pine_logs.json
57a3ddceb21b169b8704e697fd89e03ac1c75cef data/forestry/tags/blocks/plum_logs.json
1e2ec9fb02b1b3126fa83d7bc90fe335db9e48b6 data/forestry/tags/blocks/poplar_logs.json
c9a1e2d59a521114d223c967dcb8fe01515ebb38 data/forestry/tags/blocks/scoop.json
ca92f705378db38c761293f4c6867353f1b151ab data/forestry/tags/blocks/scoop.json
5001373d3cdbe55ab238e1c82b521698c299e190 data/forestry/tags/blocks/sequoia_logs.json
ff349380d39ea7002699d10ebb9251ed0391aacb data/forestry/tags/blocks/teak_logs.json
b841a00870fdcf55fc0e81960a6fefeec9a84f96 data/forestry/tags/blocks/valid_farm_base.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// 1.20.1 2024-11-21T17:52:29.5727492 Tags for minecraft:worldgen/biome mod id forestry
// 1.20.1 2025-02-02T21:55:22.3904862 Tags for minecraft:worldgen/biome mod id forestry
2848fd21678020e480817af24906cc7471b13118 data/forestry/tags/worldgen/biome/humidity/arid.json
0f241c94b10e4b16b4304f66ad949bb089955b1e data/forestry/tags/worldgen/biome/humidity/damp.json
3589bb8f8e711112317247a4999588e18ac59e7e data/forestry/tags/worldgen/biome/special/shattered_savanna.json
2848fd21678020e480817af24906cc7471b13118 data/forestry/tags/worldgen/biome/temperature/cold.json
a24545b58f3f91c6c033586e2b2ae12f1e8131b1 data/forestry/tags/worldgen/biome/temperature/hellish.json
996fc965de0088cc6a3ba3b45ed2c813ba8adbf9 data/forestry/tags/worldgen/biome/temperature/warm.json
1b4956ddefcf5cb82107f235de51e166a891f5e6 data/forestry/tags/worldgen/biome/temperature/warm.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "forestry:block/beehive_desert"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "forestry:block/beehive_end"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "forestry:block/beehive_forest"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "forestry:block/beehive_jungle"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "forestry:block/beehive_lush"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "forestry:block/beehive_meadows"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "forestry:block/beehive_savanna"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "forestry:block/beehive_snow"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "forestry:block/beehive_swamp"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "forestry:block/beehive_swarm"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "forestry:block/beehives/desert.top",
"side": "forestry:block/beehives/desert.side",
"top": "forestry:block/beehives/desert.top"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "forestry:block/beehives/end.top",
"side": "forestry:block/beehives/end.side",
"top": "forestry:block/beehives/end.top"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "forestry:block/beehives/forest.top",
"side": "forestry:block/beehives/forest.side",
"top": "forestry:block/beehives/forest.top"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "forestry:block/beehives/jungle.top",
"side": "forestry:block/beehives/jungle.side",
"top": "forestry:block/beehives/jungle.top"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "forestry:block/beehives/lush.bottom",
"side": "forestry:block/beehives/lush.side",
"top": "forestry:block/beehives/lush.top"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "forestry:block/beehives/meadows.top",
"side": "forestry:block/beehives/meadows.side",
"top": "forestry:block/beehives/meadows.top"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "forestry:block/beehives/savanna.top",
"side": "forestry:block/beehives/savanna.side",
"top": "forestry:block/beehives/savanna.top"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "forestry:block/beehives/snow.top",
"side": "forestry:block/beehives/snow.side",
"top": "forestry:block/beehives/snow.top"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "forestry:block/beehives/swamp.top",
"side": "forestry:block/beehives/swamp.side",
"top": "forestry:block/beehives/swamp.top"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "minecraft:block/cube_bottom_top",
"textures": {
"bottom": "forestry:block/beehives/swarm.top",
"side": "forestry:block/beehives/swarm.side",
"top": "forestry:block/beehives/swarm.top"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "forestry:block/beehive_desert"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "forestry:block/beehive_end"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "forestry:block/beehive_forest"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "forestry:block/beehive_jungle"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "forestry:block/beehive_lush"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "forestry:block/beehive_meadows"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "forestry:block/beehive_savanna"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "forestry:block/beehive_snow"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "forestry:block/beehive_swamp"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "forestry:block/beehive_swarm"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "forestry:beehive_lush"
}
],
"rolls": 1.0
}
],
"random_sequence": "forestry:blocks/beehive_lush"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"values": [
"minecraft:cave_vines",
"minecraft:cave_vines_plant",
"minecraft:spore_blossom"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"values": [
"minecraft:pointed_dripstone",
"minecraft:cave_vines",
"minecraft:cave_vines_plant",
"minecraft:hanging_roots",
"minecraft:glow_lichen"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"values": [
"minecraft:moss_block",
"minecraft:rooted_dirt"
]
}
Loading