diff --git a/CHANGELOG.md b/CHANGELOG.md index f081702d6..a989cecbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,19 @@ ### Bug fixes ### Translation updates +## [0.11.20] - 04-02-2026 +### Changes +- Added EV laser hatches! @TomPlop +- Removed the logs to wood dust quern recipes as originally intended @Pyritie +- Added a sealed barrel recipe to convert clay dust into clay balls (#2943) @OLOXpl +- Added more fluid hatches to the Heat Exchanger to handle the increased flowrate (#2971) @TomPlop +### Bug fixes +- Fixed all the missing crafting table saw recipes (#2967) @Pyritie +- Fixed not being able to send crafting requests to your AE2 network with the interdimensional wireless card @Mqrius +- Fixed the hydroponics facility, pisciculture fishery, and growth chamber's missing overclocks @TomPlop +### Translation updates +- Spanish @NikoNeko17 + ## [0.11.19] - 03-02-2026 ### Breaking changes - The chemical reactor recipe for making Kaolinite Powder now uses circuit 3 @Pyritie diff --git a/config/crash_assistant/modlist.json b/config/crash_assistant/modlist.json index 75537b804..f2b57a477 100644 --- a/config/crash_assistant/modlist.json +++ b/config/crash_assistant/modlist.json @@ -1381,12 +1381,12 @@ "curseForgeHash": 218830698, "modrinthHash": "7d4f578a42c9b880744ea6058a495847aac9e4c3" }, - "tacz-tweaks-2.12.2-all.jar": { - "jarName": "tacz-tweaks-2.12.2-all.jar", + "tacz-tweaks-2.13.0-all.jar": { + "jarName": "tacz-tweaks-2.13.0-all.jar", "modId": "tacztweaks", - "version": "2.12.2", - "curseForgeHash": 493830591, - "modrinthHash": "f726c2d0ac2c77e3cc7f93fad7fd4338117c7a80" + "version": "2.13.0", + "curseForgeHash": 3917857281, + "modrinthHash": "1b2d7873fd3e2150f339d0d36e588196a50061d1" }, "taczammoquery-1.20.1-1.0.0.jar": { "jarName": "taczammoquery-1.20.1-1.0.0.jar", @@ -1409,12 +1409,12 @@ "curseForgeHash": 2679626739, "modrinthHash": "ea725f5bed9662aa22d4ec089a009bd52fb82275" }, - "TerraFirmaGreg-Core-Modern-0.8.19.jar": { - "jarName": "TerraFirmaGreg-Core-Modern-0.8.19.jar", + "TerraFirmaGreg-Core-Modern-0.8.20.jar": { + "jarName": "TerraFirmaGreg-Core-Modern-0.8.20.jar", "modId": "tfg", - "version": "0.8.19", - "curseForgeHash": 275630824, - "modrinthHash": "ff9b919b7afa7a8f921c50d29718d4a3f8115648" + "version": "0.8.20", + "curseForgeHash": 3054155648, + "modrinthHash": "4a31376e9527ba6c70bf9666c308c47b5371e18a" }, "tfc_gourmet-1.4.3.jar": { "jarName": "tfc_gourmet-1.4.3.jar", diff --git a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt index 73080192c..643d62723 100644 --- a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt +++ b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt @@ -561,7 +561,6 @@ dependencies: [ "0E2E93BE3364722D" "4AD96212525517CD" - "37B7342CD1B3B76D" ] dependency_requirement: "one_completed" description: ["{quests.extreme_voltage.nuclear_fuel_factory.desc}"] @@ -2339,13 +2338,28 @@ { dependencies: ["617CF3335584DC8D"] description: ["{quests.extreme_voltage.heat_battery.desc}"] + icon: "tfg:heat_battery_mk1" id: "26AA29016BA23396" subtitle: "{quests.extreme_voltage.heat_battery.subtitle}" - tasks: [{ - id: "5C9A37E905A4030F" - item: "tfg:heat_battery_mk1" - type: "item" - }] + tasks: [ + { + id: "5C9A37E905A4030F" + item: "tfg:heat_battery_mk1" + type: "item" + } + { + id: "7B355A4ECACCBE5C" + item: "tfg:copper_sandy_frame" + optional_task: true + type: "item" + } + { + id: "36B68338FCD5F7F5" + item: "tfg:beryllium_sandy_frame" + optional_task: true + type: "item" + } + ] x: 22.0d y: 4.5d } diff --git a/config/ftbquests/quests/chapters/questsmetallurgy.snbt b/config/ftbquests/quests/chapters/questsmetallurgy.snbt index eca75da26..93b921e93 100644 --- a/config/ftbquests/quests/chapters/questsmetallurgy.snbt +++ b/config/ftbquests/quests/chapters/questsmetallurgy.snbt @@ -60,6 +60,12 @@ x: 18.5d y: -28.0d } + { + id: "5B4E347985A66970" + linked_quest: "21C58B2541BFA2EE" + x: -1.5d + y: -32.0d + } ] quests: [ { @@ -1307,6 +1313,7 @@ description: ["{quests.metal_age.toolbelt.desc}"] icon: "toolbelt:belt" id: "1DEC710C3570D5D0" + optional: true shape: "heart" subtitle: "{quests.metal_age.toolbelt.subtitle}" tasks: [ diff --git a/config/ftbquests/quests/chapters/tips__tools.snbt b/config/ftbquests/quests/chapters/tips__tools.snbt index 897535008..5f6ce1a06 100644 --- a/config/ftbquests/quests/chapters/tips__tools.snbt +++ b/config/ftbquests/quests/chapters/tips__tools.snbt @@ -2573,7 +2573,11 @@ y: -0.5d } { - dependencies: ["509C064AA92FD78F"] + dependencies: [ + "509C064AA92FD78F" + "234B68E86F72C29E" + ] + dependency_requirement: "one_completed" description: ["{quests.tfg_tips.special_sacks.desc}"] guide_page: "tfc:field_guide tfc:sns/ore_sack" id: "21C58B2541BFA2EE" @@ -2609,7 +2613,6 @@ } id: "sns:ore_sack" } - optional_task: true type: "item" } ] diff --git a/kubejs/assets/constructionwand/lang/es_es.json b/kubejs/assets/constructionwand/lang/es_es.json new file mode 100644 index 000000000..d642aad77 --- /dev/null +++ b/kubejs/assets/constructionwand/lang/es_es.json @@ -0,0 +1,7 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "item.constructionwand.stone_wand": "Vara de cobre", + "item.constructionwand.iron_wand": "Vara de hierro forjado", + "item.constructionwand.diamond_wand": "Vara de acero azul", + "item.constructionwand.infinity_wand": "Vara de titanio inteligente" +} \ No newline at end of file diff --git a/kubejs/assets/create/lang/es_es.json b/kubejs/assets/create/lang/es_es.json new file mode 100644 index 000000000..51b1c77dd --- /dev/null +++ b/kubejs/assets/create/lang/es_es.json @@ -0,0 +1,107 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.create.netherite_backtank": "Tanque trasero de acero azul", + "block.create.shadow_casing": "Carcasa de acero negro", + "block.create.refined_radiance_casing": "Carcasa brillante", + "block.create.industrial_iron_block": "Bloque de acero industrial", + "block.create.weathered_iron_block": "Bloque de acero degradado", + "block.create.industrial_iron_window": "Ventana de acero industrial", + "block.create.weathered_iron_window": "Ventana de acero degradado", + "block.create.industrial_iron_window_pane": "Panel de ventana de acero industrial", + "block.create.weathered_iron_window_pane": "Panel de ventana de acero degradado", + "block.create.dark_oak_window": "Ventana de nogal americano", + "block.create.dark_oak_window_pane": "Panel de ventana de nogal americano", + "block.create.cherry_window": "Ventana de higuera", + "block.create.cherry_window_pane": "Panel de ventana de higuera", + "block.create.spruce_window": "Ventana de cipres", + "block.create.spruce_window_pane": "Panel de ventana de cipres", + "block.create.jungle_window": "Ventana de teca", + "block.create.jungle_window_pane": "Panel de ventana de teca", + "block.create.birch_window": "Ventana de eucalipto", + "block.create.birch_window_pane": "Panel de ventana de eucalipto", + "block.create.acacia_window": "Ventana de baobab", + "block.create.acacia_window_pane": "Panel de ventana de baobab", + "block.create.andesite_bars": "Barras de metal", + "block.create.andesite_belt_funnel": "Embudo lateral de metal", + "block.create.andesite_casing": "Carcasa de metal", + "block.create.andesite_door": "Puerta de metal", + "block.create.andesite_encased_cogwheel": "Engranaje revestido de metal", + "block.create.andesite_encased_large_cogwheel": "Engranaje grande revestido de metal", + "block.create.andesite_encased_shaft": "Eje revestido de metal", + "block.create.andesite_funnel": "Embudo de metal", + "block.create.andesite_ladder": "Escalera de metal", + "block.create.andesite_scaffolding": "Andamio de metal", + "block.create.andesite_tunnel": "Túnel de metal", + "block.create.andesite_table_cloth": "Mantel de metal", + "block.create.cut_deepslate": "Migmatita cortada", + "block.create.cut_deepslate_stairs": "Escaleras de migmatita cortada", + "block.create.cut_deepslate_slab": "Losa de migmatita cortada", + "block.create.cut_deepslate_wall": "Muro de migmatita cortada", + "block.create.polished_cut_deepslate": "Migmatita cortada pulida", + "block.create.polished_cut_deepslate_stairs": "Escaleras de migmatita cortada pulida", + "block.create.polished_cut_deepslate_slab": "Losa de migmatita cortada pulida", + "block.create.polished_cut_deepslate_wall": "Muro de migmatita cortada pulida", + "block.create.cut_deepslate_brick_stairs": "Escaleras de ladrillos de migmatita cortada", + "block.create.cut_deepslate_brick_slab": "Losa de ladrillos de migmatita cortada", + "block.create.cut_deepslate_brick_wall": "Muro de ladrillos de migmatita cortada", + "block.create.small_deepslate_bricks": "Ladrillos pequeños de migmatita", + "block.create.small_deepslate_brick_stairs": "Escaleras de ladrillos pequeños de migmatita", + "block.create.small_deepslate_brick_slab": "Losa de ladrillos pequeños de migmatita", + "block.create.small_deepslate_brick_wall": "Muro de ladrillos pequeños de migmatita", + "block.create.layered_deepslate": "Migmatita estratificada", + "block.create.deepslate_pillar": "Pilar de migmatita", + "block.create.cut_dripstone": "Travertino cortado", + "block.create.cut_dripstone_stairs": "Escaleras de travertino cortado", + "block.create.cut_dripstone_slab": "Losa de travertino cortado", + "block.create.cut_dripstone_wall": "Muro de travertino cortado", + "block.create.polished_cut_dripstone": "Travertino cortado pulido", + "block.create.polished_cut_dripstone_stairs": "Escaleras de travertino cortado pulido", + "block.create.polished_cut_dripstone_slab": "Losa de travertino cortado pulido", + "block.create.polished_cut_dripstone_wall": "Muro de travertino cortado pulido", + "block.create.cut_dripstone_brick_stairs": "Escaleras de ladrillos de travertino cortado", + "block.create.cut_dripstone_brick_slab": "Losa de ladrillos de travertino cortado", + "block.create.cut_dripstone_brick_wall": "Muro de ladrillos de travertino cortado", + "block.create.small_dripstone_bricks": "Ladrillos pequeños de travertino", + "block.create.small_dripstone_brick_stairs": "Escaleras de ladrillos pequeños de travertino", + "block.create.small_dripstone_brick_slab": "Losa de ladrillos pequeños de travertino", + "block.create.small_dripstone_brick_wall": "Muro de ladrillos pequeños de travertino", + "block.create.layered_dripstone": "Travertino estratificado", + "block.create.dripstone_pillar": "Pilar de travertino", + "block.create.cut_granite": "Sílex cortado", + "block.create.cut_granite_stairs": "Escaleras de sílex cortado", + "block.create.cut_granite_slab": "Losa de sílex cortado", + "block.create.cut_granite_wall": "Muro de sílex cortado", + "block.create.polished_cut_granite": "Sílex cortado pulido", + "block.create.polished_cut_granite_stairs": "Escaleras de sílex cortado pulido", + "block.create.polished_cut_granite_slab": "Losa de sílex cortado pulido", + "block.create.polished_cut_granite_wall": "Muro de sílex cortado pulido", + "block.create.cut_granite_brick_stairs": "Escaleras de ladrillos de sílex cortado", + "block.create.cut_granite_brick_slab": "Losa de ladrillos de sílex cortado", + "block.create.cut_granite_brick_wall": "Muro de ladrillos de sílex cortado", + "block.create.small_granite_bricks": "Ladrillos pequeños de sílex", + "block.create.small_granite_brick_stairs": "Escaleras de ladrillos pequeños de sílex", + "block.create.small_granite_brick_slab": "Losa de ladrillos pequeños de sílex", + "block.create.small_granite_brick_wall": "Muro de ladrillos pequeños de sílex", + "block.create.layered_granite": "Sílex estratificado", + "block.create.granite_pillar": "Pilar de sílex", + "item.create.netherite_diving_helmet.tooltip.summary": "Junto a un _Tanque trasero de acero azul_, esto puede protegerte del _calor extremo_. Para ser efectivo, _piernas y pies_ deben estar cubiertas con un _equipamiento de buceo de acero azul_.", + "item.create.netherite_backtank": "Tanque tracero de acero azul", + "item.create.netherite_diving_helmet": "Casco de buceo de acero azul", + "item.create.netherite_diving_boots": "Botas de buceo de acero azul", + "item.create.copper_sheet": "Placa de cobre", + "item.create.brass_sheet": "Placa de latón", + "item.create.golden_sheet": "Placa de oro", + "item.create.crushed_raw_gold": "Mena de oro purificada", + "item.create.crushed_raw_copper": "Mena de cobre purificada", + "item.create.crushed_raw_zinc": "Mena de zinc purificada", + "item.create.crushed_raw_silver": "Mena de plata purificada", + "item.create.crushed_raw_tin": "Mena de estaño purificada", + "item.create.crushed_raw_lead": "Mena de plomo purificada", + "create.ponder.andesite_tunnel.header": "Usando túneles de metal", + "create.ponder.andesite_tunnel.text_1": "Los túneles de metal pueden ser usados para cubrir tus cintas transportadoras", + "create.ponder.andesite_tunnel.text_2": "Cuando un túnel de metal tiene conexiones en sus lados...", + "create.ponder.belt_casing.text_1": "Las carcasas de latón o de metal pueden ser usadas para decorar cintas transportadoras", + "create.ponder.brass_funnel.text_1": "Los túneles de metal solo pueden extraer ítems uno por uno.", + "create.ponder.cogwheel_casing.text_1": "Las carcasas de latón o de metal pueden ser usadas para decorar engranajes", + "create.ponder.shaft_casing.text_1": "Las carcasas de latón o de metal pueden ser usadas para decorar ejes" +} \ No newline at end of file diff --git a/kubejs/assets/createdeco/lang/es_es.json b/kubejs/assets/createdeco/lang/es_es.json new file mode 100644 index 000000000..57980aec0 --- /dev/null +++ b/kubejs/assets/createdeco/lang/es_es.json @@ -0,0 +1,73 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.createdeco.andesite_bars": "Barras de aleación de estaño", + "block.createdeco.andesite_bars_overlay": "Barras de aleación de estaño superpuestas", + "block.createdeco.andesite_window": "Ventana de aleación de estaño", + "block.createdeco.andesite_window_pane": "Panel de ventana de aleación de estaño", + "block.createdeco.andesite_mesh_fence": "Cerca de malla de aleación de estaño", + "block.createdeco.andesite_catwalk": "Pasarela de aleación de estaño", + "block.createdeco.andesite_catwalk_stairs": "Escaleras de pasarela de aleación de estaño", + "block.createdeco.andesite_catwalk_railing": "Barandilla de pasarela de aleación de estaño", + "block.createdeco.andesite_support_wedge": "Cuña de apoyo de aleación de estaño", + "block.createdeco.andesite_hull": "Carcasa de tren de aleación de estaño", + "block.createdeco.andesite_support": "Soporte de aleación de estaño", + "block.createdeco.yellow_andesite_lamp": "Lámpara de jaula amarilla de aleación de estaño", + "block.createdeco.red_andesite_lamp": "Lámpara de jaula roja de aleación de estaño", + "block.createdeco.blue_andesite_lamp": "Lámpara de jaula azul de aleación de estaño", + "block.createdeco.green_andesite_lamp": "Lámpara de jaula verde de aleación de estaño", + "block.createdeco.andesite_sheet_metal": "Chapa metálica de aleación de estaño", + "block.createdeco.andesite_door": "Puerta de aleación de estaño", + "block.createdeco.locked_andesite_door": "Puerta de aleación de estaño cerrada", + "block.createdeco.andesite_trapdoor": "Trampilla de aleación de estaño", + "block.createdeco.andesite_facade": "Fachada de aleación de estaño", + "block.createdeco.iron_bars": "Barras de hierro forjado", + "block.createdeco.iron_bars_overlay": "Barras de hierro forjado superpuestas", + "block.createdeco.iron_window": "Ventana de hierro forjado", + "block.createdeco.iron_window_pane": "Panel de ventana de hierro forjado", + "block.createdeco.iron_mesh_fence": "Cerca de malla de hierro forjado", + "block.createdeco.iron_catwalk": "Pasarela de hierro forjado", + "block.createdeco.iron_catwalk_stairs": "Escaleras de pasarela de hierro forjado", + "block.createdeco.iron_catwalk_railing": "Barandilla de pasarela de hierro forjado", + "block.createdeco.iron_support_wedge": "Cuña de apoyo de hierro forjado", + "block.createdeco.iron_hull": "Carcasa de tren de hierro forjado", + "block.createdeco.iron_support": "Soporte de hierro forjado", + "block.createdeco.yellow_iron_lamp": "Lámpara de jaula amarilla de hierro forjado", + "block.createdeco.red_iron_lamp": "Lámpara de jaula roja de hierro forjado", + "block.createdeco.blue_iron_lamp": "Lámpara de jaula azul de hierro forjado", + "block.createdeco.green_iron_lamp": "Lámpara de jaula verde de hierro forjado", + "block.createdeco.iron_sheet_metal": "Chapa metálica de hierro forjado", + "block.createdeco.iron_door": "Puerta de hierro forjado", + "block.createdeco.locked_iron_door": "Puerta de hierro forjado cerrada", + "block.createdeco.iron_trapdoor": "Trampilla de hierro forjado", + "block.createdeco.iron_facade": "Fachada de hierro forjado", + "block.createdeco.iron_coinstack": "Montón de monedas de hierro forjado", + "block.createdeco.netherite_coinstack": "Montón de monedas de acero azul", + "block.createdeco.industrial_iron_coinstack": "Montón de monedas de acero", + "block.createdeco.industrial_iron_bars": "Barras de acero", + "block.createdeco.industrial_iron_bars_overlay": "Barras de acero superpuestas", + "block.createdeco.industrial_iron_window": "Ventana de acero", + "block.createdeco.industrial_iron_window_pane": "Panel de ventana de acero", + "block.createdeco.industrial_iron_mesh_fence": "Cerca de malla de acero", + "block.createdeco.industrial_iron_catwalk": "Pasarela de acero", + "block.createdeco.industrial_iron_catwalk_stairs": "Escaleras de pasarela de acero", + "block.createdeco.industrial_iron_catwalk_railing": "Barandilla de pasarela de acero", + "block.createdeco.industrial_iron_support_wedge": "Cuña de apoyo de acero", + "block.createdeco.industrial_iron_hull": "Carcasa de tren de acero", + "block.createdeco.industrial_iron_support": "Soporte de acero", + "block.createdeco.yellow_industrial_iron_lamp": "Lámpara de jaula amarilla de acero", + "block.createdeco.red_industrial_iron_lamp": "Lámpara de jaula roja de acero", + "block.createdeco.blue_industrial_iron_lamp": "Lámpara de jaula azul de acero", + "block.createdeco.green_industrial_iron_lamp": "Lámpara de jaula verde de acero", + "block.createdeco.industrial_iron_sheet_metal": "Chapa metálica de acero", + "block.createdeco.industrial_iron_door": "Puerta de acero", + "block.createdeco.locked_industrial_iron_door": "Puerta de acero cerrada", + "block.createdeco.industrial_iron_trapdoor": "Trampilla de acero", + "block.createdeco.industrial_iron_ladder": "Escaleras de acero", + "block.createdeco.industrial_iron_facade": "Fachada de acero", + "item.createdeco.iron_coin": "Moneda de hierro forjado", + "item.createdeco.netherite_coin": "Moneda de acero azul", + "item.createdeco.industrial_iron_coin": "Moneda de acero", + "item.createdeco.iron_coinstack": "Montón de monedas de hierro forjado", + "item.createdeco.netherite_coinstack": "Montón de monedas de acero azul", + "item.createdeco.industrial_iron_coinstack": "Montón de monedas de acero" +} \ No newline at end of file diff --git a/kubejs/assets/createhorsepower/lang/es_es.json b/kubejs/assets/createhorsepower/lang/es_es.json new file mode 100644 index 000000000..ae353ad4f --- /dev/null +++ b/kubejs/assets/createhorsepower/lang/es_es.json @@ -0,0 +1,4 @@ +{ + "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.createhorsepower.horse_crank": "Manivela animal" +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/blockstates/ev_1024a_laser_source_hatch.json b/kubejs/assets/gtceu/blockstates/ev_1024a_laser_source_hatch.json new file mode 100644 index 000000000..ab095fc62 --- /dev/null +++ b/kubejs/assets/gtceu/blockstates/ev_1024a_laser_source_hatch.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "gtceu:block/machine/ev_1024a_laser_source_hatch", + "x": 90 + }, + "facing=east": { + "model": "gtceu:block/machine/ev_1024a_laser_source_hatch", + "y": 90 + }, + "facing=north": { + "model": "gtceu:block/machine/ev_1024a_laser_source_hatch" + }, + "facing=south": { + "model": "gtceu:block/machine/ev_1024a_laser_source_hatch", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "gtceu:block/machine/ev_1024a_laser_source_hatch", + "x": 270 + }, + "facing=west": { + "model": "gtceu:block/machine/ev_1024a_laser_source_hatch", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/blockstates/ev_1024a_laser_target_hatch.json b/kubejs/assets/gtceu/blockstates/ev_1024a_laser_target_hatch.json new file mode 100644 index 000000000..400b7cb0b --- /dev/null +++ b/kubejs/assets/gtceu/blockstates/ev_1024a_laser_target_hatch.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "gtceu:block/machine/ev_1024a_laser_target_hatch", + "x": 90 + }, + "facing=east": { + "model": "gtceu:block/machine/ev_1024a_laser_target_hatch", + "y": 90 + }, + "facing=north": { + "model": "gtceu:block/machine/ev_1024a_laser_target_hatch" + }, + "facing=south": { + "model": "gtceu:block/machine/ev_1024a_laser_target_hatch", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "gtceu:block/machine/ev_1024a_laser_target_hatch", + "x": 270 + }, + "facing=west": { + "model": "gtceu:block/machine/ev_1024a_laser_target_hatch", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/blockstates/ev_256a_laser_source_hatch.json b/kubejs/assets/gtceu/blockstates/ev_256a_laser_source_hatch.json new file mode 100644 index 000000000..b9614fa11 --- /dev/null +++ b/kubejs/assets/gtceu/blockstates/ev_256a_laser_source_hatch.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "gtceu:block/machine/ev_256a_laser_source_hatch", + "x": 90 + }, + "facing=east": { + "model": "gtceu:block/machine/ev_256a_laser_source_hatch", + "y": 90 + }, + "facing=north": { + "model": "gtceu:block/machine/ev_256a_laser_source_hatch" + }, + "facing=south": { + "model": "gtceu:block/machine/ev_256a_laser_source_hatch", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "gtceu:block/machine/ev_256a_laser_source_hatch", + "x": 270 + }, + "facing=west": { + "model": "gtceu:block/machine/ev_256a_laser_source_hatch", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/blockstates/ev_256a_laser_target_hatch.json b/kubejs/assets/gtceu/blockstates/ev_256a_laser_target_hatch.json new file mode 100644 index 000000000..4e662b935 --- /dev/null +++ b/kubejs/assets/gtceu/blockstates/ev_256a_laser_target_hatch.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "gtceu:block/machine/ev_256a_laser_target_hatch", + "x": 90 + }, + "facing=east": { + "model": "gtceu:block/machine/ev_256a_laser_target_hatch", + "y": 90 + }, + "facing=north": { + "model": "gtceu:block/machine/ev_256a_laser_target_hatch" + }, + "facing=south": { + "model": "gtceu:block/machine/ev_256a_laser_target_hatch", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "gtceu:block/machine/ev_256a_laser_target_hatch", + "x": 270 + }, + "facing=west": { + "model": "gtceu:block/machine/ev_256a_laser_target_hatch", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/blockstates/ev_4096a_laser_source_hatch.json b/kubejs/assets/gtceu/blockstates/ev_4096a_laser_source_hatch.json new file mode 100644 index 000000000..c325b47d6 --- /dev/null +++ b/kubejs/assets/gtceu/blockstates/ev_4096a_laser_source_hatch.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "gtceu:block/machine/ev_4096a_laser_source_hatch", + "x": 90 + }, + "facing=east": { + "model": "gtceu:block/machine/ev_4096a_laser_source_hatch", + "y": 90 + }, + "facing=north": { + "model": "gtceu:block/machine/ev_4096a_laser_source_hatch" + }, + "facing=south": { + "model": "gtceu:block/machine/ev_4096a_laser_source_hatch", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "gtceu:block/machine/ev_4096a_laser_source_hatch", + "x": 270 + }, + "facing=west": { + "model": "gtceu:block/machine/ev_4096a_laser_source_hatch", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/blockstates/ev_4096a_laser_target_hatch.json b/kubejs/assets/gtceu/blockstates/ev_4096a_laser_target_hatch.json new file mode 100644 index 000000000..751c8ab3d --- /dev/null +++ b/kubejs/assets/gtceu/blockstates/ev_4096a_laser_target_hatch.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "gtceu:block/machine/ev_4096a_laser_target_hatch", + "x": 90 + }, + "facing=east": { + "model": "gtceu:block/machine/ev_4096a_laser_target_hatch", + "y": 90 + }, + "facing=north": { + "model": "gtceu:block/machine/ev_4096a_laser_target_hatch" + }, + "facing=south": { + "model": "gtceu:block/machine/ev_4096a_laser_target_hatch", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "gtceu:block/machine/ev_4096a_laser_target_hatch", + "x": 270 + }, + "facing=west": { + "model": "gtceu:block/machine/ev_4096a_laser_target_hatch", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 7e6050d1c..dc9a569b8 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -39,6 +39,12 @@ "block.tfg.single_itemstack_bus": "Limiting Input Bus", "block.tfg.hydroponics_facility": "Hydroponics Facility", "block.tfg.pisciculture_fishery": "Pisciculture Fishery", + "block.gtceu.ev_1024a_laser_source_hatch": "§5EV§r 1,024§eA§r Laser Source Hatch", + "block.gtceu.ev_1024a_laser_target_hatch": "§5EV§r 1,024§eA§r Laser Target Hatch", + "block.gtceu.ev_256a_laser_source_hatch": "§5EV§r 256§eA§r Laser Source Hatch", + "block.gtceu.ev_256a_laser_target_hatch": "§5EV§r 256§eA§r Laser Target Hatch", + "block.gtceu.ev_4096a_laser_source_hatch": "§5EV§r 4,096§eA§r Laser Source Hatch", + "block.gtceu.ev_4096a_laser_target_hatch": "§5EV§r 4,096§eA§r Laser Target Hatch", "item.gtceu.tiny_wood_dust": "Tiny Pile of Softwood Pulp", "item.gtceu.small_wood_dust": "Small Pile of Softwood Pulp", "item.gtceu.wood_dust": "Softwood Pulp", diff --git a/kubejs/assets/gtceu/models/block/machine/ev_1024a_laser_source_hatch.json b/kubejs/assets/gtceu/models/block/machine/ev_1024a_laser_source_hatch.json new file mode 100644 index 000000000..72e226dbd --- /dev/null +++ b/kubejs/assets/gtceu/models/block/machine/ev_1024a_laser_source_hatch.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtceu:ev_1024a_laser_source_hatch", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], + "variants": { + "is_formed=false": { + "model": { + "parent": "gtceu:block/machine/part/laser_source_hatch", + "textures": { + "bottom": "gtceu:block/casings/voltage/ev/bottom", + "side": "gtceu:block/casings/voltage/ev/side", + "top": "gtceu:block/casings/voltage/ev/top" + } + } + }, + "is_formed=true": { + "model": { + "parent": "gtceu:block/machine/part/laser_source_hatch", + "textures": { + "bottom": "gtceu:block/casings/voltage/ev/bottom", + "side": "gtceu:block/casings/voltage/ev/side", + "top": "gtceu:block/casings/voltage/ev/top" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/block/machine/ev_1024a_laser_target_hatch.json b/kubejs/assets/gtceu/models/block/machine/ev_1024a_laser_target_hatch.json new file mode 100644 index 000000000..48d96376e --- /dev/null +++ b/kubejs/assets/gtceu/models/block/machine/ev_1024a_laser_target_hatch.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtceu:ev_1024a_laser_target_hatch", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], + "variants": { + "is_formed=false": { + "model": { + "parent": "gtceu:block/machine/part/laser_target_hatch", + "textures": { + "bottom": "gtceu:block/casings/voltage/ev/bottom", + "side": "gtceu:block/casings/voltage/ev/side", + "top": "gtceu:block/casings/voltage/ev/top" + } + } + }, + "is_formed=true": { + "model": { + "parent": "gtceu:block/machine/part/laser_target_hatch", + "textures": { + "bottom": "gtceu:block/casings/voltage/ev/bottom", + "side": "gtceu:block/casings/voltage/ev/side", + "top": "gtceu:block/casings/voltage/ev/top" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/block/machine/ev_256a_laser_source_hatch.json b/kubejs/assets/gtceu/models/block/machine/ev_256a_laser_source_hatch.json new file mode 100644 index 000000000..79b9416ee --- /dev/null +++ b/kubejs/assets/gtceu/models/block/machine/ev_256a_laser_source_hatch.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtceu:ev_256a_laser_source_hatch", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], + "variants": { + "is_formed=false": { + "model": { + "parent": "gtceu:block/machine/part/laser_source_hatch", + "textures": { + "bottom": "gtceu:block/casings/voltage/ev/bottom", + "side": "gtceu:block/casings/voltage/ev/side", + "top": "gtceu:block/casings/voltage/ev/top" + } + } + }, + "is_formed=true": { + "model": { + "parent": "gtceu:block/machine/part/laser_source_hatch", + "textures": { + "bottom": "gtceu:block/casings/voltage/ev/bottom", + "side": "gtceu:block/casings/voltage/ev/side", + "top": "gtceu:block/casings/voltage/ev/top" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/block/machine/ev_256a_laser_target_hatch.json b/kubejs/assets/gtceu/models/block/machine/ev_256a_laser_target_hatch.json new file mode 100644 index 000000000..6541957d1 --- /dev/null +++ b/kubejs/assets/gtceu/models/block/machine/ev_256a_laser_target_hatch.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtceu:ev_256a_laser_target_hatch", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], + "variants": { + "is_formed=false": { + "model": { + "parent": "gtceu:block/machine/part/laser_target_hatch", + "textures": { + "bottom": "gtceu:block/casings/voltage/ev/bottom", + "side": "gtceu:block/casings/voltage/ev/side", + "top": "gtceu:block/casings/voltage/ev/top" + } + } + }, + "is_formed=true": { + "model": { + "parent": "gtceu:block/machine/part/laser_target_hatch", + "textures": { + "bottom": "gtceu:block/casings/voltage/ev/bottom", + "side": "gtceu:block/casings/voltage/ev/side", + "top": "gtceu:block/casings/voltage/ev/top" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/block/machine/ev_4096a_laser_source_hatch.json b/kubejs/assets/gtceu/models/block/machine/ev_4096a_laser_source_hatch.json new file mode 100644 index 000000000..99d0fddfc --- /dev/null +++ b/kubejs/assets/gtceu/models/block/machine/ev_4096a_laser_source_hatch.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtceu:ev_4096a_laser_source_hatch", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], + "variants": { + "is_formed=false": { + "model": { + "parent": "gtceu:block/machine/part/laser_source_hatch", + "textures": { + "bottom": "gtceu:block/casings/voltage/ev/bottom", + "side": "gtceu:block/casings/voltage/ev/side", + "top": "gtceu:block/casings/voltage/ev/top" + } + } + }, + "is_formed=true": { + "model": { + "parent": "gtceu:block/machine/part/laser_source_hatch", + "textures": { + "bottom": "gtceu:block/casings/voltage/ev/bottom", + "side": "gtceu:block/casings/voltage/ev/side", + "top": "gtceu:block/casings/voltage/ev/top" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/block/machine/ev_4096a_laser_target_hatch.json b/kubejs/assets/gtceu/models/block/machine/ev_4096a_laser_target_hatch.json new file mode 100644 index 000000000..a979c8181 --- /dev/null +++ b/kubejs/assets/gtceu/models/block/machine/ev_4096a_laser_target_hatch.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtceu:ev_4096a_laser_target_hatch", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], + "variants": { + "is_formed=false": { + "model": { + "parent": "gtceu:block/machine/part/laser_target_hatch", + "textures": { + "bottom": "gtceu:block/casings/voltage/ev/bottom", + "side": "gtceu:block/casings/voltage/ev/side", + "top": "gtceu:block/casings/voltage/ev/top" + } + } + }, + "is_formed=true": { + "model": { + "parent": "gtceu:block/machine/part/laser_target_hatch", + "textures": { + "bottom": "gtceu:block/casings/voltage/ev/bottom", + "side": "gtceu:block/casings/voltage/ev/side", + "top": "gtceu:block/casings/voltage/ev/top" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/item/ev_1024a_laser_source_hatch.json b/kubejs/assets/gtceu/models/item/ev_1024a_laser_source_hatch.json new file mode 100644 index 000000000..8e9a1040c --- /dev/null +++ b/kubejs/assets/gtceu/models/item/ev_1024a_laser_source_hatch.json @@ -0,0 +1,3 @@ +{ + "parent": "gtceu:block/machine/ev_1024a_laser_source_hatch" +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/item/ev_1024a_laser_target_hatch.json b/kubejs/assets/gtceu/models/item/ev_1024a_laser_target_hatch.json new file mode 100644 index 000000000..d3c960479 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/ev_1024a_laser_target_hatch.json @@ -0,0 +1,3 @@ +{ + "parent": "gtceu:block/machine/ev_1024a_laser_target_hatch" +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/item/ev_256a_laser_source_hatch.json b/kubejs/assets/gtceu/models/item/ev_256a_laser_source_hatch.json new file mode 100644 index 000000000..8e47764c5 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/ev_256a_laser_source_hatch.json @@ -0,0 +1,3 @@ +{ + "parent": "gtceu:block/machine/ev_256a_laser_source_hatch" +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/item/ev_256a_laser_target_hatch.json b/kubejs/assets/gtceu/models/item/ev_256a_laser_target_hatch.json new file mode 100644 index 000000000..8565b9d64 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/ev_256a_laser_target_hatch.json @@ -0,0 +1,3 @@ +{ + "parent": "gtceu:block/machine/ev_256a_laser_target_hatch" +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/item/ev_4096a_laser_source_hatch.json b/kubejs/assets/gtceu/models/item/ev_4096a_laser_source_hatch.json new file mode 100644 index 000000000..3bace741b --- /dev/null +++ b/kubejs/assets/gtceu/models/item/ev_4096a_laser_source_hatch.json @@ -0,0 +1,3 @@ +{ + "parent": "gtceu:block/machine/ev_4096a_laser_source_hatch" +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/item/ev_4096a_laser_target_hatch.json b/kubejs/assets/gtceu/models/item/ev_4096a_laser_target_hatch.json new file mode 100644 index 000000000..9b1c0448b --- /dev/null +++ b/kubejs/assets/gtceu/models/item/ev_4096a_laser_target_hatch.json @@ -0,0 +1,3 @@ +{ + "parent": "gtceu:block/machine/ev_4096a_laser_target_hatch" +} \ No newline at end of file diff --git a/kubejs/assets/tfc/models/block/rock/magma/magma.json b/kubejs/assets/tfc/models/block/rock/magma/magma.json index 9a3d09c75..4c497183b 100644 --- a/kubejs/assets/tfc/models/block/rock/magma/magma.json +++ b/kubejs/assets/tfc/models/block/rock/magma/magma.json @@ -6,12 +6,36 @@ "to": [16, 16, 16], "forge_data": { "block_light": 15, "sky_light": 15 }, "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0"} + "north": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#0", + "cullface": "north" + }, + "east": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#0", + "cullface": "east" + }, + "south": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#0", + "cullface": "south" + }, + "west": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#0", + "cullface": "west" + }, + "up": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#0", + "cullface": "up" + }, + "down": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#0", + "cullface": "down" + } } } ], diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index bf468e88d..f59ce46fb 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -224,6 +224,7 @@ "block.tfg.spike.dripstone_spike": "Travertine Spike", "block.tfg.loose.dripstone": "Loose Travertine Rock", "block.tfg.rock.aqueduct_dripstone": "Travertine Aqueduct", + "block.tfg.rock.hardened_crackrack": "Hardened Keratophyre", "block.tfg.rock.crackrack_stairs": "Raw Keratophyre Stairs", "block.tfg.rock.crackrack_slab": "Raw Keratophyre Slab", "block.tfg.rock.crackrack_wall": "Raw Keratophyre Wall", @@ -1915,6 +1916,7 @@ "tfc.recipe.barrel.tfg.barrel.birch_syrup_to_sugar": "Making sugar", "tfc.recipe.barrel.tfg.barrel.develop_black_and_white_film": "Developing film", "tfc.recipe.barrel.tfg.barrel.develop_color_film": "Developing film", + "tfc.recipe.barrel.tfg.barrel.clay_ball": "Hydrating Clay", "tfc.recipe.barrel.tfg.barrel.light_concrete": "Solidifying Concrete", "tfc.recipe.barrel.tfg.barrel.reinforced_light_concrete_support": "Solidifying Concrete", "tfc.recipe.barrel.tfg.barrel.dark_concrete": "Dyeing", @@ -2607,6 +2609,7 @@ "quests.gregtech_energy.transformer.title": "The Super Transformer", "quests.gregtech_energy.transformer.subtitle": "Better than Optimus Prime", "quests.gregtech_energy.transformer.desc": "For every problem, GregTech has a multiblock solution. Enter the &dActive Transformer&r.\n\nThis beast is your ultimate transformer. It can transform energy between any tiers — from &aLV&r to &cUHV&r — without caring about amps or a mess of single block transformers.\n\nBut that's not even the best part: it can transmit energy using Laser Pipes.\n&7•&r Lasers send absurd amounts of Amps.\n&7•&r No loss. No cables. Just pure energy.\n&7•&r Only one catch: it &chas to be in a perfectly straight line&r.\n\nWhen cables feel weak, &luse lasers.", + "quests.gregtech_energy.transformer.task": "Any Laser Hatch from EV to IV", "quests.gregtech_energy.moving_wire.title": "Moving with wires", "quests.gregtech_energy.moving_wire.subtitle": "Funky to place", "quests.gregtech_energy.moving_wire.desc": "Moving energy around in GregTech can be tricky — &bmost cables are lossy&r. For every block, for every amp, you might lose energy as it travels through your wires. But don’t worry, there are solutions:\n\n&7•&r Cover your wires with rubber. By doing so, you'll significantly reduce energy loss over distance. Just check the quest items for a reference.\n\n&7•&r Use higher-tier cables. Platinum cables, for example, only lose 1 EU per block — practically nothing when compared to the 8192 EU it can carry.\n\n&7•&r &bSuperconductors&r. These beauties are a bit pricier, but they have &9zero loss&r. They don’t need rubber covers, and won't zap you either. Just be aware that they're usually only craftable near the end of their tier.\n\nOptimize your energy flow — &breduce losses&r and make your systems more efficient.", @@ -3030,7 +3033,7 @@ "quests.low_voltage.lv_polariser.desc": "One of the cheapest - if not the cheapest - &7LV&r machine. Use this to make &6Redstone-free Magnetic Rods&r for your Motors. Whenever you start to batch your Motors, this machine will save you stacks and stacks of Redstone.", "quests.low_voltage.link_chapter.title": "Explain energy to me", "quests.low_voltage.link_chapter.subtitle": "There is a whole chapter about energy", - "quests.low_voltage.link_chapter.desc": "It might look like a lot of reading, but it's important to understand if you want to avoid accidents and get the most out of your power generation.\n\nGregTech's energy system (EU, Energy Units) works differently to FE (Forge Energy), the system used by almost every other mod.\n\nThere's four ways to generate power in LV, and all are viable options. If you're new to GregTech, Steam is the easiest but falls off fast as you progress to further tiers. Gas fuel is more complicated to produce, but has the cheapest generators. Combustion is somewhere in between.\n\nHere's a link to the energy chapter", + "quests.low_voltage.link_chapter.desc": "GregTech's energy system (EU, Energy Units) works differently to FE (Forge Energy), the system used by almost every other mod, so we've dedicated a chapter of the questbook to talk about it.\n\nIt might look like a lot of reading, but it's important to understand if you want to avoid accidents and get the most out of your power generation.\n\nThere's four ways to generate power in LV, and all are viable options. If you're new to GregTech, Steam is the easiest but falls off fast as you progress to further tiers. Gas fuel is more complicated to produce, but has the cheapest generators. Combustion is somewhere in between.\n\nHere's a link to the energy chapter", "quests.low_voltage.link_chapter.task": "I read it", "quests.low_voltage.lv_combuston_gen.title": "The Combustion Generator", "quests.low_voltage.lv_combuston_gen.subtitle": "It does boom and make energy", diff --git a/kubejs/data/ad_astra/dimension/venus.json b/kubejs/data/ad_astra/dimension/venus.json index bdbd37c82..61d748a5f 100644 --- a/kubejs/data/ad_astra/dimension/venus.json +++ b/kubejs/data/ad_astra/dimension/venus.json @@ -10,7 +10,7 @@ "spawn_center_z": 0, "temperature_scale": 10000, "rainfall_scale": 10000, - "continentalness": 0, + "continentalness": 0.1, "rock_layer_settings": { "rocks": { "venus": { @@ -84,6 +84,36 @@ "spike": "tfg:spike/sandy_jadestone_spike", "loose": "tfg:loose/sandy_jadestone" }, + "crackrack": { + "raw": "beneath:crackrack", + "hardened": "tfg:rock/hardened_crackrack", + "gravel": "tfg:rock/gravel_crackrack", + "cobble": "tfg:rock/cobble_crackrack", + "sand": "tfc:sand/pink", + "sandstone": "tfc:raw_sandstone/pink", + "spike": "tfg:spike/crackrack_spike", + "loose": "tfg:loose/crackrack" + }, + "scoria": { + "raw": "create:scoria", + "hardened": "tfg:rock/hardened_scoria", + "gravel": "tfg:rock/gravel_scoria", + "cobble": "tfg:rock/cobble_scoria", + "sand": "tfc:sand/brown", + "sandstone": "tfc:raw_sandstone/brown", + "spike": "tfg:spike/scoria_spike", + "loose": "tfg:loose/scoria" + }, + "scorchia": { + "raw": "create:scorchia", + "hardened": "tfg:rock/hardened_scorchia", + "gravel": "tfg:rock/gravel_scorchia", + "cobble": "tfg:rock/cobble_scorchia", + "sand": "tfc:sand/black", + "sandstone": "tfc:raw_sandstone/black", + "spike": "tfg:spike/scorchia_spike", + "loose": "tfg:loose/scorchia" + }, "granite": "tfc:granite", "diorite": "tfc:diorite", "gabbro": "tfc:gabbro", @@ -176,7 +206,7 @@ "temperature": 0, "humidity": 0, "continentalness": -1, - "erosion": 0.05, + "erosion": -0.05, "weirdness": -0.2, "depth": 0, "offset": 0 @@ -188,7 +218,7 @@ "temperature": 0, "humidity": 0, "continentalness": -1, - "erosion": 0.05, + "erosion": -0.05, "weirdness": 0, "depth": 0, "offset": 0 @@ -200,7 +230,7 @@ "temperature": 0, "humidity": 0, "continentalness": -1, - "erosion": 0.05, + "erosion": -0.05, "weirdness": 0.2, "depth": 0, "offset": 0 @@ -249,8 +279,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.47, - "erosion": 0.05, + "continentalness": -0.57, + "erosion": -0.05, "weirdness": -0.2, "depth": 0, "offset": 0 @@ -261,8 +291,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.47, - "erosion": 0.05, + "continentalness": -0.57, + "erosion": -0.05, "weirdness": 0, "depth": 0, "offset": 0 @@ -273,8 +303,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.47, - "erosion": 0.05, + "continentalness": -0.57, + "erosion": -0.05, "weirdness": 0.2, "depth": 0, "offset": 0 @@ -285,7 +315,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.47, + "continentalness": -0.57, "erosion": 0.05, "weirdness": -0.2, "depth": 0, @@ -297,7 +327,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.47, + "continentalness": -0.57, "erosion": 0.05, "weirdness": 0, "depth": 0, @@ -309,7 +339,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.47, + "continentalness": -0.57, "erosion": 0.05, "weirdness": 0.2, "depth": 0, @@ -323,8 +353,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.44, - "erosion": 0.05, + "continentalness": -0.54, + "erosion": -0.05, "depth": 0, "weirdness": -0.2, "offset": 0 @@ -335,8 +365,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.44, - "erosion": 0.05, + "continentalness": -0.54, + "erosion": -0.05, "depth": 0, "weirdness": 0, "offset": 0 @@ -347,8 +377,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.44, - "erosion": 0.05, + "continentalness": -0.54, + "erosion": -0.05, "depth": 0, "weirdness": 0.2, "offset": 0 @@ -360,7 +390,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.44, + "continentalness": -0.54, "erosion": 0.05, "depth": 0, "weirdness": -0.2, @@ -372,7 +402,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.44, + "continentalness": -0.54, "erosion": 0.05, "depth": 0, "weirdness": 0, @@ -384,7 +414,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.44, + "continentalness": -0.54, "erosion": 0.05, "depth": 0, "weirdness": 0.2, @@ -398,8 +428,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.315, - "erosion": 0.05, + "continentalness": -0.415, + "erosion": -0.05, "depth": 0, "weirdness": -0.2, "offset": 0 @@ -410,8 +440,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.315, - "erosion": 0.05, + "continentalness": -0.415, + "erosion": -0.05, "depth": 0, "weirdness": 0, "offset": 0 @@ -422,8 +452,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.315, - "erosion": 0.05, + "continentalness": -0.415, + "erosion": -0.05, "depth": 0, "weirdness": 0.2, "offset": 0 @@ -435,7 +465,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.315, + "continentalness": -0.415, "erosion": 0.05, "depth": 0, "weirdness": -0.2, @@ -447,7 +477,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.315, + "continentalness": -0.415, "erosion": 0.05, "depth": 0, "weirdness": 0, @@ -459,7 +489,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.315, + "continentalness": -0.415, "erosion": 0.05, "depth": 0, "weirdness": 0.2, @@ -474,7 +504,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.3, + "continentalness": -0.39, "erosion": 0.05, "depth": 0, "weirdness": -0.2, @@ -486,7 +516,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.3, + "continentalness": -0.39, "erosion": 0.05, "depth": 0, "weirdness": 0, @@ -498,7 +528,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.3, + "continentalness": -0.39, "erosion": 0.05, "depth": 0, "weirdness": 0.2, @@ -511,7 +541,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0, + "continentalness": 0.1, "erosion": 0.05, "depth": 0, "weirdness": -0.2, @@ -523,7 +553,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0, + "continentalness": 0.1, "erosion": 0.05, "depth": 0, "weirdness": 0, @@ -535,7 +565,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0, + "continentalness": 0.1, "erosion": 0.05, "depth": 0, "weirdness": 0.2, @@ -550,8 +580,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.3, - "erosion": 0.05, + "continentalness": -0.39, + "erosion": -0.05, "depth": 0, "weirdness": -0.2, "offset": 0.0 @@ -562,8 +592,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.3, - "erosion": 0.05, + "continentalness": -0.39, + "erosion": -0.05, "depth": 0, "weirdness": 0, "offset": 0.0 @@ -574,8 +604,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": -0.3, - "erosion": 0.05, + "continentalness": -0.39, + "erosion": -0.05, "depth": 0, "weirdness": 0.2, "offset": 0.0 @@ -587,8 +617,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0, - "erosion": 0.05, + "continentalness": 0.1, + "erosion": -0.05, "depth": 0, "weirdness": -0.2, "offset": 0.0 @@ -599,8 +629,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0, - "erosion": 0.05, + "continentalness": 0.1, + "erosion": -0.05, "depth": 0, "weirdness": 0, "offset": 0.0 @@ -611,8 +641,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0, - "erosion": 0.05, + "continentalness": 0.1, + "erosion": -0.05, "depth": 0, "weirdness": 0.2, "offset": 0.0 @@ -625,7 +655,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.05, + "continentalness": 0.15, "erosion": 0.05, "depth": 0, "weirdness": -0.2, @@ -637,7 +667,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.05, + "continentalness": 0.15, "erosion": 0.05, "depth": 0, "weirdness": 0, @@ -649,7 +679,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.05, + "continentalness": 0.15, "erosion": 0.05, "depth": 0, "weirdness": 0.2, @@ -662,7 +692,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.45, + "continentalness": 0.59, "erosion": 0.05, "depth": 0, "weirdness": -0.2, @@ -674,7 +704,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.45, + "continentalness": 0.59, "erosion": 0.05, "depth": 0, "weirdness": 0, @@ -686,7 +716,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.45, + "continentalness": 0.59, "erosion": 0.05, "depth": 0, "weirdness": 0.2, @@ -701,8 +731,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.05, - "erosion": 0.05, + "continentalness": 0.15, + "erosion": -0.05, "depth": 0, "weirdness": -0.2, "offset": 0.0 @@ -713,8 +743,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.05, - "erosion": 0.05, + "continentalness": 0.15, + "erosion": -0.05, "depth": 0, "weirdness": 0, "offset": 0.0 @@ -725,8 +755,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.05, - "erosion": 0.05, + "continentalness": 0.15, + "erosion": -0.05, "depth": 0, "weirdness": 0.2, "offset": 0.0 @@ -739,8 +769,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.45, - "erosion": 0.05, + "continentalness": 0.59, + "erosion": -0.05, "depth": 0, "weirdness": -0.2, "offset": 0.0 @@ -751,8 +781,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.45, - "erosion": 0.05, + "continentalness": 0.59, + "erosion": -0.05, "depth": 0, "weirdness": 0, "offset": 0.0 @@ -763,8 +793,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.45, - "erosion": 0.05, + "continentalness": 0.59, + "erosion": -0.05, "depth": 0, "weirdness": 0.2, "offset": 0.0 @@ -779,7 +809,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.5, + "continentalness": 0.61, "erosion": 0.05, "depth": 0, "weirdness": -0.2, @@ -791,7 +821,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.5, + "continentalness": 0.61, "erosion": 0.05, "depth": 0, "weirdness": 0, @@ -803,7 +833,7 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.5, + "continentalness": 0.61, "erosion": 0.05, "depth": 0, "weirdness": 0.2, @@ -817,8 +847,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.5, - "erosion": 0.05, + "continentalness": 0.61, + "erosion": -0.05, "depth": 0, "weirdness": -0.2, "offset": 0.0 @@ -829,8 +859,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.5, - "erosion": 0.05, + "continentalness": 0.61, + "erosion": -0.05, "depth": 0, "weirdness": 0, "offset": 0.0 @@ -841,8 +871,8 @@ "parameters": { "temperature": 0, "humidity": 0, - "continentalness": 0.5, - "erosion": 0.05, + "continentalness": 0.61, + "erosion": -0.05, "depth": 0, "weirdness": 0.2, "offset": 0.0 diff --git a/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json b/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json index dbd00bd06..57fa5d58f 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json +++ b/kubejs/data/tfg/worldgen/biome/venus/fumaroles.json @@ -35,6 +35,9 @@ } }, "features": [ + [ + "tfg:venus/terrain/sulfur_fumes_spring" + ], [ "tfc:erosion" ], @@ -42,7 +45,6 @@ [], [], [], - [], "#tfg:venus_veins", "#tfg:venus_underground_decoration", [ diff --git a/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json b/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json index 46cb11773..4c757911f 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json +++ b/kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json @@ -35,20 +35,19 @@ } }, "features": [ - [ - "tfc:erosion" - ], [ "tfg:venus/terrain/lava_spring", "tfg:venus/terrain/lava_delta", "tfg:venus/terrain/lava_lake", "tfg:venus/terrain/lava_fissure", "tfg:venus/terrain/lava_rivulet", - "tfg:venus/terrain/magma_rivulet" - ], - [ + "tfg:venus/terrain/magma_rivulet", "tfg:venus/terrain/basalt_pillar" ], + [ + "tfc:erosion" + ], + [], [], [ "tfg:venus/terrain/basalt_columns_small", diff --git a/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json b/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json index 79b328a81..e65dbd1cc 100644 --- a/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json +++ b/kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json @@ -35,6 +35,10 @@ } }, "features": [ + [ + "tfg:venus/terrain/sulfur_fumes_fill", + "tfg:venus/terrain/sulfur_fumes_spring" + ], [ "tfc:erosion" ], @@ -42,7 +46,6 @@ [], [], [], - [], "#tfg:venus_veins", "#tfg:venus_underground_decoration", [ @@ -50,13 +53,12 @@ "tfg:venus/vein_manual/sulfur", "tfc:raw_boulder_small_patch", "tfc:cobble_boulder_small_patch", - "tfg:venus/terrain/thermal_vent" - ], - [ + "tfg:venus/terrain/thermal_vent", "tfg:venus/surface/sulfur_patch", "tfg:venus/surface/hydralux", "tfg:venus/surface/loose_scoria" ], + [], "#tfg:venus_top_layer_modification" ], "has_precipitation": true, diff --git a/kubejs/data/tfg/worldgen/configured_feature/nether/terrain/spring_lava.json b/kubejs/data/tfg/worldgen/configured_feature/nether/terrain/spring_lava.json index cfbbc5b0b..05ea8c047 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/nether/terrain/spring_lava.json +++ b/kubejs/data/tfg/worldgen/configured_feature/nether/terrain/spring_lava.json @@ -10,6 +10,6 @@ "falling": "true" } }, - "valid_blocks": "#base_stone_nether" + "valid_blocks": "#minecraft:base_stone_nether" } } \ 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 index b42fe220e..e75620e1d 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_crackrack.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_crackrack.json @@ -27,7 +27,7 @@ "placement": [ { "type": "minecraft:heightmap", - "heightmap": "OCEAN_FLOOR" + "heightmap": "WORLD_SURFACE" }, { "type": "minecraft:block_predicate_filter", 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 index 040d64b68..4192d4339 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_scorchia.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_scorchia.json @@ -27,7 +27,7 @@ "placement": [ { "type": "minecraft:heightmap", - "heightmap": "OCEAN_FLOOR" + "heightmap": "WORLD_SURFACE" }, { "type": "minecraft:block_predicate_filter", 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 index 406c92329..5377f30b2 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_scoria.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/loose_scoria.json @@ -27,7 +27,7 @@ "placement": [ { "type": "minecraft:heightmap", - "heightmap": "OCEAN_FLOOR" + "heightmap": "WORLD_SURFACE" }, { "type": "minecraft:block_predicate_filter", diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/pile_black_sand.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/pile_black_sand.json index b9bc3ca6a..2e211ab1f 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/pile_black_sand.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/pile_black_sand.json @@ -27,7 +27,7 @@ "placement": [ { "type": "minecraft:heightmap", - "heightmap": "OCEAN_FLOOR" + "heightmap": "WORLD_SURFACE" }, { "type": "minecraft:block_predicate_filter", diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/pile_volcanic_ash.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/pile_volcanic_ash.json index e0e523bb8..f919ce0b8 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/pile_volcanic_ash.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/pile_volcanic_ash.json @@ -27,7 +27,7 @@ "placement": [ { "type": "minecraft:heightmap", - "heightmap": "OCEAN_FLOOR" + "heightmap": "WORLD_SURFACE" }, { "type": "minecraft:block_predicate_filter", diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/shadow_plant_patch.json b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/shadow_plant_patch.json index abaeb145b..d8262a4f6 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/surface/shadow_plant_patch.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/surface/shadow_plant_patch.json @@ -16,7 +16,7 @@ "placement": [ { "type": "minecraft:heightmap", - "heightmap": "OCEAN_FLOOR_WG" + "heightmap": "WORLD_SURFACE" }, { "type": "minecraft:block_predicate_filter", @@ -24,9 +24,9 @@ "type": "minecraft:all_of", "predicates": [ { - "type": "minecraft:matching_block_tag", + "type": "minecraft:has_sturdy_face", "offset": [ 0, -1, 0 ], - "tag": "ad_astra:venus_stone_replaceables" + "direction": "down" }, { "type": "minecraft:matching_blocks", diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/basalt_columns_large.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/basalt_columns_large.json index e52016bcb..a9eb54e9d 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/basalt_columns_large.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/basalt_columns_large.json @@ -1,19 +1,44 @@ { - "type": "minecraft:basalt_columns", + "type": "minecraft:random_patch", "config": { - "height": { - "type": "minecraft:uniform", - "value": { - "max_inclusive": 10, - "min_inclusive": 4 - } + "feature": { + "feature": { + "type": "minecraft:block_column", + "config": { + "allowed_placement": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction": "up", + "layers": [ + { + "height": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 10, + "min_inclusive": 4 + } + }, + "provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:basalt" + } + } + } + ], + "prioritize_tip": false + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR" + } + ] }, - "reach": { - "type": "minecraft:uniform", - "value": { - "max_inclusive": 3, - "min_inclusive": 1 - } - } + "tries": 10, + "xz_spread": 4, + "y_spread": 1 } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/basalt_columns_small.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/basalt_columns_small.json index 108d52449..16dd80c68 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/basalt_columns_small.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/basalt_columns_small.json @@ -1,13 +1,44 @@ { - "type": "minecraft:basalt_columns", + "type": "minecraft:random_patch", "config": { - "height": { - "type": "minecraft:uniform", - "value": { - "max_inclusive": 4, - "min_inclusive": 1 - } + "feature": { + "feature": { + "type": "minecraft:block_column", + "config": { + "allowed_placement": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction": "up", + "layers": [ + { + "height": { + "type": "minecraft:uniform", + "value": { + "max_inclusive": 4, + "min_inclusive": 1 + } + }, + "provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:basalt" + } + } + } + ], + "prioritize_tip": false + } + }, + "placement": [ + { + "type": "minecraft:heightmap", + "heightmap": "OCEAN_FLOOR" + } + ] }, - "reach": 1 + "tries": 6, + "xz_spread": 3, + "y_spread": 1 } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lava_fissure.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lava_fissure.json index a79f36a28..4068e766e 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lava_fissure.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lava_fissure.json @@ -1,7 +1,7 @@ { "type": "tfc:fissure", "config": { - "wall_state": "beneath:crackrack", + "wall_state": "tfg:rock/hardened_crackrack", "fluid_state": "minecraft:lava", "count": 3, "radius": 6 diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lava_spring.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lava_spring.json index 8968b9e43..f270b2d4c 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lava_spring.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/lava_spring.json @@ -1,7 +1,6 @@ { "type": "tfc:hot_spring", "config": { - "wall_state": "beneath:crackrack", "fluid_state": "minecraft:lava", "radius": 16, "decoration": { @@ -80,8 +79,8 @@ ] } ], - "radius": 8, - "count": 32, + "radius": 12, + "count": 48, "rarity": 1 } } diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/sulfur_fumes_fill.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/sulfur_fumes_fill.json new file mode 100644 index 000000000..df39b7c16 --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/sulfur_fumes_fill.json @@ -0,0 +1,11 @@ +{ + "type": "tfc:flood_fill_lake", + "config": { + "overfill": true, + "replace_fluids": [ + "minecraft:lava", + "tfg:geyser_slurry" + ], + "state": "tfg:fluid/sulfur_fumes" + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/sulfur_fumes_spring.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/sulfur_fumes_spring.json new file mode 100644 index 000000000..ba96454ad --- /dev/null +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/sulfur_fumes_spring.json @@ -0,0 +1,87 @@ +{ + "type": "tfc:hot_spring", + "config": { + "fluid_state": "tfg:fluid/sulfur_fumes", + "radius": 8, + "decoration": { + "blocks": [ + { + "replace": [ + "tfc:rock/raw/rhyolite" + ], + "with": [ + { + "block": "tfc:rock/magma/rhyolite" + } + ] + }, + { + "replace": [ + "tfc:rock/raw/basalt", + "ad_astra:moon_deepslate" + ], + "with": [ + { + "block": "tfc:rock/magma/basalt" + } + ] + }, + { + "replace": [ + "tfc:rock/raw/andesite" + ], + "with": [ + { + "block": "tfc:rock/magma/andesite" + } + ] + }, + { + "replace": [ + "tfc:rock/raw/dacite" + ], + "with": [ + { + "block": "tfc:rock/magma/dacite" + } + ] + }, + { + "replace": [ + "tfc:rock/raw/granite", + "gtceu:red_granite" + ], + "with": [ + { + "block": "tfc:rock/magma/granite" + } + ] + }, + { + "replace": [ + "tfc:rock/raw/diorite" + ], + "with": [ + { + "block": "tfc:rock/magma/diorite" + } + ] + }, + { + "replace": [ + "tfc:rock/raw/gabbro", + "minecraft:deepslate" + ], + "with": [ + { + "block": "tfc:rock/magma/gabbro" + } + ] + } + ], + "radius": 8, + "count": 24, + "rarity": 1 + } + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/thermal_tube_worms.json b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/thermal_tube_worms.json index d8b77e7ed..5295d9cbe 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/thermal_tube_worms.json +++ b/kubejs/data/tfg/worldgen/configured_feature/venus/terrain/thermal_tube_worms.json @@ -12,7 +12,7 @@ "type": "tfg:attached_decorative_plant", "config": { "block": "betterend:tube_worm", - "heightRange": 5 + "heightRange": 1 } }, "placement": [] @@ -33,7 +33,7 @@ "fluid": "sulfur_fumes" } }, - "heightRange": 5 + "heightRange": 1 } }, "placement": [] @@ -48,8 +48,8 @@ }, "placement": [] }, - "tries": 36, + "tries": 48, "xz_spread": 4, - "y_spread": 0 + "y_spread": 5 } } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/density_function/venus/offset.json b/kubejs/data/tfg/worldgen/density_function/venus/offset.json index 31910ca48..1846adcd6 100644 --- a/kubejs/data/tfg/worldgen/density_function/venus/offset.json +++ b/kubejs/data/tfg/worldgen/density_function/venus/offset.json @@ -41,12 +41,12 @@ }, { "derivative": 0.0, - "location": -0.51, + "location": -0.61, "value": -0.09 }, { "derivative": 0.0, - "location": -0.42, + "location": -0.52, "value": { "coordinate": "tfg:venus/ridges_folded", "points": [ @@ -85,7 +85,7 @@ }, { "derivative": 0.0, - "location": -0.35, + "location": -0.45, "value": { "coordinate": "tfg:venus/erosion", "points": [ @@ -655,7 +655,7 @@ }, { "derivative": 0.0, - "location": 0.0, + "location": 0.1, "value": { "coordinate": "tfg:venus/erosion", "points": [ @@ -1046,7 +1046,7 @@ }, { "derivative": 0.0, - "location": 0.30, + "location": 0.375, "value": { "coordinate": "tfg:venus/erosion", "points": [ @@ -1437,7 +1437,398 @@ }, { "derivative": 0.0, - "location": 0.45, + "location": 0.6, + "value": { + "coordinate": "tfg:venus/erosion", + "points": [ + { + "derivative": 0.0, + "location": -0.85, + "value": { + "coordinate": "tfg:venus/ridges_folded", + "points": [ + { + "derivative": 0.0, + "location": -1.0, + "value": 0.40235021 + }, + { + "derivative": 0.5138249, + "location": 0.0, + "value": 0.55 + }, + { + "derivative": 0.5138249, + "location": 1.0, + "value": 0.7 + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.7, + "value": { + "coordinate": "tfg:venus/ridges_folded", + "points": [ + { + "derivative": 0.0, + "location": -1.0, + "value": 0.3 + }, + { + "derivative": 0.43317974, + "location": 0.0, + "value": 0.45 + }, + { + "derivative": 0.43317974, + "location": 1.0, + "value": 0.6 + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.4, + "value": { + "coordinate": "tfg:venus/ridges_folded", + "points": [ + { + "derivative": 0.0, + "location": -1.0, + "value": 0.35 + }, + { + "derivative": 0.3917051, + "location": 0.0, + "value": 0.4 + }, + { + "derivative": 0.3917051, + "location": 1.0, + "value": 0.45 + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.35, + "value": { + "coordinate": "tfg:venus/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": 0.2 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.3 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.35 + }, + { + "derivative": 0.0, + "location": 0.4, + "value": 0.4 + }, + { + "derivative": 0.049000014, + "location": 1.0, + "value": 0.45 + } + ] + } + }, + { + "derivative": 0.0, + "location": -0.1, + "value": { + "coordinate": "tfg:venus/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.1 + }, + { + "derivative": 0.07, + "location": -0.4, + "value": 0.0069999998 + }, + { + "derivative": 0.07, + "location": 0.0, + "value": 0.021 + }, + { + "derivative": 0.658, + "location": 0.4, + "value": 0.35 + }, + { + "derivative": 0.049000014, + "location": 1.0, + "value": 0.42000002 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.2, + "value": { + "coordinate": "tfg:venus/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.1 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.01 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.01 + }, + { + "derivative": 0.04, + "location": 0.4, + "value": 0.03 + }, + { + "derivative": 0.049, + "location": 1.0, + "value": 0.1 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.4, + "value": { + "coordinate": "tfg:venus/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": 0.1 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.05 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.01 + }, + { + "derivative": 0.04, + "location": 0.4, + "value": 0.03 + }, + { + "derivative": 0.049, + "location": 1.0, + "value": 0.3 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.45, + "value": { + "coordinate": "tfg:venus/ridges_folded", + "points": [ + { + "derivative": 0.0, + "location": -1.0, + "value": -0.1 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": { + "coordinate": "tfg:venus/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.1 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.01 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.01 + }, + { + "derivative": 0.04, + "location": 0.4, + "value": 0.03 + }, + { + "derivative": 0.049, + "location": 1.0, + "value": 0.1 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.17 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.55, + "value": { + "coordinate": "tfg:venus/ridges_folded", + "points": [ + { + "derivative": 0.0, + "location": -1.0, + "value": -0.1 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": { + "coordinate": "tfg:venus/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.1 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.01 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.01 + }, + { + "derivative": 0.04, + "location": 0.4, + "value": 0.03 + }, + { + "derivative": 0.049, + "location": 1.0, + "value": 0.1 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.17 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.58, + "value": { + "coordinate": "tfg:venus/ridges_folded", + "points": [ + { + "derivative": 0.5, + "location": -1.0, + "value": -0.1 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": 0.01 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": 0.01 + }, + { + "derivative": 0.04, + "location": 0.4, + "value": 0.03 + }, + { + "derivative": 0.049, + "location": 1.0, + "value": 0.1 + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.7, + "value": { + "coordinate": "tfg:venus/ridges_folded", + "points": [ + { + "derivative": 0.0, + "location": -1.0, + "value": -0.02 + }, + { + "derivative": 0.0, + "location": -0.4, + "value": -0.03 + }, + { + "derivative": 0.0, + "location": 0.0, + "value": -0.03 + }, + { + "derivative": 0.12, + "location": 0.4, + "value": 0.03 + }, + { + "derivative": 0.049, + "location": 1.0, + "value": 0.1 + } + ] + } + } + ] + } + }, + { + "derivative": 0.0, + "location": 0.65, "value": { "coordinate": "tfg:venus/erosion", "points": [ diff --git a/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json b/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json index 36a967625..19fc1262d 100644 --- a/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json +++ b/kubejs/data/tfg/worldgen/noise_settings/venus_noise.json @@ -382,7 +382,7 @@ "if_true": { "type": "minecraft:y_above", "anchor": { - "absolute": 65 + "absolute": 68 }, "surface_depth_multiplier": 0, "add_stone_depth": false diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/adakite_column.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/adakite_column.json index 7a7c2c0f0..cffa3ebfd 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/adakite_column.json +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/adakite_column.json @@ -1,4 +1,8 @@ { "feature": "tfg:venus/terrain/adakite_column", - "placement": [] + "placement": [ + { + "type": "minecraft:biome" + } + ] } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/sulfur_fumes_fill.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/sulfur_fumes_fill.json new file mode 100644 index 000000000..1a4620961 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/sulfur_fumes_fill.json @@ -0,0 +1,16 @@ +{ + "feature": "tfg:venus/terrain/sulfur_fumes_fill", + "placement": [ + { + "type": "minecraft:count", + "count": 2 + }, + { + "type": "minecraft:heightmap", + "heightmap": "WORLD_SURFACE_WG" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/sulfur_fumes_spring.json b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/sulfur_fumes_spring.json new file mode 100644 index 000000000..f55982796 --- /dev/null +++ b/kubejs/data/tfg/worldgen/placed_feature/venus/terrain/sulfur_fumes_spring.json @@ -0,0 +1,12 @@ +{ + "feature": "tfg:venus/terrain/sulfur_fumes_spring", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 30 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/endermanoverhaul/tags.js b/kubejs/server_scripts/endermanoverhaul/tags.js index 8185fce25..a10f0dd9d 100644 --- a/kubejs/server_scripts/endermanoverhaul/tags.js +++ b/kubejs/server_scripts/endermanoverhaul/tags.js @@ -18,7 +18,7 @@ const registerEndermanOverhaulItemTags = (event) => { const registerEndermanOverhaulBlockTags = (event) => { - event.add('endermanoverhaul:cave_enderman_holdable', 'forge:ores') - event.add('endermanoverhaul:cave_enderman_holdable', 'minecraft:base_stone_nether') + event.add('endermanoverhaul:cave_enderman_holdable', '#forge:ores') + event.add('endermanoverhaul:cave_enderman_holdable', '#minecraft:base_stone_nether') } \ No newline at end of file diff --git a/kubejs/server_scripts/macaws_for_tfc/recipes.js b/kubejs/server_scripts/macaws_for_tfc/recipes.js index a412f913e..29cb84ea2 100644 --- a/kubejs/server_scripts/macaws_for_tfc/recipes.js +++ b/kubejs/server_scripts/macaws_for_tfc/recipes.js @@ -24,13 +24,6 @@ function registerMacawsForTFCRecipes(event) { }).id(`tfg:shaped/${wood}_wired_fence`) }) - event.remove({input: ['mcw_tfc_aio:roofs/gray_roofs/gray_roof_slab','#tfc:saws']}) - - event.shapeless('minecraft:gray_terracotta', [ - 'mcw_tfc_aio:roofs/gray_roofs/gray_roof_slab', - 'mcw_tfc_aio:roofs/gray_roofs/gray_roof_slab' - ]).id('minecraft:gray_terracotta') - event.shaped(`4x mcw_tfc_aio:fences/other_fences/hedge`, [ 'BAB', 'BAB' diff --git a/kubejs/server_scripts/macaws_for_tfc/tags.js b/kubejs/server_scripts/macaws_for_tfc/tags.js new file mode 100644 index 000000000..9a233b5f3 --- /dev/null +++ b/kubejs/server_scripts/macaws_for_tfc/tags.js @@ -0,0 +1,8 @@ +// priority: 0 +"use strict"; + +function registerMacawsForTFCItemTags(event) { + global.MINECRAFT_DYE_NAMES.forEach(color => { + event.remove(`mcw_tfc_aio:${color}_roofs`, `mcw_tfc_aio:roofs/${color}_roofs/${color}_roof_slab`); + }) +} \ No newline at end of file diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index df97fcde1..362a89dce 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -37,6 +37,7 @@ ServerEvents.tags('item', event => { registerGreateItemTags(event) registerGTCEUItemTags(event) registerImmersiveAircraftItemTags(event) + registerMacawsForTFCItemTags(event) registerMegaCellsItemTags(event) registerMinecraftItemTags(event) registerModernMarkingsItemTags(event) diff --git a/kubejs/server_scripts/minecraft/tags.js b/kubejs/server_scripts/minecraft/tags.js index 2c029750c..83dac430a 100644 --- a/kubejs/server_scripts/minecraft/tags.js +++ b/kubejs/server_scripts/minecraft/tags.js @@ -6,57 +6,81 @@ * @param {TagEvent.Item} event */ const registerMinecraftItemTags = (event) => { - global.MINECRAFT_DISABLED_ITEMS.forEach(item => { - event.removeAllTagsFrom(item) - event.add('c:hidden_from_recipe_viewers', item) - }) + global.MINECRAFT_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + event.add('c:hidden_from_recipe_viewers', item) + }) - global.MINECRAFT_HIDED_ITEMS.forEach(item => { - event.add('c:hidden_from_recipe_viewers', item) - }) + global.MINECRAFT_HIDED_ITEMS.forEach(item => { + event.add('c:hidden_from_recipe_viewers', item) + }) - // Hide potions - event.add('c:hidden_from_recipe_viewers', /minecraft.*potion.*/) + // Hide potions + event.add('c:hidden_from_recipe_viewers', /minecraft.*potion.*/) - // Теперь обсидиан сторадж блок - event.add('forge:storage_blocks/obsidian', 'minecraft:obsidian') + // Теперь обсидиан сторадж блок + event.add('forge:storage_blocks/obsidian', 'minecraft:obsidian') - // Бамбуковые полублоки - event.add('tfg:bamboo_slabs', 'minecraft:bamboo_slab') - event.add('tfg:bamboo_slabs', 'minecraft:bamboo_mosaic_slab') + // Бамбуковые полублоки + event.add('tfg:bamboo_slabs', 'minecraft:bamboo_slab') + event.add('tfg:bamboo_slabs', 'minecraft:bamboo_mosaic_slab') - event.remove('minecraft:creeper_drop_music_discs', ['minecraft:music_disc_11']) + event.remove('minecraft:creeper_drop_music_discs', ['minecraft:music_disc_11']) - event.remove('forge:gems', 'minecraft:charcoal') - event.remove('forge:gems', 'minecraft:coal') - event.remove('forge:gems', 'minecraft:flint') + event.remove('forge:gems', 'minecraft:charcoal') + event.remove('forge:gems', 'minecraft:coal') + event.remove('forge:gems', 'minecraft:flint') - event.add('tfc:colored_terracotta', 'minecraft:white_terracotta') + event.add('tfc:colored_terracotta', 'minecraft:white_terracotta') - event.add('tfc:bells', 'minecraft:bell') + event.add('tfc:bells', 'minecraft:bell') + + event.add('tfc:makes_black_dye', 'minecraft:ink_sac') + event.add('tfc:makes_white_dye', 'minecraft:bone_meal') - event.add('tfc:makes_black_dye', 'minecraft:ink_sac') - event.add('tfc:makes_white_dye', 'minecraft:bone_meal') - event.add('create:blaze_burner_fuel/regular', 'minecraft:coal') event.add('create:blaze_burner_fuel/regular', 'minecraft:charcoal') event.add("tfg:rubber_plants", "minecraft:spore_blossom") - event.add('tfg:stonecutting/crackrack', 'minecraft:nether_brick_fence') + event.add('tfg:stonecutting/crackrack', 'minecraft:nether_brick_fence') } const registerMinecraftBlockTags = (event) => { - global.MINECRAFT_DISABLED_ITEMS.forEach(item => { - event.removeAllTagsFrom(item) - }) + global.MINECRAFT_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + }) - // Stops saws from being able to pick up ice - event.remove('minecraft:ice', 'minecraft:ice') - event.remove('minecraft:ice', 'tfc:sea_ice') + // Stops saws from being able to pick up ice + event.remove('minecraft:ice', 'minecraft:ice') + event.remove('minecraft:ice', 'tfc:sea_ice') - // Теперь обсидиан сторадж блок - event.add('forge:storage_blocks/obsidian', 'minecraft:obsidian') - - event.add('minecraft:mineable/pickaxe', 'minecraft:glowstone') + // Теперь обсидиан сторадж блок + event.add('forge:storage_blocks/obsidian', 'minecraft:obsidian') + + event.add('minecraft:mineable/pickaxe', 'minecraft:glowstone') + + // Things endermen can pick up and move around + event.removeAll('minecraft:enderman_holdable'); + event.add('minecraft:enderman_holdable', '#tfc:dirt') + event.add('minecraft:enderman_holdable', '#tfc:mud') + event.add('minecraft:enderman_holdable', '#tfc:loose_rocks') + event.add('minecraft:enderman_holdable', '#forge:gravel') + event.add('minecraft:enderman_holdable', '#forge:sand') + event.add('minecraft:enderman_holdable', '#forge:cobblestone') + event.add('minecraft:enderman_holdable', '#tfc:plants') + event.add('minecraft:enderman_holdable', '#tfg:plants/beneath') + event.add('minecraft:enderman_holdable', '#tfg:moon_plants') + event.add('minecraft:enderman_holdable', '#tfg:mars_plants') + event.add('minecraft:enderman_holdable', '#tfg:venus_plants') + event.add('minecraft:enderman_holdable', '#tfg:mercury_plants') + event.add('minecraft:enderman_holdable', '#tfg:europa_plants') + event.add('minecraft:enderman_holdable', 'tfc:pumpkin') + event.add('minecraft:enderman_holdable', 'tfc:melon') + event.add('minecraft:enderman_holdable', 'betterend:cave_pumpkin') + event.add('minecraft:enderman_holdable', '#minecraft:leaves') + event.add('minecraft:enderman_holdable', 'beneath:wood/leaves/crimson') + event.add('minecraft:enderman_holdable', 'beneath:wood/leaves/warped') + event.add('minecraft:enderman_holdable', 'tfg:glacian_leaves') + event.add('minecraft:enderman_holdable', '#tfg:solid_leaves') } \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 6eb87bda4..b51634c4d 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -241,6 +241,12 @@ const registerTFCRecipes = (event) => { .outputFluid(Fluid.of('tfc:vinegar', 250)) .id('tfc:barrel/vinegar') + // Clay dust to balls + event.recipes.tfc.barrel_sealed(8000) + .inputs('gtceu:clay_dust',TFC.fluidStackIngredient('minecraft:water', 250)) + .outputItem('1x minecraft:clay_ball') + .id('tfc:barrel/clay_ball') + // Borax to flux event.recipes.tfc.quern('4x tfc:powder/flux', 'gtceu:borax_dust') .id(`tfg:quern/borax`) diff --git a/kubejs/server_scripts/tfg/beneath/tags.beneath.js b/kubejs/server_scripts/tfg/beneath/tags.beneath.js index b5d3b554e..ce5e1a4b1 100644 --- a/kubejs/server_scripts/tfg/beneath/tags.beneath.js +++ b/kubejs/server_scripts/tfg/beneath/tags.beneath.js @@ -1,5 +1,19 @@ "use strict"; +/** + * @property {string[]} beneath_plants - List of Beneath plants to be added to the `tfg:plants/beneath` tag. +*/ +const beneath_plants = [ + 'beneath:gleamflower', + 'beneath:burpflower', + 'minecraft:big_dripleaf', + 'minecraft:small_dripleaf', + 'minecraft:glow_lichen', + 'minecraft:hanging_roots', + 'minecraft:spore_blossom', + '#beneath:mushrooms' +]; + function registerTFGBeneathItemTags(event) { event.add("minecraft:piglin_loved", "gtceu:tiny_pyrite_dust"); @@ -14,19 +28,6 @@ function registerTFGBeneathItemTags(event) { event.remove('createaddition:plants', 'minecraft:moss_carpet') - /** - * @property {string[]} beneath_plants - List of Beneath plants to be added to the `tfg:plants/beneath` tag. - */ - const beneath_plants = [ - 'beneath:gleamflower', - 'beneath:burpflower', - 'minecraft:big_dripleaf', - 'minecraft:small_dripleaf', - 'minecraft:glow_lichen', - 'minecraft:hanging_roots', - 'minecraft:spore_blossom', - '#beneath:mushrooms' - ]; beneath_plants.forEach(plant => event.add('tfg:plants/beneath', plant) ); @@ -46,6 +47,10 @@ function registerTFGBeneathBlockTags(event) { event.remove('tfc:plants', 'beneath:gleamflower') event.remove('tfc:plants', 'beneath:burpflower') + + beneath_plants.forEach(plant => + event.add('tfg:plants/beneath', plant) + ); event.add('minecraft:lush_ground_replaceable', 'minecraft:blackstone') event.add('beneath:nether_bush_plantable_on', 'minecraft:blackstone') diff --git a/kubejs/server_scripts/tfg/machines/recipes.casings.js b/kubejs/server_scripts/tfg/machines/recipes.casings.js index 199fa44a9..814409db3 100644 --- a/kubejs/server_scripts/tfg/machines/recipes.casings.js +++ b/kubejs/server_scripts/tfg/machines/recipes.casings.js @@ -200,7 +200,7 @@ function registerTFGCasingRecipes(event) { .itemInputs('gtceu:ostrum_frame', '4x #forge:plates/titanium_tungsten_carbide', '16x #forge:fine_wires/copper', '16x #forge:fine_wires/tungsten_bismuth_oxide_composite') .inputFluids(Fluid.of('gtceu:reinforced_epoxy_resin', 288)) - .itemOutputs('2x tfg:machine_casing_power_casing') + .itemOutputs('4x tfg:machine_casing_power_casing') .circuit(6) .duration(2.5 * 20) .EUt(GTValues.VA[GTValues.EV]) diff --git a/kubejs/server_scripts/tfg/mars/tags.mars.js b/kubejs/server_scripts/tfg/mars/tags.mars.js index e7a130957..fcecf3062 100644 --- a/kubejs/server_scripts/tfg/mars/tags.mars.js +++ b/kubejs/server_scripts/tfg/mars/tags.mars.js @@ -238,9 +238,6 @@ function registerTFGMarsBlockTags(event) { event.add('tfg:heightmap_ignore', 'tfg:aeronos_cap') event.add('tfg:heightmap_ignore', 'tfg:strophar_cap') - event.remove('minecraft:enderman_holdable', 'minecraft:crimson_fungus') - event.remove('minecraft:enderman_holdable', 'minecraft:warped_fungus') - event.remove('ad_astra:strophar_caps', 'ad_astra:strophar_cap') event.remove('ad_astra:aeronos_caps', 'ad_astra:aeronos_cap') diff --git a/kubejs/server_scripts/tfg/moon/tags.moon.js b/kubejs/server_scripts/tfg/moon/tags.moon.js index 33b50a4d3..90fe8cdae 100644 --- a/kubejs/server_scripts/tfg/moon/tags.moon.js +++ b/kubejs/server_scripts/tfg/moon/tags.moon.js @@ -2,9 +2,6 @@ function registerTFGMoonItemTags(event) { - event.add('tfg:moon_plants', 'tfg:lunar_roots') - event.add('tfg:moon_plants', 'tfg:lunar_sprouts') - event.add('tfc:compost_greens_high', 'minecraft:pearlescent_froglight') event.add('tfc:compost_greens_high', 'minecraft:verdant_froglight') event.add('tfc:compost_greens_high', 'minecraft:ochre_froglight') diff --git a/kubejs/server_scripts/tfg/natural_blocks/tags.stones.js b/kubejs/server_scripts/tfg/natural_blocks/tags.stones.js index 01a941a77..e8c1f7f7d 100644 --- a/kubejs/server_scripts/tfg/natural_blocks/tags.stones.js +++ b/kubejs/server_scripts/tfg/natural_blocks/tags.stones.js @@ -28,8 +28,10 @@ function registerTFGStoneItemTags(event) { material = rock.material.replace(/tfg:/g, ''); if (rock.raw != null) { - event.add('tfc:rock/raw', rock.raw.block); - event.add('forge:stone', rock.raw.block); + if (rock.collapsible) { + event.add('tfc:rock/raw', rock.raw.block); + event.add('forge:stone', rock.raw.block); + } addToTfcTag(rock.raw.block); addToMaterialTag(material, rock.raw.block); diff --git a/kubejs/server_scripts/tfg/primitive/recipes.paper.js b/kubejs/server_scripts/tfg/primitive/recipes.paper.js index 9fba0ec9e..372ad7595 100644 --- a/kubejs/server_scripts/tfg/primitive/recipes.paper.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.paper.js @@ -77,25 +77,18 @@ function registerTFGPapermakingRecipes(event) { // Create macerator recipes for softwood event.recipes.gtceu.macerator('macerate_softwood') .itemInputs('#tfg:softwood') - .itemOutputs('6x gtceu:wood_dust') + .itemOutputs('4x gtceu:wood_dust') .chancedOutput('gtceu:wood_dust', 8000, 680) .duration(70) .EUt(2) - event.recipes.tfc.quern('4x gtceu:wood_dust', '#tfg:softwood') - .id('tfg:quern/softwood_dust') - - //Create identical macerator recipe for hardwood event.recipes.gtceu.macerator('macerate_hardwood') .itemInputs('#tfg:hardwood') - .itemOutputs('6x gtceu:hardwood_dust') + .itemOutputs('4x gtceu:hardwood_dust') .chancedOutput('gtceu:hardwood_dust', 8000, 680) .duration(70) .EUt(2) - event.recipes.tfc.quern('4x gtceu:hardwood_dust', '#tfg:hardwood') - .id('tfg:quern/hardwood_dust') - //Replace any recipe that outputs wood dust to use hardwood dust if it's ID string contains the name of one of the hardwood types. //This absolutely fuckin sucks but it works event.forEachRecipe({ output: 'gtceu:wood_dust' }, r => { diff --git a/kubejs/server_scripts/tfg/venus/tags.venus.js b/kubejs/server_scripts/tfg/venus/tags.venus.js index 15dd2188b..87d703712 100644 --- a/kubejs/server_scripts/tfg/venus/tags.venus.js +++ b/kubejs/server_scripts/tfg/venus/tags.venus.js @@ -86,6 +86,7 @@ function registerTFGVenusBlockTags(event) { 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', 'tfg:rock/halite') 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') diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index dfd7a176b..d45b41af1 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -227,9 +227,9 @@ const registerGTCEuMachines = (event) => { .appearanceBlock(() => Block.getBlock('gtceu:high_temperature_smelting_casing')) .pattern(definition => FactoryBlockPattern.start() .aisle(' ','BBBBBBB','BCCCCCB','BBBBBBB',' ') - .aisle('AAAAAAA','A#####A','BDDDDDB','A#####A','AAAAAAA') + .aisle('AAAAAAA','A#####A','ZDDDDDZ','A#####A','AAAAAAA') .aisle('AFFFFFA','B#####B','LEEEEEL','B#####B','AFFFFFA') - .aisle('AAAAAAA','A#####A','BDDDDDB','A#####A','AAAAAAA') + .aisle('AAAAAAA','A#####A','ZDDDDDZ','A#####A','AAAAAAA') .aisle(' ','BBBXBBB','BCCCCCB','BBBMBBB',' ') .where('X', Predicates.controller(Predicates.blocks(definition.get()))) .where('A', Predicates.blocks('gtceu:atomic_casing')) @@ -244,6 +244,9 @@ const registerGTCEuMachines = (event) => { .or(Predicates.abilities(PartAbility.EXPORT_FLUIDS_4X).setExactLimit(1))) .where('M', Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1) .or(Predicates.blocks('gtceu:high_temperature_smelting_casing'))) + .where('Z', Predicates.blocks('gtceu:high_temperature_smelting_casing') + .or(Predicates.abilities(PartAbility.IMPORT_FLUIDS_4X).setMaxGlobalLimited(2)) + .or(Predicates.abilities(PartAbility.EXPORT_FLUIDS_4X).setMaxGlobalLimited(2))) .where('#', Predicates.air()) .where(' ', Predicates.any()) .build() diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index 6770553fe..a778f5a80 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -525,6 +525,7 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:warped_fungus_on_a_stick', 'minecraft:carrot_on_a_stick', 'minecraft:carrot', + 'minecraft:melon', 'minecraft:pumpkin', 'minecraft:suspicious_stew', 'minecraft:mycelium', diff --git a/kubejs/startup_scripts/tfg/blocks.crops.js b/kubejs/startup_scripts/tfg/blocks.crops.js index 700f6610d..3cbbca165 100644 --- a/kubejs/startup_scripts/tfg/blocks.crops.js +++ b/kubejs/startup_scripts/tfg/blocks.crops.js @@ -7,6 +7,7 @@ const registerTFGCrops = (event) => { event.create('tfg:sunflower', 'tfc:double_crop') .translationKey('block.tfg.sunflower') + .mapColor('plant') .soundType('crop') .nutrient('nitrogen') .stages(4) @@ -40,6 +41,7 @@ const registerTFGCrops = (event) => { .tagItem('c:hidden_from_recipe_viewers') event.create('tfg:rapeseed', 'tfc:double_crop') + .mapColor('plant') .translationKey('block.tfg.rapeseed') .soundType('crop') .nutrient('phosphorous') @@ -67,6 +69,7 @@ const registerTFGCrops = (event) => { .tagItem('c:hidden_from_recipe_viewers') event.create('tfg:flax', 'tfc:double_crop') + .mapColor('plant') .translationKey('block.tfg.flax') .soundType('crop') .nutrient('nitrogen') @@ -103,6 +106,7 @@ const registerTFGCrops = (event) => { // Mars Crops event.create('betterend:amber_root', 'tfc:crop') + .mapColor('color_orange') .soundType('crop') .nutrient('phosphorous') .stages(3) @@ -134,6 +138,7 @@ const registerTFGCrops = (event) => { event.create('betterend:blossom_berry', 'tfc:crop') + .mapColor('color_pink') .soundType('crop') .nutrient('potassium') .stages(3) @@ -165,6 +170,7 @@ const registerTFGCrops = (event) => { event.create('betterend:cave_pumpkin') + .mapColor('color_red') .soundType('cherry_wood') .tagBlock('minecraft:mineable/axe') .tagBlock('minecraft:mineable/hoe') @@ -176,6 +182,7 @@ const registerTFGCrops = (event) => { .notSolid() event.create('betterend:cave_pumpkin_plant', 'tfc:spreading_crop') + .mapColor('plant') .soundType('crop') .nutrient('nitrogen') .stages(3) @@ -207,6 +214,7 @@ const registerTFGCrops = (event) => { event.create('betterend:chorus_mushroom', 'tfc:crop') + .mapColor('color_purple') .translationKey('block.betterend.chorus_mushroom') .soundType('nether_wart') .nutrient('phosphorous') @@ -244,6 +252,7 @@ const registerTFGCrops = (event) => { event.create('betterend:shadow_berry', 'tfc:crop') + .mapColor('color_blue') .soundType('crop') .box(2, 0, 2, 14, 3, 14) .nutrient('potassium') @@ -278,6 +287,7 @@ const registerTFGCrops = (event) => { event.create('betterend:bolux_mushroom', 'tfc:crop') + .mapColor('color_orange') .soundType('nether_wart') .box(2, 0, 2, 14, 5, 14) .nutrient('phosphorous') diff --git a/kubejs/startup_scripts/tfg/icon_sets.js b/kubejs/startup_scripts/tfg/icon_sets.js index be0ac333c..8d86dfd69 100644 --- a/kubejs/startup_scripts/tfg/icon_sets.js +++ b/kubejs/startup_scripts/tfg/icon_sets.js @@ -37,7 +37,9 @@ function registerTFGIconSets(event) { event.create('nether_quartz').parent('quartz') + // Looks like VI vanadium event.create('noodle').parent('metallic') + // Looks like ad astra ostrum event.create('cereal_box').parent('bright') // Credits to Flare from the Cosmic Frontiers team @@ -94,7 +96,6 @@ function modifyTFGIconSets(event) { GTMaterials.BlackBronze.setMaterialIconSet(GTMaterialIconSet.SHINY) GTMaterials.Potin.setMaterialIconSet(GTMaterialIconSet.SHINY) GTMaterials.Cupronickel.setMaterialIconSet(GTMaterialIconSet.SHINY) - GTMaterials.ManganesePhosphide.setMaterialIconSet(GTMaterialIconSet.DULL) GTMaterials.Osmium.setMaterialIconSet(GTMaterialIconSet.DULL) GTMaterials.Invar.setMaterialIconSet(GTMaterialIconSet.DULL) @@ -144,19 +145,29 @@ function modifyTFGIconSets(event) { GTMaterials.Electrotine.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_garnierite')) GTMaterials.Bauxite.setMaterialIconSet(GTMaterialIconSet.getByName('tfc_borax')) + // Superconductors get noodle + GTMaterials.ManganesePhosphide.setMaterialIconSet(GTMaterialIconSet.getByName('noodle')) + GTMaterials.MagnesiumDiboride.setMaterialIconSet(GTMaterialIconSet.getByName('noodle')) + GTMaterials.MercuryBariumCalciumCuprate.setMaterialIconSet(GTMaterialIconSet.getByName('noodle')) + GTMaterials.UraniumTriplatinum.setMaterialIconSet(GTMaterialIconSet.getByName('noodle')) + GTMaterials.SamariumIronArsenicOxide.setMaterialIconSet(GTMaterialIconSet.getByName('noodle')) + GTMaterials.IndiumTinBariumTitaniumCuprate.setMaterialIconSet(GTMaterialIconSet.getByName('noodle')) + GTMaterials.UraniumRhodiumDinaquadide.setMaterialIconSet(GTMaterialIconSet.getByName('noodle')) + GTMaterials.EnrichedNaquadahTriniumEuropiumDuranide.setMaterialIconSet(GTMaterialIconSet.getByName('noodle')) + GTMaterials.RutheniumTriniumAmericiumNeutronate.setMaterialIconSet(GTMaterialIconSet.getByName('noodle')) + // Not a superconductor but it's where the icon comes from in the first place + GTMaterials.Vanadium.setMaterialIconSet(GTMaterialIconSet.getByName('noodle')) + + // All naquadah/neutronium/zirconium materials get chonky GTMaterials.Naquadah.setMaterialIconSet(GTMaterialIconSet.getByName('chonky')) GTMaterials.NaquadahEnriched.setMaterialIconSet(GTMaterialIconSet.getByName('chonky')) GTMaterials.Naquadria.setMaterialIconSet(GTMaterialIconSet.getByName('chonky')) GTMaterials.UraniumRhodiumDinaquadide.setMaterialIconSet(GTMaterialIconSet.getByName('chonky')) - GTMaterials.EnrichedNaquadahTriniumEuropiumDuranide.setMaterialIconSet(GTMaterialIconSet.getByName('chonky')) GTMaterials.NaquadahAlloy.setMaterialIconSet(GTMaterialIconSet.getByName('chonky')) GTMaterials.Neutronium.setMaterialIconSet(GTMaterialIconSet.getByName('chonky')) - GTMaterials.RutheniumTriniumAmericiumNeutronate.setMaterialIconSet(GTMaterialIconSet.getByName('chonky')) GTMaterials.Zirconium.setMaterialIconSet(GTMaterialIconSet.getByName('chonky')) - GTMaterials.Vanadium.setMaterialIconSet(GTMaterialIconSet.getByName('noodle')) - const $GreateMaterials = Java.loadClass("electrolyte.greate.registry.GreateMaterials") $GreateMaterials.RoseQuartz.setMaterialIconSet(GTMaterialIconSet.getByName('nether_quartz')) } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/mars/blocks.mars_deco.js b/kubejs/startup_scripts/tfg/mars/blocks.mars_deco.js index 86ccf9ea9..93f846ad4 100644 --- a/kubejs/startup_scripts/tfg/mars/blocks.mars_deco.js +++ b/kubejs/startup_scripts/tfg/mars/blocks.mars_deco.js @@ -54,8 +54,8 @@ function registerTFGWorldGenMarsDecoBlocks(event) { .soundType('crop') .box(1, 0, 1, 15, 2, 15) .mapColor('color_light_blue') - .tagItem('tfg:mars_plants') - .tagItem('forge:mushrooms') + .tagBoth('tfg:mars_plants') + .tagBoth('forge:mushrooms') .tagBlock('tfg:do_not_destroy_in_space') .tagBlock('minecraft:replaceable') .tagBlock('tfc:can_be_ice_piled') @@ -65,7 +65,7 @@ function registerTFGWorldGenMarsDecoBlocks(event) { .soundType('crop') .box(0, 0, 0, 16, 1, 16) .mapColor('color_cyan') - .tagItem('tfg:mars_plants') + .tagBoth('tfg:mars_plants') .tagBlock('tfg:do_not_destroy_in_space') .tagBlock('minecraft:replaceable') .tagBlock('tfc:can_be_ice_piled') @@ -74,30 +74,30 @@ function registerTFGWorldGenMarsDecoBlocks(event) { event.create('betterend:aurant_polypore', 'tfg:attached_decorative_plant') .soundType('nether_wart') - .tagItem('tfg:mars_plants') - .tagItem('forge:mushrooms') + .tagBoth('tfg:mars_plants') + .tagBoth('forge:mushrooms') .tagBlock('minecraft:replaceable') .tagBlock('tfg:do_not_destroy_in_space') event.create('betterend:purple_polypore', 'tfg:attached_decorative_plant') .soundType('nether_wart') - .tagItem('tfg:mars_plants') - .tagItem('forge:mushrooms') + .tagBoth('tfg:mars_plants') + .tagBoth('forge:mushrooms') .tagBlock('minecraft:replaceable') .tagBlock('tfg:do_not_destroy_in_space') event.create('betterend:filalux_wings', 'tfg:attached_decorative_plant') .soundType('nether_wart') .allowVertical(true) - .tagItem('tfg:mars_plants') - .tagItem('forge:mushrooms') + .tagBoth('tfg:mars_plants') + .tagBoth('forge:mushrooms') .tagBlock('minecraft:replaceable') .tagBlock('tfg:do_not_destroy_in_space') event.create('betterend:bulb_moss', 'tfg:attached_decorative_plant') .soundType('crop') .lootItem('tfc:straw') - .tagItem('tfg:mars_plants') + .tagBoth('tfg:mars_plants') .tagBlock('minecraft:replaceable') .tagBlock('tfg:do_not_destroy_in_space') @@ -116,7 +116,7 @@ function registerTFGWorldGenMarsDecoBlocks(event) { .tagBlock('tfg:do_not_destroy_in_space') .mapColor('fire') .seasonalColors(false) - .tagItem('tfg:mars_plants') + .tagBoth('tfg:mars_plants') .fallenLeaves(leaves => { leaves.noCollision() leaves.notSolid() @@ -141,7 +141,7 @@ function registerTFGWorldGenMarsDecoBlocks(event) { .tagBlock('tfg:do_not_destroy_in_space') .mapColor('color_orange') .seasonalColors(false) - .tagItem('tfg:mars_plants') + .tagBoth('tfg:mars_plants') .fallenLeaves(leaves => { leaves.noCollision() leaves.notSolid() @@ -165,7 +165,7 @@ function registerTFGWorldGenMarsDecoBlocks(event) { event.create('betterend:large_amaranita_mushroom', 'tfg:tall_decorative_plant') .height(3) .soundType('nether_wart') - .tagItem('tfg:mars_plants') + .tagBoth('tfg:mars_plants') .tagBlock('tfg:do_not_destroy_in_space') .tagItem('forge:mushrooms') .mapColor('fire') @@ -173,7 +173,7 @@ function registerTFGWorldGenMarsDecoBlocks(event) { event.create('betterend:lanceleaf', 'tfg:tall_decorative_plant') .height(5) .soundType('crop') - .tagItem('tfg:mars_plants') + .tagBoth('tfg:mars_plants') .tagBlock('tfg:do_not_destroy_in_space') .mapColor('color_orange') diff --git a/kubejs/startup_scripts/tfg/moon/blocks.moon_deco.js b/kubejs/startup_scripts/tfg/moon/blocks.moon_deco.js index 0cd4d8935..edb53fbab 100644 --- a/kubejs/startup_scripts/tfg/moon/blocks.moon_deco.js +++ b/kubejs/startup_scripts/tfg/moon/blocks.moon_deco.js @@ -7,18 +7,18 @@ function registerTFGWorldGenMoonDecoBlocks(event) { event.create('tfg:lunar_roots', 'tfg:decorative_plant') .soundType('nether_wart') .lightLevel(0.4) - .tagItem('tfg:moon_plants') + .tagBoth('tfg:moon_plants') .tagBlock('minecraft:replaceable') event.create('tfg:lunar_sprouts', 'tfg:decorative_plant') .soundType('nether_wart') - .tagItem('tfg:moon_plants') + .tagBoth('tfg:moon_plants') .tagBlock('minecraft:replaceable') event.create('betterend:chorus_lily', 'tfc:ground_cover') .soundType('cherry_wood') .hardness(0.5) - .tagItem('tfg:moon_plants') + .tagBoth('tfg:moon_plants') .tagBlock('minecraft:mineable/hoe') .tagBlock('tfg:do_not_destroy_in_space') .mapColor('terracotta_white') diff --git a/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js b/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js index c142430a7..c74331090 100644 --- a/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js +++ b/kubejs/startup_scripts/tfg/venus/blocks.venus_deco.js @@ -230,6 +230,8 @@ function registerTFGWorldGenVenusDecoBlocks(event) { .mapColor('podzol') .requiresTool(true) .tagBlock('minecraft:mineable/pickaxe') + .tagBoth('tfc:rock/raw') + .tagBoth('forge:stone') event.create('betterend:lucernia_bark') .soundType('netherrack') @@ -322,7 +324,7 @@ function registerTFGWorldGenVenusDecoBlocks(event) { .soundType('nether_wart') .mapColor('green_terracotta') .box(3, 0, 3, 13, 16, 13) - .tagItem('tfg:venus_plants') + .tagBoth('tfg:venus_plants') .tagBlock('tfg:do_not_destroy_in_space') event.create('betterend:hydralux_large', 'tfg:tall_decorative_plant') @@ -330,22 +332,18 @@ function registerTFGWorldGenVenusDecoBlocks(event) { .soundType('nether_wart') .mapColor('green_terracotta') .box(3, 0, 3, 13, 16, 13) - .tagItem('tfg:venus_plants') + .tagBoth('tfg:venus_plants') .tagBlock('tfg:do_not_destroy_in_space') - event.create('betterend:shadow_plant', 'tfg:decorative_plant') - .soundType('crop') - .mapColor('none') + createPlant(event, "shadow_plant", "venus") .box(3, 0, 3, 13, 10, 13) - .tagItem('tfg:venus_plants') - .tagBlock('tfg:do_not_destroy_in_space') event.create('betterend:twisted_vine', 'tfg:tall_decorative_plant') .height(3) .soundType('crop') .mapColor('none') .box(3, 0, 3, 13, 16, 13) - .tagItem('tfg:venus_plants') + .tagBoth('tfg:venus_plants') .tagBlock('tfg:do_not_destroy_in_space') } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/worldgen/utility.js b/kubejs/startup_scripts/tfg/worldgen/utility.js index 83e19c2f5..825fa631b 100644 --- a/kubejs/startup_scripts/tfg/worldgen/utility.js +++ b/kubejs/startup_scripts/tfg/worldgen/utility.js @@ -9,7 +9,7 @@ */ function createPlant(event, id, planet) { return event.create(`betterend:${id}`, 'tfg:decorative_plant') - .tagItem(`tfg:${planet}_plants`) + .tagBoth(`tfg:${planet}_plants`) .tagBlock('minecraft:replaceable') .tagBlock('tfg:do_not_destroy_in_space') .tagBlock('tfc:can_be_snow_piled') @@ -22,7 +22,7 @@ function createPlant(event, id, planet) { */ function createWaterPlant(event, id, planet) { return event.create(`betterend:${id}`, 'tfg:decorative_plant') - .tagItem(`tfg:${planet}_plants`) + .tagBoth(`tfg:${planet}_plants`) .tagBlock('minecraft:replaceable') .tagBlock('tfg:do_not_destroy_in_space') .tagBlock('tfc:can_be_ice_piled') diff --git a/pakku-lock.json b/pakku-lock.json index c711894cf..c58739a69 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -13968,7 +13968,7 @@ "files": [ { "type": "modrinth", - "file_name": "tacz-tweaks-2.12.2-all.jar", + "file_name": "tacz-tweaks-2.13.0-all.jar", "mc_versions": [ "1.20", "1.20.1" @@ -13977,24 +13977,24 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/H8peNuJG/versions/JnqIQ9EH/tacz-tweaks-2.12.2-all.jar", - "id": "JnqIQ9EH", + "url": "https://cdn.modrinth.com/data/H8peNuJG/versions/2ElSdr6d/tacz-tweaks-2.13.0-all.jar", + "id": "2ElSdr6d", "parent_id": "H8peNuJG", "hashes": { - "sha512": "6ff5680072a972f9a597928745525a89c194d9c7701cda33ba386d1bf8a0ff0fe010d5bf63f467c3ef7d746896ac6a7678e98a7285b0254b926075d4170ac353", - "sha1": "f726c2d0ac2c77e3cc7f93fad7fd4338117c7a80" + "sha512": "135248ead8c07f16d28253ae7ff9a7c1574f768921c9fbfa26bc05c4adb2ce1990be7a0e09897209dc758ef5eb2c302368a983fbe07af8168340971741c2d88a", + "sha1": "1b2d7873fd3e2150f339d0d36e588196a50061d1" }, "required_dependencies": [ - "1eAoo2KR", "ordsPcFz", - "SzzJttH8" + "SzzJttH8", + "1eAoo2KR" ], - "size": 1894239, - "date_published": "2026-01-24T10:14:48.372979Z" + "size": 1921024, + "date_published": "2026-02-03T11:33:11.132699Z" }, { "type": "curseforge", - "file_name": "tacz-tweaks-2.12.2-all.jar", + "file_name": "tacz-tweaks-2.13.0-all.jar", "mc_versions": [ "1.20.1", "1.20" @@ -14003,20 +14003,20 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7517/23/tacz-tweaks-2.12.2-all.jar", - "id": "7517023", + "url": "https://edge.forgecdn.net/files/7570/412/tacz-tweaks-2.13.0-all.jar", + "id": "7570412", "parent_id": "1193263", "hashes": { - "sha1": "f726c2d0ac2c77e3cc7f93fad7fd4338117c7a80", - "md5": "2b74092c813b98a27dad4b543808f61f" + "sha1": "1b2d7873fd3e2150f339d0d36e588196a50061d1", + "md5": "5a59c4f690866c9ff50eecd8015d4a73" }, "required_dependencies": [ "1028108", - "667299", - "351264" + "351264", + "667299" ], - "size": 1894239, - "date_published": "2026-01-24T10:14:48.150Z" + "size": 1921024, + "date_published": "2026-02-03T11:33:11.103Z" } ] }, @@ -14110,7 +14110,7 @@ "files": [ { "type": "modrinth", - "file_name": "TerraFirmaGreg-Core-Modern-0.8.19.jar", + "file_name": "TerraFirmaGreg-Core-Modern-0.8.20.jar", "mc_versions": [ "1.20.1" ], @@ -14119,23 +14119,23 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/lNttW2Xl/versions/LusgkBmJ/TerraFirmaGreg-Core-Modern-0.8.19.jar", - "id": "LusgkBmJ", + "url": "https://cdn.modrinth.com/data/lNttW2Xl/versions/lFy65M5b/TerraFirmaGreg-Core-Modern-0.8.20.jar", + "id": "lFy65M5b", "parent_id": "lNttW2Xl", "hashes": { - "sha512": "b65de612b24528baead242f0d9564e799db5221b36fd12ccbb191a45f9186082ca4d21599343a909ef65541d230eff2353cfaa0c78f200fd4ff259c33cda11ec", - "sha1": "ff9b919b7afa7a8f921c50d29718d4a3f8115648" + "sha512": "d6f9c3331589e46cbb30cec39d2ff3c83bc6b25f168a03cf80d6e13d144ae17d3dc6bbbcdc65963c81c289f07e2b00e52cc53b48f61dc1d836e1f6542d04b9ef", + "sha1": "4a31376e9527ba6c70bf9666c308c47b5371e18a" }, "required_dependencies": [ - "JaCEZUhg", - "7tG215v7" + "7tG215v7", + "JaCEZUhg" ], - "size": 9564353, - "date_published": "2026-02-03T11:14:10.819830Z" + "size": 9566314, + "date_published": "2026-02-03T23:29:11.849110Z" }, { "type": "curseforge", - "file_name": "TerraFirmaGreg-Core-Modern-0.8.19.jar", + "file_name": "TerraFirmaGreg-Core-Modern-0.8.20.jar", "mc_versions": [ "1.20.1" ], @@ -14144,19 +14144,19 @@ "neoforge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7570/367/TerraFirmaGreg-Core-Modern-0.8.19.jar", - "id": "7570367", + "url": "https://edge.forgecdn.net/files/7572/993/TerraFirmaGreg-Core-Modern-0.8.20.jar", + "id": "7572993", "parent_id": "513402", "hashes": { - "sha1": "ff9b919b7afa7a8f921c50d29718d4a3f8115648", - "md5": "81f3dfb6d3e503c2e10263ec3563c49a" + "sha1": "4a31376e9527ba6c70bf9666c308c47b5371e18a", + "md5": "173c0b79425140a01365b3707fb17dc4" }, "required_dependencies": [ - "302973", - "890405" + "890405", + "302973" ], - "size": 9564353, - "date_published": "2026-02-03T11:14:05.233Z" + "size": 9566314, + "date_published": "2026-02-03T23:29:07.213Z" } ] },