illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Pyritie 2025-08-31 02:25:11 +01:00
parent 16b4fea87b
commit a7d71c8e6b
46 changed files with 358 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

6
kubejs/assets/betterend/blockstates/cave_bush.json
View file

@ -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" }
]
}
}

6
kubejs/assets/betterend/blockstates/cave_grass.json
View file

@ -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" }
]
}
}

4
kubejs/assets/betterend/blockstates/chorus_grass.json
View file

@ -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" }
]
}
}

4
kubejs/assets/betterend/blockstates/clawfern.json
View file

@ -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" }
]
}
}

4
kubejs/assets/betterend/blockstates/globulagus.json
View file

@ -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" }
]
}
}

9
kubejs/assets/betterend/blockstates/inflexia.json
View file

@ -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" }
]
}
}

4
kubejs/assets/betterend/blockstates/lamellarium.json
View file

@ -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" }
]
}
}

10
kubejs/assets/betterend/blockstates/lucernia_leaves.json Normal file
View file

@ -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" }
]
}
}

12
kubejs/assets/betterend/blockstates/lucernia_outer_leaves.json Normal file
View file

@ -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" }
]
}
}

4
kubejs/assets/betterend/blockstates/vaiolush_fern.json
View file

@ -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" }
]
}
}

6
kubejs/assets/betterend/models/block/cave_grass_09.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "betterend:block/cave_grass_potted"
}
}

6
kubejs/assets/betterend/models/block/cave_grass_10.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "betterend:block/cave_grass_potted"
}
}

6
kubejs/assets/betterend/models/block/cave_grass_11.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "betterend:block/cross_inverted",
"textures": {
"cross": "betterend:block/cave_grass_potted"
}
}

6
kubejs/assets/betterend/models/block/cave_grass_12.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "betterend:block/cross_inverted",
"textures": {
"cross": "betterend:block/cave_grass_potted"
}
}

6
kubejs/assets/betterend/models/block/chorus_grass_09.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"texture": "betterend:block/chorus_grass_potted"
}
}

6
kubejs/assets/betterend/models/block/chorus_grass_10.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "betterend:block/crop_block",
"textures": {
"texture": "betterend:block/chorus_grass_potted"
}
}

6
kubejs/assets/betterend/models/block/clawfern_03.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "betterend:block/clawfern_potted"
}
}

6
kubejs/assets/betterend/models/block/clawfern_04.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "betterend:block/cross_inverted",
"textures": {
"cross": "betterend:block/clawfern_potted"
}
}

6
kubejs/assets/betterend/models/block/globulagus_05.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "betterend:block/globulagus_potted"
}
}

6
kubejs/assets/betterend/models/block/globulagus_06.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "betterend:block/cross_inverted",
"textures": {
"cross": "betterend:block/globulagus_potted"
}
}

0
kubejs/assets/betterend/models/block/inflexia.json → kubejs/assets/betterend/models/block/inflexia_1.json
View file

8
kubejs/assets/betterend/models/block/inflexia_2.json Normal file
View file

@ -0,0 +1,8 @@
{
"parent": "betterend:block/cross_inverted",
"render_type": "cutout_mipped",
"textures": {
"cross": "betterend:block/inflexia",
"particle": "betterend:block/inflexia"
}
}

8
kubejs/assets/betterend/models/block/inflexia_3.json Normal file
View file

@ -0,0 +1,8 @@
{
"parent": "betterend:block/cross_inverted",
"render_type": "cutout_mipped",
"textures": {
"cross": "betterend:block/inflexia_potted",
"particle": "betterend:block/inflexia_potted"
}
}

8
kubejs/assets/betterend/models/block/inflexia_4.json Normal file
View file

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/cross",
"render_type": "cutout_mipped",
"textures": {
"cross": "betterend:block/inflexia_potted",
"particle": "betterend:block/inflexia_potted"
}
}

6
kubejs/assets/betterend/models/block/lamellarium_05.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "betterend:block/lamellarium_potted"
}
}

6
kubejs/assets/betterend/models/block/lamellarium_06.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "betterend:block/cross_inverted",
"textures": {
"cross": "betterend:block/lamellarium_potted"
}
}

6
kubejs/assets/betterend/models/block/lucernia_leaves_1.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "betterend:block/lucernia_leaves_1"
}
}

6
kubejs/assets/betterend/models/block/lucernia_leaves_2.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "betterend:block/lucernia_leaves_2"
}
}

6
kubejs/assets/betterend/models/block/lucernia_leaves_3.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "betterend:block/lucernia_leaves_3"
}
}

6
kubejs/assets/betterend/models/block/lucernia_leaves_4.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "betterend:block/lucernia_leaves_4"
}
}

6
kubejs/assets/betterend/models/block/lucernia_outer_leaves_1.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "betterend:block/lucernia_outer_leaves_1"
}
}

6
kubejs/assets/betterend/models/block/lucernia_outer_leaves_2.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "betterend:block/cross_inverted",
"textures": {
"cross": "betterend:block/lucernia_outer_leaves_1"
}
}

6
kubejs/assets/betterend/models/block/lucernia_outer_leaves_3.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "betterend:block/lucernia_outer_leaves_2"
}
}

6
kubejs/assets/betterend/models/block/lucernia_outer_leaves_4.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "betterend:block/cross_inverted",
"textures": {
"cross": "betterend:block/lucernia_outer_leaves_2"
}
}

6
kubejs/assets/betterend/models/block/lucernia_outer_leaves_5.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "betterend:block/lucernia_outer_leaves_3"
}
}

6
kubejs/assets/betterend/models/block/lucernia_outer_leaves_6.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "betterend:block/cross_inverted",
"textures": {
"cross": "betterend:block/lucernia_outer_leaves_3"
}
}

6
kubejs/assets/betterend/models/block/vaiolush_fern_05.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "block/cross",
"textures": {
"cross": "betterend:block/vaiolush_fern_potted"
}
}

6
kubejs/assets/betterend/models/block/vaiolush_fern_06.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "betterend:block/cross_inverted",
"textures": {
"cross": "betterend:block/vaiolush_fern_potted"
}
}

6
kubejs/assets/betterend/models/item/cave_bush_fallen.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "betterend:block/cave_bush_leaves_1"
}
}

3
kubejs/assets/betterend/models/item/lucernia_leaves.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "betterend:block/lucernia_leaves_1"
}

6
kubejs/assets/betterend/models/item/lucernia_leaves_fallen.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "betterend:block/lucernia_leaves_1"
}
}

6
kubejs/assets/betterend/models/item/lucernia_outer_leaves.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "betterend:block/lucernia_outer_leaves_3"
}
}

40
kubejs/server_scripts/tfg/events.forests.js
View file

@ -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',

68
kubejs/startup_scripts/betterend/blocks.js
View file

@ -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)

46
kubejs/startup_scripts/tfg/blocks.space.js
View file

@ -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

5
kubejs/startup_scripts/tfg/items.js
View file

@ -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