diff --git a/config/fancymenu/slideshows/new_loading_screen/images/image_15.png b/config/fancymenu/slideshows/new_loading_screen/images/image_15.png new file mode 100644 index 000000000..5e9b67664 Binary files /dev/null and b/config/fancymenu/slideshows/new_loading_screen/images/image_15.png differ diff --git a/config/fancymenu/slideshows/new_loading_screen/images/image_16.png b/config/fancymenu/slideshows/new_loading_screen/images/image_16.png new file mode 100644 index 000000000..e6e7f3681 Binary files /dev/null and b/config/fancymenu/slideshows/new_loading_screen/images/image_16.png differ diff --git a/config/fancymenu/slideshows/new_loading_screen/images/image_17.png b/config/fancymenu/slideshows/new_loading_screen/images/image_17.png new file mode 100644 index 000000000..92e111cab Binary files /dev/null and b/config/fancymenu/slideshows/new_loading_screen/images/image_17.png differ diff --git a/config/fancymenu/slideshows/new_loading_screen/images/image_18.png b/config/fancymenu/slideshows/new_loading_screen/images/image_18.png new file mode 100644 index 000000000..4976ee0dd Binary files /dev/null and b/config/fancymenu/slideshows/new_loading_screen/images/image_18.png differ diff --git a/kubejs/assets/tfg/models/block/corallium_arenicolus_0_bottom.json b/kubejs/assets/tfg/models/block/corallium_arenicolus_0_bottom.json new file mode 100644 index 000000000..101071009 --- /dev/null +++ b/kubejs/assets/tfg/models/block/corallium_arenicolus_0_bottom.json @@ -0,0 +1,203 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "0": "tfg:block/planets/venus/corallium_arenicolus_0", + "particle": "tfg:block/planets/venus/corallium_arenicolus_0" + }, + "elements": [ + { + "from": [-0.5, 0, 7.4], + "to": [15.5, 16, 7.4], + "rotation": {"angle": -45, "axis": "y", "origin": [7.5, 0, 7.4]}, + "faces": { + "north": {"uv": [8, 8, 0, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "south": {"uv": [0, 8, 8, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "up": {"uv": [8, 0, 0, 0], "texture": "#0"}, + "down": {"uv": [8, 0, 0, 0], "texture": "#0"} + } + }, + { + "from": [8.8, 0, -0.6], + "to": [8.8, 16, 15.4], + "rotation": {"angle": -45, "axis": "y", "origin": [8.8, 0, 7.4]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "east": {"uv": [8, 8, 0, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "west": {"uv": [0, 8, 8, 16], "texture": "#0"}, + "up": {"uv": [8, 0, 0, 0], "rotation": 90, "texture": "#0"}, + "down": {"uv": [8, 0, 0, 0], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [4.7, 6.1, 4.6], + "to": [2.5, 3.9, 2.4], + "rotation": {"angle": 0, "axis": "y", "origin": [4.7, 6.1, 4.6]}, + "faces": { + "north": {"uv": [8, 1, 9, 2], "texture": "#0"}, + "east": {"uv": [9, 1, 8, 2], "texture": "#0"}, + "south": {"uv": [8, 1, 9, 2], "texture": "#0"}, + "west": {"uv": [9, 1, 8, 2], "texture": "#0"}, + "up": {"uv": [9, 2, 8, 1], "texture": "#0"}, + "down": {"uv": [8, 1, 9, 2], "texture": "#0"} + } + }, + { + "from": [2.6, 4, 2.5], + "to": [4.6, 6, 4.5], + "rotation": {"angle": 0, "axis": "y", "origin": [2.6, 4, 2.5]}, + "faces": { + "north": {"uv": [8, 0, 9, 1], "texture": "#0"}, + "east": {"uv": [9, 0, 8, 1], "texture": "#0"}, + "south": {"uv": [8, 0, 9, 1], "texture": "#0"}, + "west": {"uv": [9, 0, 8, 1], "texture": "#0"}, + "up": {"uv": [9, 1, 8, 0], "texture": "#0"}, + "down": {"uv": [8, 0, 9, 1], "texture": "#0"} + } + }, + { + "from": [12.6, 10.1, 12.4], + "to": [10.4, 7.9, 10.2], + "rotation": {"angle": 0, "axis": "y", "origin": [12.6, 10.1, 12.4]}, + "faces": { + "north": {"uv": [8, 1, 9, 2], "texture": "#0"}, + "east": {"uv": [9, 1, 8, 2], "texture": "#0"}, + "south": {"uv": [8, 1, 9, 2], "texture": "#0"}, + "west": {"uv": [9, 1, 8, 2], "texture": "#0"}, + "up": {"uv": [9, 2, 8, 1], "texture": "#0"}, + "down": {"uv": [8, 1, 9, 2], "texture": "#0"} + } + }, + { + "from": [10.5, 8, 10.3], + "to": [12.5, 10, 12.3], + "rotation": {"angle": 0, "axis": "y", "origin": [10.5, 8, 10.3]}, + "faces": { + "north": {"uv": [8, 0, 9, 1], "texture": "#0"}, + "east": {"uv": [9, 0, 8, 1], "texture": "#0"}, + "south": {"uv": [8, 0, 9, 1], "texture": "#0"}, + "west": {"uv": [9, 0, 8, 1], "texture": "#0"}, + "up": {"uv": [9, 1, 8, 0], "texture": "#0"}, + "down": {"uv": [8, 0, 9, 1], "texture": "#0"} + } + }, + { + "from": [5.9, 11.1, 12.4], + "to": [3.7, 8.9, 10.2], + "rotation": {"angle": 0, "axis": "y", "origin": [5.9, 11.1, 12.4]}, + "faces": { + "north": {"uv": [8, 1, 9, 2], "texture": "#0"}, + "east": {"uv": [9, 1, 8, 2], "texture": "#0"}, + "south": {"uv": [8, 1, 9, 2], "texture": "#0"}, + "west": {"uv": [9, 1, 8, 2], "texture": "#0"}, + "up": {"uv": [9, 2, 8, 1], "texture": "#0"}, + "down": {"uv": [8, 1, 9, 2], "texture": "#0"} + } + }, + { + "from": [3.8, 9, 10.3], + "to": [5.8, 11, 12.3], + "rotation": {"angle": 0, "axis": "y", "origin": [3.8, 9, 10.3]}, + "faces": { + "north": {"uv": [8, 0, 9, 1], "texture": "#0"}, + "east": {"uv": [9, 0, 8, 1], "texture": "#0"}, + "south": {"uv": [8, 0, 9, 1], "texture": "#0"}, + "west": {"uv": [9, 0, 8, 1], "texture": "#0"}, + "up": {"uv": [9, 1, 8, 0], "texture": "#0"}, + "down": {"uv": [8, 0, 9, 1], "texture": "#0"} + } + }, + { + "from": [13.7, 7.1, 4.6], + "to": [11.5, 4.9, 2.4], + "rotation": {"angle": 0, "axis": "y", "origin": [13.7, 7.1, 4.6]}, + "faces": { + "north": {"uv": [8, 1, 9, 2], "texture": "#0"}, + "east": {"uv": [9, 1, 8, 2], "texture": "#0"}, + "south": {"uv": [8, 1, 9, 2], "texture": "#0"}, + "west": {"uv": [9, 1, 8, 2], "texture": "#0"}, + "up": {"uv": [9, 2, 8, 1], "texture": "#0"}, + "down": {"uv": [8, 1, 9, 2], "texture": "#0"} + } + }, + { + "from": [11.6, 5, 2.5], + "to": [13.6, 7, 4.5], + "rotation": {"angle": 0, "axis": "y", "origin": [11.6, 5, 2.5]}, + "faces": { + "north": {"uv": [8, 0, 9, 1], "texture": "#0"}, + "east": {"uv": [9, 0, 8, 1], "texture": "#0"}, + "south": {"uv": [8, 0, 9, 1], "texture": "#0"}, + "west": {"uv": [9, 0, 8, 1], "texture": "#0"}, + "up": {"uv": [9, 1, 8, 0], "texture": "#0"}, + "down": {"uv": [8, 0, 9, 1], "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, -135, 0], + "translation": [0, -4.25, 0], + "scale": [0.625, 0.56, 0.625] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, -3.25, 0], + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + 0, + 1, + { + "name": "berry1", + "origin": [5.1, 6.1, 5.1], + "color": 0, + "children": [2, 3] + }, + { + "name": "berry2", + "origin": [5.1, 6.1, 5.1], + "color": 0, + "children": [4, 5] + }, + { + "name": "berry3", + "origin": [5.1, 6.1, 5.1], + "color": 0, + "children": [6, 7] + }, + { + "name": "berry4", + "origin": [5.1, 6.1, 5.1], + "color": 0, + "children": [8, 9] + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/corallium_arenicolus_0_top.json b/kubejs/assets/tfg/models/block/corallium_arenicolus_0_top.json new file mode 100644 index 000000000..dc1eae220 --- /dev/null +++ b/kubejs/assets/tfg/models/block/corallium_arenicolus_0_top.json @@ -0,0 +1,71 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "0": "tfg:block/planets/venus/corallium_arenicolus_0", + "particle": "tfg:block/planets/venus/corallium_arenicolus_0" + }, + "elements": [ + { + "from": [-0.5, 0, 7.4], + "to": [15.5, 16, 7.4], + "rotation": {"angle": -45, "axis": "y", "origin": [7.5, 0, 7.4]}, + "faces": { + "north": {"uv": [8, 0, 0, 8], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "up": {"uv": [8, 0, 0, 0], "texture": "#0"}, + "down": {"uv": [8, 0, 0, 0], "texture": "#0"} + } + }, + { + "from": [8.8, 0, -0.6], + "to": [8.8, 16, 15.4], + "rotation": {"angle": -45, "axis": "y", "origin": [8.8, 0, 7.4]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "east": {"uv": [8, 0, 0, 8], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "up": {"uv": [8, 0, 0, 0], "rotation": 90, "texture": "#0"}, + "down": {"uv": [8, 0, 0, 0], "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, -135, 0], + "translation": [0, -4.25, 0], + "scale": [0.625, 0.56, 0.625] + }, + "fixed": { + "rotation": [0, 90, 0], + "translation": [0, -3.25, 0], + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/corallium_arenicolus_1.json b/kubejs/assets/tfg/models/block/corallium_arenicolus_1.json new file mode 100644 index 000000000..6913d34fa --- /dev/null +++ b/kubejs/assets/tfg/models/block/corallium_arenicolus_1.json @@ -0,0 +1,54 @@ +{ + "render_type": "cutout_mipped", + "ambientocclusion": "false", + "textures": { + "cross": "tfg:block/planets/venus/corallium_arenicolus_1", + "particle": "tfg:block/planets/venus/corallium_arenicolus_1" + }, + "elements": [ + { + "from": [ 0.8, 0, 8 ], + "to": [ 15.2, 16, 8 ], + "light_emission": 5, + "rotation": { + "origin": [ 8, 8, 8 ], + "axis": "y", + "angle": 45, + "rescale": true + }, + "shade": false, + "faces": { + "north": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#cross" + }, + "south": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#cross" + } + } + }, + { + "from": [ 8, 0, 0.8 ], + "to": [ 8, 16, 15.2 ], + "light_emission": 5, + "rotation": { + "origin": [ 8, 8, 8 ], + "axis": "y", + "angle": 45, + "rescale": true + }, + "shade": false, + "faces": { + "west": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#cross" + }, + "east": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#cross" + } + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/corallium_arenicolus_2.json b/kubejs/assets/tfg/models/block/corallium_arenicolus_2.json new file mode 100644 index 000000000..265404ca3 --- /dev/null +++ b/kubejs/assets/tfg/models/block/corallium_arenicolus_2.json @@ -0,0 +1,191 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "0": "tfg:block/planets/venus/corallium_arenicolus_2", + "particle": "tfg:block/planets/venus/corallium_arenicolus_2" + }, + "elements": [ + { + "from": [-8, 0, 7], + "to": [24, 0, 27], + "rotation": {"angle": -22.5, "axis": "x", "origin": [5, 0, 7]}, + "faces": { + "north": {"uv": [0, 0, 16, 0], "texture": "#0"}, + "east": {"uv": [0, 0, 16, 0], "texture": "#0"}, + "south": {"uv": [0, 0, 16, 0], "texture": "#0"}, + "west": {"uv": [0, 0, 16, 0], "texture": "#0"}, + "up": {"uv": [16, 16, 0, 6], "texture": "#0"}, + "down": {"uv": [0, 6, 16, 16], "texture": "#0"} + } + }, + { + "from": [-8, 7.654, 25.477], + "to": [24, 7.654, 31.477], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 7.65, 25.5]}, + "faces": { + "north": {"uv": [0, 0, 16, 0], "texture": "#0"}, + "east": {"uv": [0, 0, 6, 0], "texture": "#0"}, + "south": {"uv": [0, 0, 16, 0], "texture": "#0"}, + "west": {"uv": [0, 0, 6, 0], "texture": "#0"}, + "up": {"uv": [16, 6, 0, 3], "texture": "#0"}, + "down": {"uv": [0, 3, 16, 6], "texture": "#0"} + } + }, + { + "from": [-8, 0, -11], + "to": [24, 0, 9], + "rotation": {"angle": 22.5, "axis": "x", "origin": [5, 0, 9]}, + "faces": { + "north": {"uv": [16, 0, 0, 0], "texture": "#0"}, + "east": {"uv": [16, 0, 0, 0], "texture": "#0"}, + "south": {"uv": [16, 0, 0, 0], "texture": "#0"}, + "west": {"uv": [16, 0, 0, 0], "texture": "#0"}, + "up": {"uv": [16, 6, 0, 16], "texture": "#0"}, + "down": {"uv": [0, 16, 16, 6], "texture": "#0"} + } + }, + { + "from": [-8, 7.654, -15.477], + "to": [24, 7.654, -9.477], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 7.65, -9.5]}, + "faces": { + "north": {"uv": [16, 0, 0, 0], "texture": "#0"}, + "east": {"uv": [6, 0, 0, 0], "texture": "#0"}, + "south": {"uv": [16, 0, 0, 0], "texture": "#0"}, + "west": {"uv": [6, 0, 0, 0], "texture": "#0"}, + "up": {"uv": [16, 3, 0, 6], "texture": "#0"}, + "down": {"uv": [0, 6, 16, 3], "texture": "#0"} + } + }, + { + "from": [7, 0, -8], + "to": [27, 0, 24], + "rotation": {"angle": 22.5, "axis": "z", "origin": [7, 0, 5]}, + "faces": { + "north": {"uv": [16, 0, 0, 0], "texture": "#0"}, + "east": {"uv": [16, 0, 0, 0], "texture": "#0"}, + "south": {"uv": [16, 0, 0, 0], "texture": "#0"}, + "west": {"uv": [16, 0, 0, 0], "texture": "#0"}, + "up": {"uv": [16, 6, 0, 16], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 16, 16, 6], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [25.477, 7.654, -8], + "to": [31.477, 7.654, 24], + "rotation": {"angle": 0, "axis": "y", "origin": [25.5, 7.65, 0]}, + "faces": { + "north": {"uv": [6, 0, 0, 0], "texture": "#0"}, + "east": {"uv": [16, 0, 0, 0], "texture": "#0"}, + "south": {"uv": [6, 0, 0, 0], "texture": "#0"}, + "west": {"uv": [16, 0, 0, 0], "texture": "#0"}, + "up": {"uv": [16, 3, 0, 6], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 6, 16, 3], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [-11, 0, -8], + "to": [9, 0, 24], + "rotation": {"angle": -22.5, "axis": "z", "origin": [9, 0, 5]}, + "faces": { + "north": {"uv": [0, 0, 16, 0], "texture": "#0"}, + "east": {"uv": [0, 0, 16, 0], "texture": "#0"}, + "south": {"uv": [0, 0, 16, 0], "texture": "#0"}, + "west": {"uv": [0, 0, 16, 0], "texture": "#0"}, + "up": {"uv": [16, 16, 0, 6], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 6, 16, 16], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [-15.477, 7.654, -8], + "to": [-9.477, 7.654, 24], + "rotation": {"angle": 0, "axis": "y", "origin": [-9.5, 7.65, 0]}, + "faces": { + "north": {"uv": [0, 0, 6, 0], "texture": "#0"}, + "east": {"uv": [0, 0, 16, 0], "texture": "#0"}, + "south": {"uv": [0, 0, 6, 0], "texture": "#0"}, + "west": {"uv": [0, 0, 16, 0], "texture": "#0"}, + "up": {"uv": [16, 6, 0, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 3, 16, 6], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [5, 0, 5], + "to": [11, 2, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 0, 5]}, + "faces": { + "north": {"uv": [0, 2, 3, 3], "texture": "#0"}, + "east": {"uv": [0, 2, 3, 3], "texture": "#0"}, + "south": {"uv": [0, 2, 3, 3], "texture": "#0"}, + "west": {"uv": [0, 2, 3, 3], "texture": "#0"}, + "up": {"uv": [0, 0, 3, 3], "texture": "#0"}, + "down": {"uv": [0, 0, 3, 3], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [-2, 51, 0], + "translation": [0.25, 1.25, 0], + "scale": [0.15, 0.15, 0.15] + }, + "thirdperson_lefthand": { + "rotation": [-2, 51, 0], + "translation": [0.25, 1.25, 0], + "scale": [0.15, 0.15, 0.15] + }, + "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.2, 0.2, 0.2] + }, + "gui": { + "rotation": [30, -135, 0], + "scale": [0.3, 0.3, 0.3] + }, + "head": { + "translation": [0, 14, 0] + }, + "fixed": { + "rotation": [-90, 0, 0], + "translation": [0, 0, -1], + "scale": [0.25, 0.25, 0.25] + } + }, + "groups": [ + { + "name": "petal1", + "origin": [5, 0, 6], + "color": 0, + "children": [0, 1] + }, + { + "name": "petal2", + "origin": [5, 0, 6], + "color": 0, + "children": [2, 3] + }, + { + "name": "petal3", + "origin": [5, 0, 6], + "color": 0, + "children": [4, 5] + }, + { + "name": "petal4", + "origin": [5, 0, 6], + "color": 0, + "children": [6, 7] + }, + 8 + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/corallium_arenicolus_3.json b/kubejs/assets/tfg/models/block/corallium_arenicolus_3.json new file mode 100644 index 000000000..cb162d95e --- /dev/null +++ b/kubejs/assets/tfg/models/block/corallium_arenicolus_3.json @@ -0,0 +1,54 @@ +{ + "render_type": "cutout_mipped", + "ambientocclusion": "false", + "textures": { + "cross": "tfg:block/planets/venus/corallium_arenicolus_3", + "particle": "tfg:block/planets/venus/corallium_arenicolus_3" + }, + "elements": [ + { + "from": [ 0.8, 0, 8 ], + "to": [ 15.2, 16, 8 ], + "light_emission": 5, + "rotation": { + "origin": [ 8, 8, 8 ], + "axis": "y", + "angle": 45, + "rescale": true + }, + "shade": false, + "faces": { + "north": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#cross" + }, + "south": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#cross" + } + } + }, + { + "from": [ 8, 0, 0.8 ], + "to": [ 8, 16, 15.2 ], + "light_emission": 5, + "rotation": { + "origin": [ 8, 8, 8 ], + "axis": "y", + "angle": 45, + "rescale": true + }, + "shade": false, + "faces": { + "west": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#cross" + }, + "east": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#cross" + } + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/corallium_arenicolus_4.json b/kubejs/assets/tfg/models/block/corallium_arenicolus_4.json new file mode 100644 index 000000000..ca02aa12d --- /dev/null +++ b/kubejs/assets/tfg/models/block/corallium_arenicolus_4.json @@ -0,0 +1,54 @@ +{ + "render_type": "cutout_mipped", + "ambientocclusion": "false", + "textures": { + "cross": "tfg:block/planets/venus/corallium_arenicolus_4", + "particle": "tfg:block/planets/venus/corallium_arenicolus_4" + }, + "elements": [ + { + "from": [ 0.8, 0, 8 ], + "to": [ 15.2, 16, 8 ], + "light_emission": 5, + "rotation": { + "origin": [ 8, 8, 8 ], + "axis": "y", + "angle": 45, + "rescale": true + }, + "shade": false, + "faces": { + "north": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#cross" + }, + "south": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#cross" + } + } + }, + { + "from": [ 8, 0, 0.8 ], + "to": [ 8, 16, 15.2 ], + "light_emission": 5, + "rotation": { + "origin": [ 8, 8, 8 ], + "axis": "y", + "angle": 45, + "rescale": true + }, + "shade": false, + "faces": { + "west": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#cross" + }, + "east": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#cross" + } + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/corallium_arenicolus_5.json b/kubejs/assets/tfg/models/block/corallium_arenicolus_5.json new file mode 100644 index 000000000..bb98069cb --- /dev/null +++ b/kubejs/assets/tfg/models/block/corallium_arenicolus_5.json @@ -0,0 +1,54 @@ +{ + "render_type": "cutout_mipped", + "ambientocclusion": "false", + "textures": { + "cross": "tfg:block/planets/venus/corallium_arenicolus_5", + "particle": "tfg:block/planets/venus/corallium_arenicolus_5" + }, + "elements": [ + { + "from": [ 0.8, 0, 8 ], + "to": [ 15.2, 16, 8 ], + "light_emission": 5, + "rotation": { + "origin": [ 8, 8, 8 ], + "axis": "y", + "angle": 45, + "rescale": true + }, + "shade": false, + "faces": { + "north": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#cross" + }, + "south": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#cross" + } + } + }, + { + "from": [ 8, 0, 0.8 ], + "to": [ 8, 16, 15.2 ], + "light_emission": 5, + "rotation": { + "origin": [ 8, 8, 8 ], + "axis": "y", + "angle": 45, + "rescale": true + }, + "shade": false, + "faces": { + "west": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#cross" + }, + "east": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#cross" + } + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/rock/stromatolite_block.json b/kubejs/assets/tfg/models/block/rock/stromatolite_block.json index bd6c02acc..4412c52c7 100644 --- a/kubejs/assets/tfg/models/block/rock/stromatolite_block.json +++ b/kubejs/assets/tfg/models/block/rock/stromatolite_block.json @@ -1,8 +1,9 @@ { + "format_version": "1.21.6", "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "1": "tfg:block/planets/venus/stromatolite_block", + "0": "tfg:block/planets/venus/stromatolite_block", "particle": "tfg:block/planets/venus/stromatolite_block" }, "elements": [ @@ -10,12 +11,12 @@ "from": [0, 0, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 8, 8], "texture": "#1"}, - "east": {"uv": [0, 0, 8, 8], "texture": "#1"}, - "south": {"uv": [0, 0, 8, 8], "texture": "#1"}, - "west": {"uv": [0, 0, 8, 8], "texture": "#1"}, - "up": {"uv": [16, 8, 8, 0], "texture": "#1"}, - "down": {"uv": [8, 8, 0, 16], "texture": "#1"} + "north": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "east": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "west": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "up": {"uv": [16, 8, 8, 0], "texture": "#0"}, + "down": {"uv": [8, 8, 0, 16], "texture": "#0"} } }, { @@ -23,12 +24,64 @@ "to": [16, 16, 0], "rotation": {"angle": 22.5, "axis": "x", "origin": [0, 16, 0]}, "faces": { - "north": {"uv": [8, 8, 16, 14], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 6], "texture": "#1"}, - "south": {"uv": [8, 8, 16, 14], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 6], "texture": "#1"}, - "up": {"uv": [0, 0, 8, 0], "texture": "#1"}, - "down": {"uv": [0, 0, 8, 0], "texture": "#1"} + "north": {"uv": [8, 8, 16, 14], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 6], "texture": "#0"}, + "south": {"uv": [8, 8, 16, 14], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 6], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 0], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 0], "texture": "#0"} + } + }, + { + "from": [0, 16, -9], + "to": [16, 16, 0], + "rotation": {"angle": -45, "axis": "x", "origin": [0, 16, 0]}, + "faces": { + "north": {"uv": [0, 0, 8, 0], "rotation": 180, "texture": "#0"}, + "east": {"uv": [0, 0, 0, 6], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 0, 8, 0], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 6], "rotation": 90, "texture": "#0"}, + "up": {"uv": [16, 9.5, 8, 14], "rotation": 180, "texture": "#0"}, + "down": {"uv": [8, 9.5, 16, 14], "texture": "#0"} + } + }, + { + "from": [0, 16, 16], + "to": [16, 16, 25], + "rotation": {"angle": 45, "axis": "x", "origin": [0, 16, 16]}, + "faces": { + "north": {"uv": [8, 0, 0, 0], "texture": "#0"}, + "east": {"uv": [0, 6, 0, 0], "rotation": 270, "texture": "#0"}, + "south": {"uv": [8, 0, 0, 0], "rotation": 180, "texture": "#0"}, + "west": {"uv": [0, 6, 0, 0], "rotation": 90, "texture": "#0"}, + "up": {"uv": [8, 14, 16, 9.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [16, 14, 8, 8.5], "texture": "#0"} + } + }, + { + "from": [-9, 16, 0], + "to": [0, 16, 16], + "rotation": {"angle": 45, "axis": "z", "origin": [0, 16, 0]}, + "faces": { + "north": {"uv": [0, 6, 0, 0], "rotation": 90, "texture": "#0"}, + "east": {"uv": [8, 0, 0, 0], "texture": "#0"}, + "south": {"uv": [0, 6, 0, 0], "rotation": 270, "texture": "#0"}, + "west": {"uv": [8, 0, 0, 0], "rotation": 180, "texture": "#0"}, + "up": {"uv": [8, 14, 16, 9.5], "rotation": 270, "texture": "#0"}, + "down": {"uv": [16, 14, 8, 9.5], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [16, 16, 0], + "to": [25, 16, 16], + "rotation": {"angle": -45, "axis": "z", "origin": [16, 16, 0]}, + "faces": { + "north": {"uv": [0, 0, 0, 6], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 0, 8, 0], "rotation": 180, "texture": "#0"}, + "south": {"uv": [0, 0, 0, 6], "rotation": 270, "texture": "#0"}, + "west": {"uv": [0, 0, 8, 0], "texture": "#0"}, + "up": {"uv": [16, 9.5, 8, 14], "rotation": 270, "texture": "#0"}, + "down": {"uv": [8, 9.5, 16, 14], "rotation": 270, "texture": "#0"} } }, { @@ -36,12 +89,12 @@ "to": [16, 16, 16], "rotation": {"angle": -22.5, "axis": "x", "origin": [0, 16, 16]}, "faces": { - "north": {"uv": [8, 8, 16, 14], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 6], "texture": "#1"}, - "south": {"uv": [8, 8, 16, 14], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 6], "texture": "#1"}, - "up": {"uv": [0, 0, 8, 0], "texture": "#1"}, - "down": {"uv": [0, 0, 8, 0], "texture": "#1"} + "north": {"uv": [8, 8, 16, 14], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 6], "texture": "#0"}, + "south": {"uv": [8, 8, 16, 14], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 6], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 0], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 0], "texture": "#0"} } }, { @@ -49,12 +102,12 @@ "to": [16, 16, 16], "rotation": {"angle": 22.5, "axis": "z", "origin": [16, 16, 16]}, "faces": { - "north": {"uv": [0, 0, 0, 6], "texture": "#1"}, - "east": {"uv": [8, 8, 16, 14], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 6], "texture": "#1"}, - "west": {"uv": [8, 8, 16, 14], "texture": "#1"}, - "up": {"uv": [0, 0, 8, 0], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 8, 0], "rotation": 90, "texture": "#1"} + "north": {"uv": [0, 0, 0, 6], "texture": "#0"}, + "east": {"uv": [8, 8, 16, 14], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 6], "texture": "#0"}, + "west": {"uv": [8, 8, 16, 14], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 0], "rotation": 270, "texture": "#0"}, + "down": {"uv": [0, 0, 8, 0], "rotation": 90, "texture": "#0"} } }, { @@ -62,12 +115,12 @@ "to": [0, 16, 16], "rotation": {"angle": -22.5, "axis": "z", "origin": [0, 16, 16]}, "faces": { - "north": {"uv": [0, 0, 0, 6], "texture": "#1"}, - "east": {"uv": [8, 8, 16, 14], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 6], "texture": "#1"}, - "west": {"uv": [8, 8, 16, 14], "texture": "#1"}, - "up": {"uv": [0, 0, 8, 0], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 8, 0], "rotation": 90, "texture": "#1"} + "north": {"uv": [0, 0, 0, 6], "texture": "#0"}, + "east": {"uv": [8, 8, 16, 14], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 6], "texture": "#0"}, + "west": {"uv": [8, 8, 16, 14], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 0], "rotation": 270, "texture": "#0"}, + "down": {"uv": [0, 0, 8, 0], "rotation": 90, "texture": "#0"} } } ], @@ -87,7 +140,7 @@ "scale": [0.4, 0.4, 0.4] }, "firstperson_lefthand": { - "rotation": [0, 225, 0], + "rotation": [0, -135, 0], "scale": [0.4, 0.4, 0.4] }, "ground": { @@ -95,7 +148,7 @@ "scale": [0.25, 0.25, 0.25] }, "gui": { - "rotation": [30, 225, 0], + "rotation": [30, -135, 0], "scale": [0.625, 0.625, 0.625] }, "fixed": { diff --git a/kubejs/assets/tfg/models/item/corallium_arenicolus_1.json b/kubejs/assets/tfg/models/item/corallium_arenicolus_1.json new file mode 100644 index 000000000..c4762eaf9 --- /dev/null +++ b/kubejs/assets/tfg/models/item/corallium_arenicolus_1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:block/planets/venus/corallium_arenicolus_1" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/corallium_arenicolus_3.json b/kubejs/assets/tfg/models/item/corallium_arenicolus_3.json new file mode 100644 index 000000000..cdba80006 --- /dev/null +++ b/kubejs/assets/tfg/models/item/corallium_arenicolus_3.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:block/planets/venus/corallium_arenicolus_3" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/corallium_arenicolus_4.json b/kubejs/assets/tfg/models/item/corallium_arenicolus_4.json new file mode 100644 index 000000000..365e4389d --- /dev/null +++ b/kubejs/assets/tfg/models/item/corallium_arenicolus_4.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:block/planets/venus/corallium_arenicolus_4" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/corallium_arenicolus_5.json b/kubejs/assets/tfg/models/item/corallium_arenicolus_5.json new file mode 100644 index 000000000..c451628f4 --- /dev/null +++ b/kubejs/assets/tfg/models/item/corallium_arenicolus_5.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:block/planets/venus/corallium_arenicolus_5" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/planets/venus/corallium_arenicolus_0.png b/kubejs/assets/tfg/textures/block/planets/venus/corallium_arenicolus_0.png new file mode 100644 index 000000000..70abfaeb7 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/planets/venus/corallium_arenicolus_0.png differ diff --git a/kubejs/assets/tfg/textures/block/planets/venus/corallium_arenicolus_1.png b/kubejs/assets/tfg/textures/block/planets/venus/corallium_arenicolus_1.png new file mode 100644 index 000000000..6177f40cb Binary files /dev/null and b/kubejs/assets/tfg/textures/block/planets/venus/corallium_arenicolus_1.png differ diff --git a/kubejs/assets/tfg/textures/block/planets/venus/corallium_arenicolus_2.png b/kubejs/assets/tfg/textures/block/planets/venus/corallium_arenicolus_2.png new file mode 100644 index 000000000..647082eda Binary files /dev/null and b/kubejs/assets/tfg/textures/block/planets/venus/corallium_arenicolus_2.png differ diff --git a/kubejs/assets/tfg/textures/block/planets/venus/corallium_arenicolus_3.png b/kubejs/assets/tfg/textures/block/planets/venus/corallium_arenicolus_3.png new file mode 100644 index 000000000..030d223ad Binary files /dev/null and b/kubejs/assets/tfg/textures/block/planets/venus/corallium_arenicolus_3.png differ diff --git a/kubejs/assets/tfg/textures/block/planets/venus/corallium_arenicolus_4.png b/kubejs/assets/tfg/textures/block/planets/venus/corallium_arenicolus_4.png new file mode 100644 index 000000000..dea500821 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/planets/venus/corallium_arenicolus_4.png differ diff --git a/kubejs/assets/tfg/textures/block/planets/venus/corallium_arenicolus_5.png b/kubejs/assets/tfg/textures/block/planets/venus/corallium_arenicolus_5.png new file mode 100644 index 000000000..a19259cd5 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/planets/venus/corallium_arenicolus_5.png differ diff --git a/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_block.png b/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_block.png index 02cef73d7..823e3d92a 100644 Binary files a/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_block.png and b/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_block.png differ diff --git a/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_bottom.png b/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_bottom.png new file mode 100644 index 000000000..d2f69e421 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_bottom.png differ diff --git a/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_cluster_medium.png b/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_cluster_medium.png index fdde0313b..1c90b25ee 100644 Binary files a/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_cluster_medium.png and b/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_cluster_medium.png differ diff --git a/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_cluster_small.png b/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_cluster_small.png index 8b04d113f..a5c9714f6 100644 Binary files a/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_cluster_small.png and b/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_cluster_small.png differ diff --git a/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_hanging.png b/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_hanging.png deleted file mode 100644 index 0ba47a941..000000000 Binary files a/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_hanging.png and /dev/null differ diff --git a/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_side.png b/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_side.png new file mode 100644 index 000000000..d02c0ba9f Binary files /dev/null and b/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_side.png differ diff --git a/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_side_top.png b/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_side_top.png new file mode 100644 index 000000000..48b74f7fb Binary files /dev/null and b/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_side_top.png differ diff --git a/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_spike.png b/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_spike.png index 5c41d1223..353202e86 100644 Binary files a/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_spike.png and b/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_spike.png differ diff --git a/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_top.png b/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_top.png new file mode 100644 index 000000000..2293285b6 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/planets/venus/stromatolite_top.png differ diff --git a/kubejs/startup_scripts/tfg/blocks.space.js b/kubejs/startup_scripts/tfg/blocks.space.js index e4855d8d5..c7912fb63 100644 --- a/kubejs/startup_scripts/tfg/blocks.space.js +++ b/kubejs/startup_scripts/tfg/blocks.space.js @@ -214,6 +214,13 @@ function registerTFGSpaceBlocks(event) { // #region Plants + /* + * Default box for single_plant = (3.0F, 0.0F, 3.0F, 13.0F, 7.0F, 13.0F) + * Default box for double_plants--Per half = (2.0F, 0.0F, 2.0F, 14.0F, 16.0F, 14.0F) + * Default box for smoke_emitter--Emits Signal smoke = (2.0F, 0.0F, 2.0F, 14.0F, 16.0F, 14.0F) + * Default box for light_smoke_emitter--Emits Cozy smoke = (2.0F, 0.0F, 2.0F, 14.0F, 16.0F, 14.0F) + */ + event.create('tfg:lunar_roots', 'tfg:decorative_plant') .soundType('nether_wart') .lightLevel(0.4) @@ -223,6 +230,38 @@ function registerTFGSpaceBlocks(event) { .soundType('nether_wart') .tagItem('tfg:moon_plants') + event.create('tfg:corallium_arenicolus_0', 'tfg:double_decorative_plant') + .soundType('nether_wart') + .tagItem('tfg:venus_plants') + .lightLevel(0.4) + .renderType('translucent') + + event.create('tfg:corallium_arenicolus_1', 'tfg:decorative_plant') + .soundType('nether_wart') + .tagItem('tfg:venus_plants') + .box(3, 0, 3, 13, 14, 13) + + event.create('tfg:corallium_arenicolus_2', 'tfg:decorative_plant') + .soundType('nether_wart') + .tagItem('tfg:venus_plants') + .renderType('translucent') + .box(0, 0, 0, 16, 4, 16) + + event.create('tfg:corallium_arenicolus_3', 'tfg:decorative_plant') + .soundType('nether_wart') + .tagItem('tfg:venus_plants') + .box(3, 0, 3, 13, 14, 13) + + event.create('tfg:corallium_arenicolus_4', 'tfg:decorative_plant') + .soundType('nether_wart') + .tagItem('tfg:venus_plants') + .box(3, 0, 3, 13, 14, 13) + + event.create('tfg:corallium_arenicolus_5', 'tfg:decorative_plant') + .soundType('nether_wart') + .tagItem('tfg:venus_plants') + .box(3, 0, 3, 13, 14, 13) + // #endregion //#region Venus Blocks