Merge branch 'main' of https://github.com/TerraFirmaGreg-Team/Modpack-1.20.x

2024-01-21 09:51:49 +05:00 · 2024-01-21 09:51:49 +05:00 · 21713fc34e
commit 21713fc34e
parent 631b376f8e 49bdea3f47
11 changed files with 73 additions and 40 deletions
--- a/CHANGELOG_EN.md
+++ b/CHANGELOG_EN.md
@ -1,5 +1,14 @@
 # Changelog

+## [0.6.6] - ?
+### Изменения
+- Fixed a lot of recipes with unknown tags.
+- Fixed a bug when it was impossible to melt ingots of tin and red alloys.
+- Fixed tags of some GTCEu blocks.
+- Minor code improvements in TFG-Core.
+### Updated mods
+- TerraFirmaGreg -> 0.4.3
+
 ## [0.6.5] - 20.01.2024
 ### Changes
 - Fixed a crash when opening inventory on servers.
@ -45,7 +54,7 @@
 - tfcchannelcasting
 - toofast
 - no-report-button
-### Update mods
+### Updated mods
 - GregTech -> 1.1.0
 - TerraFirmaCraft -> 3.1.5
 - TerraFirmaGreg Core -> 0.4.0
@ -65,7 +74,7 @@
 - Fixed a bug when it was impossible to make a canoe.
 - Added function to disable additional TFC-Ambiental integration.
 - Fixed the quest for the copper ingot.
-### Update mods
+### Updated mods
 - TerraFirmaGreg 0.3.1 -> 0.3.2
 - appliedenergistics2 -> 15.0.20
 - embeddium -> 0.2.18
--- a/CHANGELOG_RU.md
+++ b/CHANGELOG_RU.md
@ -1,5 +1,14 @@
 # Changelog

+## [0.6.6] - ?
+### Изменения
+- Исправлено множество рецептов с неизвестными тегами.
+- Исправлен баг когда было нельзя распоавить слитки оловянного и красного сплавов.
+- Исправлены теги некоторых блоков GTCEu.
+- Мелкие улучшения кода в TFG-Core.
+### Обновленные моды
+- TerraFirmaGreg -> 0.4.3
+
 ## [0.6.5] - 20.01.2024
 ### Изменения
 - Исправлен краш при открытии инвентаря на сервере
