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 zcmV<403rX0P)e8d*%A4E5lhnJ5$*_IIt9LvM`sn}w0DDP9K~#7F1;K#<13?JGFdiJI zxBtSG<^sE64LLK(x0-WMWoj$O&c@tey{j;(SmCr~N3gFB)`kIU>(JM-vtOWcL%rQ`Hx)g;Go5%BV=!F% Y2axCl;bFSzasU7T07*qoM6N<$f&_A7&Hw-a literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfc/textures/gui/knapping/loose/sandy_jadestone.png b/kubejs/assets/tfc/textures/gui/knapping/loose/sandy_jadestone.png new file mode 100644 index 0000000000000000000000000000000000000000..256ca2f7979087a748741d9a1ff9792e91a118c7 GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFI(1V@ z|B|StX~ETP9>ujbcfTKv1WHADx;TbZFtQ$GWMom~VLtevp@2(+Yu;MsNAZ`>XGG7E z;?U3!Sn$~@N^jlXr5n%rJ2U;d=BUW&5dUDYUftOxQj)yJU+jeL(RV8dUDYUftOxQj)yJU+jeL(RV8 { 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