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 000000000..ea0cead88 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/rapeseed_age_0.png differ diff --git a/kubejs/assets/tfg/textures/block/crop/rapeseed_age_1.png b/kubejs/assets/tfg/textures/block/crop/rapeseed_age_1.png new file mode 100644 index 000000000..46efc2191 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/rapeseed_age_1.png differ diff --git a/kubejs/assets/tfg/textures/block/crop/rapeseed_age_2.png b/kubejs/assets/tfg/textures/block/crop/rapeseed_age_2.png new file mode 100644 index 000000000..b9ad8c526 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/rapeseed_age_2.png differ diff --git a/kubejs/assets/tfg/textures/block/crop/rapeseed_age_3_bottom.png b/kubejs/assets/tfg/textures/block/crop/rapeseed_age_3_bottom.png new file mode 100644 index 000000000..48ad56e6c Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/rapeseed_age_3_bottom.png differ 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 000000000..2588b3c54 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/rapeseed_age_3_top.png differ diff --git a/kubejs/assets/tfg/textures/block/crop/rapeseed_age_4_bottom.png b/kubejs/assets/tfg/textures/block/crop/rapeseed_age_4_bottom.png new file mode 100644 index 000000000..778591b2c Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/rapeseed_age_4_bottom.png differ diff --git a/kubejs/assets/tfg/textures/block/crop/rapeseed_age_4_top.png b/kubejs/assets/tfg/textures/block/crop/rapeseed_age_4_top.png new file mode 100644 index 000000000..70428f8a9 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/rapeseed_age_4_top.png differ diff --git a/kubejs/assets/tfg/textures/block/crop/rapeseed_age_5_bottom.png b/kubejs/assets/tfg/textures/block/crop/rapeseed_age_5_bottom.png new file mode 100644 index 000000000..08874fb81 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/rapeseed_age_5_bottom.png differ diff --git a/kubejs/assets/tfg/textures/block/crop/rapeseed_age_5_top.png b/kubejs/assets/tfg/textures/block/crop/rapeseed_age_5_top.png new file mode 100644 index 000000000..b80f79aaf Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/rapeseed_age_5_top.png differ 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 000000000..5c0408695 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/rapeseed_dead_bottom.png differ 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 000000000..e532479d7 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/rapeseed_dead_top.png differ 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 000000000..ff8ba317b Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/rapeseed_dead_young.png differ diff --git a/kubejs/assets/tfg/textures/block/crop/rapeseed_greenhouse_0.png b/kubejs/assets/tfg/textures/block/crop/rapeseed_greenhouse_0.png new file mode 100644 index 000000000..ea0cead88 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/rapeseed_greenhouse_0.png differ diff --git a/kubejs/assets/tfg/textures/block/crop/rapeseed_greenhouse_1.png b/kubejs/assets/tfg/textures/block/crop/rapeseed_greenhouse_1.png new file mode 100644 index 000000000..2588b3c54 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/rapeseed_greenhouse_1.png differ diff --git a/kubejs/assets/tfg/textures/block/crop/rapeseed_greenhouse_2.png b/kubejs/assets/tfg/textures/block/crop/rapeseed_greenhouse_2.png new file mode 100644 index 000000000..75c33cc30 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/rapeseed_greenhouse_2.png differ diff --git a/kubejs/assets/tfg/textures/block/crop/rapeseed_greenhouse_3.png b/kubejs/assets/tfg/textures/block/crop/rapeseed_greenhouse_3.png new file mode 100644 index 000000000..b80f79aaf Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/rapeseed_greenhouse_3.png differ 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 000000000..4e1eae8c8 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/sunflower_age_0.png differ 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 000000000..265805151 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/sunflower_age_1.png differ 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 000000000..7d7b59de4 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/sunflower_age_2.png differ diff --git a/kubejs/assets/tfg/textures/block/crop/sunflower_age_3.png b/kubejs/assets/tfg/textures/block/crop/sunflower_age_3.png new file mode 100644 index 000000000..a6bec2fbc Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/sunflower_age_3.png differ 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 000000000..b788494d6 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/sunflower_age_4_bottom.png differ 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 000000000..f59dbbe24 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/sunflower_age_4_top.png differ diff --git a/kubejs/assets/tfg/textures/block/crop/sunflower_age_5_bottom.png b/kubejs/assets/tfg/textures/block/crop/sunflower_age_5_bottom.png new file mode 100644 index 000000000..71d1c51d4 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/sunflower_age_5_bottom.png differ 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 000000000..8f423364e Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/sunflower_age_5_top.png differ 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 000000000..733f70df5 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/sunflower_bottom.png differ 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 000000000..878303ade Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/sunflower_dead_young.png differ 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 000000000..f0d6d1e93 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/sunflower_greenhouse_0.png differ 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 000000000..9dee7a443 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/sunflower_greenhouse_1.png differ 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 000000000..565c8e22e Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/sunflower_greenhouse_2.png differ 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 000000000..d87c094ab Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/sunflower_greenhouse_3.png differ 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 000000000..846fb2c1c Binary files /dev/null and b/kubejs/assets/tfg/textures/block/crop/sunflower_top.png differ 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 000000000..0a169f417 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/rapeseed_product.png differ diff --git a/kubejs/assets/tfg/textures/item/rapeseed_seeds.png b/kubejs/assets/tfg/textures/item/rapeseed_seeds.png new file mode 100644 index 000000000..7c7987c70 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/rapeseed_seeds.png differ 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 000000000..e4047a36d Binary files /dev/null and b/kubejs/assets/tfg/textures/item/roasted_sunflower_seeds.png differ diff --git a/kubejs/assets/tfg/textures/item/sunflower_product.png b/kubejs/assets/tfg/textures/item/sunflower_product.png new file mode 100644 index 000000000..5be11370b Binary files /dev/null and b/kubejs/assets/tfg/textures/item/sunflower_product.png differ 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 000000000..e0fca2026 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/sunflower_seed.png differ 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