--- a/kubejs/server_scripts/ae2/recipes.js
+++ b/kubejs/server_scripts/ae2/recipes.js
@ -524,7 +524,7 @@ const registerAE2Recipes = (event) => {
        'CDC',
        ' E '
    ], {
-        A: '#forge:wires/single/aluminium',
+        A: 'gtceu:aluminium_single_wire',
        B: 'ae2:formation_core',
        C: 'ae2:cell_component_4k',
        D: 'gtceu:hv_lithium_battery',
--- a/kubejs/server_scripts/computer_craft/recipes.js
+++ b/kubejs/server_scripts/computer_craft/recipes.js
@ -46,7 +46,7 @@ const registerComputerCraftRecipes = (event) => {
        'CDC',
        'EFE'
    ], {
-        A: '#forge:wires/single/magnesium_diboride',
+        A: 'gtceu:magnesium_diboride_single_wire',
        B: 'gtceu:computer_monitor_cover',
        C: 'ae2:calculation_processor',
        D: 'gtceu:mv_machine_casing',
@ -60,7 +60,7 @@ const registerComputerCraftRecipes = (event) => {
        'CDC',
        'EFE'
    ], {
-        A: '#forge:wires/single/mercury_barium_calcium_cuprate',
+        A: 'gtceu:mercury_barium_calcium_cuprate_single_wire',
        B: 'gtceu:computer_monitor_cover',
        C: 'ae2:calculation_processor',
        D: 'gtceu:hv_machine_casing',
@ -131,7 +131,7 @@ const registerComputerCraftRecipes = (event) => {
        'CD ',
        'EAE'
    ], {
-        A: '#forge:wires/single/magnesium_diboride',
+        A: 'gtceu:magnesium_diboride_single_wire',
        B: 'gtceu:computer_monitor_cover',
        C: '#gtceu:batteries/mv',
        D: 'gtceu:mv_machine_casing',
@ -144,7 +144,7 @@ const registerComputerCraftRecipes = (event) => {
        'CD ',
        'EAE'
    ], {
-        A: '#forge:wires/single/mercury_barium_calcium_cuprate',
+        A: 'gtceu:mercury_barium_calcium_cuprate_single_wire',
        B: 'gtceu:computer_monitor_cover',
        C: '#gtceu:batteries/hv',
        D: 'gtceu:hv_machine_casing',
@ -201,7 +201,7 @@ const registerComputerCraftRecipes = (event) => {
        'FGF'
    ], {
        A: 'ae2:wireless_receiver',
-        B: '#forge:wires/single/mercury_barium_calcium_cuprate',
+        B: 'gtceu:mercury_barium_calcium_cuprate_single_wire',
        C: '#gtceu:batteries/hv',
        D: 'ae2:terminal',
        E: 'gtceu:hv_emitter',
@ -235,7 +235,7 @@ const registerComputerCraftRecipes = (event) => {
        'FGF'
    ], {
        A: 'ae2:wireless_receiver',
-        B: '#forge:wires/single/uranium_triplatinum',
+        B: 'gtceu:uranium_triplatinum_single_wire',
        C: '#gtceu:batteries/ev',
        D: 'ae2:terminal',
        E: 'gtceu:ev_emitter',
--- a/kubejs/server_scripts/create/recipes.js
+++ b/kubejs/server_scripts/create/recipes.js
@ -415,12 +415,12 @@ const registerCreateRecipes = (event) => {
        'A ' 
    ], {
        A: '#forge:plates/wrought_iron',
-        B: '#forge:wires/single/red_alloy',
+        B: 'gtceu:red_alloy_single_wire',
        C: '#forge:tools/hammers'
    }).id('tfg:create/shaped/gantry_shaft')

    event.recipes.gtceu.assembler('tfg:create/gantry_shaft')             
-        .itemInputs('#forge:wires/single/red_alloy', '2x #forge:plates/wrought_iron')
+        .itemInputs('gtceu:red_alloy_single_wire', '2x #forge:plates/wrought_iron')
        .circuit(3)
        .itemOutputs('create:gantry_shaft')
        .duration(200)
@ -454,7 +454,7 @@ const registerCreateRecipes = (event) => {
        'C C' 
    ], {
        A: '#forge:plates/steel',
-        B: '#forge:wires/single/red_alloy',
+        B: 'gtceu:red_alloy_single_wire',
        C: '#minecraft:logs'
    }).id('tfg:create/shaped/cart_assembler')

@ -807,7 +807,7 @@ const registerCreateRecipes = (event) => {
        A: 'gtceu:glass_tube',
        B: 'gtceu:resistor',
        C: 'gtceu:resin_circuit_board',
-        D: '#forge:wires/single/red_alloy',
+        D: 'gtceu:red_alloy_single_wire',
        E: '#forge:plates/wrought_iron'
    }).id('tfg:create/shaped/electron_tube')

@ -863,7 +863,7 @@ const registerCreateRecipes = (event) => {
    ], {
        A: '#forge:plates/copper',
        B: 'tfc:metal/helmet/copper',
-        C: '#forge:fluid_pipes/tiny/polyethylene',
+        C: 'gtceu:polyethylene_tiny_fluid_pipe',
        D: '#forge:glass_panes'
    }).id('tfg:create/shaped/copper_diving_helmet')

@ -874,7 +874,7 @@ const registerCreateRecipes = (event) => {
    ], {
        A: '#forge:plates/copper',
        B: 'tfc:metal/boots/copper',
-        C: '#forge:fluid_pipes/tiny/polyethylene',
+        C: 'gtceu:polyethylene_tiny_fluid_pipe',
        D: '#forge:foils/rubber'
    }).id('tfg:create/shaped/copper_diving_boots')

--- a/kubejs/server_scripts/create_additions/recipes.js
+++ b/kubejs/server_scripts/create_additions/recipes.js
@ -25,7 +25,7 @@ const registerCreateAdditionsRecipes = (event) => {
        'ABA' 
    ], {
        A: '#forge:plates/brass',
-        B: '#forge:wires/single/red_alloy',
+        B: 'gtceu:red_alloy_single_wire',
        C: 'computercraft:wired_modem',
    }).id('tfg:create_additions/shaped/digital_adapter')

@ -37,8 +37,8 @@ const registerCreateAdditionsRecipes = (event) => {
    ], {
        A: '#forge:plates/brass',
        B: 'create:chute',
-        C: '#forge:wires/octal/copper',
-        D: '#forge:cables/single/copper',
+        C: 'gtceu:copper_octal_wire',
+        D: 'gtceu:copper_single_cable',
        E: 'create:brass_casing'
    }).id('tfg:create_additions/shaped/portable_energy_interface')

