From 9ca6b4f5a1a02b90bb0fc9839b4d01e589b71cdf Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 18 Sep 2025 00:07:13 +0100 Subject: [PATCH] - new small desert plant - new mars mossy boulders featuring molden's textures - made forests even more dense --- .../betterend/blockstates/selagine.json | 10 +++ .../betterend/models/block/selagine_1.json | 6 ++ .../betterend/models/block/selagine_2.json | 6 ++ .../betterend/models/block/selagine_3.json | 6 ++ .../betterend/models/block/selagine_4.json | 6 ++ .../betterend/models/item/selagine.json | 6 ++ .../betterend/textures/block/selagine_1.png | Bin 0 -> 298 bytes .../betterend/textures/block/selagine_2.png | Bin 0 -> 365 bytes kubejs/data/ad_astra/dimension/mars.json | 2 + .../tfg/worldgen/biome/mars/amber_hills.json | 1 + .../biome/mars/martian_dune_edge.json | 4 +- .../worldgen/biome/mars/martian_dunes.json | 2 +- .../biome/mars/martian_mountains.json | 1 + .../worldgen/biome/mars/martian_river.json | 9 ++- .../worldgen/biome/mars/rusticus_hills.json | 1 + .../worldgen/biome/mars/sangnum_hills.json | 1 + .../mars/surface/selagine.json | 49 ++++++++++++ .../mars/terrain/mossy_boulder.json | 71 ++++++++++++++++++ .../placed_feature/mars/surface/selagine.json | 19 +++++ .../mars/terrain/mossy_boulder.json | 23 ++++++ .../placed_feature/mars/tree/cave_bush.json | 2 +- .../mars/tree/cave_bush_common.json | 24 ++++++ .../placed_feature/mars/tree/lucernia.json | 2 +- .../mars/tree/lucernia_common.json | 24 ++++++ kubejs/server_scripts/ad_astra/tags.js | 2 + kubejs/server_scripts/tfg/events.forests.js | 6 +- kubejs/startup_scripts/betterend/blocks.js | 28 +++---- 27 files changed, 290 insertions(+), 21 deletions(-) create mode 100644 kubejs/assets/betterend/blockstates/selagine.json create mode 100644 kubejs/assets/betterend/models/block/selagine_1.json create mode 100644 kubejs/assets/betterend/models/block/selagine_2.json create mode 100644 kubejs/assets/betterend/models/block/selagine_3.json create mode 100644 kubejs/assets/betterend/models/block/selagine_4.json create mode 100644 kubejs/assets/betterend/models/item/selagine.json create mode 100644 kubejs/assets/betterend/textures/block/selagine_1.png create mode 100644 kubejs/assets/betterend/textures/block/selagine_2.png create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/surface/selagine.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/terrain/mossy_boulder.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/surface/selagine.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/terrain/mossy_boulder.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/tree/cave_bush_common.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/tree/lucernia_common.json diff --git a/kubejs/assets/betterend/blockstates/selagine.json b/kubejs/assets/betterend/blockstates/selagine.json new file mode 100644 index 000000000..534df74f7 --- /dev/null +++ b/kubejs/assets/betterend/blockstates/selagine.json @@ -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" } + ] + } +} diff --git a/kubejs/assets/betterend/models/block/selagine_1.json b/kubejs/assets/betterend/models/block/selagine_1.json new file mode 100644 index 000000000..6a45e58c9 --- /dev/null +++ b/kubejs/assets/betterend/models/block/selagine_1.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/selagine_1" + } +} diff --git a/kubejs/assets/betterend/models/block/selagine_2.json b/kubejs/assets/betterend/models/block/selagine_2.json new file mode 100644 index 000000000..258542da2 --- /dev/null +++ b/kubejs/assets/betterend/models/block/selagine_2.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/selagine_1" + } +} diff --git a/kubejs/assets/betterend/models/block/selagine_3.json b/kubejs/assets/betterend/models/block/selagine_3.json new file mode 100644 index 000000000..fdfe08f86 --- /dev/null +++ b/kubejs/assets/betterend/models/block/selagine_3.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/selagine_2" + } +} diff --git a/kubejs/assets/betterend/models/block/selagine_4.json b/kubejs/assets/betterend/models/block/selagine_4.json new file mode 100644 index 000000000..1be5717e4 --- /dev/null +++ b/kubejs/assets/betterend/models/block/selagine_4.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/selagine_2" + } +} diff --git a/kubejs/assets/betterend/models/item/selagine.json b/kubejs/assets/betterend/models/item/selagine.json new file mode 100644 index 000000000..7f559cfb7 --- /dev/null +++ b/kubejs/assets/betterend/models/item/selagine.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/selagine_1" + } +} diff --git a/kubejs/assets/betterend/textures/block/selagine_1.png b/kubejs/assets/betterend/textures/block/selagine_1.png new file mode 100644 index 0000000000000000000000000000000000000000..26ffb9c5a24f8713c2583fad60a35247d05ef185 GIT binary patch literal 298 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_p*Zo-U3d7QJu#480F0NVLpf;uZQq{b#>UNs-VSr9LmmuIPi0Zgg2~^-H^a)OAAy z`|BmsF3r;aIVr=2-OzN}uAN_(J$|=$xA?OekN1C&tNgXLb@8_;-_#FHPZQhFeC^DJ z-@cCu>mDB7mv+bV%#t5JE54~OtDj+f_U$}|MfdhGJUYIM;nKs*eJYZ3Qk@DmYZvcT zW+>jd^uwx2m7d$J_R87LlE_&! z!KH^iD&sNtji}D5@|ibJPuzGT<-M6@lJX<7&Ab2G-~Y4w!2bA^d@5HP|8Tu{ukiVX zE3ds%(7yQ089FcKiDsxUC|rJdim|xXsa#T{GoO`VQo#n3*!EgO)60`GG=A~IlYjf>!pXOx@47}xUYwsOCuby^(v2F66yoiarO2x~zCfn>i z#&gSvQ=ae0 { // 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") diff --git a/kubejs/server_scripts/tfg/events.forests.js b/kubejs/server_scripts/tfg/events.forests.js index f54c6ec11..0adc7fb17 100644 --- a/kubejs/server_scripts/tfg/events.forests.js +++ b/kubejs/server_scripts/tfg/events.forests.js @@ -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 => {} diff --git a/kubejs/startup_scripts/betterend/blocks.js b/kubejs/startup_scripts/betterend/blocks.js index 106e023a9..ba0537636 100644 --- a/kubejs/startup_scripts/betterend/blocks.js +++ b/kubejs/startup_scripts/betterend/blocks.js @@ -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') } \ No newline at end of file