diff --git a/kubejs/assets/betterend/blockstates/blooming_cooksonia.json b/kubejs/assets/betterend/blockstates/blooming_cooksonia.json new file mode 100644 index 000000000..451609a73 --- /dev/null +++ b/kubejs/assets/betterend/blockstates/blooming_cooksonia.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/blooming_cooksonia_01" }, + { "model": "betterend:block/blooming_cooksonia_02" }, + { "model": "betterend:block/blooming_cooksonia_03" }, + { "model": "betterend:block/blooming_cooksonia_04" } + ] + } +} diff --git a/kubejs/assets/betterend/blockstates/chorus_grass.json b/kubejs/assets/betterend/blockstates/chorus_grass.json new file mode 100644 index 000000000..f9b90232d --- /dev/null +++ b/kubejs/assets/betterend/blockstates/chorus_grass.json @@ -0,0 +1,14 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/chorus_grass_01" }, + { "model": "betterend:block/chorus_grass_02" }, + { "model": "betterend:block/chorus_grass_03" }, + { "model": "betterend:block/chorus_grass_04" }, + { "model": "betterend:block/chorus_grass_05" }, + { "model": "betterend:block/chorus_grass_06" }, + { "model": "betterend:block/chorus_grass_07" }, + { "model": "betterend:block/chorus_grass_08" } + ] + } +} diff --git a/kubejs/assets/betterend/blockstates/chorus_lily.json b/kubejs/assets/betterend/blockstates/chorus_lily.json new file mode 100644 index 000000000..640c180d6 --- /dev/null +++ b/kubejs/assets/betterend/blockstates/chorus_lily.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "betterend:block/chorus_lily" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/blockstates/crystal_grass.json b/kubejs/assets/betterend/blockstates/crystal_grass.json new file mode 100644 index 000000000..94c476966 --- /dev/null +++ b/kubejs/assets/betterend/blockstates/crystal_grass.json @@ -0,0 +1,22 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/crystal_grass_1" }, + { "model": "betterend:block/crystal_grass_2", "weight": 1 }, + { "model": "betterend:block/crystal_grass_3", "weight": 2 }, + { "model": "betterend:block/crystal_grass_4", "weight": 3 }, + { "model": "betterend:block/crystal_grass_1", "y": 90 }, + { "model": "betterend:block/crystal_grass_2", "y": 90, "weight": 1 }, + { "model": "betterend:block/crystal_grass_3", "y": 90, "weight": 2 }, + { "model": "betterend:block/crystal_grass_4", "y": 90, "weight": 3 }, + { "model": "betterend:block/crystal_grass_1", "y": 180 }, + { "model": "betterend:block/crystal_grass_2", "y": 180, "weight": 1 }, + { "model": "betterend:block/crystal_grass_3", "y": 180, "weight": 2 }, + { "model": "betterend:block/crystal_grass_4", "y": 180, "weight": 3 }, + { "model": "betterend:block/crystal_grass_1", "y": 270 }, + { "model": "betterend:block/crystal_grass_2", "y": 270, "weight": 1 }, + { "model": "betterend:block/crystal_grass_3", "y": 270, "weight": 2 }, + { "model": "betterend:block/crystal_grass_4", "y": 270, "weight": 3 } + ] + } +} diff --git a/kubejs/assets/betterend/blockstates/fracturn.json b/kubejs/assets/betterend/blockstates/fracturn.json new file mode 100644 index 000000000..4597854c2 --- /dev/null +++ b/kubejs/assets/betterend/blockstates/fracturn.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/fracturn_01" }, + { "model": "betterend:block/fracturn_02" }, + { "model": "betterend:block/fracturn_03" }, + { "model": "betterend:block/fracturn_04" } + ] + } +} diff --git a/kubejs/assets/betterend/blockstates/inflexia.json b/kubejs/assets/betterend/blockstates/inflexia.json new file mode 100644 index 000000000..2f13df959 --- /dev/null +++ b/kubejs/assets/betterend/blockstates/inflexia.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "betterend:block/inflexia" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/blockstates/jungle_grass.json b/kubejs/assets/betterend/blockstates/jungle_grass.json new file mode 100644 index 000000000..8231d48e2 --- /dev/null +++ b/kubejs/assets/betterend/blockstates/jungle_grass.json @@ -0,0 +1,18 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/jungle_grass_01" }, + { "model": "betterend:block/jungle_grass_02" }, + { "model": "betterend:block/jungle_grass_03" }, + { "model": "betterend:block/jungle_grass_04" }, + { "model": "betterend:block/jungle_grass_05" }, + { "model": "betterend:block/jungle_grass_06" }, + { "model": "betterend:block/jungle_grass_07" }, + { "model": "betterend:block/jungle_grass_08" }, + { "model": "betterend:block/jungle_grass_09" }, + { "model": "betterend:block/jungle_grass_10" }, + { "model": "betterend:block/jungle_grass_11" }, + { "model": "betterend:block/jungle_grass_12" } + ] + } +} diff --git a/kubejs/assets/betterend/blockstates/salteago.json b/kubejs/assets/betterend/blockstates/salteago.json new file mode 100644 index 000000000..f894c45fc --- /dev/null +++ b/kubejs/assets/betterend/blockstates/salteago.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/salteago_01" }, + { "model": "betterend:block/salteago_02" }, + { "model": "betterend:block/salteago_03" }, + { "model": "betterend:block/salteago_04" } + ] + } +} diff --git a/kubejs/assets/betterend/blockstates/vaiolush_fern.json b/kubejs/assets/betterend/blockstates/vaiolush_fern.json new file mode 100644 index 000000000..a058f6831 --- /dev/null +++ b/kubejs/assets/betterend/blockstates/vaiolush_fern.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/vaiolush_fern_01" }, + { "model": "betterend:block/vaiolush_fern_02" }, + { "model": "betterend:block/vaiolush_fern_03" }, + { "model": "betterend:block/vaiolush_fern_04" } + ] + } +} diff --git a/kubejs/assets/betterend/credits.txt b/kubejs/assets/betterend/credits.txt new file mode 100644 index 000000000..2d37a1262 --- /dev/null +++ b/kubejs/assets/betterend/credits.txt @@ -0,0 +1,6 @@ +All assets in this folder taken from the Better End mod, which we'd love to include but is unfortunately only on Fabric. +We believe their assets are under the MIT license which permits us to copy them as long as the license is preserved. +TFG is also MIT license, but another license.txt is included in this folder anyway. + +Please go check out their amazing mod if you're ever playing on Fabric! +https://github.com/quiqueck/BetterEnd \ No newline at end of file diff --git a/kubejs/assets/betterend/license.txt b/kubejs/assets/betterend/license.txt new file mode 100644 index 000000000..92748bc54 --- /dev/null +++ b/kubejs/assets/betterend/license.txt @@ -0,0 +1,25 @@ +MIT License + +Copyright (c) 2020 paulevsGitch + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +___________________________ +Some of our Assets (see LICENSE.ASSETS for a Listing) is licensed under CC BY-NC-SA 4.0 +See https://creativecommons.org/licenses/by-nc-sa/4.0/ for Details. diff --git a/kubejs/assets/betterend/models/block/blooming_cooksonia_01.json b/kubejs/assets/betterend/models/block/blooming_cooksonia_01.json new file mode 100644 index 000000000..078feb60e --- /dev/null +++ b/kubejs/assets/betterend/models/block/blooming_cooksonia_01.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/blooming_cooksonia" + } +} diff --git a/kubejs/assets/betterend/models/block/blooming_cooksonia_02.json b/kubejs/assets/betterend/models/block/blooming_cooksonia_02.json new file mode 100644 index 000000000..8550a9ab4 --- /dev/null +++ b/kubejs/assets/betterend/models/block/blooming_cooksonia_02.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/blooming_cooksonia" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/blooming_cooksonia_03.json b/kubejs/assets/betterend/models/block/blooming_cooksonia_03.json new file mode 100644 index 000000000..7ddcd72c3 --- /dev/null +++ b/kubejs/assets/betterend/models/block/blooming_cooksonia_03.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/blooming_cooksonia" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/blooming_cooksonia_04.json b/kubejs/assets/betterend/models/block/blooming_cooksonia_04.json new file mode 100644 index 000000000..eba5bf993 --- /dev/null +++ b/kubejs/assets/betterend/models/block/blooming_cooksonia_04.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block_inverted", + "textures": { + "texture": "betterend:block/blooming_cooksonia" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/chorus_grass_01.json b/kubejs/assets/betterend/models/block/chorus_grass_01.json new file mode 100644 index 000000000..5b12cc8e8 --- /dev/null +++ b/kubejs/assets/betterend/models/block/chorus_grass_01.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/chorus_grass_01" + } +} diff --git a/kubejs/assets/betterend/models/block/chorus_grass_02.json b/kubejs/assets/betterend/models/block/chorus_grass_02.json new file mode 100644 index 000000000..e3e4506d4 --- /dev/null +++ b/kubejs/assets/betterend/models/block/chorus_grass_02.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/chorus_grass_02" + } +} diff --git a/kubejs/assets/betterend/models/block/chorus_grass_03.json b/kubejs/assets/betterend/models/block/chorus_grass_03.json new file mode 100644 index 000000000..ef56a9bd7 --- /dev/null +++ b/kubejs/assets/betterend/models/block/chorus_grass_03.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/chorus_grass_03" + } +} diff --git a/kubejs/assets/betterend/models/block/chorus_grass_04.json b/kubejs/assets/betterend/models/block/chorus_grass_04.json new file mode 100644 index 000000000..a4d8ba3f6 --- /dev/null +++ b/kubejs/assets/betterend/models/block/chorus_grass_04.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/chorus_grass_04" + } +} diff --git a/kubejs/assets/betterend/models/block/chorus_grass_05.json b/kubejs/assets/betterend/models/block/chorus_grass_05.json new file mode 100644 index 000000000..8f4bd5bc6 --- /dev/null +++ b/kubejs/assets/betterend/models/block/chorus_grass_05.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/chorus_grass_01" + } +} diff --git a/kubejs/assets/betterend/models/block/chorus_grass_06.json b/kubejs/assets/betterend/models/block/chorus_grass_06.json new file mode 100644 index 000000000..e3ab8f2be --- /dev/null +++ b/kubejs/assets/betterend/models/block/chorus_grass_06.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/chorus_grass_02" + } +} diff --git a/kubejs/assets/betterend/models/block/chorus_grass_07.json b/kubejs/assets/betterend/models/block/chorus_grass_07.json new file mode 100644 index 000000000..8205e7694 --- /dev/null +++ b/kubejs/assets/betterend/models/block/chorus_grass_07.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/chorus_grass_03" + } +} diff --git a/kubejs/assets/betterend/models/block/chorus_grass_08.json b/kubejs/assets/betterend/models/block/chorus_grass_08.json new file mode 100644 index 000000000..6f4da7645 --- /dev/null +++ b/kubejs/assets/betterend/models/block/chorus_grass_08.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/chorus_grass_04" + } +} diff --git a/kubejs/assets/betterend/models/block/chorus_lily.json b/kubejs/assets/betterend/models/block/chorus_lily.json new file mode 100644 index 000000000..456561411 --- /dev/null +++ b/kubejs/assets/betterend/models/block/chorus_lily.json @@ -0,0 +1,360 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/chorus_plant_flower_petal", + "texture": "betterend:block/chorus_plant_flower_petal", + "center": "betterend:block/chorus_plant_flower_center", + "texture1": "betterend:block/chorus_plant_flower_fur" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 4, 0, 4 ], + "to": [ 12, 2, 12 ], + "faces": { + "down": { + "uv": [ 0, 8, 8, 16 ], + "texture": "#center" + }, + "up": { + "uv": [ 0, 0, 8, 8 ], + "texture": "#center" + }, + "north": { + "uv": [ 8, 14, 16, 16 ], + "texture": "#center" + }, + "south": { + "uv": [ 8, 14, 16, 16 ], + "texture": "#center" + }, + "west": { + "uv": [ 8, 14, 16, 16 ], + "texture": "#center" + }, + "east": { + "uv": [ 8, 14, 16, 16 ], + "texture": "#center" + } + } + }, + { + "__comment": "PlaneY2", + "from": [ 4.5, 1.125, 16 ], + "to": [ 20.5, 1.126, 32 ], + "rotation": { + "origin": [ 4.5, 1.125, 16 ], + "axis": "y", + "angle": 45 + }, + "shade": false, + "faces": { + "down": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#texture" + }, + "up": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#texture", + "rotation": 180 + } + } + }, + { + "__comment": "PlaneY2", + "from": [ 0, 1.25, 4.5 ], + "to": [ 16, 1.251, 20.5 ], + "rotation": { + "origin": [ 0, 1.25, 4.5 ], + "axis": "y", + "angle": -45 + }, + "shade": false, + "faces": { + "down": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#texture" + }, + "up": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#texture", + "rotation": 180 + } + } + }, + { + "__comment": "PlaneY2", + "from": [ -4.5, 1.375, -16 ], + "to": [ 11.5, 1.376, 0 ], + "rotation": { + "origin": [ 11.5, 1.375, 0 ], + "axis": "y", + "angle": 45 + }, + "shade": false, + "faces": { + "down": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#texture", + "rotation": 180 + }, + "up": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#texture" + } + } + }, + { + "__comment": "PlaneY2", + "from": [ 0, 1, -4.5 ], + "to": [ 16, 1.001, 11.5 ], + "rotation": { + "origin": [ 16, 1, 11.5 ], + "axis": "y", + "angle": -45 + }, + "shade": false, + "faces": { + "down": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#texture", + "rotation": 180 + }, + "up": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#texture" + } + } + }, + { + "__comment": "PlaneX6", + "from": [ 11, 0.999, 0.5 ], + "to": [ 20, 0.9999999, 16.5 ], + "rotation": { + "origin": [ 11, 1, 0.5 ], + "axis": "z", + "angle": 22.5 + }, + "shade": false, + "faces": { + "down": { + "uv": [ 0, 7, 16, 16 ], + "texture": "#texture", + "rotation": 90 + }, + "up": { + "uv": [ 16, 16, 0, 7 ], + "texture": "#texture", + "rotation": 270 + } + } + }, + { + "__comment": "PlaneX6", + "from": [ 19.25, 4.374, 0.5 ], + "to": [ 28.25, 4.375, 16.5 ], + "shade": false, + "faces": { + "down": { + "uv": [ 0, 0, 16, 9 ], + "texture": "#texture", + "rotation": 90 + }, + "up": { + "uv": [ 16, 9, 0, 0 ], + "texture": "#texture", + "rotation": 270 + } + } + }, + { + "__comment": "PlaneY11", + "from": [ -3, 0.999, 0 ], + "to": [ 5, 0.9999999, 16 ], + "rotation": { + "origin": [ 5, 1, 0 ], + "axis": "z", + "angle": -22.5 + }, + "shade": false, + "faces": { + "down": { + "uv": [ 0, 8, 16, 16 ], + "texture": "#texture", + "rotation": 270 + }, + "up": { + "uv": [ 0, 8, 16, 16 ], + "texture": "#texture", + "rotation": 270 + } + } + }, + { + "__comment": "PlaneY11", + "from": [ -10.375, 3.999, 0 ], + "to": [ -2.375, 4, 16 ], + "shade": false, + "faces": { + "down": { + "uv": [ 0, 0, 16, 8 ], + "texture": "#texture", + "rotation": 270 + }, + "up": { + "uv": [ 0, 0, 16, 8 ], + "texture": "#texture", + "rotation": 270 + } + } + }, + { + "__comment": "PlaneY13", + "from": [ -0.5, 1, 11 ], + "to": [ 15.5, 1.001, 20 ], + "rotation": { + "origin": [ -0.5, 1, 11 ], + "axis": "x", + "angle": -22.5 + }, + "shade": false, + "faces": { + "down": { + "uv": [ 0, 7, 16, 16 ], + "texture": "#texture" + }, + "up": { + "uv": [ 0, 7, 16, 16 ], + "texture": "#texture", + "rotation": 180 + } + } + }, + { + "__comment": "PlaneY13", + "from": [ -0.5, 4.5, 19.25 ], + "to": [ 15.5, 4.501, 28.25 ], + "shade": false, + "faces": { + "down": { + "uv": [ 0, 0, 16, 9 ], + "texture": "#texture" + }, + "up": { + "uv": [ 0, 0, 16, 9 ], + "texture": "#texture", + "rotation": 180 + } + } + }, + { + "__comment": "PlaneY18", + "from": [ 1, 0.999, -4 ], + "to": [ 17, 0.9999999, 5 ], + "rotation": { + "origin": [ 1, 1, 5 ], + "axis": "x", + "angle": 22.5 + }, + "shade": false, + "faces": { + "down": { + "uv": [ 0, 8, 16, 16 ], + "texture": "#texture", + "rotation": 180 + }, + "up": { + "uv": [ 0, 8, 16, 16 ], + "texture": "#texture" + } + } + }, + { + "__comment": "PlaneY18", + "from": [ 1, 4.374, -12.25 ], + "to": [ 17, 4.375, -3.25 ], + "rotation": { + "origin": [ 1, 4.375, -3.25 ], + "axis": "x", + "angle": 0 + }, + "shade": false, + "faces": { + "down": { + "uv": [ 0, 0, 16, 8 ], + "texture": "#texture", + "rotation": 180 + }, + "up": { + "uv": [ 0, 0, 16, 8 ], + "texture": "#texture" + } + } + }, + { + "__comment": "PlaneX20", + "from": [ 2, 1, 2 ], + "to": [ 2.001, 8, 18 ], + "rotation": { + "origin": [ 2, 1, 2 ], + "axis": "y", + "angle": 45 + }, + "shade": false, + "faces": { + "west": { + "uv": [ 0, 9, 16, 16 ], + "texture": "#texture1" + }, + "east": { + "uv": [ 0, 9, 16, 16 ], + "texture": "#texture1" + } + } + }, + { + "__comment": "PlaneX20", + "from": [ 14, 1, 2 ], + "to": [ 14.001, 8, 18 ], + "rotation": { + "origin": [ 14, 1, 2 ], + "axis": "y", + "angle": -45 + }, + "shade": false, + "faces": { + "west": { + "uv": [ 0, 9, 16, 16 ], + "texture": "#texture1" + }, + "east": { + "uv": [ 0, 9, 16, 16 ], + "texture": "#texture1" + } + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [ 90, 0, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "thirdperson_lefthand": { + "rotation": [ 90, 0, 0 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "firstperson_righthand": { + "rotation": [ 35, 0, 35 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "firstperson_lefthand": { + "rotation": [ 35, 0, 35 ], + "scale": [ 0.5, 0.5, 0.5 ] + }, + "gui": { + "rotation": [ 22.5, -30, 0 ], + "translation": [ 0, 4, 0 ], + "scale": [ 0.6, 0.6, 0.6 ] + } + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/crop_block.json b/kubejs/assets/betterend/models/block/crop_block.json new file mode 100644 index 000000000..f71aa2a0c --- /dev/null +++ b/kubejs/assets/betterend/models/block/crop_block.json @@ -0,0 +1,40 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#texture" + }, + "elements": [ + { "from": [ 4.1, 0, 0 ], + "to": [ 4.1, 16, 16 ], + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { "from": [ 11.9, 0, 0 ], + "to": [ 11.9, 16, 16 ], + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { "from": [ 0, 0, 4.1 ], + "to": [ 16, 16, 4.1 ], + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + }, + { "from": [ 0, 0, 11.9 ], + "to": [ 16, 16, 11.9 ], + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + } + } + ] +} diff --git a/kubejs/assets/betterend/models/block/crop_block_inverted.json b/kubejs/assets/betterend/models/block/crop_block_inverted.json new file mode 100644 index 000000000..d08a2f6f1 --- /dev/null +++ b/kubejs/assets/betterend/models/block/crop_block_inverted.json @@ -0,0 +1,40 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#texture" + }, + "elements": [ + { "from": [ 4.1, 0, 0 ], + "to": [ 4.1, 16, 16 ], + "shade": false, + "faces": { + "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" } + } + }, + { "from": [ 11.9, 0, 0 ], + "to": [ 11.9, 16, 16 ], + "shade": false, + "faces": { + "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" } + } + }, + { "from": [ 0, 0, 4.1 ], + "to": [ 16, 16, 4.1 ], + "shade": false, + "faces": { + "north": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "south": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" } + } + }, + { "from": [ 0, 0, 11.9 ], + "to": [ 16, 16, 11.9 ], + "shade": false, + "faces": { + "north": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "south": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" } + } + } + ] +} diff --git a/kubejs/assets/betterend/models/block/cross_inverted.json b/kubejs/assets/betterend/models/block/cross_inverted.json new file mode 100644 index 000000000..5f4f8f7a0 --- /dev/null +++ b/kubejs/assets/betterend/models/block/cross_inverted.json @@ -0,0 +1,26 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#cross" + }, + "elements": [ + { "from": [ 0.8, 0, 8 ], + "to": [ 15.2, 16, 8 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "north": { "uv": [ 16, 0, 0, 16 ], "texture": "#cross" }, + "south": { "uv": [ 16, 0, 0, 16 ], "texture": "#cross" } + } + }, + { "from": [ 8, 0, 0.8 ], + "to": [ 8, 16, 15.2 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#cross" }, + "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#cross" } + } + } + ] +} diff --git a/kubejs/assets/betterend/models/block/crystal_grass_1.json b/kubejs/assets/betterend/models/block/crystal_grass_1.json new file mode 100644 index 000000000..02f092b48 --- /dev/null +++ b/kubejs/assets/betterend/models/block/crystal_grass_1.json @@ -0,0 +1,126 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/crystal_grass_2", + "texture": "betterend:block/crystal_grass_2" + }, + "elements": [ + { + "__comment": "PlaneX3", + "from": [ 2, 0, 2 ], + "to": [ 2.001, 9, 18 ], + "rotation": { "origin": [ 2, 0, 2 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 7, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 16, 7, 0, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 14, 0, 2 ], + "to": [ 14.001, 9, 18 ], + "rotation": { "origin": [ 14, 0, 2 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 7, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 16, 7, 0, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 5.5, 8.5, 5.5 ], + "to": [ 10.5, 8.501, 10.5 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 4.5, 8, 8 ], + "to": [ 9.5, 8.001, 13 ], + "rotation": { "origin": [ 4.5, 8, 8 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 1.125, 3.5, 1 ], + "to": [ 6.125, 3.501, 6 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 0.125, 3, 3.5 ], + "to": [ 5.125, 3.001, 8.5 ], + "rotation": { "origin": [ 0.125, 3, 3.5 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 9.75, 3.5, 1.25 ], + "to": [ 14.75, 3.501, 6.25 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 8.75, 3, 3.75 ], + "to": [ 13.75, 3.001, 8.75 ], + "rotation": { "origin": [ 8.75, 3, 3.75 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 9, 4.5, 9.125 ], + "to": [ 14, 4.501, 14.125 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 8, 4, 11.625 ], + "to": [ 13, 4.001, 16.625 ], + "rotation": { "origin": [ 8, 4, 11.625 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 2, 4.5, 9 ], + "to": [ 7, 4.501, 14 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 1, 4, 11.5 ], + "to": [ 6, 4.001, 16.5 ], + "rotation": { "origin": [ 1, 4, 11.5 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/crystal_grass_2.json b/kubejs/assets/betterend/models/block/crystal_grass_2.json new file mode 100644 index 000000000..efecc9793 --- /dev/null +++ b/kubejs/assets/betterend/models/block/crystal_grass_2.json @@ -0,0 +1,107 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/crystal_grass_3", + "texture": "betterend:block/crystal_grass_3" + }, + "elements": [ + { + "__comment": "PlaneX3", + "from": [ 2, 0, 2 ], + "to": [ 2.001, 9, 18 ], + "rotation": { "origin": [ 2, 0, 2 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 7, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 16, 7, 0, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 14, 0, 2 ], + "to": [ 14.001, 9, 18 ], + "rotation": { "origin": [ 14, 0, 2 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 7, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 16, 7, 0, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 3, 8.5, 3 ], + "to": [ 8, 8.501, 8 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 2, 8, 5.5 ], + "to": [ 7, 8.001, 10.5 ], + "rotation": { "origin": [ 2, 8, 5.5 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 8.375, 8.5, 2.625 ], + "to": [ 13.375, 8.501, 7.625 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 7.375, 8, 5.125 ], + "to": [ 12.375, 8.001, 10.125 ], + "rotation": { "origin": [ 7.375, 8, 5.125 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 3.5, 4.5, 7.5 ], + "to": [ 8.5, 4.501, 12.5 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 2.5, 4, 10 ], + "to": [ 7.5, 4.001, 15 ], + "rotation": { "origin": [ 2.5, 4, 10 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 8, 5, 7 ], + "to": [ 13, 5.001, 12 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 7, 4.5, 9.5 ], + "to": [ 12, 4.501, 14.5 ], + "rotation": { "origin": [ 7, 4.5, 9.5 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/crystal_grass_3.json b/kubejs/assets/betterend/models/block/crystal_grass_3.json new file mode 100644 index 000000000..496b9e747 --- /dev/null +++ b/kubejs/assets/betterend/models/block/crystal_grass_3.json @@ -0,0 +1,50 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/crystal_grass_4", + "texture": "betterend:block/crystal_grass_4" + }, + "elements": [ + { + "__comment": "PlaneX3", + "from": [ 2.5, 0, 2.5 ], + "to": [ 2.501, 9, 18.5 ], + "rotation": { "origin": [ 2.5, 0, 2.5 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 7, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 16, 7, 0, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 13.5, 0, 2.5 ], + "to": [ 13.501, 9, 18.5 ], + "rotation": { "origin": [ 13.5, 0, 2.5 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 7, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 16, 7, 0, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 5.5, 8.5, 5.5 ], + "to": [ 10.5, 8.501, 10.5 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 4.5, 8, 8 ], + "to": [ 9.5, 8.001, 13 ], + "rotation": { "origin": [ 4.5, 8, 8 ], "axis": "y", "angle": 45 }, + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/crystal_grass_4.json b/kubejs/assets/betterend/models/block/crystal_grass_4.json new file mode 100644 index 000000000..7bc547789 --- /dev/null +++ b/kubejs/assets/betterend/models/block/crystal_grass_4.json @@ -0,0 +1,31 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/crystal_grass_5", + "texture": "betterend:block/crystal_grass_5" + }, + "elements": [ + { + "__comment": "PlaneX3", + "from": [ 2.5, 0, 2.5 ], + "to": [ 2.501, 10, 18.5 ], + "rotation": { "origin": [ 2.5, 0, 2.5 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 6, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 16, 6, 0, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneX3", + "from": [ 13.5, 0, 2.5 ], + "to": [ 13.501, 10, 18.5 ], + "rotation": { "origin": [ 13.5, 0, 2.5 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 6, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 16, 6, 0, 16 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/fracturn_01.json b/kubejs/assets/betterend/models/block/fracturn_01.json new file mode 100644 index 000000000..d00f2fc8f --- /dev/null +++ b/kubejs/assets/betterend/models/block/fracturn_01.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/fracturn" + } +} diff --git a/kubejs/assets/betterend/models/block/fracturn_02.json b/kubejs/assets/betterend/models/block/fracturn_02.json new file mode 100644 index 000000000..15b96bf86 --- /dev/null +++ b/kubejs/assets/betterend/models/block/fracturn_02.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/fracturn" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/fracturn_03.json b/kubejs/assets/betterend/models/block/fracturn_03.json new file mode 100644 index 000000000..e85a9263d --- /dev/null +++ b/kubejs/assets/betterend/models/block/fracturn_03.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/fracturn" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/fracturn_04.json b/kubejs/assets/betterend/models/block/fracturn_04.json new file mode 100644 index 000000000..3b6456962 --- /dev/null +++ b/kubejs/assets/betterend/models/block/fracturn_04.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block_inverted", + "textures": { + "texture": "betterend:block/fracturn" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/inflexia.json b/kubejs/assets/betterend/models/block/inflexia.json new file mode 100644 index 000000000..0914866eb --- /dev/null +++ b/kubejs/assets/betterend/models/block/inflexia.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cross", + "render_type": "cutout_mipped", + "textures": { + "cross": "betterend:block/inflexia", + "particle": "betterend:block/inflexia" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/jungle_grass_01.json b/kubejs/assets/betterend/models/block/jungle_grass_01.json new file mode 100644 index 000000000..9f32c60e8 --- /dev/null +++ b/kubejs/assets/betterend/models/block/jungle_grass_01.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/jungle_grass" + } +} diff --git a/kubejs/assets/betterend/models/block/jungle_grass_02.json b/kubejs/assets/betterend/models/block/jungle_grass_02.json new file mode 100644 index 000000000..b973a1185 --- /dev/null +++ b/kubejs/assets/betterend/models/block/jungle_grass_02.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/jungle_grass" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/jungle_grass_03.json b/kubejs/assets/betterend/models/block/jungle_grass_03.json new file mode 100644 index 000000000..e9af75d04 --- /dev/null +++ b/kubejs/assets/betterend/models/block/jungle_grass_03.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/jungle_grass" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/jungle_grass_04.json b/kubejs/assets/betterend/models/block/jungle_grass_04.json new file mode 100644 index 000000000..ced7e2393 --- /dev/null +++ b/kubejs/assets/betterend/models/block/jungle_grass_04.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block_inverted", + "textures": { + "texture": "betterend:block/jungle_grass" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/jungle_grass_05.json b/kubejs/assets/betterend/models/block/jungle_grass_05.json new file mode 100644 index 000000000..168aa92da --- /dev/null +++ b/kubejs/assets/betterend/models/block/jungle_grass_05.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/jungle_grass_2" + } +} diff --git a/kubejs/assets/betterend/models/block/jungle_grass_06.json b/kubejs/assets/betterend/models/block/jungle_grass_06.json new file mode 100644 index 000000000..22e71f7d8 --- /dev/null +++ b/kubejs/assets/betterend/models/block/jungle_grass_06.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/jungle_grass_2" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/jungle_grass_07.json b/kubejs/assets/betterend/models/block/jungle_grass_07.json new file mode 100644 index 000000000..655625420 --- /dev/null +++ b/kubejs/assets/betterend/models/block/jungle_grass_07.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/jungle_grass_2" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/jungle_grass_08.json b/kubejs/assets/betterend/models/block/jungle_grass_08.json new file mode 100644 index 000000000..2d8c50b64 --- /dev/null +++ b/kubejs/assets/betterend/models/block/jungle_grass_08.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block_inverted", + "textures": { + "texture": "betterend:block/jungle_grass_2" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/jungle_grass_09.json b/kubejs/assets/betterend/models/block/jungle_grass_09.json new file mode 100644 index 000000000..ef8bbc1c1 --- /dev/null +++ b/kubejs/assets/betterend/models/block/jungle_grass_09.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/twisted_umbrella_moss_small" + } +} diff --git a/kubejs/assets/betterend/models/block/jungle_grass_10.json b/kubejs/assets/betterend/models/block/jungle_grass_10.json new file mode 100644 index 000000000..46f76cdc2 --- /dev/null +++ b/kubejs/assets/betterend/models/block/jungle_grass_10.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/twisted_umbrella_moss_small" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/jungle_grass_11.json b/kubejs/assets/betterend/models/block/jungle_grass_11.json new file mode 100644 index 000000000..5e2a3e005 --- /dev/null +++ b/kubejs/assets/betterend/models/block/jungle_grass_11.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/twisted_umbrella_moss_small" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/jungle_grass_12.json b/kubejs/assets/betterend/models/block/jungle_grass_12.json new file mode 100644 index 000000000..42df175c6 --- /dev/null +++ b/kubejs/assets/betterend/models/block/jungle_grass_12.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block_inverted", + "textures": { + "texture": "betterend:block/twisted_umbrella_moss_small" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/salteago_01.json b/kubejs/assets/betterend/models/block/salteago_01.json new file mode 100644 index 000000000..28109e8bf --- /dev/null +++ b/kubejs/assets/betterend/models/block/salteago_01.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/salteago" + } +} diff --git a/kubejs/assets/betterend/models/block/salteago_02.json b/kubejs/assets/betterend/models/block/salteago_02.json new file mode 100644 index 000000000..f1f314d60 --- /dev/null +++ b/kubejs/assets/betterend/models/block/salteago_02.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/salteago" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/salteago_03.json b/kubejs/assets/betterend/models/block/salteago_03.json new file mode 100644 index 000000000..d3ac7edb9 --- /dev/null +++ b/kubejs/assets/betterend/models/block/salteago_03.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/salteago" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/salteago_04.json b/kubejs/assets/betterend/models/block/salteago_04.json new file mode 100644 index 000000000..79a546fde --- /dev/null +++ b/kubejs/assets/betterend/models/block/salteago_04.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block_inverted", + "textures": { + "texture": "betterend:block/salteago" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/vaiolush_fern_01.json b/kubejs/assets/betterend/models/block/vaiolush_fern_01.json new file mode 100644 index 000000000..db51e0a03 --- /dev/null +++ b/kubejs/assets/betterend/models/block/vaiolush_fern_01.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/vaiolush_fern" + } +} diff --git a/kubejs/assets/betterend/models/block/vaiolush_fern_02.json b/kubejs/assets/betterend/models/block/vaiolush_fern_02.json new file mode 100644 index 000000000..93be0aefe --- /dev/null +++ b/kubejs/assets/betterend/models/block/vaiolush_fern_02.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/vaiolush_fern" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/vaiolush_fern_03.json b/kubejs/assets/betterend/models/block/vaiolush_fern_03.json new file mode 100644 index 000000000..8a59dcfba --- /dev/null +++ b/kubejs/assets/betterend/models/block/vaiolush_fern_03.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/vaiolush_fern" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/vaiolush_fern_04.json b/kubejs/assets/betterend/models/block/vaiolush_fern_04.json new file mode 100644 index 000000000..1ad7e096e --- /dev/null +++ b/kubejs/assets/betterend/models/block/vaiolush_fern_04.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block_inverted", + "textures": { + "texture": "betterend:block/vaiolush_fern" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/blooming_cooksonia.json b/kubejs/assets/betterend/models/item/blooming_cooksonia.json new file mode 100644 index 000000000..d413141d7 --- /dev/null +++ b/kubejs/assets/betterend/models/item/blooming_cooksonia.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:block/blooming_cooksonia" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/chorus_grass.json b/kubejs/assets/betterend/models/item/chorus_grass.json new file mode 100644 index 000000000..3043e3e22 --- /dev/null +++ b/kubejs/assets/betterend/models/item/chorus_grass.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/chorus_grass_01" + } +} diff --git a/kubejs/assets/betterend/models/item/chorus_lily.json b/kubejs/assets/betterend/models/item/chorus_lily.json new file mode 100644 index 000000000..1a91787de --- /dev/null +++ b/kubejs/assets/betterend/models/item/chorus_lily.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/chorus_lily" +} diff --git a/kubejs/assets/betterend/models/item/crystal_grass.json b/kubejs/assets/betterend/models/item/crystal_grass.json new file mode 100644 index 000000000..ae08279e7 --- /dev/null +++ b/kubejs/assets/betterend/models/item/crystal_grass.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/crystal_grass_5" + } +} diff --git a/kubejs/assets/betterend/models/item/fracturn.json b/kubejs/assets/betterend/models/item/fracturn.json new file mode 100644 index 000000000..982138acf --- /dev/null +++ b/kubejs/assets/betterend/models/item/fracturn.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:block/fracturn" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/inflexia.json b/kubejs/assets/betterend/models/item/inflexia.json new file mode 100644 index 000000000..56d09784d --- /dev/null +++ b/kubejs/assets/betterend/models/item/inflexia.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:block/inflexia" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/jungle_grass.json b/kubejs/assets/betterend/models/item/jungle_grass.json new file mode 100644 index 000000000..cce2e472d --- /dev/null +++ b/kubejs/assets/betterend/models/item/jungle_grass.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/jungle_grass" + } +} diff --git a/kubejs/assets/betterend/models/item/salteago.json b/kubejs/assets/betterend/models/item/salteago.json new file mode 100644 index 000000000..4b57e3197 --- /dev/null +++ b/kubejs/assets/betterend/models/item/salteago.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:block/salteago" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/vaiolush_fern.json b/kubejs/assets/betterend/models/item/vaiolush_fern.json new file mode 100644 index 000000000..822ad7997 --- /dev/null +++ b/kubejs/assets/betterend/models/item/vaiolush_fern.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:block/vaiolush_fern" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/textures/block/blooming_cooksonia.png b/kubejs/assets/betterend/textures/block/blooming_cooksonia.png new file mode 100644 index 000000000..c6f628bc3 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/blooming_cooksonia.png differ diff --git a/kubejs/assets/betterend/textures/block/blooming_cooksonia_e.png b/kubejs/assets/betterend/textures/block/blooming_cooksonia_e.png new file mode 100644 index 000000000..2fdb02566 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/blooming_cooksonia_e.png differ diff --git a/kubejs/assets/betterend/textures/block/chorus_grass_01.png b/kubejs/assets/betterend/textures/block/chorus_grass_01.png new file mode 100644 index 000000000..11aef5bc8 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/chorus_grass_01.png differ diff --git a/kubejs/assets/betterend/textures/block/chorus_grass_02.png b/kubejs/assets/betterend/textures/block/chorus_grass_02.png new file mode 100644 index 000000000..0d4251f80 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/chorus_grass_02.png differ diff --git a/kubejs/assets/betterend/textures/block/chorus_grass_03.png b/kubejs/assets/betterend/textures/block/chorus_grass_03.png new file mode 100644 index 000000000..3e1ed68f9 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/chorus_grass_03.png differ diff --git a/kubejs/assets/betterend/textures/block/chorus_grass_04.png b/kubejs/assets/betterend/textures/block/chorus_grass_04.png new file mode 100644 index 000000000..c4ed15d8c Binary files /dev/null and b/kubejs/assets/betterend/textures/block/chorus_grass_04.png differ diff --git a/kubejs/assets/betterend/textures/block/chorus_plant_flower_center.png b/kubejs/assets/betterend/textures/block/chorus_plant_flower_center.png new file mode 100644 index 000000000..141efa0da Binary files /dev/null and b/kubejs/assets/betterend/textures/block/chorus_plant_flower_center.png differ diff --git a/kubejs/assets/betterend/textures/block/chorus_plant_flower_fur.png b/kubejs/assets/betterend/textures/block/chorus_plant_flower_fur.png new file mode 100644 index 000000000..b5e8e5aec Binary files /dev/null and b/kubejs/assets/betterend/textures/block/chorus_plant_flower_fur.png differ diff --git a/kubejs/assets/betterend/textures/block/chorus_plant_flower_petal.png b/kubejs/assets/betterend/textures/block/chorus_plant_flower_petal.png new file mode 100644 index 000000000..5cf992a9b Binary files /dev/null and b/kubejs/assets/betterend/textures/block/chorus_plant_flower_petal.png differ diff --git a/kubejs/assets/betterend/textures/block/crystal_grass_2.png b/kubejs/assets/betterend/textures/block/crystal_grass_2.png new file mode 100644 index 000000000..7d4ef32fd Binary files /dev/null and b/kubejs/assets/betterend/textures/block/crystal_grass_2.png differ diff --git a/kubejs/assets/betterend/textures/block/crystal_grass_3.png b/kubejs/assets/betterend/textures/block/crystal_grass_3.png new file mode 100644 index 000000000..eaae32261 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/crystal_grass_3.png differ diff --git a/kubejs/assets/betterend/textures/block/crystal_grass_4.png b/kubejs/assets/betterend/textures/block/crystal_grass_4.png new file mode 100644 index 000000000..0cbffbba1 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/crystal_grass_4.png differ diff --git a/kubejs/assets/betterend/textures/block/crystal_grass_5.png b/kubejs/assets/betterend/textures/block/crystal_grass_5.png new file mode 100644 index 000000000..f6b71d47a Binary files /dev/null and b/kubejs/assets/betterend/textures/block/crystal_grass_5.png differ diff --git a/kubejs/assets/betterend/textures/block/fracturn.png b/kubejs/assets/betterend/textures/block/fracturn.png new file mode 100644 index 000000000..a8412057d Binary files /dev/null and b/kubejs/assets/betterend/textures/block/fracturn.png differ diff --git a/kubejs/assets/betterend/textures/block/inflexia.png b/kubejs/assets/betterend/textures/block/inflexia.png new file mode 100644 index 000000000..19b836990 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/inflexia.png differ diff --git a/kubejs/assets/betterend/textures/block/jungle_grass.png b/kubejs/assets/betterend/textures/block/jungle_grass.png new file mode 100644 index 000000000..088cdaf9b Binary files /dev/null and b/kubejs/assets/betterend/textures/block/jungle_grass.png differ diff --git a/kubejs/assets/betterend/textures/block/jungle_grass_2.png b/kubejs/assets/betterend/textures/block/jungle_grass_2.png new file mode 100644 index 000000000..41591c656 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/jungle_grass_2.png differ diff --git a/kubejs/assets/betterend/textures/block/salteago.png b/kubejs/assets/betterend/textures/block/salteago.png new file mode 100644 index 000000000..25f43f337 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/salteago.png differ diff --git a/kubejs/assets/betterend/textures/block/twisted_umbrella_moss_small.png b/kubejs/assets/betterend/textures/block/twisted_umbrella_moss_small.png new file mode 100644 index 000000000..5337e4982 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/twisted_umbrella_moss_small.png differ diff --git a/kubejs/assets/betterend/textures/block/vaiolush_fern.png b/kubejs/assets/betterend/textures/block/vaiolush_fern.png new file mode 100644 index 000000000..f1fe5267f Binary files /dev/null and b/kubejs/assets/betterend/textures/block/vaiolush_fern.png differ diff --git a/kubejs/assets/tfg/blockstates/bud_indicator.json b/kubejs/assets/tfg/blockstates/bud_indicator.json new file mode 100644 index 000000000..4f0d239f8 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/bud_indicator.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "tfg:block/bud_indicator" }, + { "model": "tfg:block/bud_indicator", "y": 90 }, + { "model": "tfg:block/bud_indicator", "y": 180 }, + { "model": "tfg:block/bud_indicator", "y": 270 } + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/lunar_roots.json b/kubejs/assets/tfg/blockstates/lunar_roots.json index 6bc896131..ad95a5b0d 100644 --- a/kubejs/assets/tfg/blockstates/lunar_roots.json +++ b/kubejs/assets/tfg/blockstates/lunar_roots.json @@ -1,7 +1,10 @@ { "variants": { - "": { - "model": "tfg:block/lunar_roots" - } + "": [ + { "model": "tfg:block/lunar_roots" }, + { "model": "tfg:block/lunar_roots", "y": 90 }, + { "model": "tfg:block/lunar_roots", "y": 180 }, + { "model": "tfg:block/lunar_roots", "y": 270 } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/lunar_sprouts.json b/kubejs/assets/tfg/blockstates/lunar_sprouts.json index 8e7558dca..eb3ea72af 100644 --- a/kubejs/assets/tfg/blockstates/lunar_sprouts.json +++ b/kubejs/assets/tfg/blockstates/lunar_sprouts.json @@ -1,7 +1,10 @@ { "variants": { - "": { - "model": "tfg:block/lunar_sprouts" - } + "": [ + { "model": "tfg:block/lunar_sprouts" }, + { "model": "tfg:block/lunar_sprouts", "y": 90 }, + { "model": "tfg:block/lunar_sprouts", "y": 180 }, + { "model": "tfg:block/lunar_sprouts", "y": 270 } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/mushroom_roots.json b/kubejs/assets/tfg/blockstates/mushroom_roots.json index 159eb8cfc..525e46310 100644 --- a/kubejs/assets/tfg/blockstates/mushroom_roots.json +++ b/kubejs/assets/tfg/blockstates/mushroom_roots.json @@ -1,7 +1,10 @@ { "variants": { - "": { - "model": "tfg:block/mushroom_roots" - } + "": [ + { "model": "tfg:block/mushroom_roots" }, + { "model": "tfg:block/mushroom_roots", "y": 90 }, + { "model": "tfg:block/mushroom_roots", "y": 180 }, + { "model": "tfg:block/mushroom_roots", "y": 270 } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/mushroom_sprouts.json b/kubejs/assets/tfg/blockstates/mushroom_sprouts.json index 207c44b1e..c0ead3ddf 100644 --- a/kubejs/assets/tfg/blockstates/mushroom_sprouts.json +++ b/kubejs/assets/tfg/blockstates/mushroom_sprouts.json @@ -1,7 +1,10 @@ { "variants": { - "": { - "model": "tfg:block/mushroom_sprouts" - } + "": [ + { "model": "tfg:block/mushroom_sprouts" }, + { "model": "tfg:block/mushroom_sprouts", "y": 90 }, + { "model": "tfg:block/mushroom_sprouts", "y": 180 }, + { "model": "tfg:block/mushroom_sprouts", "y": 270 } + ] } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/lunar_roots.json b/kubejs/assets/tfg/models/item/lunar_roots.json index ae4d2c6c0..88ae4ab5b 100644 --- a/kubejs/assets/tfg/models/item/lunar_roots.json +++ b/kubejs/assets/tfg/models/item/lunar_roots.json @@ -1,3 +1,6 @@ { - "parent": "tfg:block/lunar_roots" + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:block/lunar_roots" + } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/lunar_sprouts.json b/kubejs/assets/tfg/models/item/lunar_sprouts.json index d596a4eb2..d361406ce 100644 --- a/kubejs/assets/tfg/models/item/lunar_sprouts.json +++ b/kubejs/assets/tfg/models/item/lunar_sprouts.json @@ -1,3 +1,6 @@ { - "parent": "tfg:block/lunar_sprouts" + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:block/lunar_sprouts" + } } \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/chests/moonbase.json b/kubejs/data/tfg/loot_tables/chests/moonbase.json index 2422a5c3c..975593779 100644 --- a/kubejs/data/tfg/loot_tables/chests/moonbase.json +++ b/kubejs/data/tfg/loot_tables/chests/moonbase.json @@ -22,7 +22,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{BotariumData: {StoredFluids: [{Amount: 1000, Fluid: \"tfg:heliox_3\"}]}}" + "tag": "{BotariumData: {StoredFluids: [{Amount: 1000, Fluid: \"tfg:compressed_heliox_3\"}]}}" } ] }, diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json index bef11d9c4..3ce92a855 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_dense.json @@ -42,6 +42,8 @@ "#tfg:moon_small_rock_features", [ "tfg:moon/surface/warped_sprouts_patch", + "tfg:moon/surface/salteago", + "tfg:moon/surface/inflexia", "tfg:moon/asurine/asurine", "tfg:moon/asurine/asurine_spikes" ], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json index 7e2a46420..10ad638d6 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_asurine_sparse.json @@ -45,6 +45,10 @@ "tfg:moon/surface/dead_coral_fans", "tfg:moon/surface/warped_sprouts_patch", "tfg:moon/surface/warped_roots_patch", + "tfg:moon/surface/chorus_grass_rare", + "tfg:moon/surface/vaiolush_fern", + "tfg:moon/surface/salteago", + "tfg:moon/surface/inflexia", "tfg:moon/asurine/asurine_spikes" ], [ diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json index 2b6e6f6a0..dd20521e8 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_dense.json @@ -40,7 +40,10 @@ [], "#tfg:moon_small_rock_features", [ - "tfg:moon/surface/warped_sprouts_patch", + "tfg:moon/surface/chorus_lily", + "tfg:moon/surface/chorus_grass_rare", + "tfg:moon/surface/chorus_grass_common", + "tfg:moon/surface/inflexia", "tfg:moon/surface/chorus_plant_common" ], [ @@ -72,17 +75,17 @@ "type": "minecraft:enderman", "maxCount": 3, "minCount": 1, - "weight": 100 + "weight": 50 }, { "type": "endermanoverhaul:windswept_hills_enderman", "maxCount": 1, "minCount": 1, - "weight": 20 + "weight": 10 }, { "type": "endermanoverhaul:end_enderman", - "maxCount": 1, + "maxCount": 2, "minCount": 1, "weight": 100 }, diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json index 8f9da9b99..f30e6d6d3 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_chorus_sparse.json @@ -43,7 +43,10 @@ "tfg:moon/surface/birt_dwelling", "tfg:moon/surface/dead_coral_fans", "tfg:moon/surface/warped_sprouts_patch", - "tfg:moon/surface/warped_roots_patch", + "tfg:moon/surface/chorus_lily", + "tfg:moon/surface/chorus_grass_common", + "tfg:moon/surface/vaiolush_fern", + "tfg:moon/surface/inflexia", "tfg:moon/surface/chorus_plant_rare" ], [ @@ -118,6 +121,12 @@ "maxCount": 1, "minCount": 1, "weight": 100 + }, + { + "type": "endermanoverhaul:end_islands_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 10 } ], "underground_water_creature": [], diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json index b8abcec69..f0a2cfee0 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_dense.json @@ -42,7 +42,8 @@ [ "tfg:moon/surface/dead_coral_blocks", "tfg:moon/surface/dead_coral", - "tfg:moon/surface/dead_coral_fans" + "tfg:moon/surface/dead_coral_fans", + "tfg:moon/surface/inflexia" ], [ "tfg:moon/hardening" diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json index f7b3dce5f..b2f4b7b65 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_corals_sparse.json @@ -44,7 +44,10 @@ "tfg:moon/surface/birt_dwelling", "tfg:moon/surface/dead_coral", "tfg:moon/surface/dead_coral_fans", - "tfg:moon/surface/warped_sprouts_patch" + "tfg:moon/surface/warped_sprouts_patch", + "tfg:moon/surface/chorus_grass_rare", + "tfg:moon/surface/salteago", + "tfg:moon/surface/inflexia" ], [ "tfg:moon/hardening" diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json index 59b359961..1c206bd34 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_dense.json @@ -42,6 +42,8 @@ [ "tfg:moon/surface/warped_sprouts_patch", "tfg:moon/surface/warped_roots_patch", + "tfg:moon/surface/vaiolush_fern", + "tfg:moon/surface/salteago", "tfg:moon/surface/warped_vine_common" ], [ diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json index e39b53841..75224d972 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_lights_sparse.json @@ -44,6 +44,9 @@ "tfg:moon/surface/birt_dwelling", "tfg:moon/surface/warped_sprouts_patch", "tfg:moon/surface/warped_roots_patch", + "tfg:moon/surface/vaiolush_fern", + "tfg:moon/surface/salteago", + "tfg:moon/surface/inflexia", "tfg:moon/surface/warped_vine_rare" ], [ diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json index a4b77a7b4..652494db2 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_plains.json @@ -43,7 +43,11 @@ [ "tfg:moon/surface/birt_dwelling", "tfg:moon/surface/dead_coral_fans", - "tfg:moon/surface/warped_sprouts_patch" + "tfg:moon/surface/warped_sprouts_patch", + "tfg:moon/surface/chorus_grass_rare", + "tfg:moon/surface/vaiolush_fern", + "tfg:moon/surface/salteago", + "tfg:moon/surface/inflexia" ], [ "tfg:moon/hardening" diff --git a/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json b/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json index 566524fa6..bae9a915a 100644 --- a/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json +++ b/kubejs/data/tfg/worldgen/biome/moon/lunar_sands.json @@ -55,7 +55,8 @@ "tfg:moon/surface/loose/rhyolite", "tfg:moon/surface/pile_moon_sand", "tfg:moon/surface/pile_white_sand", - "tfg:moon/surface/pile_black_sand" + "tfg:moon/surface/pile_black_sand", + "tfg:moon/surface/inflexia" ], [ "tfg:moon/hardening" diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/crater/extra_large_bowl.json b/kubejs/data/tfg/worldgen/configured_feature/moon/crater/extra_large_bowl.json index 7538e4653..ad68243e8 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/moon/crater/extra_large_bowl.json +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/crater/extra_large_bowl.json @@ -57,7 +57,7 @@ "filling": 0.01, "inner_layer": 0.01, "middle_layer": 0.01, - "outer_layer": 38 + "outer_layer": 30 }, "max_gen_offset": 48, "min_gen_offset": -48, diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/chorus_grass_common.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/chorus_grass_common.json new file mode 100644 index 000000000..5812581c4 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/chorus_grass_common.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "betterend:chorus_grass" + } + } + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_block_tag", + "offset": [ 0, -1, 0 ], + "tag": "ad_astra:moon_stone_replaceables" + } + } + ] + }, + "tries": 32, + "xz_spread": 16, + "y_spread": 3 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/chorus_grass_rare.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/chorus_grass_rare.json new file mode 100644 index 000000000..cb838f880 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/chorus_grass_rare.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "betterend:chorus_grass" + } + } + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_block_tag", + "offset": [ 0, -1, 0 ], + "tag": "ad_astra:moon_stone_replaceables" + } + } + ] + }, + "tries": 16, + "xz_spread": 16, + "y_spread": 3 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/chorus_lily.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/chorus_lily.json new file mode 100644 index 000000000..3c0ceceb0 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/chorus_lily.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "betterend:chorus_lily" + } + } + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_block_tag", + "offset": [ 0, -1, 0 ], + "tag": "ad_astra:moon_stone_replaceables" + } + } + ] + }, + "tries": 8, + "xz_spread": 16, + "y_spread": 3 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/inflexia.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/inflexia.json new file mode 100644 index 000000000..f8d829457 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/inflexia.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "betterend:inflexia" + } + } + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_block_tag", + "offset": [ 0, -1, 0 ], + "tag": "ad_astra:moon_stone_replaceables" + } + } + ] + }, + "tries": 16, + "xz_spread": 16, + "y_spread": 3 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/salteago.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/salteago.json new file mode 100644 index 000000000..35c78bd1f --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/salteago.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "betterend:salteago" + } + } + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_block_tag", + "offset": [ 0, -1, 0 ], + "tag": "ad_astra:moon_stone_replaceables" + } + } + ] + }, + "tries": 16, + "xz_spread": 16, + "y_spread": 3 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/moon/surface/vaiolush_fern.json b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/vaiolush_fern.json new file mode 100644 index 000000000..76edc5429 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/moon/surface/vaiolush_fern.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "betterend:vaiolush_fern" + } + } + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_block_tag", + "offset": [ 0, -1, 0 ], + "tag": "ad_astra:moon_stone_replaceables" + } + } + ] + }, + "tries": 16, + "xz_spread": 16, + "y_spread": 3 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/chorus_grass_common.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/chorus_grass_common.json new file mode 100644 index 000000000..fde95e4fa --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/chorus_grass_common.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:moon/surface/chorus_grass_common", + "placement": [ + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/chorus_grass_rare.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/chorus_grass_rare.json new file mode 100644 index 000000000..bde4e5f22 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/chorus_grass_rare.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:moon/surface/chorus_grass_rare", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 4 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/chorus_lily.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/chorus_lily.json new file mode 100644 index 000000000..b5204facc --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/chorus_lily.json @@ -0,0 +1,16 @@ +{ + "feature": "tfg:moon/surface/chorus_lily", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 2 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/inflexia.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/inflexia.json new file mode 100644 index 000000000..1d1bab4ba --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/inflexia.json @@ -0,0 +1,16 @@ +{ + "feature": "tfg:moon/surface/inflexia", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 2 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/salteago.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/salteago.json new file mode 100644 index 000000000..e2b1d2c5a --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/salteago.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:moon/surface/salteago", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 8 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/vaiolush_fern.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/vaiolush_fern.json new file mode 100644 index 000000000..7ee63de1c --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/vaiolush_fern.json @@ -0,0 +1,19 @@ +{ + "feature": "tfg:moon/surface/vaiolush_fern", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 8 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_roots_patch.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_roots_patch.json index b868d9283..c84cbb0d0 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_roots_patch.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_roots_patch.json @@ -11,6 +11,9 @@ { "type": "minecraft:heightmap", "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:biome" } ] } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_sprouts_patch.json b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_sprouts_patch.json index a3dd70e5f..2679bec94 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_sprouts_patch.json +++ b/kubejs/data/tfg/worldgen/placed_feature/moon/surface/warped_sprouts_patch.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 4 + "chance": 7 }, { "type": "minecraft:in_square" @@ -11,6 +11,9 @@ { "type": "minecraft:heightmap", "heightmap": "WORLD_SURFACE" + }, + { + "type": "minecraft:biome" } ] } \ No newline at end of file diff --git a/kubejs/server_scripts/betterend/recipes.js b/kubejs/server_scripts/betterend/recipes.js new file mode 100644 index 000000000..2daa1db4b --- /dev/null +++ b/kubejs/server_scripts/betterend/recipes.js @@ -0,0 +1,30 @@ +// priority: 0 + +function registerBetterEndRecipes(event) { + + Ingredient.of('#tfg:moon_plants').stacks.forEach(element => { + const itemId = element.id; + const recipeId = `betterend:greenhouse_${itemId.replace(':', '_')}`; + + event.recipes.gtceu.greenhouse(recipeId) + .itemInputs(element.id) + .itemOutputs(`8x ${element.id}`) + .chancedOutput(element.id, 7500, 0) + .chancedOutput(element.id, 5000, 0) + .duration(36000) // 30 mins + .circuit(1) + .EUt(GTValues.VA[GTValues.MV]) + .dimension('ad_astra:moon') + + event.recipes.gtceu.greenhouse(recipeId + "_helium") + .itemInputs(element.id) + .inputFluids(Fluid.of('gtceu:helium_3', 500)) + .itemOutputs(`8x ${element.id}`) + .chancedOutput(element.id, 7500, 0) + .chancedOutput(element.id, 5000, 0) + .duration(12000) // 30 mins + .circuit(2) + .EUt(GTValues.VA[GTValues.MV]) + .dimension('ad_astra:moon') + }); +} \ No newline at end of file diff --git a/kubejs/server_scripts/betterend/tags.js b/kubejs/server_scripts/betterend/tags.js new file mode 100644 index 000000000..3b9eb1ad2 --- /dev/null +++ b/kubejs/server_scripts/betterend/tags.js @@ -0,0 +1,8 @@ +// priority: 0 + +function registerBetterEndItemTags(event) { + + event.add('tfg:moon_plants', 'betterend:chorus_lily') + event.add('tfg:moon_plants', 'betterend:inflexia') + event.add('tfg:moon_plants', 'betterend:chorus_grass') +} \ No newline at end of file diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 10eab60a3..a586e8841 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -12,6 +12,7 @@ ServerEvents.tags('item', event => { registerAlekishipsItemTags(event) registerAsticorCartsItemTags(event) registerBeneathItemTags(event) + registerBetterEndItemTags(event) registerChalkItemTags(event); registerChiselAndBitsItemTags(event) registerComputerCraftItemTags(event) @@ -194,6 +195,7 @@ ServerEvents.recipes(event => { registerAE2NetworkAnalyzerRecipes(event) registerAE2WTLibRecipes(event) registerBeneathRecipes(event) + registerBetterEndRecipes(event) registerBuildingGadgetsRecipes(event) registerChalkRecipes(event); registerChiselAndBitsRecipes(event) diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index bc1ebea4c..fd0905ec8 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -184,6 +184,12 @@ const registerTFGItemTags = (event) => { event.add('tfg:foods/usable_in_meal_bag', 'tfc:food/boiled_egg'); //#endregion + // #region Space blocks + event.add('tfg:moon_plants', 'tfg:lunar_roots') + event.add('tfg:moon_plants', 'tfg:lunar_sprouts') + event.add('tfg:moon_plants', 'tfg:lunar_chorus_flower') + // #endregion + // #region 0.7.19 -> 0.9 conversion event.add('c:hidden_from_recipe_viewers', 'treetap:tap') event.add('c:hidden_from_recipe_viewers', 'tfcea:refrigerator') @@ -310,14 +316,6 @@ const registerTFGBlockTags = (event) => { event.add('tfc:rock/hardened', 'tfg:rock/hardened_dripstone') // #endregion - - // #region Space blocks - - event.add('tfc:plants', 'tfg:lunar_roots') - event.add('tfc:plants', 'tfg:lunar_sprouts') - event.add('tfc:plants', 'tfg:lunar_chorus_flower') - - // #endregion } const registerTFGFluidTags = (event) => { diff --git a/kubejs/startup_scripts/betterend/blocks.js b/kubejs/startup_scripts/betterend/blocks.js new file mode 100644 index 000000000..9f33ad159 --- /dev/null +++ b/kubejs/startup_scripts/betterend/blocks.js @@ -0,0 +1,44 @@ +// priority: 0 + +function registerBetterEndBlocks(event) { + + // Moon + + event.create('betterend:chorus_lily', 'tfc:ground_cover') + .soundType('cherry_wood') + .hardness(0.5) + .tagBlock('minecraft:mineable/hoe') + .tagItem('tfg:moon_plants') + .mapColor('terracotta_white') + .box(0, 0, 0, 16, 6, 16) + .fullBlock(false) + .opaque(false) + .notSolid() + .renderType('cutout') + + event.create('betterend:inflexia', 'tfg:decorative_plant') + .tagItem('tfg:moon_plants') + + event.create('betterend:chorus_grass', 'tfg:decorative_plant') + .tagItem('tfg:moon_plants') + + event.create('betterend:salteago', 'tfg:decorative_plant') + .tagItem('tfg:moon_plants') + + event.create('betterend:vaiolush_fern', 'tfg:decorative_plant') + .tagItem('tfg:moon_plants') + + // Mars + + event.create('betterend:crystal_grass', 'tfg:decorative_plant') + .tagItem('tfg:mars_plants') + + event.create('betterend:blooming_cooksonia', 'tfg:decorative_plant') + .tagItem('tfg:mars_plants') + + event.create('betterend:fracturn', 'tfg:decorative_plant') + .tagItem('tfg:mars_plants') + + event.create('betterend:jungle_grass', 'tfg:decorative_plant') + .tagItem('tfg:mars_plants') +} \ No newline at end of file diff --git a/kubejs/startup_scripts/main_startup_script.js b/kubejs/startup_scripts/main_startup_script.js index b73aa2fa9..e0079e103 100644 --- a/kubejs/startup_scripts/main_startup_script.js +++ b/kubejs/startup_scripts/main_startup_script.js @@ -6,6 +6,7 @@ StartupEvents.registry('item', event => { }) StartupEvents.registry('block', event => { + registerBetterEndBlocks(event) registerTFGBlocks(event) }) diff --git a/kubejs/startup_scripts/tfg/blocks.space.js b/kubejs/startup_scripts/tfg/blocks.space.js index affe1f64a..e4855d8d5 100644 --- a/kubejs/startup_scripts/tfg/blocks.space.js +++ b/kubejs/startup_scripts/tfg/blocks.space.js @@ -7,7 +7,7 @@ function registerTFGSpaceBlocks(event) { .item(item => { item.modelJson({ parent: 'tfg:block/marker/moon' }) }) - .tagBlock('minecraft:mineable/pickaxe') + .tagBlock('c:hidden_from_recipe_viewers') .fullBlock(true) .opaque(true) @@ -16,7 +16,7 @@ function registerTFGSpaceBlocks(event) { .item(item => { item.modelJson({ parent: 'tfg:block/marker/mars' }) }) - .tagBlock('minecraft:mineable/pickaxe') + .tagBlock('c:hidden_from_recipe_viewers') .fullBlock(true) .opaque(true) @@ -25,7 +25,7 @@ function registerTFGSpaceBlocks(event) { .item(item => { item.modelJson({ parent: 'tfg:block/marker/venus' }) }) - .tagBlock('minecraft:mineable/pickaxe') + .tagBlock('c:hidden_from_recipe_viewers') .fullBlock(true) .opaque(true) @@ -34,7 +34,7 @@ function registerTFGSpaceBlocks(event) { .item(item => { item.modelJson({ parent: 'tfg:block/marker/mercury' }) }) - .tagBlock('minecraft:mineable/pickaxe') + .tagBlock('c:hidden_from_recipe_viewers') .fullBlock(true) .opaque(true)