From 035d55ffd5039b31af990c26d24720d96b5b930e Mon Sep 17 00:00:00 2001 From: Redeix <59435925+Redeix@users.noreply.github.com> Date: Sun, 6 Jul 2025 05:56:14 -0500 Subject: [PATCH] Biodiesel Stuff (#1249) * - Lots of ui updates. And a couple fixes. * - New button textures. - Fixed campfire loot table. - Made anvil rod recipes easier. - Added assembler recipes for multiblock tank parts. * - Added assembler recipes for multiblock tank parts. * - Updated Changelog * - Some more UI tweaks. - Added modern-markings mod with integration. * - Updated stromatolite textures - Added some more WIP venus foliage * - Moved some blocks over from tfg-core. * - Updated textures for tier-1 rocket and food oven. * - Updated textures for more ad-astra stuff + new panorama * - Biodiesel stuff --------- Co-authored-by: Pyritie --- .../fancymenu/customization/gui_main_menu.txt | 4 +- kubejs/assets/tfg/blockstates/rapeseed.json | 1 + .../assets/tfg/blockstates/rapeseed_dead.json | 1 + .../assets/tfg/blockstates/rapeseed_wild.json | 1 + kubejs/assets/tfg/blockstates/sunflower.json | 1 + .../tfg/blockstates/sunflower_dead.json | 1 + .../tfg/blockstates/sunflower_wild.json | 1 + .../tfg/models/block/crop/rapeseed_age_0.json | 1 + .../tfg/models/block/crop/rapeseed_age_1.json | 1 + .../tfg/models/block/crop/rapeseed_age_2.json | 1 + .../block/crop/rapeseed_age_3_bottom.json | 1 + .../models/block/crop/rapeseed_age_3_top.json | 1 + .../block/crop/rapeseed_age_4_bottom.json | 1 + .../models/block/crop/rapeseed_age_4_top.json | 1 + .../block/crop/rapeseed_age_5_bottom.json | 1 + .../models/block/crop/rapeseed_age_5_top.json | 1 + .../block/crop/rapeseed_dead_bottom.json | 1 + .../models/block/crop/rapeseed_dead_top.json | 1 + .../block/crop/rapeseed_dead_young.json | 1 + .../tfg/models/block/crop/rapeseed_wild.json | 1 + .../models/block/crop/sunflower_age_0.json | 78 ++++++++ .../models/block/crop/sunflower_age_1.json | 78 ++++++++ .../models/block/crop/sunflower_age_2.json | 78 ++++++++ .../models/block/crop/sunflower_age_3.json | 78 ++++++++ .../block/crop/sunflower_age_4_bottom.json | 78 ++++++++ .../block/crop/sunflower_age_4_top.json | 124 +++++++++++++ .../block/crop/sunflower_age_5_bottom.json | 78 ++++++++ .../block/crop/sunflower_age_5_top.json | 124 +++++++++++++ .../block/crop/sunflower_dead_bottom.json | 78 ++++++++ .../models/block/crop/sunflower_dead_top.json | 123 +++++++++++++ .../block/crop/sunflower_dead_young.json | 78 ++++++++ .../tfg/models/block/crop/sunflower_wild.json | 170 ++++++++++++++++++ .../block/crop/sunflower_wild_bottom.json | 78 ++++++++ .../models/block/crop/sunflower_wild_top.json | 124 +++++++++++++ .../assets/tfg/models/item/rapeseed_wild.json | 3 + .../tfg/models/item/sunflower_wild.json | 3 + .../textures/block/crop/rapeseed_age_0.png | Bin 0 -> 356 bytes .../textures/block/crop/rapeseed_age_1.png | Bin 0 -> 492 bytes .../textures/block/crop/rapeseed_age_2.png | Bin 0 -> 6529 bytes .../block/crop/rapeseed_age_3_bottom.png | Bin 0 -> 583 bytes .../block/crop/rapeseed_age_3_top.png | Bin 0 -> 415 bytes .../block/crop/rapeseed_age_4_bottom.png | Bin 0 -> 420 bytes .../block/crop/rapeseed_age_4_top.png | Bin 0 -> 548 bytes .../block/crop/rapeseed_age_5_bottom.png | Bin 0 -> 496 bytes .../block/crop/rapeseed_age_5_top.png | Bin 0 -> 561 bytes .../block/crop/rapeseed_dead_bottom.png | Bin 0 -> 423 bytes .../textures/block/crop/rapeseed_dead_top.png | Bin 0 -> 507 bytes .../block/crop/rapeseed_dead_young.png | Bin 0 -> 370 bytes .../block/crop/rapeseed_greenhouse_0.png | Bin 0 -> 356 bytes .../block/crop/rapeseed_greenhouse_1.png | Bin 0 -> 415 bytes .../block/crop/rapeseed_greenhouse_2.png | Bin 0 -> 542 bytes .../block/crop/rapeseed_greenhouse_3.png | Bin 0 -> 561 bytes .../textures/block/crop/sunflower_age_0.png | Bin 0 -> 141 bytes .../textures/block/crop/sunflower_age_1.png | Bin 0 -> 189 bytes .../textures/block/crop/sunflower_age_2.png | Bin 0 -> 238 bytes .../textures/block/crop/sunflower_age_3.png | Bin 0 -> 290 bytes .../block/crop/sunflower_age_4_bottom.png | Bin 0 -> 230 bytes .../block/crop/sunflower_age_4_top.png | Bin 0 -> 942 bytes .../block/crop/sunflower_age_5_bottom.png | Bin 0 -> 230 bytes .../block/crop/sunflower_age_5_top.png | Bin 0 -> 998 bytes .../textures/block/crop/sunflower_bottom.png | Bin 0 -> 216 bytes .../block/crop/sunflower_dead_young.png | Bin 0 -> 228 bytes .../block/crop/sunflower_greenhouse_0.png | Bin 0 -> 160 bytes .../block/crop/sunflower_greenhouse_1.png | Bin 0 -> 287 bytes .../block/crop/sunflower_greenhouse_2.png | Bin 0 -> 341 bytes .../block/crop/sunflower_greenhouse_3.png | Bin 0 -> 406 bytes .../tfg/textures/block/crop/sunflower_top.png | Bin 0 -> 850 bytes .../tfg/textures/item/rapeseed_product.png | Bin 0 -> 408 bytes .../tfg/textures/item/rapeseed_seeds.png | Bin 0 -> 434 bytes .../textures/item/roasted_sunflower_seeds.png | Bin 0 -> 548 bytes .../tfg/textures/item/sunflower_product.png | Bin 0 -> 297 bytes .../tfg/textures/item/sunflower_seed.png | Bin 0 -> 473 bytes kubejs/server_scripts/tfg/data.js | 50 +++++- kubejs/server_scripts/tfg/recipes.food.js | 3 + .../tfg/recipes.miscellaneous.js | 4 +- kubejs/server_scripts/tfg/tags.js | 4 + kubejs/startup_scripts/tfc/constants.js | 5 +- kubejs/startup_scripts/tfg/blocks.crops.js | 42 +++-- kubejs/startup_scripts/tfg/items.food.js | 5 +- 79 files changed, 1484 insertions(+), 25 deletions(-) create mode 100644 kubejs/assets/tfg/blockstates/rapeseed.json create mode 100644 kubejs/assets/tfg/blockstates/rapeseed_dead.json create mode 100644 kubejs/assets/tfg/blockstates/rapeseed_wild.json create mode 100644 kubejs/assets/tfg/blockstates/sunflower.json create mode 100644 kubejs/assets/tfg/blockstates/sunflower_dead.json create mode 100644 kubejs/assets/tfg/blockstates/sunflower_wild.json create mode 100644 kubejs/assets/tfg/models/block/crop/rapeseed_age_0.json create mode 100644 kubejs/assets/tfg/models/block/crop/rapeseed_age_1.json create mode 100644 kubejs/assets/tfg/models/block/crop/rapeseed_age_2.json create mode 100644 kubejs/assets/tfg/models/block/crop/rapeseed_age_3_bottom.json create mode 100644 kubejs/assets/tfg/models/block/crop/rapeseed_age_3_top.json create mode 100644 kubejs/assets/tfg/models/block/crop/rapeseed_age_4_bottom.json create mode 100644 kubejs/assets/tfg/models/block/crop/rapeseed_age_4_top.json create mode 100644 kubejs/assets/tfg/models/block/crop/rapeseed_age_5_bottom.json create mode 100644 kubejs/assets/tfg/models/block/crop/rapeseed_age_5_top.json create mode 100644 kubejs/assets/tfg/models/block/crop/rapeseed_dead_bottom.json create mode 100644 kubejs/assets/tfg/models/block/crop/rapeseed_dead_top.json create mode 100644 kubejs/assets/tfg/models/block/crop/rapeseed_dead_young.json create mode 100644 kubejs/assets/tfg/models/block/crop/rapeseed_wild.json create mode 100644 kubejs/assets/tfg/models/block/crop/sunflower_age_0.json create mode 100644 kubejs/assets/tfg/models/block/crop/sunflower_age_1.json create mode 100644 kubejs/assets/tfg/models/block/crop/sunflower_age_2.json create mode 100644 kubejs/assets/tfg/models/block/crop/sunflower_age_3.json create mode 100644 kubejs/assets/tfg/models/block/crop/sunflower_age_4_bottom.json create mode 100644 kubejs/assets/tfg/models/block/crop/sunflower_age_4_top.json create mode 100644 kubejs/assets/tfg/models/block/crop/sunflower_age_5_bottom.json create mode 100644 kubejs/assets/tfg/models/block/crop/sunflower_age_5_top.json create mode 100644 kubejs/assets/tfg/models/block/crop/sunflower_dead_bottom.json create mode 100644 kubejs/assets/tfg/models/block/crop/sunflower_dead_top.json create mode 100644 kubejs/assets/tfg/models/block/crop/sunflower_dead_young.json create mode 100644 kubejs/assets/tfg/models/block/crop/sunflower_wild.json create mode 100644 kubejs/assets/tfg/models/block/crop/sunflower_wild_bottom.json create mode 100644 kubejs/assets/tfg/models/block/crop/sunflower_wild_top.json create mode 100644 kubejs/assets/tfg/models/item/rapeseed_wild.json create mode 100644 kubejs/assets/tfg/models/item/sunflower_wild.json create mode 100644 kubejs/assets/tfg/textures/block/crop/rapeseed_age_0.png create mode 100644 kubejs/assets/tfg/textures/block/crop/rapeseed_age_1.png create mode 100644 kubejs/assets/tfg/textures/block/crop/rapeseed_age_2.png create mode 100644 kubejs/assets/tfg/textures/block/crop/rapeseed_age_3_bottom.png create mode 100644 kubejs/assets/tfg/textures/block/crop/rapeseed_age_3_top.png create mode 100644 kubejs/assets/tfg/textures/block/crop/rapeseed_age_4_bottom.png create mode 100644 kubejs/assets/tfg/textures/block/crop/rapeseed_age_4_top.png create mode 100644 kubejs/assets/tfg/textures/block/crop/rapeseed_age_5_bottom.png create mode 100644 kubejs/assets/tfg/textures/block/crop/rapeseed_age_5_top.png create mode 100644 kubejs/assets/tfg/textures/block/crop/rapeseed_dead_bottom.png create mode 100644 kubejs/assets/tfg/textures/block/crop/rapeseed_dead_top.png create mode 100644 kubejs/assets/tfg/textures/block/crop/rapeseed_dead_young.png create mode 100644 kubejs/assets/tfg/textures/block/crop/rapeseed_greenhouse_0.png create mode 100644 kubejs/assets/tfg/textures/block/crop/rapeseed_greenhouse_1.png create mode 100644 kubejs/assets/tfg/textures/block/crop/rapeseed_greenhouse_2.png create mode 100644 kubejs/assets/tfg/textures/block/crop/rapeseed_greenhouse_3.png create mode 100644 kubejs/assets/tfg/textures/block/crop/sunflower_age_0.png create mode 100644 kubejs/assets/tfg/textures/block/crop/sunflower_age_1.png create mode 100644 kubejs/assets/tfg/textures/block/crop/sunflower_age_2.png create mode 100644 kubejs/assets/tfg/textures/block/crop/sunflower_age_3.png create mode 100644 kubejs/assets/tfg/textures/block/crop/sunflower_age_4_bottom.png create mode 100644 kubejs/assets/tfg/textures/block/crop/sunflower_age_4_top.png create mode 100644 kubejs/assets/tfg/textures/block/crop/sunflower_age_5_bottom.png create mode 100644 kubejs/assets/tfg/textures/block/crop/sunflower_age_5_top.png create mode 100644 kubejs/assets/tfg/textures/block/crop/sunflower_bottom.png create mode 100644 kubejs/assets/tfg/textures/block/crop/sunflower_dead_young.png create mode 100644 kubejs/assets/tfg/textures/block/crop/sunflower_greenhouse_0.png create mode 100644 kubejs/assets/tfg/textures/block/crop/sunflower_greenhouse_1.png create mode 100644 kubejs/assets/tfg/textures/block/crop/sunflower_greenhouse_2.png create mode 100644 kubejs/assets/tfg/textures/block/crop/sunflower_greenhouse_3.png create mode 100644 kubejs/assets/tfg/textures/block/crop/sunflower_top.png create mode 100644 kubejs/assets/tfg/textures/item/rapeseed_product.png create mode 100644 kubejs/assets/tfg/textures/item/rapeseed_seeds.png create mode 100644 kubejs/assets/tfg/textures/item/roasted_sunflower_seeds.png create mode 100644 kubejs/assets/tfg/textures/item/sunflower_product.png create mode 100644 kubejs/assets/tfg/textures/item/sunflower_seed.png diff --git a/config/fancymenu/customization/gui_main_menu.txt b/config/fancymenu/customization/gui_main_menu.txt index c7d2de2d2..46f20a575 100644 --- a/config/fancymenu/customization/gui_main_menu.txt +++ b/config/fancymenu/customization/gui_main_menu.txt @@ -3,13 +3,13 @@ type = fancymenu_layout layout-meta { identifier = title_screen render_custom_elements_behind_vanilla = false - last_edited_time = 1751673555539 + last_edited_time = 1751683723374 is_enabled = true randommode = false randomgroup = 1 randomonlyfirsttime = false layout_index = 0 - [loading_requirement_container_meta:366f5f74-f5fb-4832-b4b2-1456899ce898-1751673551462] = [groups:][instances:] + [loading_requirement_container_meta:10db7c9a-a492-438d-8b42-467316a2015e-1751677015677] = [groups:][instances:] } menu_background { diff --git a/kubejs/assets/tfg/blockstates/rapeseed.json b/kubejs/assets/tfg/blockstates/rapeseed.json new file mode 100644 index 000000000..07a5f896e --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rapeseed.json @@ -0,0 +1 @@ +{"variants":{"age=0":{"model":"tfg:block/crop/rapeseed_age_0"},"age=1":{"model":"tfg:block/crop/rapeseed_age_1"},"age=2":{"model":"tfg:block/crop/rapeseed_age_2"},"age=3,part=bottom":{"model":"tfg:block/crop/rapeseed_age_3_bottom"},"age=4,part=bottom":{"model":"tfg:block/crop/rapeseed_age_4_bottom"},"age=5,part=bottom":{"model":"tfg:block/crop/rapeseed_age_5_bottom"},"age=3,part=top":{"model":"tfg:block/crop/rapeseed_age_3_top"},"age=4,part=top":{"model":"tfg:block/crop/rapeseed_age_4_top"},"age=5,part=top":{"model":"tfg:block/crop/rapeseed_age_5_top"}}} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rapeseed_dead.json b/kubejs/assets/tfg/blockstates/rapeseed_dead.json new file mode 100644 index 000000000..1fceba724 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rapeseed_dead.json @@ -0,0 +1 @@ +{"variants":{"mature=false":{"model":"tfg:block/crop/rapeseed_dead_young"},"mature=true,part=top":{"model":"tfg:block/crop/rapeseed_dead_top"},"mature=true,part=bottom":{"model":"tfg:block/crop/rapeseed_dead_bottom"}}} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/rapeseed_wild.json b/kubejs/assets/tfg/blockstates/rapeseed_wild.json new file mode 100644 index 000000000..48068e127 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/rapeseed_wild.json @@ -0,0 +1 @@ +{"variants":{"part=top,mature=true":{"model":"tfg:block/crop/rapeseed_age_5_top"},"part=top,mature=false":{"model":"tfg:block/crop/rapeseed_dead_top"},"part=bottom,mature=true":{"model":"tfg:block/crop/rapeseed_age_5_bottom"},"part=bottom,mature=false":{"model":"tfg:block/crop/rapeseed_dead_bottom"}}} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/sunflower.json b/kubejs/assets/tfg/blockstates/sunflower.json new file mode 100644 index 000000000..960859ad8 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/sunflower.json @@ -0,0 +1 @@ +{"variants":{"age=0":{"model":"tfg:block/crop/sunflower_age_0"},"age=1":{"model":"tfg:block/crop/sunflower_age_1"},"age=2":{"model":"tfg:block/crop/sunflower_age_2"},"age=3":{"model":"tfg:block/crop/sunflower_age_3"},"age=4,part=bottom":{"model":"tfg:block/crop/sunflower_age_4_bottom"},"age=5,part=bottom":{"model":"tfg:block/crop/sunflower_age_5_bottom"},"age=4,part=top":{"model":"tfg:block/crop/sunflower_age_4_top"},"age=5,part=top":{"model":"tfg:block/crop/sunflower_age_5_top"}}} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/sunflower_dead.json b/kubejs/assets/tfg/blockstates/sunflower_dead.json new file mode 100644 index 000000000..9a968c698 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/sunflower_dead.json @@ -0,0 +1 @@ +{"variants":{"mature=false":{"model":"tfg:block/crop/sunflower_dead_young"},"mature=true,part=top":{"model":"tfg:block/crop/sunflower_dead_top"},"mature=true,part=bottom":{"model":"tfg:block/crop/sunflower_dead_bottom"}}} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/sunflower_wild.json b/kubejs/assets/tfg/blockstates/sunflower_wild.json new file mode 100644 index 000000000..d508c29c0 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/sunflower_wild.json @@ -0,0 +1 @@ +{"variants":{"part=top,mature=true":{"model":"tfg:block/crop/sunflower_wild_top"},"part=top,mature=false":{"model":"tfg:block/crop/sunflower_dead_top"},"part=bottom,mature=true":{"model":"tfg:block/crop/sunflower_wild_bottom"},"part=bottom,mature=false":{"model":"tfg:block/crop/sunflower_dead_bottom"}}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/crop/rapeseed_age_0.json b/kubejs/assets/tfg/models/block/crop/rapeseed_age_0.json new file mode 100644 index 000000000..a81e48f36 --- /dev/null +++ b/kubejs/assets/tfg/models/block/crop/rapeseed_age_0.json @@ -0,0 +1 @@ +{"parent":"block/crop","textures":{"crop":"tfg:block/crop/rapeseed_age_0"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/crop/rapeseed_age_1.json b/kubejs/assets/tfg/models/block/crop/rapeseed_age_1.json new file mode 100644 index 000000000..c1830d22a --- /dev/null +++ b/kubejs/assets/tfg/models/block/crop/rapeseed_age_1.json @@ -0,0 +1 @@ +{"parent":"block/crop","textures":{"crop":"tfg:block/crop/rapeseed_age_1"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/crop/rapeseed_age_2.json b/kubejs/assets/tfg/models/block/crop/rapeseed_age_2.json new file mode 100644 index 000000000..2033e4839 --- /dev/null +++ b/kubejs/assets/tfg/models/block/crop/rapeseed_age_2.json @@ -0,0 +1 @@ +{"parent":"block/crop","textures":{"crop":"tfg:block/crop/rapeseed_age_2"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/crop/rapeseed_age_3_bottom.json b/kubejs/assets/tfg/models/block/crop/rapeseed_age_3_bottom.json new file mode 100644 index 000000000..cdbcc3dd7 --- /dev/null +++ b/kubejs/assets/tfg/models/block/crop/rapeseed_age_3_bottom.json @@ -0,0 +1 @@ +{"parent":"block/crop","textures":{"crop":"tfg:block/crop/rapeseed_age_3_bottom"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/crop/rapeseed_age_3_top.json b/kubejs/assets/tfg/models/block/crop/rapeseed_age_3_top.json new file mode 100644 index 000000000..ef854e4e6 --- /dev/null +++ b/kubejs/assets/tfg/models/block/crop/rapeseed_age_3_top.json @@ -0,0 +1 @@ +{"parent":"block/crop","textures":{"crop":"tfg:block/crop/rapeseed_age_3_top"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/crop/rapeseed_age_4_bottom.json b/kubejs/assets/tfg/models/block/crop/rapeseed_age_4_bottom.json new file mode 100644 index 000000000..a781245dc --- /dev/null +++ b/kubejs/assets/tfg/models/block/crop/rapeseed_age_4_bottom.json @@ -0,0 +1 @@ +{"parent":"block/crop","textures":{"crop":"tfg:block/crop/rapeseed_age_4_bottom"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/crop/rapeseed_age_4_top.json b/kubejs/assets/tfg/models/block/crop/rapeseed_age_4_top.json new file mode 100644 index 000000000..809d624bc --- /dev/null +++ b/kubejs/assets/tfg/models/block/crop/rapeseed_age_4_top.json @@ -0,0 +1 @@ +{"parent":"block/crop","textures":{"crop":"tfg:block/crop/rapeseed_age_4_top"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/crop/rapeseed_age_5_bottom.json b/kubejs/assets/tfg/models/block/crop/rapeseed_age_5_bottom.json new file mode 100644 index 000000000..a29c0e18f --- /dev/null +++ b/kubejs/assets/tfg/models/block/crop/rapeseed_age_5_bottom.json @@ -0,0 +1 @@ +{"parent":"block/crop","textures":{"crop":"tfg:block/crop/rapeseed_age_5_bottom"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/crop/rapeseed_age_5_top.json b/kubejs/assets/tfg/models/block/crop/rapeseed_age_5_top.json new file mode 100644 index 000000000..b85951c0e --- /dev/null +++ b/kubejs/assets/tfg/models/block/crop/rapeseed_age_5_top.json @@ -0,0 +1 @@ +{"parent":"block/crop","textures":{"crop":"tfg:block/crop/rapeseed_age_5_top"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/crop/rapeseed_dead_bottom.json b/kubejs/assets/tfg/models/block/crop/rapeseed_dead_bottom.json new file mode 100644 index 000000000..9e317800f --- /dev/null +++ b/kubejs/assets/tfg/models/block/crop/rapeseed_dead_bottom.json @@ -0,0 +1 @@ +{"parent":"block/crop","textures":{"crop":"tfg:block/crop/rapeseed_dead_bottom"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/crop/rapeseed_dead_top.json b/kubejs/assets/tfg/models/block/crop/rapeseed_dead_top.json new file mode 100644 index 000000000..94a972f45 --- /dev/null +++ b/kubejs/assets/tfg/models/block/crop/rapeseed_dead_top.json @@ -0,0 +1 @@ +{"parent":"block/crop","textures":{"crop":"tfg:block/crop/rapeseed_dead_top"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/crop/rapeseed_dead_young.json b/kubejs/assets/tfg/models/block/crop/rapeseed_dead_young.json new file mode 100644 index 000000000..22e767677 --- /dev/null +++ b/kubejs/assets/tfg/models/block/crop/rapeseed_dead_young.json @@ -0,0 +1 @@ +{"parent":"block/crop","textures":{"crop":"tfg:block/crop/rapeseed_dead_young"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/crop/rapeseed_wild.json b/kubejs/assets/tfg/models/block/crop/rapeseed_wild.json new file mode 100644 index 000000000..2033e4839 --- /dev/null +++ b/kubejs/assets/tfg/models/block/crop/rapeseed_wild.json @@ -0,0 +1 @@ +{"parent":"block/crop","textures":{"crop":"tfg:block/crop/rapeseed_age_2"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/crop/sunflower_age_0.json b/kubejs/assets/tfg/models/block/crop/sunflower_age_0.json new file mode 100644 index 000000000..44c385f86 --- /dev/null +++ b/kubejs/assets/tfg/models/block/crop/sunflower_age_0.json @@ -0,0 +1,78 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench", + "textures": { + "0": "tfg:block/crop/sunflower_age_0", + "particle": "tfg:block/crop/sunflower_age_0" + }, + "elements": [ + { + "from": [8, 0, 5], + "to": [8, 16, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 6]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "east": {"uv": [6, 0, 12, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "west": {"uv": [6, 0, 12, 16], "texture": "#0"}, + "up": {"uv": [0, 6, 0, 0], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 6], "texture": "#0"} + } + }, + { + "from": [5, 0, 8], + "to": [11, 16, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 0, 8]}, + "faces": { + "north": {"uv": [6, 0, 12, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "south": {"uv": [6, 0, 12, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "up": {"uv": [6, 0, 0, 0], "texture": "#0"}, + "down": {"uv": [6, 0, 0, 0], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, -135, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 90, 0], + "translation": [0, -3.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "rotation": [0, -90, 0], + "translation": [0, -3.25, 0], + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "bottom", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/crop/sunflower_age_1.json b/kubejs/assets/tfg/models/block/crop/sunflower_age_1.json new file mode 100644 index 000000000..f6d202e63 --- /dev/null +++ b/kubejs/assets/tfg/models/block/crop/sunflower_age_1.json @@ -0,0 +1,78 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench", + "textures": { + "0": "tfg:block/crop/sunflower_age_1", + "particle": "tfg:block/crop/sunflower_age_1" + }, + "elements": [ + { + "from": [8, 0, 5], + "to": [8, 16, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 6]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "east": {"uv": [6, 0, 12, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "west": {"uv": [6, 0, 12, 16], "texture": "#0"}, + "up": {"uv": [0, 6, 0, 0], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 6], "texture": "#0"} + } + }, + { + "from": [5, 0, 8], + "to": [11, 16, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 0, 8]}, + "faces": { + "north": {"uv": [6, 0, 12, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "south": {"uv": [6, 0, 12, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "up": {"uv": [6, 0, 0, 0], "texture": "#0"}, + "down": {"uv": [6, 0, 0, 0], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, -135, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 90, 0], + "translation": [0, -3.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "rotation": [0, -90, 0], + "translation": [0, -3.25, 0], + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "bottom", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/crop/sunflower_age_2.json b/kubejs/assets/tfg/models/block/crop/sunflower_age_2.json new file mode 100644 index 000000000..99f6694eb --- /dev/null +++ b/kubejs/assets/tfg/models/block/crop/sunflower_age_2.json @@ -0,0 +1,78 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench", + "textures": { + "0": "tfg:block/crop/sunflower_age_2", + "particle": "tfg:block/crop/sunflower_age_2" + }, + "elements": [ + { + "from": [8, 0, 5], + "to": [8, 16, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 6]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "east": {"uv": [6, 0, 12, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "west": {"uv": [6, 0, 12, 16], "texture": "#0"}, + "up": {"uv": [0, 6, 0, 0], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 6], "texture": "#0"} + } + }, + { + "from": [5, 0, 8], + "to": [11, 16, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 0, 8]}, + "faces": { + "north": {"uv": [6, 0, 12, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "south": {"uv": [6, 0, 12, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "up": {"uv": [6, 0, 0, 0], "texture": "#0"}, + "down": {"uv": [6, 0, 0, 0], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, -135, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 90, 0], + "translation": [0, -3.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "rotation": [0, -90, 0], + "translation": [0, -3.25, 0], + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "bottom", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/crop/sunflower_age_3.json b/kubejs/assets/tfg/models/block/crop/sunflower_age_3.json new file mode 100644 index 000000000..228bed511 --- /dev/null +++ b/kubejs/assets/tfg/models/block/crop/sunflower_age_3.json @@ -0,0 +1,78 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench", + "textures": { + "0": "tfg:block/crop/sunflower_age_3", + "particle": "tfg:block/crop/sunflower_age_3" + }, + "elements": [ + { + "from": [8, 0, 5], + "to": [8, 16, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 6]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "east": {"uv": [6, 0, 12, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "west": {"uv": [6, 0, 12, 16], "texture": "#0"}, + "up": {"uv": [0, 6, 0, 0], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 6], "texture": "#0"} + } + }, + { + "from": [5, 0, 8], + "to": [11, 16, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 0, 8]}, + "faces": { + "north": {"uv": [6, 0, 12, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "south": {"uv": [6, 0, 12, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "up": {"uv": [6, 0, 0, 0], "texture": "#0"}, + "down": {"uv": [6, 0, 0, 0], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, -135, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 90, 0], + "translation": [0, -3.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "rotation": [0, -90, 0], + "translation": [0, -3.25, 0], + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "bottom", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/crop/sunflower_age_4_bottom.json b/kubejs/assets/tfg/models/block/crop/sunflower_age_4_bottom.json new file mode 100644 index 000000000..1c9496a23 --- /dev/null +++ b/kubejs/assets/tfg/models/block/crop/sunflower_age_4_bottom.json @@ -0,0 +1,78 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench", + "textures": { + "0": "tfg:block/crop/sunflower_age_4_bottom", + "particle": "tfg:block/crop/sunflower_age_4_bottom" + }, + "elements": [ + { + "from": [8, 0, 5], + "to": [8, 16, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 6]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "east": {"uv": [6, 0, 12, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "west": {"uv": [6, 0, 12, 16], "texture": "#0"}, + "up": {"uv": [0, 6, 0, 0], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 6], "texture": "#0"} + } + }, + { + "from": [5, 0, 8], + "to": [11, 16, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 0, 8]}, + "faces": { + "north": {"uv": [6, 0, 12, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "south": {"uv": [6, 0, 12, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "up": {"uv": [5.33333, 0, 0, 0], "texture": "#0"}, + "down": {"uv": [5.33333, 0, 0, 0], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, -135, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 90, 0], + "translation": [0, -3.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "rotation": [0, -90, 0], + "translation": [0, -3.25, 0], + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "bottom", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/crop/sunflower_age_4_top.json b/kubejs/assets/tfg/models/block/crop/sunflower_age_4_top.json new file mode 100644 index 000000000..8820f29e0 --- /dev/null +++ b/kubejs/assets/tfg/models/block/crop/sunflower_age_4_top.json @@ -0,0 +1,124 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "0": "tfg:block/crop/sunflower_age_4_top", + "particle": "tfg:block/crop/sunflower_age_4_top" + }, + "elements": [ + { + "from": [8, 0, 5], + "to": [8, 16, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -2, 6]}, + "faces": { + "north": {"uv": [0, 0, 0, 8], "texture": "#0"}, + "east": {"uv": [4, 8, 1, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 8], "texture": "#0"}, + "west": {"uv": [4, 8, 1, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 3], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 3], "texture": "#0"} + } + }, + { + "from": [5, 0, 8], + "to": [13, 16, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [6, -2, 8]}, + "faces": { + "north": {"uv": [0, 0, 4, 8], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "south": {"uv": [4, 0, 0, 8], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 0], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 0], "texture": "#0"} + } + }, + { + "from": [10.9, 5, 1], + "to": [10.9, 9, 15], + "rotation": {"angle": 22.5, "axis": "z", "origin": [10.9, 5, 6]}, + "faces": { + "north": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "east": {"uv": [15.5, 3, 8.5, 5], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "west": {"uv": [15.5, 11, 8.5, 13], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 6], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 6], "texture": "#0"} + } + }, + { + "from": [9.81, 2.23, 1], + "to": [14.81, 2.23, 15], + "rotation": {"angle": -45, "axis": "z", "origin": [13.7, 2.3, 2]}, + "faces": { + "north": {"uv": [0, 2.5, 0, 0], "rotation": 270, "texture": "#0"}, + "east": {"uv": [0, 7, 0, 0], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 2.5, 0, 0], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 7, 0, 0], "rotation": 90, "texture": "#0"}, + "up": {"uv": [8.5, 7.5, 15.5, 5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [8.5, 15.5, 15.5, 13], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [9.37, 8.69, 1], + "to": [9.37, 13.69, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9.4, 8.6, 2]}, + "faces": { + "north": {"uv": [0, 0, 0, 2.5], "texture": "#0"}, + "east": {"uv": [15.5, 0.5, 8.5, 3], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 2.5], "texture": "#0"}, + "west": {"uv": [15.5, 8.5, 8.5, 11], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 7], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 7], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, -135, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 90, 0], + "translation": [0, -3.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "rotation": [0, -90, 0], + "translation": [0, -3.25, 0], + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "top", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1] + }, + { + "name": "group", + "origin": [3, 24, 6], + "color": 0, + "children": [2, 3, 4] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/crop/sunflower_age_5_bottom.json b/kubejs/assets/tfg/models/block/crop/sunflower_age_5_bottom.json new file mode 100644 index 000000000..c8512e0af --- /dev/null +++ b/kubejs/assets/tfg/models/block/crop/sunflower_age_5_bottom.json @@ -0,0 +1,78 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench", + "textures": { + "1": "tfg:block/crop/sunflower_age_5_bottom", + "particle": "tfg:block/crop/sunflower_age_5_bottom" + }, + "elements": [ + { + "from": [8, 0, 5], + "to": [8, 16, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 6]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#1"}, + "east": {"uv": [5, 0, 11, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#1"}, + "west": {"uv": [5, 0, 11, 16], "texture": "#1"}, + "up": {"uv": [0, 6, 0, 0], "texture": "#1"}, + "down": {"uv": [0, 0, 0, 6], "texture": "#1"} + } + }, + { + "from": [5, 0, 8], + "to": [11, 16, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 0, 8]}, + "faces": { + "north": {"uv": [5, 0, 11, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 16], "texture": "#1"}, + "south": {"uv": [5, 0, 11, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#1"}, + "up": {"uv": [5.33333, 0, 0, 0], "texture": "#1"}, + "down": {"uv": [5.33333, 0, 0, 0], "texture": "#1"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, -135, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 90, 0], + "translation": [0, -3.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "rotation": [0, -90, 0], + "translation": [0, -3.25, 0], + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "bottom", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/crop/sunflower_age_5_top.json b/kubejs/assets/tfg/models/block/crop/sunflower_age_5_top.json new file mode 100644 index 000000000..3f314ff09 --- /dev/null +++ b/kubejs/assets/tfg/models/block/crop/sunflower_age_5_top.json @@ -0,0 +1,124 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "0": "tfg:block/crop/sunflower_age_5_top", + "particle": "tfg:block/crop/sunflower_age_5_top" + }, + "elements": [ + { + "from": [8, 0, 5], + "to": [8, 16, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -2, 6]}, + "faces": { + "north": {"uv": [0, 0, 0, 8], "texture": "#0"}, + "east": {"uv": [4, 8, 1, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 8], "texture": "#0"}, + "west": {"uv": [4, 8, 1, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 3], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 3], "texture": "#0"} + } + }, + { + "from": [5, 0, 8], + "to": [13, 16, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [6, -2, 8]}, + "faces": { + "north": {"uv": [0, 0, 4, 8], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "south": {"uv": [4, 0, 0, 8], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 0], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 0], "texture": "#0"} + } + }, + { + "from": [11, 7, 1], + "to": [11, 11, 15], + "rotation": {"angle": 22.5, "axis": "z", "origin": [11, 7, 6]}, + "faces": { + "north": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "east": {"uv": [15.5, 3, 8.5, 5], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "west": {"uv": [15.5, 11, 8.5, 13], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 6], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 6], "texture": "#0"} + } + }, + { + "from": [9.91, 4.23, 1], + "to": [14.91, 4.23, 15], + "rotation": {"angle": -45, "axis": "z", "origin": [13.8, 4.3, 2]}, + "faces": { + "north": {"uv": [0, 2.5, 0, 0], "rotation": 270, "texture": "#0"}, + "east": {"uv": [0, 7, 0, 0], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 2.5, 0, 0], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 7, 0, 0], "rotation": 90, "texture": "#0"}, + "up": {"uv": [8.5, 7.5, 15.5, 5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [8.5, 15.5, 15.5, 13], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [9.48, 10.69, 1], + "to": [9.48, 15.69, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 10.7, 2]}, + "faces": { + "north": {"uv": [0, 0, 0, 2.5], "texture": "#0"}, + "east": {"uv": [15.5, 0.5, 8.5, 3], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 2.5], "texture": "#0"}, + "west": {"uv": [15.5, 8.5, 8.5, 11], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 7], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 7], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, -135, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 90, 0], + "translation": [0, -3.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "rotation": [0, -90, 0], + "translation": [0, -3.25, 0], + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "top", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1] + }, + { + "name": "flower", + "origin": [3, 24, 6], + "color": 0, + "children": [2, 3, 4] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/crop/sunflower_dead_bottom.json b/kubejs/assets/tfg/models/block/crop/sunflower_dead_bottom.json new file mode 100644 index 000000000..b84c3c9d3 --- /dev/null +++ b/kubejs/assets/tfg/models/block/crop/sunflower_dead_bottom.json @@ -0,0 +1,78 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench", + "textures": { + "0": "tfg:block/crop/sunflower_bottom", + "particle": "tfg:block/crop/sunflower_bottom" + }, + "elements": [ + { + "from": [8, 0, 5], + "to": [8, 16, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 6]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "east": {"uv": [5, 0, 11, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "west": {"uv": [5, 0, 11, 16], "texture": "#0"}, + "up": {"uv": [0, 6, 0, 0], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 6], "texture": "#0"} + } + }, + { + "from": [5, 0, 8], + "to": [11, 16, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 0, 8]}, + "faces": { + "north": {"uv": [5, 0, 11, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "south": {"uv": [5, 0, 11, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "up": {"uv": [5.33334, 0, 0, 0], "texture": "#0"}, + "down": {"uv": [5.33334, 0, 0, 0], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, -135, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 90, 0], + "translation": [0, -3.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "rotation": [0, -90, 0], + "translation": [0, -3.25, 0], + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "bottom", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/crop/sunflower_dead_top.json b/kubejs/assets/tfg/models/block/crop/sunflower_dead_top.json new file mode 100644 index 000000000..6cc38a0bc --- /dev/null +++ b/kubejs/assets/tfg/models/block/crop/sunflower_dead_top.json @@ -0,0 +1,123 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench", + "textures": { + "0": "tfg:block/crop/sunflower_top", + "particle": "tfg:block/crop/sunflower_top" + }, + "elements": [ + { + "from": [8, 0, 5], + "to": [8, 16, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -2, 6]}, + "faces": { + "north": {"uv": [0, 0, 0, 8], "texture": "#0"}, + "east": {"uv": [4, 8, 1, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 8], "texture": "#0"}, + "west": {"uv": [4, 8, 1, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 3], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 3], "texture": "#0"} + } + }, + { + "from": [5, 0, 8], + "to": [13, 16, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [6, -2, 8]}, + "faces": { + "north": {"uv": [0, 0, 4, 8], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "south": {"uv": [4, 0, 0, 8], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 0], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 0], "texture": "#0"} + } + }, + { + "from": [11.2, 7, 1], + "to": [11.2, 11, 15], + "rotation": {"angle": -22.5, "axis": "z", "origin": [11.2, 7, 6]}, + "faces": { + "north": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "east": {"uv": [15.5, 3, 8.5, 5], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "west": {"uv": [15.5, 11, 8.5, 13], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 6], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 6], "texture": "#0"} + } + }, + { + "from": [11.19895, 2.01, 1], + "to": [11.19895, 7.01, 15], + "rotation": {"angle": 0, "axis": "z", "origin": [11.2, 7, 2]}, + "faces": { + "north": {"uv": [0, 0, 0, 2.5], "texture": "#0"}, + "east": {"uv": [15.5, 5, 8.5, 7.5], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 2.5], "texture": "#0"}, + "west": {"uv": [15.5, 13, 8.5, 15.5], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 7], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 7], "texture": "#0"} + } + }, + { + "from": [12.71, 10.67, 1], + "to": [17.71, 10.67, 15], + "rotation": {"angle": 45, "axis": "z", "origin": [12.7, 10.7, 2]}, + "faces": { + "north": {"uv": [0, 2.5, 0, 0], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 7, 0, 0], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 2.5, 0, 0], "rotation": 270, "texture": "#0"}, + "west": {"uv": [0, 7, 0, 0], "rotation": 270, "texture": "#0"}, + "up": {"uv": [8.5, 11, 15.5, 8.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [8.5, 3, 15.5, 0.5], "rotation": 270, "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, -135, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 90, 0], + "translation": [0, -3.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "rotation": [0, -90, 0], + "translation": [0, -3.25, 0], + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "top", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1] + }, + { + "name": "flower", + "origin": [3, 24, 6], + "color": 0, + "children": [2, 3, 4] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/crop/sunflower_dead_young.json b/kubejs/assets/tfg/models/block/crop/sunflower_dead_young.json new file mode 100644 index 000000000..0cb78e14d --- /dev/null +++ b/kubejs/assets/tfg/models/block/crop/sunflower_dead_young.json @@ -0,0 +1,78 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench", + "textures": { + "0": "tfg:block/crop/sunflower_dead_young", + "particle": "tfg:block/crop/sunflower_dead_young" + }, + "elements": [ + { + "from": [8, 0, 5], + "to": [8, 16, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 6]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "east": {"uv": [6, 0, 12, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "west": {"uv": [6, 0, 12, 16], "texture": "#0"}, + "up": {"uv": [0, 6, 0, 0], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 6], "texture": "#0"} + } + }, + { + "from": [5, 0, 8], + "to": [11, 16, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 0, 8]}, + "faces": { + "north": {"uv": [6, 0, 12, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "south": {"uv": [6, 0, 12, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "up": {"uv": [6, 0, 0, 0], "texture": "#0"}, + "down": {"uv": [6, 0, 0, 0], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, -135, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 90, 0], + "translation": [0, -3.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "rotation": [0, -90, 0], + "translation": [0, -3.25, 0], + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "bottom", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/crop/sunflower_wild.json b/kubejs/assets/tfg/models/block/crop/sunflower_wild.json new file mode 100644 index 000000000..d6343c01e --- /dev/null +++ b/kubejs/assets/tfg/models/block/crop/sunflower_wild.json @@ -0,0 +1,170 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "0": "tfg:block/crop/sunflower_age_5_top", + "1": "tfg:block/crop/sunflower_age_5_bottom", + "particle": "tfg:block/crop/sunflower_age_5_bottom" + }, + "elements": [ + { + "from": [8, 16, 5], + "to": [8, 32, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 6]}, + "faces": { + "north": {"uv": [0, 0, 0, 8], "texture": "#0"}, + "east": {"uv": [4, 8, 1, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 8], "texture": "#0"}, + "west": {"uv": [4, 8, 1, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 3], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 3], "texture": "#0"} + } + }, + { + "from": [5, 16, 8], + "to": [13, 32, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 14, 8]}, + "faces": { + "north": {"uv": [0, 0, 4, 8], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "south": {"uv": [4, 0, 0, 8], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 0], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 0], "texture": "#0"} + } + }, + { + "from": [11, 23, 1], + "to": [11, 27, 15], + "rotation": {"angle": 22.5, "axis": "z", "origin": [11, 23, 6]}, + "faces": { + "north": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "east": {"uv": [15.5, 3, 8.5, 5], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "west": {"uv": [15.5, 11, 8.5, 13], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 6], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 6], "texture": "#0"} + } + }, + { + "from": [9.91, 20.23, 1], + "to": [14.91, 20.23, 15], + "rotation": {"angle": -45, "axis": "z", "origin": [13.8, 20.3, 2]}, + "faces": { + "north": {"uv": [0, 2.5, 0, 0], "rotation": 270, "texture": "#0"}, + "east": {"uv": [0, 7, 0, 0], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 2.5, 0, 0], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 7, 0, 0], "rotation": 90, "texture": "#0"}, + "up": {"uv": [8.5, 7.5, 15.5, 5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [8.5, 15.5, 15.5, 13], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [9.48, 26.69, 1], + "to": [9.48, 31.69, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 26.7, 2]}, + "faces": { + "north": {"uv": [0, 0, 0, 2.5], "texture": "#0"}, + "east": {"uv": [15.5, 0.5, 8.5, 3], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 2.5], "texture": "#0"}, + "west": {"uv": [15.5, 8.5, 8.5, 11], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 7], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 7], "texture": "#0"} + } + }, + { + "from": [8, 0, 5], + "to": [8, 16, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 6]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#1"}, + "east": {"uv": [5, 0, 11, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#1"}, + "west": {"uv": [5, 0, 11, 16], "texture": "#1"}, + "up": {"uv": [0, 6, 0, 0], "texture": "#1"}, + "down": {"uv": [0, 0, 0, 6], "texture": "#1"} + } + }, + { + "from": [5, 0, 8], + "to": [11, 16, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 0, 8]}, + "faces": { + "north": {"uv": [5, 0, 11, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 16], "texture": "#1"}, + "south": {"uv": [5, 0, 11, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#1"}, + "up": {"uv": [5.33333, 0, 0, 0], "texture": "#1"}, + "down": {"uv": [5.33333, 0, 0, 0], "texture": "#1"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [10, 58, 0], + "translation": [0.25, 0.75, 1.5], + "scale": [0.25, 0.25, 0.25] + }, + "thirdperson_lefthand": { + "rotation": [10, -141, 0], + "translation": [0.25, 0.75, 1.5], + "scale": [0.25, 0.25, 0.25] + }, + "firstperson_righthand": { + "rotation": [0, -180, 0], + "translation": [0, 0, 1.25], + "scale": [0.3, 0.3, 0.3] + }, + "firstperson_lefthand": { + "translation": [0, 0, 1.25], + "scale": [0.3, 0.3, 0.3] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, -90, 0], + "translation": [0, -3.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "head": { + "rotation": [-70, 149, -1], + "translation": [-6.5, 2, 1.5], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, -3.25, 0], + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "top", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1] + }, + { + "name": "flower", + "origin": [3, 24, 6], + "color": 0, + "children": [2, 3, 4] + }, + { + "name": "sunflower_age_5_bottom", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "bottom", + "origin": [8, 8, 8], + "color": 0, + "children": [5, 6] + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/crop/sunflower_wild_bottom.json b/kubejs/assets/tfg/models/block/crop/sunflower_wild_bottom.json new file mode 100644 index 000000000..d4a033b75 --- /dev/null +++ b/kubejs/assets/tfg/models/block/crop/sunflower_wild_bottom.json @@ -0,0 +1,78 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench", + "textures": { + "0": "tfg:block/crop/sunflower_age_5_bottom", + "particle": "tfg:block/crop/sunflower_age_5_bottom" + }, + "elements": [ + { + "from": [8, 0, 5], + "to": [8, 16, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 6]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "east": {"uv": [5, 0, 11, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "west": {"uv": [5, 0, 11, 16], "texture": "#0"}, + "up": {"uv": [0, 6, 0, 0], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 6], "texture": "#0"} + } + }, + { + "from": [5, 0, 8], + "to": [11, 16, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 0, 8]}, + "faces": { + "north": {"uv": [5, 0, 11, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "south": {"uv": [5, 0, 11, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "up": {"uv": [5.33333, 0, 0, 0], "texture": "#0"}, + "down": {"uv": [5.33333, 0, 0, 0], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, -135, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 90, 0], + "translation": [0, -3.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "rotation": [0, -90, 0], + "translation": [0, -3.25, 0], + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "bottom", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/crop/sunflower_wild_top.json b/kubejs/assets/tfg/models/block/crop/sunflower_wild_top.json new file mode 100644 index 000000000..3f314ff09 --- /dev/null +++ b/kubejs/assets/tfg/models/block/crop/sunflower_wild_top.json @@ -0,0 +1,124 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "0": "tfg:block/crop/sunflower_age_5_top", + "particle": "tfg:block/crop/sunflower_age_5_top" + }, + "elements": [ + { + "from": [8, 0, 5], + "to": [8, 16, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [8, -2, 6]}, + "faces": { + "north": {"uv": [0, 0, 0, 8], "texture": "#0"}, + "east": {"uv": [4, 8, 1, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 8], "texture": "#0"}, + "west": {"uv": [4, 8, 1, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 3], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 3], "texture": "#0"} + } + }, + { + "from": [5, 0, 8], + "to": [13, 16, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [6, -2, 8]}, + "faces": { + "north": {"uv": [0, 0, 4, 8], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "south": {"uv": [4, 0, 0, 8], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 0], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 0], "texture": "#0"} + } + }, + { + "from": [11, 7, 1], + "to": [11, 11, 15], + "rotation": {"angle": 22.5, "axis": "z", "origin": [11, 7, 6]}, + "faces": { + "north": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "east": {"uv": [15.5, 3, 8.5, 5], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 2], "texture": "#0"}, + "west": {"uv": [15.5, 11, 8.5, 13], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 6], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 6], "texture": "#0"} + } + }, + { + "from": [9.91, 4.23, 1], + "to": [14.91, 4.23, 15], + "rotation": {"angle": -45, "axis": "z", "origin": [13.8, 4.3, 2]}, + "faces": { + "north": {"uv": [0, 2.5, 0, 0], "rotation": 270, "texture": "#0"}, + "east": {"uv": [0, 7, 0, 0], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 2.5, 0, 0], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 7, 0, 0], "rotation": 90, "texture": "#0"}, + "up": {"uv": [8.5, 7.5, 15.5, 5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [8.5, 15.5, 15.5, 13], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [9.48, 10.69, 1], + "to": [9.48, 15.69, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9.5, 10.7, 2]}, + "faces": { + "north": {"uv": [0, 0, 0, 2.5], "texture": "#0"}, + "east": {"uv": [15.5, 0.5, 8.5, 3], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 2.5], "texture": "#0"}, + "west": {"uv": [15.5, 8.5, 8.5, 11], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 7], "texture": "#0"}, + "down": {"uv": [0, 0, 0, 7], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, -135, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 90, 0], + "translation": [0, -3.5, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "rotation": [0, -90, 0], + "translation": [0, -3.25, 0], + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "top", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1] + }, + { + "name": "flower", + "origin": [3, 24, 6], + "color": 0, + "children": [2, 3, 4] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/rapeseed_wild.json b/kubejs/assets/tfg/models/item/rapeseed_wild.json new file mode 100644 index 000000000..fce6f1f16 --- /dev/null +++ b/kubejs/assets/tfg/models/item/rapeseed_wild.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/crop/rapeseed_wild" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/sunflower_wild.json b/kubejs/assets/tfg/models/item/sunflower_wild.json new file mode 100644 index 000000000..a36e98146 --- /dev/null +++ b/kubejs/assets/tfg/models/item/sunflower_wild.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/crop/sunflower_wild" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/crop/rapeseed_age_0.png b/kubejs/assets/tfg/textures/block/crop/rapeseed_age_0.png new file mode 100644 index 0000000000000000000000000000000000000000..ea0cead8847df459a07f314c46d74226e3436ae2 GIT binary patch literal 356 zcmV-q0h|7bP)h`kvsMae1CJZ702B6+ENPX_FVt=VmPa$DYy zE7*wwD9Ri_=NCprnUkdP0q{Ej)-Zj1B@807gAfLhtOgF6Bx$S$V5ivzVGxy-8}$~hCbQ+UB3ZCP=2^)t0klW0000TlCf$VK@f(&(HRGUL5GPi%@scIqQ+oSs8Jd>v0uO> zjb9*GbsoZLW&8qe9P$EkB~rLi6GIxa#Wkuy((RI7@(yKUg{==!OG!{Y=% z04>)`ibbJ5_wrv08r7;%{qLQ$$$ajKyW3W)QLSf}C%O@e0X@4sk!n>@EDCj*3q%Tt z%bY5;S<|Q%QvmSx-75gy+udY1NTnrP0Hlrp#OGei_42U=pL=Z=1GvoT*Q=kFHy{OM zZ+DZ6Pu~C@TWB_mhpvV*m$?8^Sc}i$b~fi|cA$Wmh2}N6oy|?^aFEhi(X=0%n&BWd zwVk8S2MX}vbe~pKmpN$wRveTCvd{wobben_tty(H1iu!4eE(%c(@8_xBeT z4_%rG#AQwz5+i&4W@TiD$4MACIydKc!L#)uS;yl@7JF1n;y`sfcVk=-*n{u-`&MFCI1D`}Ajdm)H8I1PeznaO;xj zv*C@Ly_KQ%*UlDX9Pf>Bahkg$ZRMeH>ZsdkGP2%oS;al$ZWI6bDIeKKr6;y0Us0FL zioRTx=oZ>8MV;HgJDZcX7CHUgw8Wmi<>x9+&K9l+Te|EbD&cXh1lJa=Im*zn3Hx$}^oRP+jQj#;?0RsQ*6CWN_D;%iAye z&p5lk=8S__bhY>W_=oragJW0_ER;7Crnnof@JE{_cjw9vmK*jL~iFr=2~o5puM z9?+F8D{)9!`L-t{K6>u3TPanXUow8K?bdml4X8~ojwa2!eSqa*e9ksCa^k=NmWx@) zqEx)}_G3MLsxGsrp*;b6q->8%UZ&@Thf9O(c9=hGabrK!uBf?G$8tr>US|4SYK?ee zmt-lYTVE(CokAYgFxp9ay)88}#;JE(OKtY06^=W%|bf_v*s!v9U?P+|qpkl-oy|`^>8x8eLB% z`gHm|TjR~b1ewG}p9wOfFNz7wS$@5v)Hib((SOVJy4jx^1vAq2a5t@#ooZt0uWP>V zmeLn{=GZ{(lOvP;tC{kJQEjsph$yM0cvHLRMuC=fYfZ_cEwzi0XFg30Q%#6#YTXww z+@t#{SzAS0r!vYT_t)QUTjU<4mo#?w&rN8>l|M2_dAFv{knU|Y9qcGz&~)N{iA1** z$bA~m`=+J5tx7SftgvoLK3s98tzpg7P36V4;34N}=PT4p4G&wml$Q102NvI5R;oU5 zBuoEV(UoT{_fGLcx-_okIZoHVWqm4a-cm=@(bzeKAD=D-Cu*Hs?Bf&|%Ov^~Kg%zt z<>aw~^146mSoJ#l@@At7mdUd-L(YDDC+E1rT`HY#-=;d~1jP*X<{r1PT--QeO3{Ui zJx`y_IVHMEcY4S~%fj>0Oft)}Ys2d9W=FZJHEbLz7=LHZ^sEOvPldZ(W9ujNB38&% zh1r1yONVld%d^%aA}K(*SC04Vm*;wCbYD?9rF+DqfRbRbZ6GyJKgYf>>A`S!wiCw+ zdF`ZjWyori^RfM(ckCk@Vag3zPs6jCknRRTt(_|6i}WpO8>i16s-AdBr_jjHa9(<8 zYDpdWj<+O;6dL0i*cT&zRPT!Yb;)d~-=lTwV0G3dYsO90B;S}P&DFrm6h@C-pUq3^ z@tSQ$OLL>i5%kUSjN2LSEqYctJ(|PVHCq$HY#&$tNqbSx;Oj`wC7!nuEnbrMHZH}4 z?NfcqFMn@xr&`m=VEEM=bV^{t_4`cO3abT2f013)t(hd0Gv#Z6B;8`)d~`y?iM`~% zp9vebv%S_;(|6wQ@XP9@3ZrYKtQM%S={kQ|2SGu+ixjsW6RN{Gdc3uoS zyDygld=;dx+imGwYHe^UhDK8@iG_Jn^5T&1RN6aU9DjjY@Cj>ne(S)~qPeg7Ec@D2Y>(aaEeuojGOu#J z#b#MtTByEin!UzHZM-R->3Lk2*l!Rt*gqi0+$p?T`;ltv(#F}~IX{D43``Sg*YX2s zUF+I$zc4fhr~^edy7OZ@ihEwq={j1fT042p!3Xs41AdDl^IJ-CIN4?OWz!rUng&%A z=ZM?dbC#{niSYb%GkDbshV;;H8ts0zs*IP;j#{8^@I03@jtSdl^p?|yOLtl^Fb7wH zILV?+&6#_iPx!p)No(rnQw*}%>~Y0G{15CI8a=8t#e(&7nlKolN6 z{^P3OUvw4b{hjV%&j0FHu}65OQVGl5QP>> zjT96k9QL4;E#ZkFo=AvPZ~`n*1Z0Uq!Sl#ba(I^Q5Csp8I#BeL^iqg}WxyR0ydD^U zCE#!rG>(8KP_bj};aPY0uhv58sEV+j*eF1Z#ba<-f#5p}DdZ6O&EKC|NPXdFC9Dr9 z6-7wcphF}mgp9^I74svcV|_+QLB)_VZa#;Lg@aOh9&6*oaQFIZqmVI#ClD(w6zH)? z4*M%k93kN=F&s7)pdWFkqJr^J)B z8e~I%>pAuS`DhX(xpw(TxAFsDHxIM-tWxDU* zC5l4&KmLqn-~Z7AO#Rcz59#|;uAg%KkODsh{+V4r<@zB7ehBp54n9wm< zO9x4|N8nb#Lwb;dA7m#IDBhwFqfhHd84n6YDjw~ZZ=9kF|63-VVQ=G0soKoMhu-wk zUS~yVICnx_jS-%0Xh@)dlj658*lRm$i^r7kDNq$(-DC?!t=!iyJvYR{Y& zVjlI%Oh12Mt9^!Km)8uowT>@}5e5^5gX)IAF817gs4cT}a^b?^=iR%;U6s3Bii77; zy=QZ0&dtS2QdCaH&<$~id##BH^W7#Q{4!PrBVCz@;D)(-?-l$Kch&D=C(1t+CEGT9 z;K7B0cSWnx9m=0~BRd{mka$lD>DRkPoDv#cobOa6#H?z#2^GY3cJmL$+T~^=HYDeD zF01P7ryxvMrqv5=bF;-w?)I^6Q7QA?7#-#Ie+$kXh*FvTw!BP>f3elz#`M-3+_PBG zyGE<6W%BmPXG~cbV{tY(&^Q%Qqw(N;FW8B>5 zmvOh{2DiS_C3A6aR$X8iJx*l1>I`bC*=zRw`{pIVS1Jz^YD^b-hQMSS%&yk)$kNJ| zEWKNDZ$0i(k{PZjW7FFGmxgsbEvkjj$a&^>HaEZ0qVca>u5O;9wV4C#f(Jf`dIF;l{acQuuabhXfBCyF0t@-MshY z%jly%JZ|OSu&QyCaBx^9juNq{)lMs9vo1@cTLREHO62XEiZ;3>CgY5=lXEG|7gGUr zHQNFRPo;Z1`)t-_&Q8vmj58+V3_t;iqlAaYEdWJ8ZECS;4yEde=8LKJhHdS%LIF7Y z^h3V={0vl?j57f!0CF|D5daeyy}Y;s&_=gJf6&APMr!p6wR(l)(<689rlDX0!|~~n z0@&0_rxoJH%w>6yO|A37ODN=Q(jPRr8r?W{zJLAUR(aMJfP=$7GUdZbO9A?WCUKO= zZdlUIx-07%R#vkuCNSJDGXR+{ro>Ugd@2hUwLf#GU&kK!|A7B6&99Ca;5WQ& V_Atj(%@~J literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/crop/rapeseed_age_3_top.png b/kubejs/assets/tfg/textures/block/crop/rapeseed_age_3_top.png new file mode 100644 index 0000000000000000000000000000000000000000..2588b3c548d45c3e5d78e0677866a822679de988 GIT binary patch literal 415 zcmV;Q0bu@#P)imQMC3gCMIrj-YfvrB`;g(Uz!KHs@Ix&I}w zE3R&=-l^{eL}H1>z8AGb*u zZE}q}$7{*I&StU{aw!3{)9aJXWZB$aX5DxKklRO70XaRm;TuTk}*pIK@f$%k;5WE5;$(FOGt6rOKeP)R;x7m6Y7uf zZ`j$V$v^O_YgDZ4Qpn}1JpvabSJdTAkD2%0JXWr5E>V$UH13%!UDA(R zBlWz-aY`BOoz;8uL79KbO;~-0bux5op#p_d>KGa2WPm&_vcUXcLK}g0M{FU zI0?y%8u!l9C7pKH6pIykQKL&updtl8u~-3^yr}84k7d27OqNyvX1%F^lcry9aHJCG zQUi!Ce^l&!WN9V3)CRzb=u)F1)!=|Ra?Qp0pa~{Rm(9%<6YCHFZ&n)1rPqOu%&$JI2-@(q(rN-t2V6JaRTliiAmxFaDo?`)! zho`%Sy;!W=KM>!h-^WR~h3|E+uYyAt{Gb5>AF%fR4DQ0=zfU;S4Zt^<{hr1KmG$KS O0000LlfR48U>L_gZ*YjOhgCv4onRs8;8b<#Ur^BD?%=%D z4$2{1JO|gpfrH>0dmy(cxQK&xl5S4k;MsGzECwpn#fCtOZ3r%pLz=g?QU}eHJU_m_ z9->5q|9Py%LK-SbL-lU}X{eUUSq7}`Ke=r_9^ZT++67hu0LAGY02+Ji>~FP2SMvJq z(<4Tc;k<%}mtQSq-`{HIy|Mpy3jk?68~ptJim7XN+FP_BBBY^`B(fDCj+db;fl7P6 z04j-Wal9-CsRRYMYP8no6*yidhNaUPXi*2A&KlcD~10w z237)<#>k~4%q>h#kiuUQ*&GZuxLbas952f+0`w1U94|w=v-cu`Q%Ph4c~iR?v;i>E zr@^TtvPHXQ(I~bS23hqSU}i(RaG{pTyR&!ZF2dL+?fGIA!%1Y*KeQDC8EBkwO_`U#w^KV+C+@{FP?6 zE^l9dqS>trpw@3)GmNXA!)P+ZDP_DI?6CVh{{^gOw@%qD8>Z{ki)QItl+b9cnLr2e mfX!Bo5AXYoCPQxQ)%XPgLCXXMq0(aj0000Lk)dzfKp4e;XBl|J)fBZTmI?wY1z9agQCU>f4HPV- z1!+PmZKNbpxBLMml`@d6V8a8`NTO(9Wo9j^RB$Lh71%lw;H4!u5T9#x)7GgEefM~kRW^*f`Qy=j5+ba%Mz7jO%e7HKKQy&mZkMV7rPJO`ZPkSsqzhkO0k)#Pu zujSKg`6#K`f4{?2WdLL;Y|qZfQaGM80f-}y)BVr(jsbAroJs&;i5I);Fr$E$9=(>& z`3=S5BuxMqowSUT3(ZEjY8L?rEj`A58$dj}{vwprbSEKNdTfNNjQSDr_amHKB&xN_ z;`Mt7fS@rqEMulBW7xbD#}`eiwF+_M0SIT*kIbka0idKtNzKRPWwFI}u(=h`orHz` zpKH4SIC12WrHlM!1dX||9avEwR{-SQEh1>?J=9x^0Akp@6iR9UQHm+LlMuI*_n`}+ zq&BSF6M4}9MPKgNZ?io+`^|wxxsN|V41XNj*(j;46Z@V2oZUPd0M%Nhm>@8)WoAaGnd}r&$^X~wxT(lHUk~|{xV*XAqqQa3aw?M&7R4_nva{=sn zTRba$P=*yrqB=g&FsumO%$&>dDh1!w(%{ys>HbTh&a=n`2$^S`53*(%KIJDS*?nA2|J*e0={6r(Y95Z9cx6Dy~@uvtWv0MI3q! zng>tf44i(Al37ZX?p1DZ@bW$YKV6@CdqXJ3|ARO2*lt((@_EcGnDX#d6+{FP!RhXZ zcu42CA;AC<4{^FXB4JB{LEP^gHwXr#v*N*Dz=`hj@NHB(00000NkvXXu0mjf3wQo= literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/crop/rapeseed_dead_bottom.png b/kubejs/assets/tfg/textures/block/crop/rapeseed_dead_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..5c0408695f307a12fef2421baaddd0ac4a2b02dd GIT binary patch literal 423 zcmV;Y0a*TtP)Lk-tkqQ545NR~#A|O0aa02p$MRC69DgTExL!2>b{9 z4{C6z|GsCoh(NVjRI~9s6!Bl*!&odh#j?`?3gG4O4S-B8iGELq z9^F=704zIAy;V}CfXd{OOWm~yz~12w-o)pukylRJ6)hYh)LSKH<2loz7X}WF_5mo= zvN&y5?25%r=PrU5i+GH#zc7o&)Ho{zOq8=mUIo)B1M_K0)BGMYag`r7SmHWc+QBAWO@BB+CYOu^Hno2vd;*r;jn#cH RRs{e6002ovPDHLkV1m1Tw9)_o literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/crop/rapeseed_dead_top.png b/kubejs/assets/tfg/textures/block/crop/rapeseed_dead_top.png new file mode 100644 index 0000000000000000000000000000000000000000..e532479d7ee199c032a7438a0ff1a9339b81f09f GIT binary patch literal 507 zcmVTl1)n+Q51%slg3)55~f6$EGh(of{22c?1W}n1@{HP zwU9+uU1!m53;hWJA$wQuMl7xbC03D!fx()^_>nIJ#n$9>;mqxfq$@qUd+vST_c`}o zQB|H&i6^O_!ypOp_1hxFwK)KsN=*R?*MrKb)VRIA`$rHxoE%C3s8gwN|GO6zsZ*)_ ze}oIK6Q&PJjP;{|#^8A8RDG{aquw+W->XM4vY-#Z`}KU>!1vnNSxbVYB!?0LP%UpO zAdPx6M%C-};|76PbMqM*^=1@Vf_?7)^vyjaU%p_eRCsuWkN_ZOWe5^A6ayOW+gU3{ z68#5iXDxXJ!(b>@8)FpjN9wGC{^4bH=i-0 zh2=^4P=05q0A5?K7#SPpafzz(>EnzB$#k!7NTo+vSe}%AudmL=p#T(DXLWzeWvNsU z-)-s1?it0kIT2Om%jbdyLK&Y(X?|r&F1!w>KhE{?SJ#M~jl*z60J>K<4+ICD5__9J xHNP??zS~ke_eKEI1MuCJ0+OCcaj@l@{$G`z#E56}0xkdm002ovPDHLkV1gXT-bnxe literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/crop/rapeseed_dead_young.png b/kubejs/assets/tfg/textures/block/crop/rapeseed_dead_young.png new file mode 100644 index 0000000000000000000000000000000000000000..ff8ba317b37cd8ddb46e629ec07c7f3330c79279 GIT binary patch literal 370 zcmV-&0ge8NP)br#gD!!r|U?zW@J^5fL^yTN_RP z1O5h30eJbiUi%>*!q7rVa#jEFEC9@vLPoC#n&-xa_B{A}r=4#!MYTa1@=?+v;0HQDfkiFw=iNeH2Sr?(aL<8`A|Ayzgrhwr2u4oN> zb21*y!~#@J9eBQLe%63QVM3lRMO`UC3N_R2HaWjJA_@~;pWf|oo-RdU?QTh`kvsMae1CJZ702B6+ENPX_FVt=VmPa$DYy zE7*wwD9Ri_=NCprnUkdP0q{Ej)-Zj1B@807gAfLhtOgF6Bx$S$V5ivzVGxy-8}$~hCbQ+UB3ZCP=2^)t0klW0000imQMC3gCMIrj-YfvrB`;g(Uz!KHs@Ix&I}w zE3R&=-l^{eL}H1>z8AGb*u zZE}q}$7{*I&StU{aw!3{)9aJXWZB$aX5DxKklRO70XaRm;TuTk+EwNVHn1LZ>GBwjB;G21`HeuIz?Ub7X%d27V6v# zN)fKs!8H(Y5L}ZC(j|h6bTGI`HYYn+QC^o$5P%-}8OX z`##U}ic*U6RN-9g|It7mJ>N8!XLnyJ=eiOAvM$&G0L}Iq{q}$y-{~GOn@>+GcyjHv z4kMN`q4e7W((o+)R|{#pJb(UvLt~*R$NPtcd<)~ZHh^;d1x}?S*a2xMB$1_De*u6~ z>3|&wvC!ow9Wcrhb@$OVQMz$gUuE!6*EE}Bkms?0fQ5o1J&@xF!YFSI&O85L0{XFdDM(jX0NFs|QvKa4M0?-=O`Lm8b{>YOTqay24 z*cw*Z8dlkzteekIZw>`uqgT^FEEF&Qq@8)WoAaGnd}r&$^X~wxT(lHUk~|{xV*XAqqQa3aw?M&7R4_nva{=sn zTRba$P=*yrqB=g&FsumO%$&>dDh1!w(%{ys>HbTh&a=n`2$^S`53*(%KIJDS*?nA2|J*e0={6r(Y95Z9cx6Dy~@uvtWv0MI3q! zng>tf44i(Al37ZX?p1DZ@bW$YKV6@CdqXJ3|ARO2*lt((@_EcGnDX#d6+{FP!RhXZ zcu42CA;AC<4{^FXB4JB{LEP^gHwXr#v*N*Dz=`hj@NHB(00000NkvXXu0mjf3wQo= literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/crop/sunflower_age_0.png b/kubejs/assets/tfg/textures/block/crop/sunflower_age_0.png new file mode 100644 index 0000000000000000000000000000000000000000..4e1eae8c82235cb97027bf1f7f1e9f6e57ee6543 GIT binary patch literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|+&x_!Lo9le z6C_v{C!{pC_Gp`L4@@5bX`ZT?YyPj_Q*+|O>)-K{VtClK n8g>4EHHzG5HGctj2P1?3G0|1^i65kZMlyK1`njxgN@xNA?XWg) literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/crop/sunflower_age_1.png b/kubejs/assets/tfg/textures/block/crop/sunflower_age_1.png new file mode 100644 index 0000000000000000000000000000000000000000..265805151f9c91bd89f70cc2662b9d83a269594a GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|$~|2iLo9le z6C_xhB}#Pt{`>b>sl^CgpC_B3@$$QJ28SQ>x;-@~4gkS~3oHNGFASDl?r6blart}m z#{-XJ3l10TWLwT?;GCdW`T4b4rk(@a{(b*jt2u$jF;gy;h&j&_^RvtsoK6SPPpc5E8UHx3vIVCg!00LV@-2eap literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/crop/sunflower_age_2.png b/kubejs/assets/tfg/textures/block/crop/sunflower_age_2.png new file mode 100644 index 0000000000000000000000000000000000000000..7d7b59de453946687eaebcad1c48df6eec1b324d GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|R(QHNhFJ6_ zCrC&x$S(XKHviuvCylyI5CovPx#+(|@1R5*>Dk}(RxFc^hj)e7z+cmlUhp2IV^m98T640h1bwa{BQ^#I}^rI1A| zLQ6~bN~FXo(rTKfeq-{#$K(A!(191&+zV{p_CM$n7c>I^Y!54`iPE5;8D`Tt3Yvj3 z(m#O^t7tXw0-MKa2mqjrz;}ru>tdve@4LiUZW7MQs?mp50?J6ExHt_FK2G`um-`Kr z5wNlX07Q9$^Zsdk&;2~qu^jW0;Cg&XXO&wJqVZ(dI-@kGi`TnF|3eb6vO<(6|0NK} o3hXqn9FvPJw4qhv-v&Co0Vfe+ozC2@$^ZZW07*qoM6N<$f)Vt4XaE2J literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/crop/sunflower_age_4_bottom.png b/kubejs/assets/tfg/textures/block/crop/sunflower_age_4_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..b788494d6ffad1e6a6542c6b19267b352155172b GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|7I?ZihFJ6_ zCnzxZbXokH{^j@IgTe~DWM4fGKX8T literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/crop/sunflower_age_4_top.png b/kubejs/assets/tfg/textures/block/crop/sunflower_age_4_top.png new file mode 100644 index 0000000000000000000000000000000000000000..f59dbbe248f84d8cab5893c47ca04ca171a43a71 GIT binary patch literal 942 zcmV;f15x~mP)Px&Xh}ptR9J=WR$WL_VHkc+n@5MPfd;eIk4fsRAtE9PU5GG$F6t)m<`hOj;0S~j zMnqT9MM368ByWiyad|XBHyRZ z`E}nJ<^h&${!zkDuEhxaqXdBXm$1AEE~k%&Ugv>EZ&6m64jJ z-5xC#1S`)h0VJ8im4`LlcCbv*@iugRDXvhD%V zVnWNYw*SSy5968Gb{&Moj&2w^@}>< ze|rf@rZCXkrCT#J2l}25gCtWBEhf0^C%BEBoP{8>zi^nAoS2bM4{iwq zy9Y7Y{mbva$CtNp&R1b(Wd~hH!x+6ok{#2R{ZDJzxopY(_x5_%1$tQ7 zm<$g(d3;{~zFzX2?GE;GK~Fu4?+@gdrPYo7&a&_(JWf%2;&3SO!|UJir+5~eU~S1+ ezL&d$k%1%EHgh{a=T@Lw89ZJ6T-G@yGywp8G+Xrm literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/crop/sunflower_age_5_top.png b/kubejs/assets/tfg/textures/block/crop/sunflower_age_5_top.png new file mode 100644 index 0000000000000000000000000000000000000000..8f423364ee43de62e75d90e5b8343622fdfd43eb GIT binary patch literal 998 zcmVPx&ph-kQR9J=WS6@gIaUB2Lmd9pDdTYoUO9?b0lQv{8KI}m(B9QE@7|}xy34$m_ zPd?dOq7;Hr29XE76$V3AB={C1rs#=GA-%3?$GNQ_wspFGJ#4=p-lpc(3W~mP-0gec zyYJ`w=f2<1fPYQ46B8u4=p*@hMHF_`mtB&JKC+#dAc`muMHC2iz85f4xdFsx7l8B% z9Bti*t=gakt4VCt2BcTA_kM@a=xD@qgAGIrR+GD(b!2X^f!yt^BU-SUWh1%hW7#-V z4ged09yl)EgF{$>7Q9cQA>i@kRV;s+MP|c|$)#!F0WddcCyur&fTaN&fgY3%fXg4} z6tRcIR&974K7yrBM*+;D(e1|M^fXS@)ZqCN0Hn~A1MKq0Ipp_1|40YvAL%HmQ(gWz z=k#i5_wWFKMzadhZFgt1dnc+DDfK5G8ifEAgMCm4W|oi_7g=Eh{gUL(U2WZug1;*kk(9w z`eU!p@YV7Z0APM>t0?ElWrG)dNNc0Hh)pD|nc!&aMmF-9{a?`BRY6+%EF~|EojV|3 zf1qX5(q}1o7W^0djeMZ!F8`S*qCf_sc1Ws>@fsJLUJbYAY9XmIUU(`CKEtvA*iK9k zI*45UIM>o=A$rOuyen#43vBNNvg~a+K}{mS3a<*M@j}kn~*xv zQyIg7+*d%ack%%SAiVazWDt}O1X`;wKeom3Rx^03nK`D;=f}3VKx-BDKT^T7tuP7s@V1W#^9iUN>a^bub0 zVdKqcj;?1@P5D6O>6xDs5=oWORGTeJv6B7!wZI~!XGI)k6L4Rle4x3j;*W5GA7k4y U(Ql2CPyhe`07*qoM6N<$f?kc!WB>pF literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/crop/sunflower_bottom.png b/kubejs/assets/tfg/textures/block/crop/sunflower_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..733f70df5727a8f658c763f0b4336ed160ce72dd GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|CV9FzhFJ6_ zCmdkjbLY#y>(77wKfb(;bH0ip!+OSLQe8ax_v=;9GdTGj&vvMt_y7O)_xp|J>?@pa z!<^vY8Pj9Kd~e_XQwFIY<=oiV*xHus+dufq7si}0Ya;KFRE~oge@=ejUT+h}{BCc} z(F5lW90RM2x!8G~p^VMULi%pBi{t@^mEs+Y6}$>5)^B4Sco-PWtqo_cXk%FobRC1I LtDnm{r-UW|)C^K3 literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/crop/sunflower_dead_young.png b/kubejs/assets/tfg/textures/block/crop/sunflower_dead_young.png new file mode 100644 index 0000000000000000000000000000000000000000..878303ade2257f01ca94d10afcda9bf75628b42e GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|=6Sj}hFJ6_ zCrEs1m^h)yGxp_wNeKxFyS literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/crop/sunflower_greenhouse_0.png b/kubejs/assets/tfg/textures/block/crop/sunflower_greenhouse_0.png new file mode 100644 index 0000000000000000000000000000000000000000..f0d6d1e933d8bb808d0d4b221ece919ac52ab405 GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP%y~T z#WBR9H~G*1|MtwP4V_AN7qj(9IrK0Zm1g}bP0l+XkK DYj8Jq literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/crop/sunflower_greenhouse_1.png b/kubejs/assets/tfg/textures/block/crop/sunflower_greenhouse_1.png new file mode 100644 index 0000000000000000000000000000000000000000..9dee7a443d646f5b89a3fc086b883e6d31cd587b GIT binary patch literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkQ1GIs zi(`mI@7YO)T!$P4T<>?)ZrBv5(=?Sk(`Caq4$DUO4WAgMg$Y?}`%iE?p?bvaf|E*X z&SbA9c8S?Xw4^&T?_?#W-QQ!sMo9419KY4q>lt5M6McN#@7+yN2VM2qX$>#y)E06| zd~@F~dE<%@v*Hz}ISg;JQ-ifxT_hH)`lU5}hn=2^3FEEnEour@Dt^sg4mFm{91bNO z7xt~2^R6f0+4hyH_0OIxmwCp^)Afg8#>T=|){IY|e7YyIVHe{Hp+{eB)E9hHXOf@n i#>TKd_ggRT0cq`buG0)>JX#C%9D}E;pUXO@geCwe$89+P literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/crop/sunflower_greenhouse_2.png b/kubejs/assets/tfg/textures/block/crop/sunflower_greenhouse_2.png new file mode 100644 index 0000000000000000000000000000000000000000..565c8e22e1e302a579ab2683594fad6812876361 GIT binary patch literal 341 zcmV-b0jmCqP)LlCetzF&u@zsC#ibkl=6}MJ|xV#ZBm+kjc@>wN4!! zI(BUT0Y|4>3LQHOB1oZf6zOynI?3T~9NKhflQZI55<>Xi`@KY1Yx$2(e1}($9cz>Z z5P${9k{ok>C-(0ig~-Kx24J%!Crfe$)2H|Z&iOjYVO7#C-{^I24%{0P0I(|I>;iy~ z^}Dw$Z-VFBDe|FB7cj@)jUK@SGL@oQRuuCYMrqec9ANNrZ;jH(RAQ87IG$jXj_<&| z0KjlOL8elK5_mhPmKDWztv_q(*P7O8D}DqwKY+Sa8)$zK4{*+I-y}a^<0c#=6d%Gr naVH1)Qv!gm(fT)bGayz!1JGI?;6)uA00000NkvXXu0mjfF-e7V literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/crop/sunflower_greenhouse_3.png b/kubejs/assets/tfg/textures/block/crop/sunflower_greenhouse_3.png new file mode 100644 index 0000000000000000000000000000000000000000..d87c094abaf476fbbc08aaaf766eb09c8659d203 GIT binary patch literal 406 zcmV;H0crk;P)5lEF#>Q51&1nPPAgGRT0X8(Rb-NE!G7F}qf6BYJ`G z6{H@)T(>LQfHq>o2RpP>WHhGpS5s>GZ*lfaCs4r2Z`d)Em8aC^7G>$4Npm@@}ZrYV5U zgEPW*1-D@F;Jb8&ThyCV?0iW=mILIQ>&+?MR*Oy;0^m2Q*!j|GfNXLL7TM&0qwFVc z!6N3&@f%eIpoIATXak5zU^40_07zt_;8urd=Sy7KrvRji0jXjTnU(Q6z*_R0+Dn_8 zof8fRd+a_r3(WxQx=XL;QTwjra2)*u-A7V307!4A4X@_`klW9Zxwo|Dg#bBOo|j1v zxaa~H5)!xL3jx{;eo8|AwE@7#<=ZOua=>5p1ro=n AIsgCw literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/crop/sunflower_top.png b/kubejs/assets/tfg/textures/block/crop/sunflower_top.png new file mode 100644 index 0000000000000000000000000000000000000000..846fb2c1cf3d10cd60c3da13ab9d5ada308325f2 GIT binary patch literal 850 zcmV-Y1FigtP)Px&3`s;mR9J=Wm%(e>W*EkQN@mF;X|QOq#sn%c#Z_r5NJ%yZV<%%qpp;w-KKD?Q ze<9>w2=1Y0!>+{?N(m;{9adIwH|lucu~2PD)X2Coo$Q6Lm+GsO#I2KPm$nb+AnEP?yd&fS~h>VAYNaGPT^~Ka z0ND&{(R?Cji zP75I z&JNa%i~P6$g1Q=-@Zn2Oj%*lp~6C`##pZ#!x)v_bj%FBY7 zOdmBq+wsS1$Bu1sUZ0ciAOHN@WIIj+aXbF;yK4aSf+6SiIeNj6f{~}|`7$;_DlIt9 zj^pHUOtj-PiiqrZ#a=u@-V26wJ%6$tr-8_hBf>a&gu`~6${9Fp$G^1yq+sL|G12Y; z!py9Eo{9p;*>TtN6W3IByjETorjbibuxXH*9h*iD*XvWQl%yd|gR|JNEFdBb8R2?; zOe4ohiioSR?++4oT&p*geSdIlysSL>mRHM;04NxFT(5toe}!ov6^P5Ip;D_i71PN5 cpWFbv0i6`og2{bXXaE2J07*qoM6N<$f+P^3(*OVf literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/rapeseed_product.png b/kubejs/assets/tfg/textures/item/rapeseed_product.png new file mode 100644 index 0000000000000000000000000000000000000000..0a169f4176aa70e313abed28121429ecdbfc9296 GIT binary patch literal 408 zcmV;J0cZY+P)TlQB=iKorM+M@*>3jp)Y4%Hk#;0u~n%2WKfWOboiX z1B;Ub35juOnEV3r39t*q1e~rRVZfu?bEs{v2#E>4ez$xrpo@rYoWm(WJTQN}PX95E0o^z&^A!$NAiIL_{nPHa+A&arYOJi)S0Z=G~%7)9WFg5Y^xyJp)>sF7FQCdzNKr(Pr zKnEH?t$dM{pJ!JTs~d{d-`}@?<&3JWv@g`5&-ojP-|M#&5=Wu{0000zlfO%XQ51%sQxSZjB3UWzaDHSW7Ja8oKl zAk<{>_Y?$>`Nbt2wR&_V*ek9n3P2*{(f5E~-vj=R0s#8_RHAIp)C+Gun>U}0Yl^t0 z$WCfQlkuoF30&Q|bsIzGRshl&hr{EuS|$Q8WNr!Dk=7XiG9I0z9IX0H#-qAAI6$P& zk{llZla`IYjOlKU@8K;4u<44+Bh->zx#JW8!&^W$2 cZnx|F4N#4VkGQ4nq5uE@07*qoM6N<$g2(~6=>Px# literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/roasted_sunflower_seeds.png b/kubejs/assets/tfg/textures/item/roasted_sunflower_seeds.png new file mode 100644 index 0000000000000000000000000000000000000000..e4047a36d924ca01c953bb6a269a96303506d759 GIT binary patch literal 548 zcmV+<0^9wGP)Tkxxq-Q4~kdle9ExBp9O<68}V`4NcP0MIfZ415&k$ z>BeREegK#G08;Q9%&OZif{VHl+r=P}HUo)RLqoclS|`xOFp`NRwqRdZP7@Qmv2S_r z`<-|0eL_mfP0rAb(*FbCIsSSGKtav-HI?~A$|YU4nzp#wTi@LNx53+@f`D9?4_z`aL=FD_`Dn0Rj829Q9XNuR;O%1gd~I|d*ae!|rBG_iP`J6_*FgC4;1 zTYOM0g^?)|=M=OeU7ZWMYZmzZ_{dD%7e~9zS~}3Tj>gtgdZ{ZUYgD zDiqYbSY6w2$(EtXa!IGvwB0~=uxA9z(5}`AMHR6SRr>0dp`q>W$o0)_0WcJbDrmbq meHXh=LCs6c&}7#`uE`(l3bAx`z4>hb0000&xega6ny!3bWWd{yVH90L>H-|m8&*uZYZA>!I#Ctusu4h#?E*4spD0`C&V2X zUPOwi&*Lk<+9cBS_@b3yol9`;LS0qH1$hz@=h6g@D*Z7ya_9Tj^}NzZ3 zc$nY$$h3W26|=oBRaRR(uHp*0W*nSk{Qiz+BimUkGlAY@@O1TaS?83{1OTG+bp!wa literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/sunflower_seed.png b/kubejs/assets/tfg/textures/item/sunflower_seed.png new file mode 100644 index 0000000000000000000000000000000000000000..e0fca20265840fe6404b49f0bd2f956bf5db3d43 GIT binary patch literal 473 zcmV;~0Ve*5P)Lk}*g^K^TC)3n2#~eNjk+L!#|cL$TS#ss{u8Z2~YB80Ws>#jp4Q=;$43NUSkr4E%~; zwqBb=!cijOC{v+6)siX(kQj*M;2@{KE!OsCty5QtDY(6>6A4EhC0axAX^x!v1_o?w z(tAOn_%u3thiXY>W_4Nuj0L@6C-77 zwJGq8D57?yO5?r&@7?yVplb!OxrC@)sq#U40ifAxyMl+ur{>tv#=piVx&od@d|9y8 P00000NkvXXu0mjfsP5E9 literal 0 HcmV?d00001 diff --git a/kubejs/server_scripts/tfg/data.js b/kubejs/server_scripts/tfg/data.js index 1ed624022..68cad8ea5 100644 --- a/kubejs/server_scripts/tfg/data.js +++ b/kubejs/server_scripts/tfg/data.js @@ -7,6 +7,7 @@ function registerTFCDataForTFG(event) { registerTFGFoodData(event); registerTFGFauna(event); registerTFGCropRanges(event); + registerTFGFLPlanters(event); } @@ -17,6 +18,9 @@ const registerTFGHeatData = (event) => { event.itemHeat(`tfg:decorative_vase/unfired/${color}`, 1.0, null, null) }) event.itemHeat('tfg:decorative_vase/unfired', 1.0, null, null) + + event.itemHeat('tfg:sunflower_product', 1.0, null, null) + event.itemHeat('tfg:roasted_sunflower_seeds', 1.0, null, null) } @@ -130,9 +134,14 @@ const registerTFGFoodData = (event) => { }) event.foodItem('tfg:roasted_sunflower_seeds', food => { - food.hunger(0.5) + food.hunger(4) food.decayModifier(0.5) food.grain(0.1) + food.saturation(0.5) + }) + + event.foodItem('tfg:sunflower_product', food => { + food.decayModifier(0.5) }) } @@ -160,4 +169,43 @@ const registerTFGCropRanges = (event) => { climate.hydrationWiggle(7.5) climate.temperatureWiggle(1.5) }, 'tfg:rapeseed') +} + +const registerTFGFLPlanters = (event) => { + + event.firmalifePlantable( + 'tfg:sunflower_seeds', + 'large', + 10, + 3, + 0.15, + 'tfg:sunflower_seeds', + 'tfg:sunflower_product', + 'nitrogen', + [ + 'tfg:block/crop/sunflower_greenhouse_0', + 'tfg:block/crop/sunflower_greenhouse_1', + 'tfg:block/crop/sunflower_greenhouse_2', + 'tfg:block/crop/sunflower_greenhouse_3' + ], + null + ) + + event.firmalifePlantable( + 'tfg:rapeseed_seeds', + 'large', + 10, + 3, + 0.15, + 'tfg:rapeseed_seeds', + 'tfg:rapeseed_product', + 'phosphorous', + [ + 'tfg:block/crop/rapeseed_greenhouse_0', + 'tfg:block/crop/rapeseed_greenhouse_1', + 'tfg:block/crop/rapeseed_greenhouse_2', + 'tfg:block/crop/rapeseed_greenhouse_3' + ], + null + ) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index 573b012e0..f3298c792 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -752,6 +752,9 @@ function registerTFGFoodRecipes(event) { event.recipes.tfc.heating('tfg:food/raw_limpet', 200) .resultItem(TFC.isp.of('tfg:food/cooked_limpet').copyFood()) + event.recipes.tfc.heating('tfg:sunflower_product', 200) + .resultItem(TFC.isp.of('tfg:roasted_sunflower_seeds').copyFood()) + //#endregion // Food processing machine recipes diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index 7f7ada750..1dec39cbc 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -556,11 +556,11 @@ function registerTFGMiscellaneousRecipes(event) { event.recipes.tfc.barrel_sealed(1000) .inputs('tfg:rapeseed_product', Fluid.of('minecraft:water', 100)) - .outputFluid(Fluid.of('gtceu:seed_oil', 600)) + .outputFluid(Fluid.of('gtceu:seed_oil', 250)) .id('tfg:barrel/rapeseed_to_oil') event.recipes.tfc.barrel_sealed(1000) .inputs('tfg:sunflower_product', Fluid.of('minecraft:water', 100)) - .outputFluid(Fluid.of('gtceu:seed_oil', 350)) + .outputFluid(Fluid.of('gtceu:seed_oil', 120)) .id('tfg:barrel/sunflower_to_oil') } diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index caa0665da..a4742242c 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -6,6 +6,10 @@ const registerTFGItemTags = (event) => { event.add('tfc:seeds', 'tfg:sunflower_seeds') event.add('tfc:seeds', 'tfg:rapeseed_seeds') event.add('tfc:foods', 'tfg:roasted_sunflower_seeds') + event.add('tfc:compost_greens_high', 'tfg:rapeseed_product') + event.add('tfc:compost_greens_high', 'tfg:sunflower_product') + event.add('tfg:water_breathing_ingredients', 'tfg:rapeseed_product') + event.add('tfg:night_vision_ingredients', 'tfg:sunflower_product') //temporary hidden items event.add('c:hidden_from_recipe_viewers', 'tfg:geyser_source_small') event.add('c:hidden_from_recipe_viewers', 'tfg:geyser_source') diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index fbf28924d..c3acae813 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -888,7 +888,8 @@ global.TFC_MEAT_RECIPE_COMPONENTS = [ { input: 'minecraft:chorus_fruit', output: 'minecraft:popped_chorus_fruit', name: 'popped_chorus_fruit' }, { input: 'tfg:food/raw_birt', output: 'tfg:food/cooked_birt', name: 'cooked_birt' }, { input: 'tfg:food/raw_crawlermari', output: 'tfg:food/cooked_crawlermari', name: 'cooked_crawlermari' }, - { input: 'tfg:food/raw_limpet', output: 'tfg:food/cooked_limpet', name: 'cooked_limpet' } + { input: 'tfg:food/raw_limpet', output: 'tfg:food/cooked_limpet', name: 'cooked_limpet' }, + { input: 'tfg:sunflower_product', output: 'tfg:roasted_sunflower_seeds', name: 'roasted_sunflower_seeds' } ]; global.TFC_QUERN_POWDER_RECIPE_COMPONENTS = [ @@ -997,6 +998,8 @@ global.TFC_GREENHOUSE_VEGETABLE_RECIPE_COMPONENTS = [ { input: '8x tfc:seeds/melon', fluid_amount: 4000, output: '24x tfc:melon', name: 'melon' }, { input: '8x tfc:seeds/red_bell_pepper', fluid_amount: 4000, output: '24x tfc:food/red_bell_pepper', name: 'red_bell_pepper' }, { input: '8x tfc:seeds/yellow_bell_pepper', fluid_amount: 4000, output: '24x tfc:food/yellow_bell_pepper', name: 'yellow_bell_pepper' }, + { input: '8x tfg:sunflower_seeds', fluid_amount: 4000, output: '24x tfg:sunflower_product', name: 'sunflower' }, + { input: '8x tfg:rapeseed_seeds', fluid_amount: 4000, output: '24x tfg:rapeseed_product', name: 'rapeseed' }, ]; global.TFC_GREENHOUSE_BERRY_RECIPE_COMPONENTS = [ diff --git a/kubejs/startup_scripts/tfg/blocks.crops.js b/kubejs/startup_scripts/tfg/blocks.crops.js index ecfc666cf..a0597df08 100644 --- a/kubejs/startup_scripts/tfg/blocks.crops.js +++ b/kubejs/startup_scripts/tfg/blocks.crops.js @@ -3,52 +3,58 @@ const registerTFGCrops = (event) => { event.create('tfg:sunflower', 'tfc:double_crop') - .displayName('Sunflower') + .translationKey('block.tfg.sunflower') + .soundType('crop') .nutrient('nitrogen') - .stages(8) + .stages(4) + .doubleStages(2) .hardness(0.4) - .texture('tfg:block/plant/sunflower') ['productItem(java.util.function.Consumer)'](product=> { - product.translationKey('item.tfg.sunflower') - product.texture('tfg:item/plant/sunflower_plant') + product.translationKey('item.tfg.sunflower_product') + product.texture('tfg:item/sunflower_product') }) .seedItem(seed => { seed.translationKey('item.tfg.sunflower_seed') - seed.texture('tfg:item/plant/sunflower_seed') + seed.texture('tfg:item/sunflower_seed') }) .deadBlock(dead => { - dead.translationKey('item.tfg.sunflower_dead') + dead.translationKey('block.tfg.sunflower_dead') dead.hardness(0.2) + dead.soundType('crop') }) - event.create('tfg:wild_sunflower', 'tfc:wild_crop') + event.create('tfg:sunflower_wild', 'tfc:wild_crop') .type('double') - .translationKey('item.tfg.wild_sunflower') + .translationKey('block.tfg.sunflower_wild') + .soundType('crop') .seeds('tfg:sunflower_seeds') .hardness(0.2) + .tagBoth('tfc:wild_crops') event.create('tfg:rapeseed', 'tfc:double_crop') - .displayName('Rapeseed') + .translationKey('block.tfg.rapeseed') + .soundType('crop') .nutrient('phosphorous') - .stages(12) + .stages(3) + .doubleStages(3) .hardness(0.4) - .texture('tfg:block/plant/rapeseed') ['productItem(java.util.function.Consumer)'](product => { - product.translationKey('item.tfg.rapeseed') - product.texture('tfg:item/plant/rapeseed_plant') + product.translationKey('item.tfg.rapeseed_product') }) .seedItem(seed => { seed.translationKey('item.tfg.rapeseed_seed') - seed.texture('tfg:item/plant/rapeseed_seed') }) .deadBlock(dead => { - dead.translationKey('item.tfg.rapeseed_dead') + dead.translationKey('block.tfg.rapeseed_dead') dead.hardness(0.2) + dead.soundType('crop') }) - event.create('tfg:wild_rapeseed', 'tfc:wild_crop') + event.create('tfg:rapeseed_wild', 'tfc:wild_crop') .type('double') - .translationKey('item.tfg.wild_rapeseed') + .translationKey('block.tfg.rapeseed_wild') + .soundType('crop') .seeds('tfg:rapeseed_seeds') .hardness(0.2) + .tagBoth('tfc:wild_crops') } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/items.food.js b/kubejs/startup_scripts/tfg/items.food.js index fc777ee60..0f53c399d 100644 --- a/kubejs/startup_scripts/tfg/items.food.js +++ b/kubejs/startup_scripts/tfg/items.food.js @@ -68,5 +68,8 @@ function registerTFGFoodItems(event) { event.create('tfg:roasted_sunflower_seeds') .translationKey('item.tfg.roasted_sunflower_seeds') - .texture('tfg:item/plant/roasted_sunflower_seeds') + .texture('tfg:item/roasted_sunflower_seeds') + .food(food => food.hunger(4).saturation(2)) + .tag('tfc:foods/grains') + .tag('tfc:foods/usable_in_salad') } \ No newline at end of file