From 260851074c39b56dfdf208580b912e54e850b2ff Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 2 Feb 2026 23:42:42 +0000 Subject: [PATCH] Feature/venus stone ores (#2961) * langs * fix veins * missing knapping textures * rename ignimbrite features * new ores * feature stuff * entity tweaks --- kubejs/assets/betterend/lang/es_es.json | 10 +-- kubejs/assets/gtceu/lang/en_us.json | 2 + .../entries/tfg_ores/venus_vein_index.json | 4 +- .../entries/tfg_ores/venus_vein_index.json | 4 +- .../entries/tfg_ores/venus_vein_index.json | 4 +- .../entries/tfg_ores/venus_vein_index.json | 4 +- .../entries/tfg_ores/venus_vein_index.json | 4 +- .../entries/tfg_ores/venus_vein_index.json | 4 +- .../entries/tfg_ores/venus_vein_index.json | 4 +- .../textures/gui/knapping/loose/flavolite.png | Bin 0 -> 222 bytes .../gui/knapping/loose/sandy_jadestone.png | Bin 0 -> 187 bytes .../textures/gui/knapping/loose/scorchia.png | Bin 0 -> 208 bytes .../textures/gui/knapping/loose/scoria.png | Bin 0 -> 208 bytes kubejs/data/ad_astra/dimension/venus.json | 27 +++++- .../tfg/worldgen/biome/venus/arachnoids.json | 20 +++-- .../worldgen/biome/venus/fractured_pools.json | 20 +++-- .../tfg/worldgen/biome/venus/fumaroles.json | 19 +++-- .../tfg/worldgen/biome/venus/geysers.json | 19 +++-- .../biome/venus/jagged_tablelands.json | 65 +++++++++++--- .../tfg/worldgen/biome/venus/salt_flats.json | 20 +++-- .../biome/venus/scorching_volcanoes.json | 30 ++++--- .../biome/venus/stromatolite_beach.json | 20 +++-- .../worldgen/biome/venus/sulfuric_ravine.json | 19 +++-- .../venus/surface/adakite_spikes.json | 62 ++++++++++++++ .../venus/surface/crimsite_spikes.json | 80 ++++++++++++++++++ .../venus/surface/loose_crackrack.json | 55 ++++++++++++ .../venus/surface/loose_scorchia.json | 55 ++++++++++++ .../venus/surface/loose_scoria.json | 55 ++++++++++++ .../venus/surface/ochrum_spikes.json | 80 ++++++++++++++++++ ...rite_columns.json => thermal_columns.json} | 0 ...ignimbrite_disk.json => thermal_disk.json} | 0 ...ube_worms.json => thermal_tube_worms.json} | 0 ...nimbrite_vents.json => thermal_vents.json} | 0 .../venus/vein/venus_manual_salt.json | 46 ++++++++++ .../venus/vein/venus_manual_sulfur.json | 53 +++++++++++- .../worldgen/noise_settings/venus_noise.json | 13 +-- .../venus/surface/adakite_spikes.json | 23 +++++ .../venus/surface/crimsite_spikes.json | 23 +++++ .../venus/surface/loose_crackrack.json | 12 +++ .../venus/surface/loose_scorchia.json | 12 +++ .../venus/surface/loose_scoria.json | 12 +++ .../venus/surface/ochrum_spikes.json | 23 +++++ .../venus/terrain/lava_spring_rare.json | 12 +++ .../venus/terrain/thermal_vent.json | 8 +- .../venus/terrain/thermal_vent_rare.json | 8 +- kubejs/server_scripts/tfg/mars/tags.mars.js | 1 + .../tfg/natural_blocks/tags.stones.js | 4 +- kubejs/server_scripts/tfg/venus/tags.venus.js | 19 ++++- kubejs/startup_scripts/gtceu/constants.js | 4 +- .../tfg/stone_types/constants.rocks.js | 4 +- .../tfg/stone_types/tag_prefixes.rocks.js | 18 ++++ 51 files changed, 850 insertions(+), 131 deletions(-) create mode 100644 kubejs/assets/tfc/textures/gui/knapping/loose/flavolite.png create mode 100644 kubejs/assets/tfc/textures/gui/knapping/loose/sandy_jadestone.png create mode 100644 kubejs/assets/tfc/textures/gui/knapping/loose/scorchia.png create mode 100644 kubejs/assets/tfc/textures/gui/knapping/loose/scoria.png create mode 100644 kubejs/data/tfg/worldgen/configured_feature/venus/surface/adakite_spikes.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/venus/surface/crimsite_spikes.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_crackrack.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_scorchia.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_scoria.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/venus/surface/ochrum_spikes.json rename kubejs/data/tfg/worldgen/configured_feature/venus/terrain/{ignimbrite_columns.json => thermal_columns.json} (100%) rename kubejs/data/tfg/worldgen/configured_feature/venus/terrain/{ignimbrite_disk.json => thermal_disk.json} (100%) rename kubejs/data/tfg/worldgen/configured_feature/venus/terrain/{ignimbrite_tube_worms.json => thermal_tube_worms.json} (100%) rename kubejs/data/tfg/worldgen/configured_feature/venus/terrain/{ignimbrite_vents.json => thermal_vents.json} (100%) create mode 100644 kubejs/data/tfg/worldgen/placed_feature/venus/surface/adakite_spikes.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/venus/surface/crimsite_spikes.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/venus/surface/loose_crackrack.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/venus/surface/loose_scorchia.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/venus/surface/loose_scoria.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/venus/surface/ochrum_spikes.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lava_spring_rare.json diff --git a/kubejs/assets/betterend/lang/es_es.json b/kubejs/assets/betterend/lang/es_es.json index b20b22cf0..eb5e160e3 100644 --- a/kubejs/assets/betterend/lang/es_es.json +++ b/kubejs/assets/betterend/lang/es_es.json @@ -46,11 +46,11 @@ "block.betterend.filalux_wings": "Alas filalúceas", "block.betterend.flamaea": "Hongo flamigero", "block.betterend.flammalix": "Hongo flamante", - "block.betterend.flavolite": "Lucitita en bruto", - "block.betterend.flavolite_bricks": "Ladrillos de lucitita", - "block.betterend.flavolite_pillar": "Pilar de lucitita", - "block.betterend.flavolite_polished": "Lucitita pulida", - "block.betterend.flavolite_tiles": "Baldosas de lucitita", + "block.betterend.flavolite": "Ignimbrita en bruto", + "block.betterend.flavolite_bricks": "Ladrillos de ignimbrita", + "block.betterend.flavolite_pillar": "Pilar de ignimbrita", + "block.betterend.flavolite_polished": "Ignimbrita pulida", + "block.betterend.flavolite_tiles": "Baldosas de ignimbrita", "block.betterend.fracturn": "Fracturno", "block.betterend.glacian_hymenophore": "Himenóforo glacial", "block.betterend.globulagus": "Globulago", diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 1da35e6fc..7e6050d1c 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -248,6 +248,8 @@ "tagprefix.deepslate": "Migmatite %s Ore", "tagprefix.pyroxenite": "Pyroxenite %s Ore", "tagprefix.dripstone": "Travertine %s Ore", + "tagprefix.sandy_jadestone": "Lamproite %s Ore", + "tagprefix.flavolite": "Ignimbrite %s Ore", "gtceu.tooltip.machine.moon_dust_harvester_1": "§7Extraterrestrial Vacuum Cleaner§r", "gtceu.tooltip.machine.moon_dust_harvester_2": "§7Harvests infinite Regolith Dust depending on the biome its placed in.§r", "gtceu.tooltip.machine.ostrum_harvester_1": "§7Legally Distinct Spice Crawler§r", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/venus_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/venus_vein_index.json index b24ac9b4c..aa0337fbd 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/venus_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/venus_vein_index.json @@ -19,7 +19,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/30 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Wide and flat)Disc Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 40 — 65$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)Height$(): 6$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite, Trachyte, Travertine$(br2)Only appears in the $(thing)Salt Flats$() biome.", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/30 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Wide and flat)Disc Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 40 — 65$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)Height$(): 6$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Ignimbrite, Lamproite, Rhyolite, Trachyte, Travertine$(br2)Only appears in the $(thing)Salt Flats$() biome.", "title": "Salts & Spodumene", "type": "patchouli:text", "anchor": "venus_manual_salt" @@ -111,7 +111,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/30 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 40 — 65$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite, Trachyte, Travertine$(br2)Only appears in the $(thing)Sulfuric Ravines$() biome.", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/30 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 40 — 65$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Ignimbrite, Lamproite, Rhyolite, Trachyte, Travertine$(br2)Only appears in the $(thing)Sulfuric Ravines$() biome.", "title": "Sulfur & Pyrite", "type": "patchouli:text", "anchor": "venus_manual_sulfur" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/venus_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/venus_vein_index.json index b24ac9b4c..aa0337fbd 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/venus_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/venus_vein_index.json @@ -19,7 +19,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/30 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Wide and flat)Disc Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 40 — 65$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)Height$(): 6$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite, Trachyte, Travertine$(br2)Only appears in the $(thing)Salt Flats$() biome.", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/30 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Wide and flat)Disc Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 40 — 65$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)Height$(): 6$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Ignimbrite, Lamproite, Rhyolite, Trachyte, Travertine$(br2)Only appears in the $(thing)Salt Flats$() biome.", "title": "Salts & Spodumene", "type": "patchouli:text", "anchor": "venus_manual_salt" @@ -111,7 +111,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/30 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 40 — 65$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite, Trachyte, Travertine$(br2)Only appears in the $(thing)Sulfuric Ravines$() biome.", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/30 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 40 — 65$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Ignimbrite, Lamproite, Rhyolite, Trachyte, Travertine$(br2)Only appears in the $(thing)Sulfuric Ravines$() biome.", "title": "Sulfur & Pyrite", "type": "patchouli:text", "anchor": "venus_manual_sulfur" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ja_jp/entries/tfg_ores/venus_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ja_jp/entries/tfg_ores/venus_vein_index.json index b24ac9b4c..b63bea0b9 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ja_jp/entries/tfg_ores/venus_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ja_jp/entries/tfg_ores/venus_vein_index.json @@ -19,7 +19,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/30 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Wide and flat)Disc Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 40 — 65$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)Height$(): 6$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite, Trachyte, Travertine$(br2)Only appears in the $(thing)Salt Flats$() biome.", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/30 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Wide and flat)Disc Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 40 — 65$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)Height$(): 6$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite, Trachyte, Travertine, イグニンブライト, ランプロアイト$(br2)Only appears in the $(thing)Salt Flats$() biome.", "title": "Salts & Spodumene", "type": "patchouli:text", "anchor": "venus_manual_salt" @@ -111,7 +111,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/30 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 40 — 65$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite, Trachyte, Travertine$(br2)Only appears in the $(thing)Sulfuric Ravines$() biome.", + "text": "$(thing)$(t:The chance of a vein generating per chunk. Smaller bottom numbers are more common.)Rarity$(/t)$(): 1/30 chunks$(br)$(thing)$(t:The percentage of blocks in a vein that are ores instead of stone. A bigger percentage means more ores.)Density$(/t)$(): 20%$(br)$(thing)$(t:The shape of the vein.)Type$(/t)$(): $(t:Mostly round shaped)Cluster Vein$(/t)$(br)$(thing)$(t:The Y levels that the vein can generate between.)Y$(/t)$(): 40 — 65$(br)$(thing)$(t:The average diameter of the vein)Size$(/t)$(): 20$(br)$(thing)$(t:If the distance between the surface and the ore vein is larger than this number, the ore vein will not generate surface indicators.)Indicator Max Depth$(/t)$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite, Trachyte, Travertine, イグニンブライト, ランプロアイト$(br2)Only appears in the $(thing)Sulfuric Ravines$() biome.", "title": "Sulfur & Pyrite", "type": "patchouli:text", "anchor": "venus_manual_sulfur" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/venus_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/venus_vein_index.json index 9fd5f17e3..b2d841c0c 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/venus_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/pt_br/entries/tfg_ores/venus_vein_index.json @@ -19,7 +19,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Raridade$(): 1/30 chunks$(br)$(thing)Densidade$(): 20%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 40 — 65$(br)$(thing)Tamanho$(): 20$(br)$(thing)Profundidade Máxima do Indicador$(): 30$(br2)$(thing)Tipos de Pedra$(): Andesito, Basalto, Dacito, Riolito, Traquito, Travertino", + "text": "$(thing)Raridade$(): 1/30 chunks$(br)$(thing)Densidade$(): 20%$(br)$(thing)Tipo$(): Veio Aglomerado$(br)$(thing)Y$(): 40 — 65$(br)$(thing)Tamanho$(): 20$(br)$(thing)Profundidade Máxima do Indicador$(): 30$(br2)$(thing)Tipos de Pedra$(): Andesito, Basalto, Dacito, Ignimbrito, Lamproíto, Riolito, Traquito, Travertino", "title": "Enxofre e Pirita", "type": "patchouli:text", "anchor": "venus_manual_sulfur" @@ -86,7 +86,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Raridade$(): 1/30 chunks$(br)$(thing)Densidade$(): 20%$(br)$(thing)Tipo$(): Veio em Disco$(br)$(thing)Y$(): 40 — 65$(br)$(thing)Tamanho$(): 20$(br)$(thing)Altura$(): 6$(br)$(thing)Profundidade Máxima do Indicador$(): 30$(br2)$(thing)Tipos de Pedra$(): Andesito, Basalto, Dacito, Riolito, Traquito, Travertino$(br2)Only appears in the $(thing)Salt Flats$() biome.", + "text": "$(thing)Raridade$(): 1/30 chunks$(br)$(thing)Densidade$(): 20%$(br)$(thing)Tipo$(): Veio em Disco$(br)$(thing)Y$(): 40 — 65$(br)$(thing)Tamanho$(): 20$(br)$(thing)Altura$(): 6$(br)$(thing)Profundidade Máxima do Indicador$(): 30$(br2)$(thing)Tipos de Pedra$(): Andesito, Basalto, Dacito, Ignimbrito, Lamproíto, Riolito, Traquito, Travertino$(br2)Only appears in the $(thing)Salt Flats$() biome.", "title": "Salts & Spodumene", "type": "patchouli:text", "anchor": "venus_manual_salt" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/venus_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/venus_vein_index.json index ad813fd4e..a0e933ece 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/venus_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/ru_ru/entries/tfg_ores/venus_vein_index.json @@ -19,7 +19,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:Вероятность генерации жилы в чанке. Чем меньше знаменатель(второе число), тем чаще встречается.)Редкость$(/t)$(): 1/30 на чанк$(br)$(thing)$(t:Содержание блоков руды в жиле заменяющих камень. Большее значение означает больше руды.)Плотность$(/t)$(): 20%$(br)$(thing)$(t:Форма жилы.)Вид$(/t)$(): $(t:Широкая и плоская)Дискообразная жила$(/t)$(br)$(thing)$(t:Уровни Y, между которыми может сгенерироваться жила.)Y-уровень$(/t)$(): 40 — 65$(br)$(thing)(t:Средний диаметр жилы)Размер$(/t)$(): 20$(br)$(thing)Высота$(): 6$(br)$(thing)$(t:Если расстояние между поверхностью и жилой больше чем это число, то жила не сгененрирует индикаторы на поверхности.)Максимальная высота индикатора$(/t)$(): 30$(br2)$(thing)Виды камней$(): Андезит, Базальт, Дацит, Риолит, Травертин, Трахит$(br2)Only appears in the $(thing)Salt Flats$() biome.", + "text": "$(thing)$(t:Вероятность генерации жилы в чанке. Чем меньше знаменатель(второе число), тем чаще встречается.)Редкость$(/t)$(): 1/30 на чанк$(br)$(thing)$(t:Содержание блоков руды в жиле заменяющих камень. Большее значение означает больше руды.)Плотность$(/t)$(): 20%$(br)$(thing)$(t:Форма жилы.)Вид$(/t)$(): $(t:Широкая и плоская)Дискообразная жила$(/t)$(br)$(thing)$(t:Уровни Y, между которыми может сгенерироваться жила.)Y-уровень$(/t)$(): 40 — 65$(br)$(thing)(t:Средний диаметр жилы)Размер$(/t)$(): 20$(br)$(thing)Высота$(): 6$(br)$(thing)$(t:Если расстояние между поверхностью и жилой больше чем это число, то жила не сгененрирует индикаторы на поверхности.)Максимальная высота индикатора$(/t)$(): 30$(br2)$(thing)Виды камней$(): Андезит, Базальт, Дацит, Игнимбрит, Лампроит, Риолит, Травертин, Трахит$(br2)Only appears in the $(thing)Salt Flats$() biome.", "title": "Salts & Spodumene", "type": "patchouli:text", "anchor": "venus_manual_salt" @@ -111,7 +111,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)$(t:Вероятность генерации жилы в чанке. Чем меньше знаменатель(второе число), тем чаще встречается.)Редкость$(/t)$(): 1/30 на чанк$(br)$(thing)$(t:Содержание блоков руды в жиле заменяющих камень. Большее значение означает больше руды.)Плотность$(/t)$(): 20%$(br)$(thing)$(t:Форма жилы.)Вид$(/t)$(): $(t:Зачастую круглой формы)Кластерная жила$(/t)$(br)$(thing)$(t:Уровни Y, между которыми может сгенерироваться жила.)Y-уровень$(/t)$(): 40 — 65$(br)$(thing)(t:Средний диаметр жилы)Размер$(/t)$(): 20$(br)$(thing)$(t:Если расстояние между поверхностью и жилой больше чем это число, то жила не сгененрирует индикаторы на поверхности.)Максимальная высота индикатора$(/t)$(): 30$(br2)$(thing)Виды камней$(): Андезит, Базальт, Дацит, Риолит, Травертин, Трахит", + "text": "$(thing)$(t:Вероятность генерации жилы в чанке. Чем меньше знаменатель(второе число), тем чаще встречается.)Редкость$(/t)$(): 1/30 на чанк$(br)$(thing)$(t:Содержание блоков руды в жиле заменяющих камень. Большее значение означает больше руды.)Плотность$(/t)$(): 20%$(br)$(thing)$(t:Форма жилы.)Вид$(/t)$(): $(t:Зачастую круглой формы)Кластерная жила$(/t)$(br)$(thing)$(t:Уровни Y, между которыми может сгенерироваться жила.)Y-уровень$(/t)$(): 40 — 65$(br)$(thing)(t:Средний диаметр жилы)Размер$(/t)$(): 20$(br)$(thing)$(t:Если расстояние между поверхностью и жилой больше чем это число, то жила не сгененрирует индикаторы на поверхности.)Максимальная высота индикатора$(/t)$(): 30$(br2)$(thing)Виды камней$(): Андезит, Базальт, Дацит, Игнимбрит, Лампроит, Риолит, Травертин, Трахит", "title": "Сера и Пирит", "type": "patchouli:text", "anchor": "venus_manual_sulfur" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/venus_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/venus_vein_index.json index e2cf19252..755e2793c 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/venus_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/uk_ua/entries/tfg_ores/venus_vein_index.json @@ -19,7 +19,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Рідкість$(): 1/30 чанків$(br)$(thing)Щільність$(): 20%$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): 40 — 65$(br)$(thing)Розмір$(): 20$(br)$(thing)Індикатор Max Depth$(): 30$(br2)$(thing)Типи каменю$(): Андезит, Базальт, Дацит, Ріоліт, Травертин, Трахіт", + "text": "$(thing)Рідкість$(): 1/30 чанків$(br)$(thing)Щільність$(): 20%$(br)$(thing)Тип$(): Кластерна вена$(br)$(thing)Y$(): 40 — 65$(br)$(thing)Розмір$(): 20$(br)$(thing)Індикатор Max Depth$(): 30$(br2)$(thing)Типи каменю$(): Iгнімбрит, Андезит, Базальт, Дацит, Лампроїт, Ріоліт, Травертин, Трахіт", "title": "Сірка та Пірит", "type": "patchouli:text", "anchor": "venus_manual_sulfur" @@ -86,7 +86,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)Рідкість$(): 1/30 чанків$(br)$(thing)Щільність$(): 20%$(br)$(thing)Тип$(): Дискова вена$(br)$(thing)Y$(): 40 — 65$(br)$(thing)Розмір$(): 20$(br)$(thing)Висота$(): 6$(br)$(thing)Індикатор Max Depth$(): 30$(br2)$(thing)Типи каменю$(): Андезит, Базальт, Дацит, Ріоліт, Травертин, Трахіт", + "text": "$(thing)Рідкість$(): 1/30 чанків$(br)$(thing)Щільність$(): 20%$(br)$(thing)Тип$(): Дискова вена$(br)$(thing)Y$(): 40 — 65$(br)$(thing)Розмір$(): 20$(br)$(thing)Висота$(): 6$(br)$(thing)Індикатор Max Depth$(): 30$(br2)$(thing)Типи каменю$(): Iгнімбрит, Андезит, Базальт, Дацит, Лампроїт, Ріоліт, Травертин, Трахіт", "title": "Солі і Сподумен", "type": "patchouli:text", "anchor": "venus_manual_salt" diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/venus_vein_index.json b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/venus_vein_index.json index c7df0df3f..eb801f189 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/venus_vein_index.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/zh_cn/entries/tfg_ores/venus_vein_index.json @@ -19,7 +19,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)稀有度$(): 1/30 区块$(br)$(thing)密度$(): 20%$(br)$(thing)类型$(): 盘状矿脉$(br)$(thing)Y 坐标$(): 40 — 65$(br)$(thing)尺寸$(): 20$(br)$(thing)高度$(): 6$(br)$(thing)指示器最大深度$(): 30$(br2)$(thing)岩石类型$(): 安山岩, 流纹岩, 玄武岩, 石灰华, 粗面岩, 英安岩", + "text": "$(thing)稀有度$(): 1/30 区块$(br)$(thing)密度$(): 20%$(br)$(thing)类型$(): 盘状矿脉$(br)$(thing)Y 坐标$(): 40 — 65$(br)$(thing)尺寸$(): 20$(br)$(thing)高度$(): 6$(br)$(thing)指示器最大深度$(): 30$(br2)$(thing)岩石类型$(): 天然煌斑岩, 天然熔灰岩, 安山岩, 流纹岩, 玄武岩, 石灰华, 粗面岩, 英安岩", "title": "盐, 锂辉石", "type": "patchouli:text", "anchor": "venus_manual_salt" @@ -111,7 +111,7 @@ }, { "Type": "patchouli:text", - "text": "$(thing)稀有度$(): 1/30 区块$(br)$(thing)密度$(): 20%$(br)$(thing)类型$(): 团簇状矿脉$(br)$(thing)Y 坐标$(): 40 — 65$(br)$(thing)尺寸$(): 20$(br)$(thing)指示器最大深度$(): 30$(br2)$(thing)岩石类型$(): 安山岩, 流纹岩, 玄武岩, 石灰华, 粗面岩, 英安岩", + "text": "$(thing)稀有度$(): 1/30 区块$(br)$(thing)密度$(): 20%$(br)$(thing)类型$(): 团簇状矿脉$(br)$(thing)Y 坐标$(): 40 — 65$(br)$(thing)尺寸$(): 20$(br)$(thing)指示器最大深度$(): 30$(br2)$(thing)岩石类型$(): 天然煌斑岩, 天然熔灰岩, 安山岩, 流纹岩, 玄武岩, 石灰华, 粗面岩, 英安岩", "title": "硫, 黄铁矿", "type": "patchouli:text", "anchor": "venus_manual_sulfur" diff --git a/kubejs/assets/tfc/textures/gui/knapping/loose/flavolite.png b/kubejs/assets/tfc/textures/gui/knapping/loose/flavolite.png new file mode 100644 index 0000000000000000000000000000000000000000..f259025e7e6655068f0712bc7dc50d8d840d2458 GIT binary patch literal 222 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QUsuz{S+^6mc* zO?}3+JCWDY_~iCkTXh;A?rzvpc&69oaKg^c#aq+(4!?Y`J}l_=1jhKI`_j2LyPy5K zH|)fk`Kejj$Il(RldyNS!ODn-TT zI(1V@|B|StX~ETP9>ujbcfTKvWME*3@^onkAF$xFRg~Vky-PQq^LJ+Ybug=jz`(%Z>FVdQ&MBb@09v_29smFU literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfc/textures/gui/knapping/loose/scorchia.png b/kubejs/assets/tfc/textures/gui/knapping/loose/scorchia.png new file mode 100644 index 0000000000000000000000000000000000000000..8d1c9f3b2601bee7f7beec72940a90619d4409db GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdnK1d_r79Q=?q{y)A6*b@ffP zbd1#0bmSFOq^0G=*iOG@U|=Zrba4!+U}Qb$$j788z;YliK0)oGwQs}fob-zJLZSCv zHI3h+SxZl!jye!glEz=K`f}=pS9f-alq9e57dxSQ^xcX|Tc6d7UL?#8TX4=Mt|aEB z+Iyi0_Y+e;6w7KZ?^-T7y}kL*xewnP&6NFihxTyfZv4aOuu#gxmdK II;Vst0BXichX4Qo literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfc/textures/gui/knapping/loose/scoria.png b/kubejs/assets/tfc/textures/gui/knapping/loose/scoria.png new file mode 100644 index 0000000000000000000000000000000000000000..eecc0be2bab75aa27d6ae6e3a45d62e156558c8c GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdnK1d_r6+Vgr)AodWI5T#WVX z^>wT?wTzWD^yJiHA}?)XU|=Zrba4!+U}Qb$$j788z;YliK0)oGwQs}fob-zJLZSCv zHI3h+SxZl!jye!glEz=K`f}=pS9f-alq9e57dxSQ^xcX|Tc6d7UL?#8TX4=Mt|aEB z+Iyi0_Y+e;6w7KZ?^-T7y}kL*xewnP&6NFihxTyfZv4aOuu#gxmdK II;Vst010wSlmGw# literal 0 HcmV?d00001 diff --git a/kubejs/data/ad_astra/dimension/venus.json b/kubejs/data/ad_astra/dimension/venus.json index 6d7dba3d4..f27fbe150 100644 --- a/kubejs/data/ad_astra/dimension/venus.json +++ b/kubejs/data/ad_astra/dimension/venus.json @@ -64,6 +64,26 @@ "spike": "tfg:spike/dripstone_spike", "loose": "tfg:loose/dripstone" }, + "flavolite": { + "raw": "betterend:flavolite", + "hardened": "tfg:rock/hardened_flavolite", + "gravel": "tfg:rock/gravel_flavolite", + "cobble": "tfg:rock/cobble_flavolite", + "sand": "tfc:sand/green", + "sandstone": "tfc:raw_sandstone/green", + "spike": "tfg:spike/flavolite_spike", + "loose": "tfg:loose/flavolite" + }, + "sandy_jadestone": { + "raw": "betterend:sandy_jadestone", + "hardened": "tfg:rock/hardened_sandy_jadestone", + "gravel": "tfg:rock/gravel_sandy_jadestone", + "cobble": "tfg:rock/cobble_sandy_jadestone", + "sand": "tfc:sand/green", + "sandstone": "tfc:raw_sandstone/green", + "spike": "tfg:spike/sandy_jadestone_spike", + "loose": "tfg:loose/sandy_jadestone" + }, "granite": "tfc:granite", "diorite": "tfc:diorite", "gabbro": "tfc:gabbro", @@ -95,7 +115,8 @@ "basalt": "bottom", "schist": "bottom", "gneiss": "bottom", - "quartzite": "bottom" + "quartzite": "bottom", + "flavolite": "bottom" } }, { @@ -116,7 +137,9 @@ "rhyolite": "middle", "basalt": "middle", "andesite": "middle", - "dacite": "middle" + "dacite": "middle", + "flavolite": "middle", + "sandy_jadestone": "middle" } } ], diff --git a/kubejs/data/tfg/worldgen/biome/venus/arachnoids.json b/kubejs/data/tfg/worldgen/biome/venus/arachnoids.json index 95fb1affa..d5b111716 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/arachnoids.json +++ b/kubejs/data/tfg/worldgen/biome/venus/arachnoids.json @@ -39,7 +39,9 @@ "tfc:erosion" ], [], - [], + [ + "tfc:random_empty_hot_spring" + ], [], [], [], @@ -55,20 +57,20 @@ "has_precipitation": true, "spawn_costs": { "endermanoverhaul:desert_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:savanna_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:nether_wastes_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "minecraft:enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "species:cliff_hanger": { "energy_budget": 0.15, diff --git a/kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json b/kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json index 9f2b96211..d86ef6e86 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json +++ b/kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json @@ -39,7 +39,9 @@ "tfc:erosion" ], [], - [], + [ + "tfc:random_empty_hot_spring" + ], [], [], [], @@ -57,20 +59,20 @@ "has_precipitation": true, "spawn_costs": { "endermanoverhaul:desert_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:savanna_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:nether_wastes_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "minecraft:enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "species:cliff_hanger": { "energy_budget": 0.15, diff --git a/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json b/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json index 143ac2e11..dbd00bd06 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json +++ b/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json @@ -55,27 +55,28 @@ ], [ "tfg:venus/surface/sulfur_patch", - "tfg:venus/surface/hydralux_rare" + "tfg:venus/surface/hydralux_rare", + "tfg:venus/surface/loose_scoria" ], "#tfg:venus_top_layer_modification" ], "has_precipitation": true, "spawn_costs": { "endermanoverhaul:desert_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:savanna_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:nether_wastes_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "minecraft:enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "species:cliff_hanger": { "energy_budget": 0.15, diff --git a/kubejs/data/tfg/worldgen/biome/venus/geysers.json b/kubejs/data/tfg/worldgen/biome/venus/geysers.json index 843cfe253..b4132b4eb 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/geysers.json +++ b/kubejs/data/tfg/worldgen/biome/venus/geysers.json @@ -40,7 +40,8 @@ ], [], [ - "tfg:venus/terrain/hot_spring_delta" + "tfg:venus/terrain/hot_spring_delta", + "tfc:random_empty_hot_spring" ], [], [], @@ -59,20 +60,20 @@ "has_precipitation": true, "spawn_costs": { "endermanoverhaul:desert_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:savanna_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:nether_wastes_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "minecraft:enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "species:cliff_hanger": { "energy_budget": 0.15, diff --git a/kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json b/kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json index 61ec76bf1..acabee994 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json +++ b/kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json @@ -8,8 +8,8 @@ "sound": "tfg:ambient.venus_surface.additions", "tick_chance": 0.0015 }, - "sky_color": 10465603, - "fog_color": 9938052, + "sky_color": 11239553, + "fog_color": 11239553, "water_color": 8241044, "water_fog_color": 10866612, "ambient_sound": "tfg:ambient.venus_surface.loop", @@ -39,7 +39,10 @@ "tfc:erosion" ], [], - [], + [ + "tfg:venus/terrain/lava_spring_rare", + "tfc:random_empty_hot_spring" + ], [], [], [], @@ -49,28 +52,38 @@ "tfc:raw_boulder", "tfc:cobble_boulder", "tfc:raw_boulder_small_patch", - "tfc:cobble_boulder_small_patch" + "tfc:cobble_boulder_small_patch", + "tfg:venus/surface/adakite_spikes", + "tfg:venus/surface/ochrum_spikes", + "tfg:venus/surface/crimsite_spikes" + ], + [ + "tfg:venus/surface/smoker_source_patch", + "tfg:venus/surface/lava_source_patch", + "tfg:venus/surface/twisted_vine", + "tfg:venus/surface/shadow_plant_patch", + "tfg:venus/surface/pile_volcanic_ash", + "tfg:venus/surface/loose_scorchia" ], - [], "#tfg:venus_top_layer_modification" ], "has_precipitation": true, "spawn_costs": { "endermanoverhaul:desert_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:savanna_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:nether_wastes_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "minecraft:enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "species:cliff_hanger": { "energy_budget": 0.15, @@ -97,7 +110,7 @@ "charge": 0.9 } }, - "creature_spawn_probability": 0.1, + "creature_spawn_probability": 0.15, "spawners": { "ambient": [], "axolotls": [], @@ -153,6 +166,18 @@ "minCount": 1, "weight": 100 }, + { + "type": "endermanoverhaul:nether_wastes_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 100 + }, + { + "type": "endermanoverhaul:desert_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 100 + }, { "type": "minecraft:enderman", "maxCount": 1, @@ -171,6 +196,18 @@ "minCount": 1, "weight": 100 }, + { + "type": "minecraft:magma_cube", + "maxCount": 2, + "minCount": 1, + "weight": 30 + }, + { + "type": "minecraft:blaze", + "maxCount": 2, + "minCount": 1, + "weight": 30 + }, { "type": "arthropocolypse:millipede_head", "maxCount": 2, diff --git a/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json b/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json index 2e46cbaf2..16c2bf780 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json +++ b/kubejs/data/tfg/worldgen/biome/venus/salt_flats.json @@ -39,7 +39,9 @@ "tfc:erosion" ], [], - [], + [ + "tfc:random_empty_hot_spring" + ], [], [], [], @@ -56,20 +58,20 @@ "has_precipitation": true, "spawn_costs": { "endermanoverhaul:desert_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:savanna_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:nether_wastes_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "minecraft:enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "species:cliff_hanger": { "energy_budget": 0.15, diff --git a/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json b/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json index 720efe591..46cb11773 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json +++ b/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json @@ -8,8 +8,8 @@ "sound": "tfg:ambient.venus_surface.additions", "tick_chance": 0.0015 }, - "sky_color": 5450003, - "fog_color": 5450003, + "sky_color": 7687245, + "fog_color": 7687245, "water_color": 8241044, "water_fog_color": 10866612, "ambient_sound": "tfg:ambient.venus_surface.loop", @@ -68,7 +68,9 @@ "tfg:venus/surface/twisted_vine", "tfg:venus/surface/shadow_plant_patch", "tfg:venus/surface/pile_volcanic_ash", - "tfg:venus/surface/pile_black_sand" + "tfg:venus/surface/pile_black_sand", + "tfg:venus/surface/loose_scorchia", + "tfg:venus/surface/loose_crackrack" ], [ "tfg:venus/terrain/lava_fill" @@ -78,20 +80,20 @@ "has_precipitation": true, "spawn_costs": { "endermanoverhaul:desert_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:savanna_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:nether_wastes_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "minecraft:enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "species:cliff_hanger": { "energy_budget": 0.3, @@ -123,6 +125,12 @@ "ambient": [], "axolotls": [], "creature": [ + { + "type": "minecraft:strider", + "maxCount": 5, + "minCount": 3, + "weight": 100 + }, { "type": "arthropocolypse:ice_crawler", "maxCount": 2, diff --git a/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json b/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json index 820b5ad67..13198fce5 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json +++ b/kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json @@ -40,6 +40,7 @@ ], [], [ + "tfc:random_empty_hot_spring", "tfg:venus/terrain/stromatolite_disk" ], [], @@ -52,27 +53,28 @@ "tfg:venus/terrain/thermal_vent_rare" ], [ - "tfg:venus/surface/sulfur_patch" + "tfg:venus/surface/sulfur_patch", + "tfg:venus/surface/loose_scoria" ], "#tfg:venus_top_layer_modification" ], "has_precipitation": true, "spawn_costs": { "endermanoverhaul:desert_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:savanna_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:nether_wastes_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "minecraft:enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "species:cliff_hanger": { "energy_budget": 0.15, diff --git a/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json b/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json index fc2615b45..79b328a81 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json +++ b/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json @@ -54,27 +54,28 @@ ], [ "tfg:venus/surface/sulfur_patch", - "tfg:venus/surface/hydralux" + "tfg:venus/surface/hydralux", + "tfg:venus/surface/loose_scoria" ], "#tfg:venus_top_layer_modification" ], "has_precipitation": true, "spawn_costs": { "endermanoverhaul:desert_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:savanna_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "endermanoverhaul:nether_wastes_enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "minecraft:enderman": { - "energy_budget": 0.05, - "charge": 0.9 + "energy_budget": 0.15, + "charge": 0.7 }, "species:cliff_hanger": { "energy_budget": 0.15, diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/adakite_spikes.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/adakite_spikes.json new file mode 100644 index 000000000..5a617f6b4 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/adakite_spikes.json @@ -0,0 +1,62 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:block_column", + "config": { + "allowed_placement": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction": "up", + "layers": [ + { + "height": { + "type": "minecraft:weighted_list", + "distribution": [ + { + "data": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 8, + "min_inclusive": 4 + } + }, + "weight": 5 + }, + { + "data": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 16, + "min_inclusive": 8 + } + }, + "weight": 1 + } + ] + }, + "provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "betterend:lacugrove_bark" + } + } + } + ], + "prioritize_tip": true + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR" + } + ] + }, + "tries": 12, + "xz_spread": 16, + "y_spread": 1 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/crimsite_spikes.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/crimsite_spikes.json new file mode 100644 index 000000000..dce1d7f60 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/crimsite_spikes.json @@ -0,0 +1,80 @@ +{ + "type": "minecraft:vegetation_patch", + "config": { + "depth": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 2, + "min_inclusive": 1 + } + }, + "extra_bottom_block_chance": 0, + "extra_edge_column_chance": 0.2, + "ground_state": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "create:crimsite" + } + }, + "replaceable": "#ad_astra:venus_stone_replaceables", + "surface": "floor", + "vegetation_chance": 0.4, + "vegetation_feature": { + "feature": { + "type": "minecraft:block_column", + "config": { + "allowed_placement": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction": "up", + "layers": [ + { + "height": { + "type": "minecraft:weighted_list", + "distribution": [ + { + "data": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 3, + "min_inclusive": 0 + } + }, + "weight": 5 + }, + { + "data": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 7, + "min_inclusive": 1 + } + }, + "weight": 1 + } + ] + }, + "provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "create:crimsite" + } + } + } + ], + "prioritize_tip": true + } + }, + "placement": [] + }, + "vertical_range": 5, + "xz_radius": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 2, + "min_inclusive": 1 + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_crackrack.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_crackrack.json new file mode 100644 index 000000000..b42fe220e --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_crackrack.json @@ -0,0 +1,55 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "count", + "values": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 1, + "max_inclusive": 3 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfg:loose/crackrack" + } + } + } + } + }, + "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:has_sturdy_face", + "offset": [ 0, -1, 0 ], + "direction": "down" + } + ] + } + } + ] + }, + "tries": 8, + "xz_spread": 7, + "y_spread": 1 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_scorchia.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_scorchia.json new file mode 100644 index 000000000..040d64b68 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_scorchia.json @@ -0,0 +1,55 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "count", + "values": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 1, + "max_inclusive": 3 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfg:loose/scorchia" + } + } + } + } + }, + "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:has_sturdy_face", + "offset": [ 0, -1, 0 ], + "direction": "down" + } + ] + } + } + ] + }, + "tries": 8, + "xz_spread": 7, + "y_spread": 1 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_scoria.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_scoria.json new file mode 100644 index 000000000..406c92329 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_scoria.json @@ -0,0 +1,55 @@ +{ + "type": "minecraft:random_patch", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:randomized_int_state_provider", + "property": "count", + "values": { + "type": "minecraft:uniform", + "value": { + "min_inclusive": 1, + "max_inclusive": 3 + } + }, + "source": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "tfg:loose/scoria" + } + } + } + } + }, + "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:has_sturdy_face", + "offset": [ 0, -1, 0 ], + "direction": "down" + } + ] + } + } + ] + }, + "tries": 8, + "xz_spread": 7, + "y_spread": 1 + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/ochrum_spikes.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/ochrum_spikes.json new file mode 100644 index 000000000..a1ea43be6 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/ochrum_spikes.json @@ -0,0 +1,80 @@ +{ + "type": "minecraft:vegetation_patch", + "config": { + "depth": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 2, + "min_inclusive": 1 + } + }, + "extra_bottom_block_chance": 0, + "extra_edge_column_chance": 0.2, + "ground_state": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "create:ochrum" + } + }, + "replaceable": "#ad_astra:venus_stone_replaceables", + "surface": "floor", + "vegetation_chance": 0.4, + "vegetation_feature": { + "feature": { + "type": "minecraft:block_column", + "config": { + "allowed_placement": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction": "up", + "layers": [ + { + "height": { + "type": "minecraft:weighted_list", + "distribution": [ + { + "data": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 2, + "min_inclusive": 0 + } + }, + "weight": 5 + }, + { + "data": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 5, + "min_inclusive": 1 + } + }, + "weight": 1 + } + ] + }, + "provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "create:ochrum" + } + } + } + ], + "prioritize_tip": true + } + }, + "placement": [] + }, + "vertical_range": 5, + "xz_radius": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 2, + "min_inclusive": 1 + } + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_columns.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/thermal_columns.json similarity index 100% rename from kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_columns.json rename to kubejs/data/tfg/worldgen/configured_feature/venus/terrain/thermal_columns.json diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_disk.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/thermal_disk.json similarity index 100% rename from kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_disk.json rename to kubejs/data/tfg/worldgen/configured_feature/venus/terrain/thermal_disk.json diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_tube_worms.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/thermal_tube_worms.json similarity index 100% rename from kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_tube_worms.json rename to kubejs/data/tfg/worldgen/configured_feature/venus/terrain/thermal_tube_worms.json diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_vents.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/thermal_vents.json similarity index 100% rename from kubejs/data/tfg/worldgen/configured_feature/venus/terrain/ignimbrite_vents.json rename to kubejs/data/tfg/worldgen/configured_feature/venus/terrain/thermal_vents.json diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/vein/venus_manual_salt.json b/kubejs/data/tfg/worldgen/configured_feature/venus/vein/venus_manual_salt.json index 375a552e5..fb68763cf 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/vein/venus_manual_salt.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/vein/venus_manual_salt.json @@ -148,6 +148,52 @@ "weight": 5 } ] + }, + { + "replace": [ + "betterend:flavolite" + ], + "with": [ + { + "block": "gtceu:flavolite_salt_ore", + "weight": 80 + }, + { + "block": "gtceu:flavolite_rock_salt_ore", + "weight": 10 + }, + { + "block": "gtceu:flavolite_lepidolite_ore", + "weight": 5 + }, + { + "block": "gtceu:flavolite_spodumene_ore", + "weight": 5 + } + ] + }, + { + "replace": [ + "betterend:sandy_jadestone" + ], + "with": [ + { + "block": "gtceu:sandy_jadestone_salt_ore", + "weight": 80 + }, + { + "block": "gtceu:sandy_jadestone_rock_salt_ore", + "weight": 10 + }, + { + "block": "gtceu:sandy_jadestone_lepidolite_ore", + "weight": 5 + }, + { + "block": "gtceu:sandy_jadestone_spodumene_ore", + "weight": 5 + } + ] } ], "indicator": { diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/vein/venus_manual_sulfur.json b/kubejs/data/tfg/worldgen/configured_feature/venus/vein/venus_manual_sulfur.json index acc09cbcb..6555775b3 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/vein/venus_manual_sulfur.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/vein/venus_manual_sulfur.json @@ -123,6 +123,44 @@ "weight": 5 } ] + }, + { + "replace": [ + "betterend:flavolite" + ], + "with": [ + { + "block": "gtceu:flavolite_sulfur_ore", + "weight": 80 + }, + { + "block": "gtceu:flavolite_pyrite_ore", + "weight": 15 + }, + { + "block": "gtceu:flavolite_sphalerite_ore", + "weight": 5 + } + ] + }, + { + "replace": [ + "betterend:sandy_jadestone" + ], + "with": [ + { + "block": "gtceu:sandy_jadestone_sulfur_ore", + "weight": 80 + }, + { + "block": "gtceu:sandy_jadestone_pyrite_ore", + "weight": 15 + }, + { + "block": "gtceu:sandy_jadestone_sphalerite_ore", + "weight": 5 + } + ] } ], "indicator": { @@ -130,7 +168,20 @@ "depth": 30, "underground_rarity": 40, "underground_count": 200, - "blocks": [] + "blocks": [ + { + "block": "gtceu:sulfur_indicator", + "weight": 80 + }, + { + "block": "gtceu:pyrite_indicator", + "weight": 15 + }, + { + "block": "tfc:ore/small_sphalerite", + "weight": 5 + } + ] } } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json b/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json index 50fead7fc..36a967625 100644 --- a/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json +++ b/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json @@ -323,7 +323,7 @@ "then_run": { "type": "minecraft:block", "result_state": { - "Name": "betterend:flavolite" + "Name": "minecraft:tuff" } } } @@ -349,13 +349,16 @@ "raw_rock_weight": 20, "palette": [ { "Name": "create:ochrum" }, - { "Name": "betterend:sandy_jadestone" }, - { "Name": "betterend:sandy_jadestone" }, + { "Name": "create:ochrum" }, + { "Name": "tfg:rock/hardened_scoria" }, + { "Name": "tfg:rock/hardened_scorchia" }, { "Name": "betterend:sandy_jadestone" }, { "Name": "betterend:sandy_jadestone" }, { "Name": "betterend:flavolite" }, { "Name": "betterend:flavolite" }, - { "Name": "betterend:flavolite" } + { "Name": "minecraft:tuff" }, + { "Name": "tfc:rock/raw/basalt" }, + { "Name": "ad_astra:venus_stone" } ], "fallback": { "Name": "ad_astra:venus_stone" @@ -544,7 +547,7 @@ "then_run": { "type": "minecraft:block", "result_state": { - "Name": "create:scorchia" + "Name": "tfg:rock/hardened_scorchia" } } } diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/surface/adakite_spikes.json b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/adakite_spikes.json new file mode 100644 index 000000000..c8b439c68 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/adakite_spikes.json @@ -0,0 +1,23 @@ +{ + "feature": "tfg:venus/surface/adakite_spikes", + "placement": [ + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:rarity_filter", + "chance": 3 + }, + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/surface/crimsite_spikes.json b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/crimsite_spikes.json new file mode 100644 index 000000000..8e6070cab --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/crimsite_spikes.json @@ -0,0 +1,23 @@ +{ + "feature": "tfg:venus/surface/crimsite_spikes", + "placement": [ + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:rarity_filter", + "chance": 4 + }, + { + "type": "minecraft:count", + "count": 3 + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/surface/loose_crackrack.json b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/loose_crackrack.json new file mode 100644 index 000000000..5d1fe5881 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/loose_crackrack.json @@ -0,0 +1,12 @@ +{ + "feature": "tfg:venus/surface/loose_crackrack", + "placement": [ + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "minecraft:in_square" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/surface/loose_scorchia.json b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/loose_scorchia.json new file mode 100644 index 000000000..244e2e670 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/loose_scorchia.json @@ -0,0 +1,12 @@ +{ + "feature": "tfg:venus/surface/loose_scorchia", + "placement": [ + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "minecraft:in_square" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/surface/loose_scoria.json b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/loose_scoria.json new file mode 100644 index 000000000..ac76c0dba --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/loose_scoria.json @@ -0,0 +1,12 @@ +{ + "feature": "tfg:venus/surface/loose_scoria", + "placement": [ + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "minecraft:in_square" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/surface/ochrum_spikes.json b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/ochrum_spikes.json new file mode 100644 index 000000000..121e57bd7 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/surface/ochrum_spikes.json @@ -0,0 +1,23 @@ +{ + "feature": "tfg:venus/surface/ochrum_spikes", + "placement": [ + { + "type": "minecraft:biome" + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:rarity_filter", + "chance": 8 + }, + { + "type": "minecraft:count", + "count": 3 + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lava_spring_rare.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lava_spring_rare.json new file mode 100644 index 000000000..fc484f739 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lava_spring_rare.json @@ -0,0 +1,12 @@ +{ + "feature": "tfg:venus/terrain/lava_spring", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 40 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/thermal_vent.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/thermal_vent.json index eadd12694..01b0d8c21 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/thermal_vent.json +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/thermal_vent.json @@ -4,19 +4,19 @@ "config": { "features": [ { - "feature": "tfg:venus/terrain/ignimbrite_disk", + "feature": "tfg:venus/terrain/thermal_disk", "placement": [] }, { - "feature": "tfg:venus/terrain/ignimbrite_columns", + "feature": "tfg:venus/terrain/thermal_columns", "placement": [] }, { - "feature": "tfg:venus/terrain/ignimbrite_vents", + "feature": "tfg:venus/terrain/thermal_vents", "placement": [] }, { - "feature": "tfg:venus/terrain/ignimbrite_tube_worms", + "feature": "tfg:venus/terrain/thermal_tube_worms", "placement": [] } ] diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/thermal_vent_rare.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/thermal_vent_rare.json index fa99f779f..ae2633784 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/thermal_vent_rare.json +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/thermal_vent_rare.json @@ -4,19 +4,19 @@ "config": { "features": [ { - "feature": "tfg:venus/terrain/ignimbrite_disk", + "feature": "tfg:venus/terrain/thermal_disk", "placement": [] }, { - "feature": "tfg:venus/terrain/ignimbrite_columns", + "feature": "tfg:venus/terrain/thermal_columns", "placement": [] }, { - "feature": "tfg:venus/terrain/ignimbrite_vents", + "feature": "tfg:venus/terrain/thermal_vents", "placement": [] }, { - "feature": "tfg:venus/terrain/ignimbrite_tube_worms", + "feature": "tfg:venus/terrain/thermal_tube_worms", "placement": [] } ] diff --git a/kubejs/server_scripts/tfg/mars/tags.mars.js b/kubejs/server_scripts/tfg/mars/tags.mars.js index 3d554382d..e7a130957 100644 --- a/kubejs/server_scripts/tfg/mars/tags.mars.js +++ b/kubejs/server_scripts/tfg/mars/tags.mars.js @@ -394,6 +394,7 @@ function registerTFGMarsEntityTypeTags(event) { 'species:springling', 'species:quake', 'species:stackatick', + 'minecraft:enderman', 'endermanoverhaul:crimson_forest_enderman', 'endermanoverhaul:warped_forest_enderman', 'endermanoverhaul:badlands_enderman', diff --git a/kubejs/server_scripts/tfg/natural_blocks/tags.stones.js b/kubejs/server_scripts/tfg/natural_blocks/tags.stones.js index fdc774c8b..01a941a77 100644 --- a/kubejs/server_scripts/tfg/natural_blocks/tags.stones.js +++ b/kubejs/server_scripts/tfg/natural_blocks/tags.stones.js @@ -278,8 +278,6 @@ function registerTFGStoneBlockTags(event) { if (rock.raw != null) { event.add('forge:stone', rock.raw.block) - event.add('tfc:breaks_when_isolated', rock.raw.block) - event.add('tfc:rock/raw', rock.raw.block) event.add('minecraft:mineable/pickaxe', rock.raw.block) event.add('tfc:can_carve', rock.raw.block) event.add('tfc:powderkeg_breaking_blocks', rock.raw.block) @@ -288,11 +286,13 @@ function registerTFGStoneBlockTags(event) { event.add('tfc:forge_insulation', rock.raw.block) if (rock.collapsible && rock.cobble != null) { + event.add('tfc:rock/raw', rock.raw.block) // Collapse tags also require a collapse recipe to work. // Don't add the recipe if you don't want them to actually collapse! event.add('tfc:can_collapse', rock.raw.block) event.add('tfc:can_trigger_collapse', rock.raw.block) event.add('tfc:can_start_collapse', rock.raw.block) + event.add('tfc:breaks_when_isolated', rock.raw.block) } SHAPES.forEach(shape => { diff --git a/kubejs/server_scripts/tfg/venus/tags.venus.js b/kubejs/server_scripts/tfg/venus/tags.venus.js index 7b480c219..15dd2188b 100644 --- a/kubejs/server_scripts/tfg/venus/tags.venus.js +++ b/kubejs/server_scripts/tfg/venus/tags.venus.js @@ -61,6 +61,12 @@ function registerTFGVenusBlockTags(event) { event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/raw/quartzite') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/hardened/quartzite') event.add('ad_astra:venus_stone_replaceables', 'tfc:rock/gravel/quartzite') + event.add('ad_astra:venus_stone_replaceables', 'betterend:flavolite') + event.add('ad_astra:venus_stone_replaceables', 'tfg:rock/hardened_flavolite') + event.add('ad_astra:venus_stone_replaceables', 'tfg:rock/gravel_flavolite') + event.add('ad_astra:venus_stone_replaceables', 'betterend:sandy_jadestone') + event.add('ad_astra:venus_stone_replaceables', 'tfg:rock/hardened_sandy_jadestone') + event.add('ad_astra:venus_stone_replaceables', 'tfg:rock/gravel_sandy_jadestone') event.add('ad_astra:venus_stone_replaceables', 'tfg:sand/fluorapatite/blue') event.add('ad_astra:venus_stone_replaceables', 'tfg:sandstone/raw/fluorapatite/blue') event.add('ad_astra:venus_stone_replaceables', 'tfg:sand/fluorapatite/green') @@ -79,6 +85,7 @@ function registerTFGVenusBlockTags(event) { event.add('ad_astra:venus_stone_replaceables', 'tfc:raw_sandstone/black') event.add('ad_astra:venus_stone_replaceables', 'create:scoria') event.add('ad_astra:venus_stone_replaceables', 'create:scorchia') + event.add('ad_astra:venus_stone_replaceables', 'ad_astra:conglomerate') event.add('ad_astra:venus_stone_replaceables', 'minecraft:tuff') event.add('ad_astra:venus_stone_replaceables', 'minecraft:basalt') event.add('ad_astra:venus_stone_replaceables', 'minecraft:smooth_basalt') @@ -91,16 +98,22 @@ function registerTFGVenusBlockTags(event) { event.add('ad_astra:venus_stone_replaceables', 'betterend:lucernia_bark') event.add('tfc:can_carve', '#ad_astra:venus_stone_replaceables') + event.add('minecraft:animals_spawnable_on', '#ad_astra:venus_stone_replaceables') - event.add("tfc:monster_spawns_on", "create:scorchia"); - event.add("tfc:monster_spawns_on", "minecraft:basalt"); - event.add("tfc:monster_spawns_on", "minecraft:smooth_basalt"); + event.add("tfc:monster_spawns_on", "create:scorchia"); + event.add("tfc:monster_spawns_on", "create:scoria"); + event.add("tfc:monster_spawns_on", "minecraft:basalt"); + event.add("tfc:monster_spawns_on", "minecraft:smooth_basalt"); event.add("minecraft:strider_warm_blocks", "create:scorchia"); + event.add("minecraft:strider_warm_blocks", "tfg:rock/hardened_scorchia"); event.add("minecraft:strider_warm_blocks", "minecraft:basalt"); event.add("minecraft:strider_warm_blocks", "minecraft:smooth_basalt"); event.add("minecraft:strider_warm_blocks", 'tfc:rock/raw/basalt'); event.add("minecraft:strider_warm_blocks", 'tfc:rock/magma/basalt'); + event.add("minecraft:strider_warm_blocks", 'tfc:rock/hardened/basalt'); + event.add("minecraft:strider_warm_blocks", 'beneath:crackrack'); + event.add("minecraft:strider_warm_blocks", '#minecraft:infiniburn_nether'); event.add('tfc:can_landslide', 'tfg:sand/fluorapatite/blue') event.add('tfc:can_landslide', 'tfg:sand/fluorapatite/green') diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index ad6c1828c..8084f8658 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -427,7 +427,9 @@ global.ORE_BEARING_STONES = /** @type {const} */ ([ "venus_stone", "mercury_stone", "glacio_stone", - "red_granite" + "red_granite", + "flavolite", + "sandy_jadestone" ]); //#endregion diff --git a/kubejs/startup_scripts/tfg/stone_types/constants.rocks.js b/kubejs/startup_scripts/tfg/stone_types/constants.rocks.js index 5e13faaa9..0154cb35a 100644 --- a/kubejs/startup_scripts/tfg/stone_types/constants.rocks.js +++ b/kubejs/startup_scripts/tfg/stone_types/constants.rocks.js @@ -1051,7 +1051,7 @@ global.BIG_ROCK_TABLE = /** @type {{String, RockType}} */ ({ "ochrum": { material: 'ochrum', collapsible: false, - dimensions: ['ad_astra:mars'], + dimensions: ['ad_astra:mars', 'ad_astra:venus'], pillar: 'create:ochrum_pillar', pillar2: 'create:layered_ochrum', stonecutterTag: 'create:stone_types/ochrum', @@ -1066,7 +1066,7 @@ global.BIG_ROCK_TABLE = /** @type {{String, RockType}} */ ({ "crimsite": { material: 'crimsite', collapsible: false, - dimensions: ['ad_astra:venus'], + dimensions: ['ad_astra:venus', 'ad_astra:mercury'], pillar: 'create:crimsite_pillar', pillar2: 'create:layered_crimsite', stonecutterTag: 'create:stone_types/crimsite', diff --git a/kubejs/startup_scripts/tfg/stone_types/tag_prefixes.rocks.js b/kubejs/startup_scripts/tfg/stone_types/tag_prefixes.rocks.js index 0595b7243..594ddc170 100644 --- a/kubejs/startup_scripts/tfg/stone_types/tag_prefixes.rocks.js +++ b/kubejs/startup_scripts/tfg/stone_types/tag_prefixes.rocks.js @@ -128,4 +128,22 @@ const registerTFGRocksTagPrefixes = (event) => { .generationCondition(shouldGenerateOre) TFGHelpers.registerCobbleBlock('red_granite', 'gtceu:red_granite_cobblestone'); + + event.create('flavolite', 'ore') + .stateSupplier(() => Block.getBlock('tfg:rock/hardened_flavolite').defaultBlockState()) + .baseModelLocation('betterend:block/flavolite') + .unificationEnabled(true) + .materialIconType(GTMaterialIconType.ore) + .generationCondition(shouldGenerateOre) + + TFGHelpers.registerCobbleBlock('flavolite', 'tfg:rock/cobble_flavolite'); + + event.create('sandy_jadestone', 'ore') + .stateSupplier(() => Block.getBlock('tfg:rock/hardened_sandy_jadestone').defaultBlockState()) + .baseModelLocation('betterend:block/sandy_jadestone') + .unificationEnabled(true) + .materialIconType(GTMaterialIconType.ore) + .generationCondition(shouldGenerateOre) + + TFGHelpers.registerCobbleBlock('sandy_jadestone', 'tfg:rock/cobble_sandy_jadestone'); } \ No newline at end of file