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

- new small desert plant

Browse source 
- new mars mossy boulders featuring molden's textures
- made forests even more dense
This commit is contained in:
Pyritie 2025-09-18 00:07:13 +01:00
parent b1ea189f02
commit 9ca6b4f5a1
27 changed files with 290 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -0,0 +1,10 @@
{
"variants": {
"": [
{ "model": "betterend:block/selagine_1", "weight": 2 },
{ "model": "betterend:block/selagine_2", "weight": 2 },
{ "model": "betterend:block/selagine_3" },
{ "model": "betterend:block/selagine_4" }
]
}
}

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

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

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

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

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

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

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

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

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

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

BIN
kubejs/assets/betterend/textures/block/selagine_1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 298 B

BIN
kubejs/assets/betterend/textures/block/selagine_2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 365 B

2
kubejs/data/ad_astra/dimension/mars.json
View file

@ -21,6 +21,7 @@
"sand": "ad_astra:mars_sand",
"sandstone": "ad_astra:mars_stone",
"spike": "tfg:spike/mars_stone_spike",
"mossy": "tfg:rock/mossy_cobble_mars",
"loose": "tfg:loose/mars_stone"
},
"venus": {
@ -31,6 +32,7 @@
"sand": "ad_astra:venus_sand",
"sandstone": "ad_astra:venus_sandstone",
"spike": "tfg:spike/venus_stone_spike",
"mossy": "tfg:rock/mossy_cobble_venus",
"loose": "tfg:loose/venus_stone"
},
"red_granite": {

1
kubejs/data/tfg/worldgen/biome/mars/amber_hills.json
View file

@ -40,6 +40,7 @@
"tfc:cobble_boulder",
"tfc:raw_boulder_small_patch",
"tfc:cobble_boulder_small_patch",
"tfg:mars/terrain/mossy_boulder",
"tfg:mars/surface/small_skull_and_bones",
"tfg:mars/surface/large_skull_and_bones",
"tfg:mars/surface/rotten_flesh_patch",

4
kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json
View file

@ -35,6 +35,7 @@
"tfc:cobble_boulder",
"tfc:raw_boulder_small_patch",
"tfc:cobble_boulder_small_patch",
"tfg:mars/terrain/mossy_boulder",
"tfg:mars/surface/small_skull_and_bones",
"tfg:mars/surface/large_skull_and_bones",
"tfg:mars/surface/rotten_flesh_patch",
@ -45,7 +46,8 @@
],
[
"tfg:mars/surface/feather_patch_wraptor",
"tfg:mars/surface/feather_patch_glider"
"tfg:mars/surface/feather_patch_glider",
"tfg:mars/surface/selagine"
],
"#tfg:mars_top_layer_modification"
],

2
kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json
View file

@ -37,7 +37,7 @@
"tfg:mars/surface/large_skull_and_bones"
],
[
"tfg:mars/surface/selagine"
],
"#tfg:mars_top_layer_modification"
],

1
kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json
View file

@ -44,6 +44,7 @@
"tfc:raw_boulder",
"tfc:raw_boulder_small_patch",
"tfc:cobble_boulder_small_patch",
"tfg:mars/terrain/mossy_boulder",
"tfg:mars/surface/small_skull_and_bones",
"tfg:mars/surface/large_skull_and_bones",
"tfg:mars/surface/rotten_flesh_patch",

9
kubejs/data/tfg/worldgen/biome/mars/martian_river.json
View file

@ -34,11 +34,18 @@
[
"tfc:raw_boulder_small_patch",
"tfc:cobble_boulder_small_patch",
"tfg:mars/terrain/mossy_boulder",
"tfg:mars/surface/pile_venus_sand_no_water",
"tfg:mars/surface/flint_patch"
],
[
"tfg:mars/surface/charnia"
"tfg:mars/surface/charnia",
"tfg:mars/surface/flamaea",
"tfg:mars/surface/lucernia_outer_leaves",
"tfg:mars/surface/lanceleaf_small",
"tfg:mars/surface/flammalix",
"tfg:mars/surface/selagine"
],
"#tfg:mars_top_layer_modification"
],

1
kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json
View file

