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

@ -2,6 +2,7 @@
function registerTFGCollapseRecipes(event) {
// #region Nether
event.recipes.tfc.collapse('minecraft:cobbled_deepslate', 'minecraft:deepslate')
event.recipes.tfc.collapse('minecraft:cobbled_deepslate', 'tfg:rock/hardened_deepslate')
event.recipes.tfc.collapse('minecraft:blackstone', 'minecraft:blackstone')
@ -13,8 +14,23 @@ function registerTFGCollapseRecipes(event) {
event.recipes.tfc.collapse('minecraft:cobbled_deepslate', '#forge:ores_in_ground/deepslate')
event.recipes.tfc.collapse('minecraft:blackstone', '#forge:ores_in_ground/pyroxenite')
event.recipes.tfc.collapse('minecraft:dripstone_block', '#forge:ores_in_ground/dripstone')
event.recipes.tfc.landslide('tfg:ash_pile', 'tfg:ash_pile')
event.recipes.tfc.landslide('minecraft:cobbled_deepslate', 'minecraft:cobbled_deepslate')
// #endregion Nether
// #region Space
event.recipes.tfc.collapse('ad_astra:moon_cobblestone', 'tfg:raw_anorthosite')
event.recipes.tfc.collapse('ad_astra:moon_cobblestone', 'tfg:hardened_anorthosite')
event.recipes.tfc.collapse('tfg:raw_basanite', 'tfg:raw_basanite')
event.recipes.tfc.landslide('ad_astra:moon_cobblestone', 'ad_astra:moon_cobblestone')
event.recipes.tfc.landslide('ad_astra:moon_sand', 'ad_astra:moon_sand')
event.recipes.tfc.collapse('ad_astra:mars_cobblestone', 'tfg:raw_syenite')
event.recipes.tfc.collapse('ad_astra:mars_cobblestone', 'tfg:hardened_syenite')
event.recipes.tfc.landslide('ad_astra:mars_cobblestone', 'ad_astra:mars_cobblestone')
event.recipes.tfc.landslide('ad_astra:mars_sand', 'ad_astra:mars_sand')
// #endregion
}

View file

@ -10,7 +10,9 @@ function registerTFGRockRecipes(event) {
{ loose: 'tfg:loose/deepslate', block: 'minecraft:cobbled_deepslate' },
{ loose: 'beneath:blackstone_pebble', block: 'minecraft:blackstone' },
{ loose: 'tfg:brick/deepslate', block: '4x minecraft:deepslate_bricks' },
{ loose: 'tfg:loose/dripstone', block: 'minecraft:dripstone_block' }
{ loose: 'tfg:loose/dripstone', block: 'minecraft:dripstone_block' },
{ loose: 'tfg:loose/anorthosite', block: 'ad_astra:moon_cobblestone' },
{ loose: 'tfg:loose/syenite', block: 'ad_astra:mars_cobblestone' }
]
GLUEING_TOGETHER.forEach(x => {
@ -35,7 +37,9 @@ function registerTFGRockRecipes(event) {
// loose to bricks
const LOOSE_TO_BRICKS = [
{ loose: 'tfg:loose/deepslate', brick: 'tfg:brick/deepslate' }
{ loose: 'tfg:loose/deepslate', brick: 'tfg:brick/deepslate' },
{ loose: 'tfg:loose/anorthosite', brick: 'tfg:brick/anorthosite' },
{ loose: 'tfg:loose/syenite', brick: 'tfg:brick/syenite' }
]
LOOSE_TO_BRICKS.forEach(x => {
@ -109,7 +113,10 @@ function registerTFGRockRecipes(event) {
{ raw: 'minecraft:cobbled_deepslate', hammered: 'tfc:sand/black' },
{ raw: 'minecraft:blackstone', hammered: 'tfc:sand/black' },
{ raw: 'beneath:crackrack', hammered: 'tfc:sand/pink' },
{ raw: 'minecraft:dripstone_block', hammered: 'tfc:sand/brown' }
{ raw: 'minecraft:dripstone_block', hammered: 'tfc:sand/brown' },
{ raw: 'tfg:raw_anorthosite', hammered: 'ad_astra:moon_cobblestone' },
{ raw: 'tfg:hardened_anorthosite', hammered: 'ad_astra:moon_cobblestone' },
{ raw: 'ad_astra:moon_cobblestone', hammered: 'tfc:sand/white' }
]
HAMMERING.forEach(x => {
@ -255,5 +262,20 @@ function registerTFGRockRecipes(event) {
.EUt(7)
})
event.recipes.gtceu.rock_breaker('tfg:raw_anorthosite')
.notConsumable('tfg:raw_anorthosite')
.itemOutputs('tfg:raw_anorthosite')
.duration(16)
.EUt(7)
.dimension('ad_astra:moon')
event.recipes.gtceu.rock_breaker('tfg:raw_basanite')
.notConsumable('tfg:raw_basanite')
.itemOutputs('tfg:raw_basanite')
.duration(16)
.EUt(7)
.dimension('ad_astra:moon')
// #endregion
}