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

@ -263,6 +263,16 @@ const registerAE2Recipes = (event) => {
D: '#forge:plates/titanium',
}).id('tfg:crafting/wireless_booster')
event.shaped('ae2:wireless_booster', [
'ABC',
'DDD',
], {
A: '#forge:dusts/fluix',
B: '#forge:gems/certus_quartz',
C: '#forge:plates/ender_pearl',
D: 'minecraft:shulker_shell',
}).id('tfg:crafting/wireless_booster_shulker')
// Memory Card
event.shaped('ae2:memory_card', [
'ABB',
@ -348,30 +358,42 @@ const registerAE2Recipes = (event) => {
E: 'ae2:terminal'
}).id('tfg:crafting/me_chest')
// ME Drive
event.shaped('ae2:drive', [
'ABA',
'CDC',
'EBE'
], {
A: '#forge:plates/steel',
B: 'ae2:engineering_processor',
C: '#ae2:glass_cable',
D: '#gtceu:circuits/lv',
E: '#forge:plates/titanium'
}).id('tfg:crafting/drive')
// ME Drive
event.shaped('ae2:drive', [
'ABA',
'CDC',
'EBE'
], {
A: '#forge:plates/steel',
B: 'ae2:engineering_processor',
C: '#ae2:glass_cable',
D: '#gtceu:circuits/mv',
E: '#forge:plates/titanium'
}).id('tfg:crafting/drive')
// Spatial Pylon
event.shaped('ae2:spatial_pylon', [
'ABA',
'CDC',
'ABA'
], {
A: '#forge:plates/glass',
B: '#ae2:glass_cable',
C: '#forge:dusts/fluix',
D: '#forge:gems/fluix',
}).id('tfg:crafting/spatial_pylon')
event.shaped('ae2:drive', [
'ABA',
'CDC',
'EBE'
], {
A: '#forge:plates/steel',
B: 'ae2:engineering_processor',
C: '#ae2:glass_cable',
D: '#gtceu:circuits/mv',
E: 'minecraft:shulker_shell'
}).id('tfg:crafting/drive_shulker')
// Spatial Pylon
event.shaped('ae2:spatial_pylon', [
'ABA',
'CDC',
'ABA'
], {
A: '#forge:plates/glass',
B: '#ae2:glass_cable',
C: '#forge:dusts/fluix',
D: '#forge:gems/fluix',
}).id('tfg:crafting/spatial_pylon')
// IO Port
event.shaped('ae2:io_port', [
@ -386,28 +408,52 @@ const registerAE2Recipes = (event) => {
E: 'ae2:engineering_processor'
}).id('tfg:crafting/io_port')
// Spatial IO Port
event.shaped('ae2:spatial_io_port', [
'AAA',
'BCB',
'DED'
], {
A: '#forge:plates/glass',
B: '#ae2:glass_cable',
C: 'ae2:io_port',
D: '#forge:plates/titanium',
E: 'ae2:engineering_processor'
}).id('tfg:crafting/spatial_io_port')
event.shaped('ae2:io_port', [
'AAA',
'BCB',
'DED'
], {
A: '#forge:plates/glass',
B: 'ae2:drive',
C: '#ae2:glass_cable',
D: 'minecraft:shulker_shell',
E: 'ae2:engineering_processor'
}).id('tfg:crafting/io_port_shulker')
// Monitors
event.shapeless('ae2:semi_dark_monitor', ['ae2:dark_monitor'])
.id('tfg:crafting/semi_dark_monitor_2')
// Spatial IO Port
event.shaped('ae2:spatial_io_port', [
'AAA',
'BCB',
'DED'
], {
A: '#forge:plates/glass',
B: '#ae2:glass_cable',
C: 'ae2:io_port',
D: '#forge:plates/titanium',
E: 'ae2:engineering_processor'
}).id('tfg:crafting/spatial_io_port')
event.shapeless('ae2:dark_monitor', ['ae2:monitor'])
.id('tfg:crafting/dark_monitor')
event.shaped('ae2:spatial_io_port', [
'AAA',
'BCB',
'DED'
], {
A: '#forge:plates/glass',
B: '#ae2:glass_cable',
C: 'ae2:io_port',
D: 'minecraft:shulker_shell',
E: 'ae2:engineering_processor'
}).id('tfg:crafting/spatial_io_port_shulker')
event.shapeless('ae2:monitor', ['ae2:semi_dark_monitor'])
.id('tfg:crafting/monitor')
// Monitors
event.shapeless('ae2:semi_dark_monitor', ['ae2:dark_monitor'])
.id('tfg:crafting/semi_dark_monitor_2')
event.shapeless('ae2:dark_monitor', ['ae2:monitor'])
.id('tfg:crafting/dark_monitor')
event.shapeless('ae2:monitor', ['ae2:semi_dark_monitor'])
.id('tfg:crafting/monitor')
// Cell Workbench
event.shaped('ae2:cell_workbench', [
@ -854,29 +900,41 @@ const registerAE2Recipes = (event) => {
.duration(200)
.EUt(480)
// 4k storage components
event.recipes.gtceu.assembler('ae2:cell_component_4k')
.itemInputs(
'4x #gtceu:circuits/ev',
'4x #forge:plates/titanium',
'4x #forge:dusts/certus_quartz',
'ae2:logic_processor')
.inputFluids(Fluid.of('gtceu:steel', 144))
.itemOutputs('ae2:cell_component_4k')
.duration(200)
.EUt(1920)
.cleanroom(CleanroomType.CLEANROOM)
// 4k storage components
event.recipes.gtceu.assembler('ae2:cell_component_4k')
.itemInputs(
'4x #gtceu:circuits/ev',
'4x #forge:plates/titanium',
'4x #forge:dusts/certus_quartz',
'ae2:logic_processor')
.inputFluids(Fluid.of('gtceu:steel', 144))
.itemOutputs('ae2:cell_component_4k')
.duration(200)
.EUt(1920)
.cleanroom(CleanroomType.CLEANROOM)
event.recipes.gtceu.assembler('ae2:cell_component_4k_1k')
.itemInputs(
'ae2:logic_processor',
'2x #gtceu:circuits/ev',
'4x ae2:cell_component_1k')
.inputFluids(Fluid.of('gtceu:steel', 144))
.itemOutputs('ae2:cell_component_4k')
.duration(400)
.EUt(1920)
.cleanroom(CleanroomType.CLEANROOM)
event.recipes.gtceu.assembler('ae2:cell_component_4k_shulker')
.itemInputs(
'4x #gtceu:circuits/ev',
'4x minecraft:shulker_shell',
'4x #forge:dusts/certus_quartz',
'ae2:logic_processor')
.inputFluids(Fluid.of('gtceu:steel', 144))
.itemOutputs('ae2:cell_component_4k')
.duration(200)
.EUt(1920)
.cleanroom(CleanroomType.CLEANROOM)
event.recipes.gtceu.assembler('ae2:cell_component_4k_1k')
.itemInputs(
'ae2:logic_processor',
'2x #gtceu:circuits/ev',
'4x ae2:cell_component_1k')
.inputFluids(Fluid.of('gtceu:steel', 144))
.itemOutputs('ae2:cell_component_4k')
.duration(400)
.EUt(1920)
.cleanroom(CleanroomType.CLEANROOM)
// 16k storage components
event.recipes.gtceu.assembler('ae2:cell_component_16k')
@ -1154,18 +1212,30 @@ const registerAE2Recipes = (event) => {
// ME Контроллер
event.recipes.gtceu.assembler('ae2:controller')
.itemInputs(
'2x ae2:engineering_processor',
'2x #gtceu:circuits/hv',
'2x #forge:plates/titanium',
'ae2:fluix_block')
.inputFluids(Fluid.of('gtceu:polyethylene', 144))
.itemOutputs('ae2:controller')
.duration(200)
.EUt(480)
.cleanroom(CleanroomType.CLEANROOM)
.itemInputs(
'2x ae2:engineering_processor',
'2x #gtceu:circuits/hv',
'2x #forge:plates/titanium',
'ae2:fluix_block')
.inputFluids(Fluid.of('gtceu:polyethylene', 144))
.itemOutputs('ae2:controller')
.duration(200)
.EUt(480)
.cleanroom(CleanroomType.CLEANROOM)
//#region ME Interfaces
event.recipes.gtceu.assembler('ae2:controller_shulker')
.itemInputs(
'2x ae2:engineering_processor',
'2x #gtceu:circuits/hv',
'2x minecraft:shulker_shell',
'ae2:fluix_block')
.inputFluids(Fluid.of('gtceu:polyethylene', 144))
.itemOutputs('ae2:controller')
.duration(200)
.EUt(480)
.cleanroom(CleanroomType.CLEANROOM)
//#region ME Interfaces
// MV
event.recipes.gtceu.assembler('ae2:interface_mv')
@ -1636,65 +1706,37 @@ const registerAE2Recipes = (event) => {
.category(GTRecipeCategories.CHEM_DYES)
};
// Inscriber Silicon Press
event.recipes.gtceu.laser_engraver('ae2:silicon_press_iron')
.itemInputs('#forge:plates/cast_iron')
.notConsumable('#forge:lenses/white')
.itemOutputs('ae2:silicon_press')
.duration(12000)
.EUt(116)
// Inscriber Silicon Press
event.recipes.gtceu.forming_press('ae2:silicon_press_stainless_steel')
.itemInputs('#forge:plates/stainless_steel')
.notConsumable('ae2:silicon_press')
.itemOutputs('ae2:silicon_press')
.duration(100)
.EUt(480)
event.recipes.gtceu.laser_engraver('ae2:silicon_press_wrought_iron')
.itemInputs('#forge:plates/wrought_iron')
.notConsumable('#forge:lenses/white')
.itemOutputs('ae2:silicon_press')
.duration(8000)
.EUt(116)
// Inscriber logic Press
event.recipes.gtceu.forming_press('ae2:logic_processor_press_stainless_steel')
.itemInputs('#forge:plates/stainless_steel')
.notConsumable('ae2:logic_processor_press')
.itemOutputs('ae2:logic_processor_press')
.duration(100)
.EUt(480)
// Inscriber logic Press
event.recipes.gtceu.laser_engraver('ae2:logic_processor_press_iron')
.itemInputs('#forge:plates/cast_iron')
.notConsumable('#forge:lenses/green')
.itemOutputs('ae2:logic_processor_press')
.duration(12000)
.EUt(116)
// Inscriber engineering Press
event.recipes.gtceu.forming_press('ae2:engineering_press_stainless_steel')
.itemInputs('#forge:plates/stainless_steel')
.notConsumable('ae2:engineering_processor_press')
.itemOutputs('ae2:engineering_processor_press')
.duration(100)
.EUt(480)
event.recipes.gtceu.laser_engraver('ae2:logic_processor_press_wrought_iron')
.itemInputs('#forge:plates/wrought_iron')
.notConsumable('#forge:lenses/green')
.itemOutputs('ae2:logic_processor_press')
.duration(8000)
.EUt(116)
// Inscriber engineering Press
event.recipes.gtceu.laser_engraver('ae2:engineering_press_iron')
.itemInputs('#forge:plates/cast_iron')
.notConsumable('#forge:lenses/light_blue')
.itemOutputs('ae2:engineering_processor_press')
.duration(12000)
.EUt(116)
event.recipes.gtceu.laser_engraver('ae2:engineering_press_wrought_iron')
.itemInputs('#forge:plates/wrought_iron')
.notConsumable('#forge:lenses/light_blue')
.itemOutputs('ae2:engineering_processor_press')
.duration(8000)
.EUt(116)
// Inscriber calculation Press
event.recipes.gtceu.laser_engraver('ae2:calculation_press_iron')
.itemInputs('#forge:plates/cast_iron')
.notConsumable('#forge:lenses/blue')
.itemOutputs('ae2:calculation_processor_press')
.duration(12000)
.EUt(116)
event.recipes.gtceu.laser_engraver('ae2:calculation_press_wrought_iron')
.itemInputs('#forge:plates/wrought_iron')
.notConsumable('#forge:lenses/blue')
.itemOutputs('ae2:calculation_processor_press')
.duration(8000)
.EUt(116)
// Inscriber calculation Press
event.recipes.gtceu.forming_press('ae2:calculation_press_stainless_steel')
.itemInputs('#forge:plates/stainless_steel')
.notConsumable('ae2:calculation_processor_press')
.itemOutputs('ae2:calculation_processor_press')
.duration(100)
.EUt(480)
// Quartz Fiber
event.recipes.gtceu.wiremill('ae2:quartz_fiber_certus')