@ -40,6 +40,7 @@
"tfc:cobble_boulder",
"tfc:raw_boulder_small_patch",
"tfc:cobble_boulder_small_patch",
"tfg:mars/terrain/mossy_boulder",
"tfg:mars/surface/small_skull_and_bones",
"tfg:mars/surface/large_skull_and_bones",
"tfg:mars/surface/rotten_flesh_patch",

1
kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json
View file

@ -40,6 +40,7 @@
"tfc:cobble_boulder",
"tfc:raw_boulder_small_patch",
"tfc:cobble_boulder_small_patch",
"tfg:mars/terrain/mossy_boulder",
"tfg:mars/surface/small_skull_and_bones",
"tfg:mars/surface/large_skull_and_bones",
"tfg:mars/surface/rotten_flesh_patch",

49
kubejs/data/tfg/worldgen/configured_feature/mars/surface/selagine.json Normal file
View file

@ -0,0 +1,49 @@
{
"type": "minecraft:random_patch",
"config": {
"feature": {
"feature": {
"type": "minecraft:simple_block",
"config": {
"to_place": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "betterend:selagine"
}
}
}
},
"placement": [
{
"type": "minecraft:heightmap",
"heightmap": "OCEAN_FLOOR"
},
{
"type": "minecraft:block_predicate_filter",
"predicate": {
"type": "minecraft:all_of",
"predicates": [
{
"type": "minecraft:matching_blocks",
"blocks": "minecraft:air"
},
{
"type": "minecraft:any_of",
"predicates": [
{
"type": "minecraft:matching_block_tag",
"offset": [ 0, -1, 0 ],
"tag": "tfg:mars_soil"
}
]
}
]
}
}
]
},
"tries": 8,
"xz_spread": 10,
"y_spread": 3
}
}

71
kubejs/data/tfg/worldgen/configured_feature/mars/terrain/mossy_boulder.json Normal file
View file

@ -0,0 +1,71 @@
{
"type": "tfc:boulder",
"config": {
"states": [
{
"rock": "ad_astra:mars_stone",
"blocks": [
"ad_astra:mars_stone",
"ad_astra:mars_cobblestone",
"tfg:rock/mossy_cobble_mars"
]
},
{
"rock": "tfc:rock/raw/chalk",
"blocks": [
"ad_astra:mars_stone",
"ad_astra:mars_cobblestone",
"tfg:rock/mossy_cobble_mars"
]
},
{
"rock": "tfc:rock/raw/shale",
"blocks": [
"ad_astra:mars_stone",
"ad_astra:mars_cobblestone",
"tfg:rock/mossy_cobble_mars"
]
},
{
"rock": "tfc:rock/raw/dolomite",
"blocks": [
"ad_astra:mars_stone",
"ad_astra:mars_cobblestone",
"tfg:rock/mossy_cobble_mars"
]
},
{
"rock": "tfc:rock/raw/limestone",
"blocks": [
"ad_astra:venus_stone",
"ad_astra:venus_cobblestone",
"tfg:rock/mossy_cobble_venus"
]
},
{
"rock": "tfc:rock/raw/claystone",
"blocks": [
"ad_astra:venus_stone",
"ad_astra:venus_cobblestone",
"tfg:rock/mossy_cobble_venus"
]
},
{
"rock": "tfc:rock/raw/conglomerate",
"blocks": [
"ad_astra:venus_stone",
"ad_astra:venus_cobblestone",
"tfg:rock/mossy_cobble_venus"
]
},
{
"rock": "tfc:rock/raw/chert",
"blocks": [
"ad_astra:venus_stone",
"ad_astra:venus_cobblestone",
"tfg:rock/mossy_cobble_venus"
]
}
]
}
}

19
kubejs/data/tfg/worldgen/placed_feature/mars/surface/selagine.json Normal file
View file

@ -0,0 +1,19 @@
{
"feature": "tfg:mars/surface/selagine",
"placement": [
{
"type": "minecraft:rarity_filter",
"chance": 3
},
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:biome"
},
{
"type": "minecraft:heightmap",
"heightmap": "OCEAN_FLOOR"
}
]
}

23
kubejs/data/tfg/worldgen/placed_feature/mars/terrain/mossy_boulder.json Normal file
View file