--- a/kubejs/server_scripts/gregtech/recipes.js
+++ b/kubejs/server_scripts/gregtech/recipes.js
@ -610,7 +610,7 @@ const registerGTCEURecipes = (event) => {
        A: '#tfg:metal_bars',
        B: 'gtceu:item_filter',
        C: 'gtceu:mv_electric_motor',
-        D: '#forge:frames/steel',
+        D: 'gtceu:steel_frame',
        E: '#forge:rotors/steel'
    }).id('gtceu:shaped/filter_casing')
    
@ -625,7 +625,7 @@ const registerGTCEURecipes = (event) => {
    ], {
        A: '#tfg:metal_bars',
        B: '#forge:rotors/steel',
-        C: '#forge:frames/steel',
+        C: 'gtceu:steel_frame',
        D: 'gtceu:mv_electric_motor'
    }).id('gtceu:shaped/casing_grate_casing')
    
@ -953,7 +953,7 @@ const registerGTCEURecipes = (event) => {
        'DBD'
    ], {
        A: 'gtceu:steel_brick_casing',
-        B: '#forge:fluid_pipes/small/tin_alloy',
+        B: 'gtceu:tin_alloy_small_fluid_pipe',
        C: '#forge:plates/steel',
        D: '#forge:plates/wrought_iron',
        E: '#forge:glass_panes'
@ -966,7 +966,7 @@ const registerGTCEURecipes = (event) => {
        'DDD'
    ], {
        A: 'gtceu:steel_brick_casing',
-        B: '#forge:fluid_pipes/small/tin_alloy',
+        B: 'gtceu:tin_alloy_small_fluid_pipe',
        C: '#forge:plates/steel',
        D: '#forge:plates/wrought_iron'
    }).id('gtceu:shaped/steam_macerator_steel')
@ -978,7 +978,7 @@ const registerGTCEURecipes = (event) => {
        'BBB'
    ], {
        A: 'gtceu:steel_brick_casing',
-        B: '#forge:fluid_pipes/small/tin_alloy',
+        B: 'gtceu:tin_alloy_small_fluid_pipe',
        C: '#forge:plates/steel',
        D: '#forge:plates/wrought_iron'
    }).id('gtceu:shaped/steam_compressor_steel')
@ -990,7 +990,7 @@ const registerGTCEURecipes = (event) => {
        'CCC'
    ], {
        A: 'gtceu:steel_brick_casing',
-        B: '#forge:fluid_pipes/small/tin_alloy',
+        B: 'gtceu:tin_alloy_small_fluid_pipe',
        C: '#forge:plates/steel',
        D: '#forge:plates/wrought_iron'
    }).id('gtceu:shaped/steam_hammer_steel')
@ -1002,7 +1002,7 @@ const registerGTCEURecipes = (event) => {
        'BCB'
    ], {
        A: 'gtceu:steel_brick_casing',
-        B: '#forge:fluid_pipes/small/tin_alloy',
+        B: 'gtceu:tin_alloy_small_fluid_pipe',
        C: '#forge:plates/steel',
        D: '#forge:plates/wrought_iron'
    }).id('gtceu:shaped/steam_furnace_steel')
