From a7d71c8e6b82952c458f2f9dba9b105265d9a39a Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 31 Aug 2025 02:25:11 +0100 Subject: [PATCH] added more variants of a few plans, added some leaf blocks to use as bushes, added some new feather groundcover and started work on some twigs --- .../betterend/blockstates/cave_bush.json | 6 +- .../betterend/blockstates/cave_grass.json | 6 +- .../betterend/blockstates/chorus_grass.json | 4 +- .../betterend/blockstates/clawfern.json | 4 +- .../betterend/blockstates/globulagus.json | 4 +- .../betterend/blockstates/inflexia.json | 9 ++- .../betterend/blockstates/lamellarium.json | 4 +- .../blockstates/lucernia_leaves.json | 10 +++ .../blockstates/lucernia_outer_leaves.json | 12 ++++ .../betterend/blockstates/vaiolush_fern.json | 4 +- .../betterend/models/block/cave_grass_09.json | 6 ++ .../betterend/models/block/cave_grass_10.json | 6 ++ .../betterend/models/block/cave_grass_11.json | 6 ++ .../betterend/models/block/cave_grass_12.json | 6 ++ .../models/block/chorus_grass_09.json | 6 ++ .../models/block/chorus_grass_10.json | 6 ++ .../betterend/models/block/clawfern_03.json | 6 ++ .../betterend/models/block/clawfern_04.json | 6 ++ .../betterend/models/block/globulagus_05.json | 6 ++ .../betterend/models/block/globulagus_06.json | 6 ++ .../block/{inflexia.json => inflexia_1.json} | 0 .../betterend/models/block/inflexia_2.json | 8 +++ .../betterend/models/block/inflexia_3.json | 8 +++ .../betterend/models/block/inflexia_4.json | 8 +++ .../models/block/lamellarium_05.json | 6 ++ .../models/block/lamellarium_06.json | 6 ++ .../models/block/lucernia_leaves_1.json | 6 ++ .../models/block/lucernia_leaves_2.json | 6 ++ .../models/block/lucernia_leaves_3.json | 6 ++ .../models/block/lucernia_leaves_4.json | 6 ++ .../models/block/lucernia_outer_leaves_1.json | 6 ++ .../models/block/lucernia_outer_leaves_2.json | 6 ++ .../models/block/lucernia_outer_leaves_3.json | 6 ++ .../models/block/lucernia_outer_leaves_4.json | 6 ++ .../models/block/lucernia_outer_leaves_5.json | 6 ++ .../models/block/lucernia_outer_leaves_6.json | 6 ++ .../models/block/vaiolush_fern_05.json | 6 ++ .../models/block/vaiolush_fern_06.json | 6 ++ .../models/item/cave_bush_fallen.json | 6 ++ .../models/item/lucernia_leaves.json | 3 + .../models/item/lucernia_leaves_fallen.json | 6 ++ .../models/item/lucernia_outer_leaves.json | 6 ++ kubejs/server_scripts/tfg/events.forests.js | 40 +++++------ kubejs/startup_scripts/betterend/blocks.js | 68 +++++++++++++------ kubejs/startup_scripts/tfg/blocks.space.js | 46 +++++++++++++ kubejs/startup_scripts/tfg/items.js | 5 ++ 46 files changed, 358 insertions(+), 53 deletions(-) create mode 100644 kubejs/assets/betterend/blockstates/lucernia_leaves.json create mode 100644 kubejs/assets/betterend/blockstates/lucernia_outer_leaves.json create mode 100644 kubejs/assets/betterend/models/block/cave_grass_09.json create mode 100644 kubejs/assets/betterend/models/block/cave_grass_10.json create mode 100644 kubejs/assets/betterend/models/block/cave_grass_11.json create mode 100644 kubejs/assets/betterend/models/block/cave_grass_12.json create mode 100644 kubejs/assets/betterend/models/block/chorus_grass_09.json create mode 100644 kubejs/assets/betterend/models/block/chorus_grass_10.json create mode 100644 kubejs/assets/betterend/models/block/clawfern_03.json create mode 100644 kubejs/assets/betterend/models/block/clawfern_04.json create mode 100644 kubejs/assets/betterend/models/block/globulagus_05.json create mode 100644 kubejs/assets/betterend/models/block/globulagus_06.json rename kubejs/assets/betterend/models/block/{inflexia.json => inflexia_1.json} (100%) create mode 100644 kubejs/assets/betterend/models/block/inflexia_2.json create mode 100644 kubejs/assets/betterend/models/block/inflexia_3.json create mode 100644 kubejs/assets/betterend/models/block/inflexia_4.json create mode 100644 kubejs/assets/betterend/models/block/lamellarium_05.json create mode 100644 kubejs/assets/betterend/models/block/lamellarium_06.json create mode 100644 kubejs/assets/betterend/models/block/lucernia_leaves_1.json create mode 100644 kubejs/assets/betterend/models/block/lucernia_leaves_2.json create mode 100644 kubejs/assets/betterend/models/block/lucernia_leaves_3.json create mode 100644 kubejs/assets/betterend/models/block/lucernia_leaves_4.json create mode 100644 kubejs/assets/betterend/models/block/lucernia_outer_leaves_1.json create mode 100644 kubejs/assets/betterend/models/block/lucernia_outer_leaves_2.json create mode 100644 kubejs/assets/betterend/models/block/lucernia_outer_leaves_3.json create mode 100644 kubejs/assets/betterend/models/block/lucernia_outer_leaves_4.json create mode 100644 kubejs/assets/betterend/models/block/lucernia_outer_leaves_5.json create mode 100644 kubejs/assets/betterend/models/block/lucernia_outer_leaves_6.json create mode 100644 kubejs/assets/betterend/models/block/vaiolush_fern_05.json create mode 100644 kubejs/assets/betterend/models/block/vaiolush_fern_06.json create mode 100644 kubejs/assets/betterend/models/item/cave_bush_fallen.json create mode 100644 kubejs/assets/betterend/models/item/lucernia_leaves.json create mode 100644 kubejs/assets/betterend/models/item/lucernia_leaves_fallen.json create mode 100644 kubejs/assets/betterend/models/item/lucernia_outer_leaves.json diff --git a/kubejs/assets/betterend/blockstates/cave_bush.json b/kubejs/assets/betterend/blockstates/cave_bush.json index 3153315ea..ca13d9ffc 100644 --- a/kubejs/assets/betterend/blockstates/cave_bush.json +++ b/kubejs/assets/betterend/blockstates/cave_bush.json @@ -1,10 +1,10 @@ { "variants": { "": [ - { "model": "betterend:block/cave_bush_01", "weight": 4 }, + { "model": "betterend:block/cave_bush_01", "weight": 2 }, { "model": "betterend:block/cave_bush_02" }, - { "model": "betterend:block/cave_bush_03", "weight": 2 }, - { "model": "betterend:block/cave_bush_04", "weight": 2 } + { "model": "betterend:block/cave_bush_03" }, + { "model": "betterend:block/cave_bush_04" } ] } } diff --git a/kubejs/assets/betterend/blockstates/cave_grass.json b/kubejs/assets/betterend/blockstates/cave_grass.json index 7d18af28c..f615de18f 100644 --- a/kubejs/assets/betterend/blockstates/cave_grass.json +++ b/kubejs/assets/betterend/blockstates/cave_grass.json @@ -8,7 +8,11 @@ { "model": "betterend:block/cave_grass_05" }, { "model": "betterend:block/cave_grass_06" }, { "model": "betterend:block/cave_grass_07" }, - { "model": "betterend:block/cave_grass_08" } + { "model": "betterend:block/cave_grass_08" }, + { "model": "betterend:block/cave_grass_09" }, + { "model": "betterend:block/cave_grass_10" }, + { "model": "betterend:block/cave_grass_11" }, + { "model": "betterend:block/cave_grass_12" } ] } } diff --git a/kubejs/assets/betterend/blockstates/chorus_grass.json b/kubejs/assets/betterend/blockstates/chorus_grass.json index f9b90232d..1d38ad3ec 100644 --- a/kubejs/assets/betterend/blockstates/chorus_grass.json +++ b/kubejs/assets/betterend/blockstates/chorus_grass.json @@ -8,7 +8,9 @@ { "model": "betterend:block/chorus_grass_05" }, { "model": "betterend:block/chorus_grass_06" }, { "model": "betterend:block/chorus_grass_07" }, - { "model": "betterend:block/chorus_grass_08" } + { "model": "betterend:block/chorus_grass_08" }, + { "model": "betterend:block/chorus_grass_09" }, + { "model": "betterend:block/chorus_grass_10" } ] } } diff --git a/kubejs/assets/betterend/blockstates/clawfern.json b/kubejs/assets/betterend/blockstates/clawfern.json index f4c0ab349..d03877e01 100644 --- a/kubejs/assets/betterend/blockstates/clawfern.json +++ b/kubejs/assets/betterend/blockstates/clawfern.json @@ -2,7 +2,9 @@ "variants": { "": [ { "model": "betterend:block/clawfern_01" }, - { "model": "betterend:block/clawfern_02" } + { "model": "betterend:block/clawfern_02" }, + { "model": "betterend:block/clawfern_03" }, + { "model": "betterend:block/clawfern_04" } ] } } diff --git a/kubejs/assets/betterend/blockstates/globulagus.json b/kubejs/assets/betterend/blockstates/globulagus.json index fb41e3241..2f55e586b 100644 --- a/kubejs/assets/betterend/blockstates/globulagus.json +++ b/kubejs/assets/betterend/blockstates/globulagus.json @@ -4,7 +4,9 @@ { "model": "betterend:block/globulagus_01" }, { "model": "betterend:block/globulagus_02" }, { "model": "betterend:block/globulagus_03" }, - { "model": "betterend:block/globulagus_04" } + { "model": "betterend:block/globulagus_04" }, + { "model": "betterend:block/globulagus_05" }, + { "model": "betterend:block/globulagus_06" } ] } } diff --git a/kubejs/assets/betterend/blockstates/inflexia.json b/kubejs/assets/betterend/blockstates/inflexia.json index 2f13df959..7a3bcee0b 100644 --- a/kubejs/assets/betterend/blockstates/inflexia.json +++ b/kubejs/assets/betterend/blockstates/inflexia.json @@ -1,7 +1,10 @@ { "variants": { - "": { - "model": "betterend:block/inflexia" - } + "": [ + { "model": "betterend:block/inflexia_1" }, + { "model": "betterend:block/inflexia_2" }, + { "model": "betterend:block/inflexia_3" }, + { "model": "betterend:block/inflexia_4" } + ] } } \ No newline at end of file diff --git a/kubejs/assets/betterend/blockstates/lamellarium.json b/kubejs/assets/betterend/blockstates/lamellarium.json index 7cf50cdd6..70d644c38 100644 --- a/kubejs/assets/betterend/blockstates/lamellarium.json +++ b/kubejs/assets/betterend/blockstates/lamellarium.json @@ -4,7 +4,9 @@ { "model": "betterend:block/lamellarium_01" }, { "model": "betterend:block/lamellarium_02" }, { "model": "betterend:block/lamellarium_03" }, - { "model": "betterend:block/lamellarium_04" } + { "model": "betterend:block/lamellarium_04" }, + { "model": "betterend:block/lamellarium_05" }, + { "model": "betterend:block/lamellarium_06" } ] } } diff --git a/kubejs/assets/betterend/blockstates/lucernia_leaves.json b/kubejs/assets/betterend/blockstates/lucernia_leaves.json new file mode 100644 index 000000000..f77a5f66b --- /dev/null +++ b/kubejs/assets/betterend/blockstates/lucernia_leaves.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/lucernia_leaves_1" }, + { "model": "betterend:block/lucernia_leaves_2" }, + { "model": "betterend:block/lucernia_leaves_3" }, + { "model": "betterend:block/lucernia_leaves_4" } + ] + } +} diff --git a/kubejs/assets/betterend/blockstates/lucernia_outer_leaves.json b/kubejs/assets/betterend/blockstates/lucernia_outer_leaves.json new file mode 100644 index 000000000..0b599ece9 --- /dev/null +++ b/kubejs/assets/betterend/blockstates/lucernia_outer_leaves.json @@ -0,0 +1,12 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/lucernia_outer_leaves_1" }, + { "model": "betterend:block/lucernia_outer_leaves_2" }, + { "model": "betterend:block/lucernia_outer_leaves_3" }, + { "model": "betterend:block/lucernia_outer_leaves_4" }, + { "model": "betterend:block/lucernia_outer_leaves_5" }, + { "model": "betterend:block/lucernia_outer_leaves_6" } + ] + } +} diff --git a/kubejs/assets/betterend/blockstates/vaiolush_fern.json b/kubejs/assets/betterend/blockstates/vaiolush_fern.json index a058f6831..8c5d1aa50 100644 --- a/kubejs/assets/betterend/blockstates/vaiolush_fern.json +++ b/kubejs/assets/betterend/blockstates/vaiolush_fern.json @@ -4,7 +4,9 @@ { "model": "betterend:block/vaiolush_fern_01" }, { "model": "betterend:block/vaiolush_fern_02" }, { "model": "betterend:block/vaiolush_fern_03" }, - { "model": "betterend:block/vaiolush_fern_04" } + { "model": "betterend:block/vaiolush_fern_04" }, + { "model": "betterend:block/vaiolush_fern_05" }, + { "model": "betterend:block/vaiolush_fern_06" } ] } } diff --git a/kubejs/assets/betterend/models/block/cave_grass_09.json b/kubejs/assets/betterend/models/block/cave_grass_09.json new file mode 100644 index 000000000..618a68dc6 --- /dev/null +++ b/kubejs/assets/betterend/models/block/cave_grass_09.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/cave_grass_potted" + } +} diff --git a/kubejs/assets/betterend/models/block/cave_grass_10.json b/kubejs/assets/betterend/models/block/cave_grass_10.json new file mode 100644 index 000000000..618a68dc6 --- /dev/null +++ b/kubejs/assets/betterend/models/block/cave_grass_10.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/cave_grass_potted" + } +} diff --git a/kubejs/assets/betterend/models/block/cave_grass_11.json b/kubejs/assets/betterend/models/block/cave_grass_11.json new file mode 100644 index 000000000..8d7051abf --- /dev/null +++ b/kubejs/assets/betterend/models/block/cave_grass_11.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/cave_grass_potted" + } +} diff --git a/kubejs/assets/betterend/models/block/cave_grass_12.json b/kubejs/assets/betterend/models/block/cave_grass_12.json new file mode 100644 index 000000000..8d7051abf --- /dev/null +++ b/kubejs/assets/betterend/models/block/cave_grass_12.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/cave_grass_potted" + } +} diff --git a/kubejs/assets/betterend/models/block/chorus_grass_09.json b/kubejs/assets/betterend/models/block/chorus_grass_09.json new file mode 100644 index 000000000..e33b5eae2 --- /dev/null +++ b/kubejs/assets/betterend/models/block/chorus_grass_09.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "texture": "betterend:block/chorus_grass_potted" + } +} diff --git a/kubejs/assets/betterend/models/block/chorus_grass_10.json b/kubejs/assets/betterend/models/block/chorus_grass_10.json new file mode 100644 index 000000000..08172f7d2 --- /dev/null +++ b/kubejs/assets/betterend/models/block/chorus_grass_10.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/chorus_grass_potted" + } +} diff --git a/kubejs/assets/betterend/models/block/clawfern_03.json b/kubejs/assets/betterend/models/block/clawfern_03.json new file mode 100644 index 000000000..9ac28aa57 --- /dev/null +++ b/kubejs/assets/betterend/models/block/clawfern_03.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/clawfern_potted" + } +} diff --git a/kubejs/assets/betterend/models/block/clawfern_04.json b/kubejs/assets/betterend/models/block/clawfern_04.json new file mode 100644 index 000000000..c2df60cad --- /dev/null +++ b/kubejs/assets/betterend/models/block/clawfern_04.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/clawfern_potted" + } +} diff --git a/kubejs/assets/betterend/models/block/globulagus_05.json b/kubejs/assets/betterend/models/block/globulagus_05.json new file mode 100644 index 000000000..c028d9afb --- /dev/null +++ b/kubejs/assets/betterend/models/block/globulagus_05.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/globulagus_potted" + } +} diff --git a/kubejs/assets/betterend/models/block/globulagus_06.json b/kubejs/assets/betterend/models/block/globulagus_06.json new file mode 100644 index 000000000..b6821ea3e --- /dev/null +++ b/kubejs/assets/betterend/models/block/globulagus_06.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/globulagus_potted" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/inflexia.json b/kubejs/assets/betterend/models/block/inflexia_1.json similarity index 100% rename from kubejs/assets/betterend/models/block/inflexia.json rename to kubejs/assets/betterend/models/block/inflexia_1.json diff --git a/kubejs/assets/betterend/models/block/inflexia_2.json b/kubejs/assets/betterend/models/block/inflexia_2.json new file mode 100644 index 000000000..8262d772e --- /dev/null +++ b/kubejs/assets/betterend/models/block/inflexia_2.json @@ -0,0 +1,8 @@ +{ + "parent": "betterend:block/cross_inverted", + "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/inflexia_3.json b/kubejs/assets/betterend/models/block/inflexia_3.json new file mode 100644 index 000000000..2dc943f68 --- /dev/null +++ b/kubejs/assets/betterend/models/block/inflexia_3.json @@ -0,0 +1,8 @@ +{ + "parent": "betterend:block/cross_inverted", + "render_type": "cutout_mipped", + "textures": { + "cross": "betterend:block/inflexia_potted", + "particle": "betterend:block/inflexia_potted" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/inflexia_4.json b/kubejs/assets/betterend/models/block/inflexia_4.json new file mode 100644 index 000000000..d8d503b87 --- /dev/null +++ b/kubejs/assets/betterend/models/block/inflexia_4.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cross", + "render_type": "cutout_mipped", + "textures": { + "cross": "betterend:block/inflexia_potted", + "particle": "betterend:block/inflexia_potted" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/lamellarium_05.json b/kubejs/assets/betterend/models/block/lamellarium_05.json new file mode 100644 index 000000000..d36584d82 --- /dev/null +++ b/kubejs/assets/betterend/models/block/lamellarium_05.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/lamellarium_potted" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/lamellarium_06.json b/kubejs/assets/betterend/models/block/lamellarium_06.json new file mode 100644 index 000000000..5b97b6c2d --- /dev/null +++ b/kubejs/assets/betterend/models/block/lamellarium_06.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/lamellarium_potted" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/lucernia_leaves_1.json b/kubejs/assets/betterend/models/block/lucernia_leaves_1.json new file mode 100644 index 000000000..8622ebb51 --- /dev/null +++ b/kubejs/assets/betterend/models/block/lucernia_leaves_1.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/lucernia_leaves_1" + } +} diff --git a/kubejs/assets/betterend/models/block/lucernia_leaves_2.json b/kubejs/assets/betterend/models/block/lucernia_leaves_2.json new file mode 100644 index 000000000..3eccb21b2 --- /dev/null +++ b/kubejs/assets/betterend/models/block/lucernia_leaves_2.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/lucernia_leaves_2" + } +} diff --git a/kubejs/assets/betterend/models/block/lucernia_leaves_3.json b/kubejs/assets/betterend/models/block/lucernia_leaves_3.json new file mode 100644 index 000000000..d522ecc20 --- /dev/null +++ b/kubejs/assets/betterend/models/block/lucernia_leaves_3.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/lucernia_leaves_3" + } +} diff --git a/kubejs/assets/betterend/models/block/lucernia_leaves_4.json b/kubejs/assets/betterend/models/block/lucernia_leaves_4.json new file mode 100644 index 000000000..de57ae628 --- /dev/null +++ b/kubejs/assets/betterend/models/block/lucernia_leaves_4.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/lucernia_leaves_4" + } +} diff --git a/kubejs/assets/betterend/models/block/lucernia_outer_leaves_1.json b/kubejs/assets/betterend/models/block/lucernia_outer_leaves_1.json new file mode 100644 index 000000000..7a945d3ea --- /dev/null +++ b/kubejs/assets/betterend/models/block/lucernia_outer_leaves_1.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/lucernia_outer_leaves_1" + } +} diff --git a/kubejs/assets/betterend/models/block/lucernia_outer_leaves_2.json b/kubejs/assets/betterend/models/block/lucernia_outer_leaves_2.json new file mode 100644 index 000000000..75bd603b6 --- /dev/null +++ b/kubejs/assets/betterend/models/block/lucernia_outer_leaves_2.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/lucernia_outer_leaves_1" + } +} diff --git a/kubejs/assets/betterend/models/block/lucernia_outer_leaves_3.json b/kubejs/assets/betterend/models/block/lucernia_outer_leaves_3.json new file mode 100644 index 000000000..d06c662b4 --- /dev/null +++ b/kubejs/assets/betterend/models/block/lucernia_outer_leaves_3.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/lucernia_outer_leaves_2" + } +} diff --git a/kubejs/assets/betterend/models/block/lucernia_outer_leaves_4.json b/kubejs/assets/betterend/models/block/lucernia_outer_leaves_4.json new file mode 100644 index 000000000..de40ca546 --- /dev/null +++ b/kubejs/assets/betterend/models/block/lucernia_outer_leaves_4.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/lucernia_outer_leaves_2" + } +} diff --git a/kubejs/assets/betterend/models/block/lucernia_outer_leaves_5.json b/kubejs/assets/betterend/models/block/lucernia_outer_leaves_5.json new file mode 100644 index 000000000..9e4542777 --- /dev/null +++ b/kubejs/assets/betterend/models/block/lucernia_outer_leaves_5.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/lucernia_outer_leaves_3" + } +} diff --git a/kubejs/assets/betterend/models/block/lucernia_outer_leaves_6.json b/kubejs/assets/betterend/models/block/lucernia_outer_leaves_6.json new file mode 100644 index 000000000..eb37c1c14 --- /dev/null +++ b/kubejs/assets/betterend/models/block/lucernia_outer_leaves_6.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/lucernia_outer_leaves_3" + } +} diff --git a/kubejs/assets/betterend/models/block/vaiolush_fern_05.json b/kubejs/assets/betterend/models/block/vaiolush_fern_05.json new file mode 100644 index 000000000..5a915f548 --- /dev/null +++ b/kubejs/assets/betterend/models/block/vaiolush_fern_05.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/vaiolush_fern_potted" + } +} diff --git a/kubejs/assets/betterend/models/block/vaiolush_fern_06.json b/kubejs/assets/betterend/models/block/vaiolush_fern_06.json new file mode 100644 index 000000000..253271cee --- /dev/null +++ b/kubejs/assets/betterend/models/block/vaiolush_fern_06.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/vaiolush_fern_potted" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/cave_bush_fallen.json b/kubejs/assets/betterend/models/item/cave_bush_fallen.json new file mode 100644 index 000000000..c643bf9ac --- /dev/null +++ b/kubejs/assets/betterend/models/item/cave_bush_fallen.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/cave_bush_leaves_1" + } +} diff --git a/kubejs/assets/betterend/models/item/lucernia_leaves.json b/kubejs/assets/betterend/models/item/lucernia_leaves.json new file mode 100644 index 000000000..974abc519 --- /dev/null +++ b/kubejs/assets/betterend/models/item/lucernia_leaves.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/lucernia_leaves_1" +} diff --git a/kubejs/assets/betterend/models/item/lucernia_leaves_fallen.json b/kubejs/assets/betterend/models/item/lucernia_leaves_fallen.json new file mode 100644 index 000000000..a19282676 --- /dev/null +++ b/kubejs/assets/betterend/models/item/lucernia_leaves_fallen.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/lucernia_leaves_1" + } +} diff --git a/kubejs/assets/betterend/models/item/lucernia_outer_leaves.json b/kubejs/assets/betterend/models/item/lucernia_outer_leaves.json new file mode 100644 index 000000000..b2d7674e7 --- /dev/null +++ b/kubejs/assets/betterend/models/item/lucernia_outer_leaves.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/lucernia_outer_leaves_3" + } +} diff --git a/kubejs/server_scripts/tfg/events.forests.js b/kubejs/server_scripts/tfg/events.forests.js index 7e1551a4e..04017cc60 100644 --- a/kubejs/server_scripts/tfg/events.forests.js +++ b/kubejs/server_scripts/tfg/events.forests.js @@ -25,8 +25,8 @@ TFCEvents.worldgenData(event => { 'minecraft:crimson_fungus', 'beneath:wood/fallen_leaves/crimson', 'beneath:wood/twig/crimson', - 'tfc:groundcover/feather', - 'tfc:groundcover/stick' + 'tfg:groundcover/wraptor_feather', + 'tfg:groundcover/glider_feather' ], 'tfg:mars/tree/crimson', // tree feature 'tfg:mars/tree/crimson_dead', // dead tree feature @@ -50,8 +50,8 @@ TFCEvents.worldgenData(event => { 'minecraft:warped_fungus', 'beneath:wood/fallen_leaves/warped', 'beneath:wood/twig/warped', - 'tfc:groundcover/feather', - 'tfc:groundcover/stick' + 'tfg:groundcover/wraptor_feather', + 'tfg:groundcover/glider_feather' ], 'tfg:mars/tree/warped', 'tfg:mars/tree/warped_dead', @@ -64,14 +64,15 @@ TFCEvents.worldgenData(event => { climate => {}, 'ad_astra:aeronos_stem', 'ad_astra:aeronos_cap', - 'ad_astra:aeronos_stem', - null, + 'betterend:cave_bush', + 'betterend:cave_bush', [ "ad_astra:aeronos_mushroom", - 'beneath:wood/fallen_leaves/crimson', - 'beneath:wood/twig/crimson', - 'tfc:groundcover/feather', - 'tfc:groundcover/stick' + 'betterend:cave_bush', + 'betterend:cave_bush_fallen', + 'tfg:groundcover/wraptor_feather', + 'tfg:groundcover/glider_feather', + 'tfg:groundcover/aeronos_stick' ], 'tfg:mars/tree/aeronos', 'tfg:mars/tree/aeronos_dead', @@ -84,14 +85,15 @@ TFCEvents.worldgenData(event => { climate => {}, 'ad_astra:strophar_stem', 'ad_astra:strophar_cap', - null, - null, + 'betterend:lucernia_leaves', + 'betterend:lucernia_leaves', [ "ad_astra:strophar_mushroom", - 'beneath:wood/fallen_leaves/warped', - 'beneath:wood/twig/warped', - 'tfc:groundcover/feather', - 'tfc:groundcover/stick' + 'betterend:lucernia_leaves', + 'betterend:lucernia_leaves_fallen', + 'tfg:groundcover/wraptor_feather', + 'tfg:groundcover/glider_feather', + 'tfg:groundcover/strophar_stick' ], 'tfg:mars/tree/strophar', 'tfg:mars/tree/strophar_dead', @@ -108,9 +110,9 @@ TFCEvents.worldgenData(event => { null, [ "species:alphacene_mushroom", - 'beneath:wood/fallen_leaves/crimson', - 'beneath:wood/twig/crimson', - 'tfc:groundcover/feather', + 'tfg:groundcover/wraptor_feather', + 'tfg:groundcover/glider_feather', + 'tfg:groundcover/alphacene_stick', 'tfc:groundcover/stick' ], 'species:alphacene_mushroom', diff --git a/kubejs/startup_scripts/betterend/blocks.js b/kubejs/startup_scripts/betterend/blocks.js index a9e532dcf..c3d242708 100644 --- a/kubejs/startup_scripts/betterend/blocks.js +++ b/kubejs/startup_scripts/betterend/blocks.js @@ -59,9 +59,10 @@ function registerBetterEndBlocks(event) { .lootItem('beneath:crimson_straw') createPlant(event, 'small_amaranita_mushroom', 'mars') .box(3, 0, 3, 13, 8, 13) + createPlant(event, 'lucernia_outer_leaves', 'mars') + // TODO: needs a feature // 1 block tall waterlogged - // jungle_grass createPlant(event, 'charnia_orange', 'mars') createPlant(event, 'charnia_cyan', 'mars') @@ -70,33 +71,56 @@ function registerBetterEndBlocks(event) { createPlant(event, 'charnia_purple', 'mars') createPlant(event, 'charnia_red', 'mars') - // Crops - // amber_root - // blossom_berry - // shadow_berry - // chorus mushroom - // Mosses / Can go on sides of blocks - // bulb_moss - // cyan_moss - // filalux_wings - // jungle_fern - // twisted_moss //createPlant(event, 'aurant_polypore', 'mars') //createPlant(event, 'purple_polypore', 'mars') - // Vines - // bulb_vine - // dense_vine - // hydralux (bottom up, waterlogged) - // jungle_vine - // magnula - // rubinea + // Leaves - // Blocks - // cave_bush - // cave_pumpkin (also a vine) + event.create('betterend:cave_bush', 'tfc:leaves') + .soundType('azalea_leaves') + .tagBlock('minecraft:mineable/hoe') + .mapColor('fire') + .seasonalColors(false) + .fallenLeaves(leaves => { + leaves.noCollision() + leaves.notSolid() + leaves.defaultCutout() + leaves.soundType('azalea_leaves') + leaves.tagBlock('minecraft:mineable/hoe') + // TODO: kjs-tfc 1.3.3 will have an option to disable tinting on leaves + leaves.models((modelType, generator) => { + if (modelType.layers != 8) { + generator.parent("tfc:block/groundcover/fallen_leaves_height" + modelType.height); + generator.texture("all", "betterend:block/cave_bush_leaves_1"); + } else { + generator.parent("betterend:block/cave_bush_01"); + } + }) + }) + + event.create('betterend:lucernia_leaves', 'tfc:leaves') + .soundType('azalea_leaves') + .tagBlock('minecraft:mineable/hoe') + .mapColor('color_orange') + .seasonalColors(false) + .fallenLeaves(leaves => { + leaves.noCollision() + leaves.notSolid() + leaves.defaultCutout() + leaves.soundType('azalea_leaves') + leaves.tagBlock('minecraft:mineable/hoe') + // TODO: kjs-tfc 1.3.3 will have an option to disable tinting on leaves + leaves.models((modelType, generator) => { + if (modelType.layers != 8) { + generator.parent("tfc:block/groundcover/fallen_leaves_height" + modelType.height); + generator.texture("all", "betterend:block/lucernia_leaves_1"); + } else { + generator.parent("betterend:block/lucernia_leaves_1"); + } + }) + }) // "Structures"? // blue_vine (blue) diff --git a/kubejs/startup_scripts/tfg/blocks.space.js b/kubejs/startup_scripts/tfg/blocks.space.js index 744226667..32ef5f312 100644 --- a/kubejs/startup_scripts/tfg/blocks.space.js +++ b/kubejs/startup_scripts/tfg/blocks.space.js @@ -418,6 +418,52 @@ function registerTFGSpaceBlocks(event) { .fullBlock(true) .opaque(true) + event.create('tfg:groundcover/glider_feather', 'tfc:ground_cover') + .box(4, 0, 4, 12, 2, 12) + .soundType('wool') + .groundCoverModelShape('feather') + .withPreexistingItem('wan_ancient_beasts:glider_feather') + .textureAll('wan_ancient_beasts:item/glider_feather') + + event.create('tfg:groundcover/wraptor_feather', 'tfc:ground_cover') + .box(4, 0, 4, 12, 2, 12) + .soundType('wool') + .groundCoverModelShape('feather') + .withPreexistingItem('minecraft:feather') + .textureAll('tfg:item/wraptor_wool') + + event.create('tfg:groundcover/aeronos_stick', 'tfc:ground_cover') + .box(3, 0, 3, 13, 3, 13) + .groundCoverModelShape('twig') + .withPreexistingItem('tfg:twigs/aeronos') + .texture('particle', 'ad_astra:block/aeronos_stem') + .texture('all', 'ad_astra:block/aeronos_stem') + .texture('top', 'ad_astra:block/aeronos_stem_inside') + + event.create('tfg:groundcover/strophar_stick', 'tfc:ground_cover') + .box(3, 0, 3, 13, 3, 13) + .groundCoverModelShape('twig') + .withPreexistingItem('tfg:twigs/strophar') + .texture('particle', 'ad_astra:block/strophar_stem') + .texture('all', 'ad_astra:block/strophar_stem') + .texture('top', 'ad_astra:block/strophar_stem_inside') + + event.create('tfg:groundcover/glacian_stick', 'tfc:ground_cover') + .box(3, 0, 3, 13, 3, 13) + .groundCoverModelShape('twig') + .withPreexistingItem('tfg:twigs/glacian') + .texture('particle', 'ad_astra:block/glacian_log') + .texture('all', 'ad_astra:block/glacian_log') + .texture('top', 'ad_astra:block/glacian_log_top') + + event.create('tfg:groundcover/alphacene_stick', 'tfc:ground_cover') + .box(3, 0, 3, 13, 3, 13) + .groundCoverModelShape('twig') + .withPreexistingItem('tfg:twigs/alphacene') + .texture('particle', 'species:block/alphacene_mushroom_block') + .texture('all', 'species:block/alphacene_mushroom_block') + .texture('top', 'minecraft:block/mushroom_stem') + // #endregion //#region Venus Blocks diff --git a/kubejs/startup_scripts/tfg/items.js b/kubejs/startup_scripts/tfg/items.js index 40901917a..a301cf31c 100644 --- a/kubejs/startup_scripts/tfg/items.js +++ b/kubejs/startup_scripts/tfg/items.js @@ -175,6 +175,11 @@ const registerTFGItems = (event) => { event.create('tfg:foil_pack') event.create('tfg:clean_foil_pack') event.create('tfg:flint_club_head') + + event.create('tfg:twigs/strophar').tag('tfc:twigs') + event.create('tfg:twigs/aeronos').tag('tfc:twigs') + event.create('tfg:twigs/glacian').tag('tfc:twigs') + event.create('tfg:twigs/alphacene').tag('tfc:twigs') //#endregion //#region Cloth & String