@ -0,0 +1,23 @@
{
"feature": "tfg:mars/terrain/mossy_boulder",
"placement": [
{
"type": "minecraft:rarity_filter",
"chance": 36
},
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:heightmap",
"heightmap": "OCEAN_FLOOR_WG"
},
{
"type": "tfc:flat_enough",
"flatness": 0.2
},
{
"type": "minecraft:biome"
}
]
}

2
kubejs/data/tfg/worldgen/placed_feature/mars/tree/cave_bush.json
View file

@ -3,7 +3,7 @@
"placement": [
{
"type": "minecraft:rarity_filter",
"chance": 2
"chance": 3
},
{
"type": "tfc:climate",

24
kubejs/data/tfg/worldgen/placed_feature/mars/tree/cave_bush_common.json Normal file
View file

@ -0,0 +1,24 @@
{
"feature": "tfg:mars/tree/cave_bush",
"placement": [
{
"type": "minecraft:count",
"count": 2
},
{
"type": "tfc:climate",
"min_forest": "normal",
"min_rainfall": -5
},
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:biome"
},
{
"type": "minecraft:heightmap",
"heightmap": "OCEAN_FLOOR"
}
]
}

2
kubejs/data/tfg/worldgen/placed_feature/mars/tree/lucernia.json
View file

@ -3,7 +3,7 @@
"placement": [
{
"type": "minecraft:rarity_filter",
"chance": 2
"chance": 3
},
{
"type": "tfc:climate",

24
kubejs/data/tfg/worldgen/placed_feature/mars/tree/lucernia_common.json Normal file
View file

@ -0,0 +1,24 @@
{
"feature": "tfg:mars/tree/lucernia",
"placement": [
{
"type": "minecraft:count",
"count": 2
},
{
"type": "tfc:climate",
"min_forest": "normal",
"max_rainfall": -7
},
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:biome"
},
{
"type": "minecraft:heightmap",
"heightmap": "OCEAN_FLOOR"
}
]
}

2
kubejs/server_scripts/ad_astra/tags.js
View file

@ -500,7 +500,9 @@ const registerAdAstraPlacedFeatures = (event) => {
// Vegetation
event.add("tfg:mars_global_small_plants", "tfg:mars/tree/lucernia")
event.add("tfg:mars_global_small_plants", "tfg:mars/tree/lucernia_common")
event.add("tfg:mars_global_small_plants", "tfg:mars/tree/cave_bush")
event.add("tfg:mars_global_small_plants", "tfg:mars/tree/cave_bush_common")
event.add("tfg:mars_global_small_plants", "tfg:mars/surface/charnia")
event.add("tfg:mars_global_small_plants", "tfg:mars/surface/flamaea")
event.add("tfg:mars_global_small_plants", "tfg:mars/surface/lacugrove")

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

@ -10,9 +10,9 @@ TFCEvents.worldgenData(event => {
event.forestTypesMapEntry('none', [0, 1], 1, 0.1, 0, false, false, 0),
event.forestTypesMapEntry('sparse', [0, 3], 10, 0.3, 1, false, false, [0, 1]),
event.forestTypesMapEntry('edge', [2, 5], 20, 0.8, 1, true, false, [1, 2]),
event.forestTypesMapEntry('normal', [6, 9], 35, 1, 2, true, false, [2, 3]),
event.forestTypesMapEntry('old_growth', [10, 13], 50, 1, 3, true, true, [3, 4])
event.forestTypesMapEntry('edge', [2, 5], 20, 0.8, 2, true, false, [1, 2]),
event.forestTypesMapEntry('normal', [7, 10], 35, 1, 3, true, false, [4, 6]),
event.forestTypesMapEntry('old_growth', [10, 13], 50, 1, 4, true, true, [5, 8])
],
false,
placement => {}

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

@ -10,7 +10,7 @@ function registerBetterEndBlocks(event) {
.hardness(0.5)
.tagItem('tfg:moon_plants')
.tagBlock('minecraft:mineable/hoe')
.tagBlock('tfg:do_not_destroy_in_space')
.tagBlock('tfg:do_not_destroy_in_space')
.mapColor('terracotta_white')
.box(0, 0, 0, 16, 6, 16)
.fullBlock(false)
@ -61,6 +61,8 @@ function registerBetterEndBlocks(event) {
createPlant(event, 'lucernia_outer_leaves', 'mars')
createPlant(event, 'lanceleaf_small', 'mars')
.box(4, 0, 4, 12, 8, 12)
createPlant(event, 'selagine', 'mars')
.lootItem('tfc:straw')
// 1 block tall waterlogged
@ -79,7 +81,7 @@ function registerBetterEndBlocks(event) {
.mapColor('color_light_blue')
.tagItem('tfg:mars_plants')
.tagItem('forge:mushrooms')
.tagBlock('tfg:do_not_destroy_in_space')
.tagBlock('tfg:do_not_destroy_in_space')
.tagBlock('minecraft:replaceable')
event.create('betterend:lacugrove', 'tfg:floating_decorative_plant')
@ -88,7 +90,7 @@ function registerBetterEndBlocks(event) {
.box(0, 0, 0, 16, 1, 16)
.mapColor('color_cyan')
.tagItem('tfg:mars_plants')
.tagBlock('tfg:do_not_destroy_in_space')
.tagBlock('tfg:do_not_destroy_in_space')
.tagBlock('minecraft:replaceable')
// Mosses / Can go on sides of blocks
@ -99,36 +101,36 @@ function registerBetterEndBlocks(event) {
.tagItem('tfg:mars_plants')
.tagItem('forge:mushrooms')
.tagBlock('minecraft:replaceable')
.tagBlock('tfg:do_not_destroy_in_space')
.tagBlock('tfg:do_not_destroy_in_space')
event.create('betterend:purple_polypore', 'tfg:attached_decorative_plant')
.soundType('nether_wart')
.tagItem('tfg:mars_plants')
.tagItem('forge:mushrooms')
.tagBlock('minecraft:replaceable')
.tagBlock('tfg:do_not_destroy_in_space')
.tagBlock('tfg:do_not_destroy_in_space')
event.create('betterend:filalux_wings', 'tfg:attached_decorative_plant')
.soundType('nether_wart')
.allowVertical(true)
.tagItem('tfg:mars_plants')
.tagItem('forge:mushrooms')
.tagBlock('minecraft:replaceable')
.tagBlock('tfg:do_not_destroy_in_space')
.tagBlock('tfg:do_not_destroy_in_space')
event.create('betterend:bulb_moss', 'tfg:attached_decorative_plant')
.soundType('crop')
.lootItem('tfc:straw')
.tagItem('tfg:mars_plants')
.tagBlock('minecraft:replaceable')
.tagBlock('tfg:do_not_destroy_in_space')
.tagBlock('tfg:do_not_destroy_in_space')
// Leaves
event.create('betterend:cave_bush', 'tfc:leaves')
.soundType('azalea_leaves')
.tagBlock('minecraft:mineable/hoe')
.tagBlock('tfg:do_not_destroy_in_space')
.tagBlock('tfg:do_not_destroy_in_space')
.mapColor('fire')
.seasonalColors(false)
.tagItem('tfg:mars_plants')
@ -153,7 +155,7 @@ function registerBetterEndBlocks(event) {
event.create('betterend:lucernia_leaves', 'tfc:leaves')
.soundType('azalea_leaves')
.tagBlock('minecraft:mineable/hoe')
.tagBlock('tfg:do_not_destroy_in_space')
.tagBlock('tfg:do_not_destroy_in_space')
.mapColor('color_orange')
.seasonalColors(false)
.tagItem('tfg:mars_plants')
@ -187,7 +189,7 @@ function registerBetterEndBlocks(event) {
.height(3)
.soundType('nether_wart')
.tagItem('tfg:mars_plants')
.tagBlock('tfg:do_not_destroy_in_space')
.tagBlock('tfg:do_not_destroy_in_space')
.tagItem('forge:mushrooms')
.mapColor('fire')
@ -195,7 +197,7 @@ function registerBetterEndBlocks(event) {
.height(5)
.soundType('crop')
.tagItem('tfg:mars_plants')
.tagBlock('tfg:do_not_destroy_in_space')
.tagBlock('tfg:do_not_destroy_in_space')
.mapColor('color_orange')
// europa...?
@ -219,5 +221,5 @@ function createPlant(event, id, planet) {
return event.create(`betterend:${id}`, 'tfg:decorative_plant')
.tagItem(`tfg:${planet}_plants`)
.tagBlock('minecraft:replaceable')
.tagBlock('tfg:do_not_destroy_in_space')
.tagBlock('tfg:do_not_destroy_in_space')
}