@ -1014,7 +1014,7 @@ const registerGTCEURecipes = (event) => {
        'DBD'
    ], {
        A: 'gtceu:steel_brick_casing',
-        B: '#forge:fluid_pipes/small/tin_alloy',
+        B: 'gtceu:tin_alloy_small_fluid_pipe',
        C: '#forge:plates/steel',
        D: '#forge:plates/wrought_iron'
    }).id('gtceu:shaped/steam_alloy_smelter_steel')
@ -1026,7 +1026,7 @@ const registerGTCEURecipes = (event) => {
        'DDD'
    ], {
        A: 'gtceu:steel_brick_casing',
-        B: '#forge:fluid_pipes/small/tin_alloy',
+        B: 'gtceu:tin_alloy_small_fluid_pipe',
        C: '#forge:plates/steel',
        D: '#forge:plates/wrought_iron'
    }).id('gtceu:shaped/steam_rock_breaker_steel')
@ -1112,7 +1112,7 @@ const registerGTCEURecipes = (event) => {
        B: '#gtceu:circuits/lv',
        C: 'gtceu:lv_voltage_coil',
        D: 'gtceu:solid_machine_casing',
-        E: '#forge:cables/single/copper'
+        E: 'gtceu:copper_single_cable'
    }).id('tfg:shaped/alternator')

    // Compressed Coke Clay
@ -1219,7 +1219,7 @@ const registerGTCEURecipes = (event) => {
    ], '#forge:plates/wrought_iron', [
        event.recipes.createDeploying('tfg:unfinished_vacuum_tube', ['tfg:unfinished_vacuum_tube', '#forge:bolts/steel']),
        event.recipes.createDeploying('tfg:unfinished_vacuum_tube', ['tfg:unfinished_vacuum_tube', 'gtceu:glass_tube']),
-        event.recipes.createDeploying('tfg:unfinished_vacuum_tube', ['tfg:unfinished_vacuum_tube', '#forge:wires/single/copper']),
+        event.recipes.createDeploying('tfg:unfinished_vacuum_tube', ['tfg:unfinished_vacuum_tube', 'gtceu:copper_single_wire']),
    ]).transitionalItem('tfg:unfinished_vacuum_tube').loops(2).id('tfg:gtceu/sequenced_assembly/vacuum_tube')

    // Рецепт LV микросхемы
@ -1231,7 +1231,7 @@ const registerGTCEURecipes = (event) => {
        event.recipes.createDeploying('tfg:unfinished_basic_electronic_circuit', ['tfg:unfinished_basic_electronic_circuit', '#forge:plates/steel']),
        event.recipes.createDeploying('tfg:unfinished_basic_electronic_circuit', ['tfg:unfinished_basic_electronic_circuit', 'gtceu:resistor']),
        event.recipes.createDeploying('tfg:unfinished_basic_electronic_circuit', ['tfg:unfinished_basic_electronic_circuit', 'gtceu:vacuum_tube']),
-        event.recipes.createDeploying('tfg:unfinished_basic_electronic_circuit', ['tfg:unfinished_basic_electronic_circuit', '#forge:cables/single/red_alloy']),
+        event.recipes.createDeploying('tfg:unfinished_basic_electronic_circuit', ['tfg:unfinished_basic_electronic_circuit', 'gtceu:red_alloy_single_cable']),
    ]).transitionalItem('tfg:unfinished_basic_electronic_circuit').loops(2).id('tfg:gtceu/sequenced_assembly/basic_electronic_circuit')

    //#region Рецепты электрического генератора
