Merging space stuff from my own fork into the main repo (#935)

* ignore .vs

* initial commit of ~space~

* fixed planets in config

* adding ore blocks to anorthite, renamed moon deepslate to dunite

* added moon ore veins, adjusted earth ones, added separate rock blocks

* added new buds for the new minerals, adjusted veins again

* forgot to add titanium to the moon!

* added moon zombies

* adjusted veins + added endermites

* first step to the moon

Signed-off-by: SverhRazum-Nah <leon.trol@mail.ru>

* change sky colors back to black

* added ad astra ores

* add desh veins to the moon

* added missing certus clusters

* adding desh veins/loc

* adding meteors + rabbit houses

* cheeeeeeese

* replaced meteor concrete with sky stone

* burying the meteors a little more

* initial commit of ores to field guide tool

* updated mineral data with new space ores

* fixed trapdoor orientation

* added anorthite rocks/bricks, changed names of cut deepslate, made cut deepslate + asurine visible

* changed average moon temp

* First Push

* split 'for' value into arrays, added russian

* pillars are stone, not metal

* adjusting spawns (again)

* oh so that's how charge and energy budget work

* added recipes for the create decoration blocks

* bricks and rocks

* remove ad astra recipes

* added limpets to the moon

* Landing on Mars

Signed-off-by: SverhRazum-Nah <leon.trol@mail.ru>

* Man thats a lot

* added translations for vein types, rock types, and added ukranium

* rabbit adjustments

* removed cooking anorthite cobble into raw

* Pushin P

* Parity

* Move translation tokens to the language tokens JSON

* Remove bin and obj

* Update .gitignore

* Update .gitignore

Signed-off-by: Pyritie <pyritie@gmail.com>

* moon mobs again

* Ore Index being Written

* More PRogress

* Improve string formatting

* toned down realgar

* structures! shulkers! oh my!

* Some progress on the vein index writing

* replace obsidian with scorchia in meteors

* meteor adjustments

* Actual vein index

* add globes to loot table

* Project Completed

* added solar power values

* adjusted ad astra recipes, hid some of the items, added bedrock ores

* more fiddling with structures

* made the rover a bit cheaper

* comply with review

* anorthite dust

* retextured shulkers

* disabled stuff from species/endermanoverhaul

* texture tweak

* recipe tweak

* fixed space rocks being invisible on the map for some reason

* removed earth bauxite vein

* mars rock

* mars stuff

* starting work on mars biome generation

* put biomes in folders

* climate stuff

* more mars worldgen

* added carve tag to space blocks

* move to correct folder

* removed veins

* added armalcolite to the moon

* anorthite -> anorthosite

* plagioclase -> syenite

* dunite -> basanite

* what is climate

* climates again

* mars rock layers

* fixed the temps!

* Update tags.js

Signed-off-by: Pyritie <pyritie@gmail.com>

* Add a Solution file

* adding this back

* remove tools folder since it was moved to a different repo

* some stuff that didn't merge

* updates

* merges

* merges

---------

Signed-off-by: SverhRazum-Nah <leon.trol@mail.ru>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: SverhRazum-Nah <leon.trol@mail.ru>
Co-authored-by: Nebby1999 <nebby131999@gmail.com>
This commit is contained in:
Pyritie 2025-04-29 19:38:01 +01:00 committed by GitHub
parent 7606ee85c6
commit 7c86ce53c0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
227 changed files with 214667 additions and 753 deletions

View file

@ -4,6 +4,7 @@
* Событие регистрации предмет-тэгов.
*/
ServerEvents.tags('item', event => {
registerAdAstraItemTags(event)
registerAdvancedPeripheralsItemTags(event)
registerAE2ItemTags(event)
registerAFCItemTags(event)
@ -38,6 +39,7 @@ ServerEvents.tags('item', event => {
registerRailWaysItemTags(event)
registerRnrItemTags(event)
registerSophisticatedBackpacksItemTags(event)
registerSpeciesItemTags(event)
registerTFCAmbientalItemTags(event)
registerTFCItemTags(event)
registerTFCTextileItemTags(event)
@ -49,6 +51,7 @@ ServerEvents.tags('item', event => {
* Событие регистрации блок-тэгов.
*/
ServerEvents.tags('block', event => {
registerAdAstraBlockTags(event)
registerAE2BlockTags(event)
registerAFCBlockTags(event)
registerAsticorCartsBlockTags(event)
@ -72,6 +75,7 @@ ServerEvents.tags('block', event => {
registerHotOrNotBlockTags(event)
registerRailWaysBlockTags(event)
registerSophisticatedBackpacksBlockTags(event)
registerSpeciesBlockTags(event)
registerTFCBlockTags(event)
registerTFGBlockTags(event)
registerVintageImprovementsBlockTags(event)
@ -82,6 +86,7 @@ ServerEvents.tags('block', event => {
*/
ServerEvents.tags('fluid', event => {
registerAFCFluidTags(event)
registerAdAstraFluidTags(event)
registerCreateFluidTags(event)
registerCreateAdditionsFluidTags(event)
registerGTCEUFluidTags(event)
@ -96,6 +101,7 @@ ServerEvents.tags('fluid', event => {
* Событие регистрации тегов структур.
*/
ServerEvents.tags('worldgen/placed_feature', event => {
registerAdAstraPlacedFeatures(event)
registerFirmaLifePlacedFeatures(event)
registerTFCPlacedFeatures(event)
registerTFGPlacedFeatures(event)
@ -106,6 +112,14 @@ ServerEvents.tags('worldgen/biome', event => {
registerTFGBiomeTags(event)
})
ServerEvents.tags('worldgen/biome', event => {
registerAdAstraBiomeTags(event)
})
ServerEvents.tags('entity_type', event => {
registerAdAstraEntityTypeTags(event)
})
/**
* Событие регистрации датапаков (Здесь можно регистрировать теги, данные, рецепты, общий метод короче).
* Срабатывает до инициализации рецептов, но после тегов.
@ -147,11 +161,16 @@ GTCEuServerEvents.oreVeins(event => {
event.removeAll()
})
GTCEuServerEvents.bedrockOreVeins(event => {
registerGTCEUBedrockOreVeins(event)
})
/**
* Событие регистрации рецептов.
* Срабатывает после инициализации датапаков и тегов.
*/
ServerEvents.recipes(event => {
registerAdAstraRecipes(event)
registerAdvancedPeripheralsRecipes(event)
registerAlekishipsRecipes(event)
registerAE2Recipes(event)
@ -202,8 +221,8 @@ ServerEvents.recipes(event => {
registerTfceaRecipes(event)
registerTFCRecipes(event)
registerTFCBetterBFRecipes(event)
registerTFGRecipes(event)
registerTFCGroomingStationRecipes(event)
registerTFGRecipes(event)
registerToolBeltRecipes(event)
registerTreeTapRecipes(event)
registerVintageImprovementsRecipes(event)