@ -1382,6 +1382,7 @@ const registerGTCEURecipes = (event) => {
        if (material.hasFlag($MaterialFlags.GENERATE_PLATE) && material != GTMaterials.Wood && material != GTMaterials.TreatedWood) 
        {
            let plateStack = ChemicalHelper.get(TagPrefix.plate, material, 1)
+            let blockStack = ChemicalHelper.get(TagPrefix.block, material, 1)

            if (material.hasProperty(PropertyKey.INGOT))
            {
@ -1389,16 +1390,22 @@ const registerGTCEURecipes = (event) => {
                event.recipes.createPressing(plateStack.withChance(0.97), ingotStack)
                    .id(`tfg:pressing/${material.getName()}_plate`)

-                // 9х Слиток -> Блок
-                event.recipes.createCompacting(Item.of(`#forge:storage_blocks/${material.getName()}`), ingotStack.withCount(9))
-                    .heated()
-                    .id(`tfg:compacting/${material.getName()}_block`)
+                if (!blockStack.isEmpty()) {
+                    // 9х Слиток -> Блок
+                    event.recipes.createCompacting(blockStack, ingotStack.withCount(9))
+                        .heated()
+                        .id(`tfg:compacting/${material.getName()}_block`)
+                }
+                
            }
            else
            {
-                // Блок из гемов -> 9 Пластин
-                event.recipes.createCutting(Item.of(plateStack.withCount(9)).withChance(0.65), `#forge:storage_blocks/${material.getName()}`)
-                    .id(`tfg:cutting/${material.getName()}_plate`)
+                if (!blockStack.isEmpty()) {
+                    // Блок из гемов -> 9 Пластин
+                    event.recipes.createCutting(Item.of(plateStack.withCount(9)).withChance(0.65), `#forge:storage_blocks/${material.getName()}`)
+                        .id(`tfg:cutting/${material.getName()}_plate`)
+                }
+                
            }
        }

--- a/kubejs/server_scripts/minecraft/recipes.js
+++ b/kubejs/server_scripts/minecraft/recipes.js
@ -1259,6 +1259,12 @@ const registerMinecraftRecipes = (event) => {

    //#endregion

+    //#region Древесный уголь
+
+    event.remove({ id: 'minecraft:charcoal' })
+
+    //#endregion
+
    //#region Выход: Высушенные водросли блок

    event.remove({ id: 'minecraft:dried_kelp_block' })
--- a/kubejs/server_scripts/railways/recipes.js
+++ b/kubejs/server_scripts/railways/recipes.js
@ -32,14 +32,14 @@ const registerRailWaysRecipes = (event) => {
        ' C ' 
    ], {
        A: '#forge:sheets/wrought_iron',
-        B: '#forge:wires/single/red_alloy',
+        B: 'gtceu:red_alloy_single_wire',
        C: 'create:railway_casing',
        D: '#forge:tools/wire_cutters',
        E: '#forge:tools/screwdrivers',
    }).id('tfg:railways/shaped/track_coupler')

    event.recipes.gtceu.assembler('tfg:railways/track_coupler')             
-        .itemInputs('3x #forge:sheets/wrought_iron', '#forge:wires/single/red_alloy', 'create:railway_casing')
+        .itemInputs('3x #forge:sheets/wrought_iron', 'gtceu:red_alloy_single_wire', 'create:railway_casing')
        .circuit(3)
        .itemOutputs('railways:track_coupler')
        .duration(200)
--- a/kubejs/server_scripts/tfc/data.js
+++ b/kubejs/server_scripts/tfc/data.js
@ -71,6 +71,8 @@ const registerTFCHeats = (event) => {
            makeItemHeatByTagPrefix(TagPrefix.bolt, material, tfcProperty, 0.245)
            makeItemHeatByTagPrefix(TagPrefix.screw, material, tfcProperty, 0.567)
            makeItemHeatByTagPrefix(TagPrefix.nugget, material, tfcProperty, 0.124)
+
+            makeItemHeatByTagPrefix(TagPrefix.ingot, material, tfcProperty, 1.429)
            
            makeItemHeatByTagPrefix(TagPrefix.rawOre, material, tfcProperty, 1.429)
            makeItemHeatByTagPrefix(TFGTagPrefix.richRawOre, material, tfcProperty, 1.429)
--- a/kubejs/server_scripts/tfc/recipes.js
+++ b/kubejs/server_scripts/tfc/recipes.js
@ -2519,7 +2519,7 @@ const registerTFCRecipes = (event) => {
        .EUt(4)

    event.recipes.gtceu.chemical_bath(`fired_large_vessel_decolor`)             
-        .itemInputs('#tfg:colorized_large_vessels')
+        .itemInputs('#tfg:colorized_fired_large_vessels')
        .inputFluids(Fluid.of(`gtceu:chlorine`, 72))
        .itemOutputs('tfc:ceramic/large_vessel')
        .duration(300)