diff --git a/CHANGELOG.md b/CHANGELOG.md index abb48e7ab..2a359a5e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,9 @@ ### Breaking changes If you missed it, [0.11.19](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/releases/tag/0.11.19) and [0.11.20](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/releases/tag/0.11.20) were Alpha versions with many important breaking changes. Be sure to read their changelogs as well! - Greate Encased Fans now work differently. Water (or distilled water) needs to be pumped into the encased fan itself, instead of having a source block in front. Items also must be on a Depot or Belt in order to be washed, instead of the floor. Processing time decreases with fan RPM. Regular water produces fewer byproducts than distilled water. +- Some recipe changes to AE2 mainly to ExtandedAE to avoid conflicts, check your patterns ### Changes +- Large Solar Array Mk2 (LSA) is now craftable after reaching Mars rather than at the end of the Fission Line - Added artisan table recipes for all pipe mold sizes (#2983) @Redeix - You can now pick up foxes @Pyritie - Added glass batch to glass vial extruder recipe (#2999) @Inceitious @@ -13,7 +15,12 @@ If you missed it, [0.11.19](https://github.com/TerraFirmaGreg-Team/Modpack-Moder - Added soybean + sea water to soy mixture recipe (#2984) @Redeix - Added optional [Chimes](https://www.curseforge.com/minecraft/mc-mods/chimes) compat. (#2973) @TreyR9 - Added optional [Create: Sound of Steam](https://www.curseforge.com/minecraft/mc-mods/create-sound-of-steam) compat (#2324) @samtsa +- Added Universal Bags of Composts (#3016) @Nebby1999 ### Bug fixes +- Fix the Empty Rod T1 that was uncraftable (#3008) @TomPlop +- Fixed fission fuel rods looking for the wrong items to recycle @TomPlop +- Add a missing recipe for the Heat Input Hatch that was making progressing on the Fission line after Uranium impossible @TomPlop +- Add a missing recipe for the Titanium Exhaust Vent that was making building the Cooling Tower impossible @TomPlop - Fixed incorrect mechanical mixer recipes for weak and regular colored steel dust (#2977) @Pyritie - Fixed cobble breaking into two cobble blocks (#2980) @Pyritie - Fixed a recycling dupe with maintenance hatches (#3003) @Pyritie diff --git a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt index 643d62723..614ae60a1 100644 --- a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt +++ b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt @@ -26,7 +26,7 @@ id: "0E76B952D3BA3BDA" linked_quest: "017019EB38F7A18C" x: -0.75d - y: 9.0d + y: 8.5d } { id: "66960076A74E9B79" @@ -82,6 +82,14 @@ x: 23.5d y: 10.5d } + { + id: "6CE2E1928A907A30" + linked_quest: "3AEAB1930F4CC034" + shape: "octagon" + size: 1.25d + x: 16.0d + y: 3.0d + } ] quests: [ { @@ -1991,8 +1999,8 @@ type: "item" } ] - x: 3.75d - y: 12.75d + x: 3.5d + y: 12.5d } { dependencies: ["5EC5566546591DEE"] @@ -2395,6 +2403,21 @@ x: 11.5d y: 3.0d } + { + dependencies: ["7AC97F7850E31D95"] + description: ["{quests.extreme_voltage.schematic_terminal.desc}"] + id: "4B600E20614EB886" + optional: true + shape: "heart" + subtitle: "{quests.extreme_voltage.schematic_terminal.subtitle}" + tasks: [{ + id: "30C659B8B4BDEF8A" + item: "gtceuterminal:schematic_interface" + type: "item" + }] + x: 1.5d + y: 8.5d + } ] subtitle: ["{quests.extreme_voltage.subtitle}"] title: "{quests.extreme_voltage}" diff --git a/config/ftbquests/quests/chapters/gregtech_energy.snbt b/config/ftbquests/quests/chapters/gregtech_energy.snbt index 1c658bad5..6cbf2cb41 100644 --- a/config/ftbquests/quests/chapters/gregtech_energy.snbt +++ b/config/ftbquests/quests/chapters/gregtech_energy.snbt @@ -798,7 +798,7 @@ y: -5.0d } { - dependencies: ["4D0ADC66D2CF09B1"] + dependencies: ["0AF286AA540A82E6"] description: ["{quests.gregtech_energy.solar_panel.desc}"] id: "109C57B63EE95E35" subtitle: "{quests.gregtech_energy.solar_panel.subtitle}" @@ -809,12 +809,14 @@ type: "item" }] x: -6.0d - y: -3.0d + y: -5.0d } { dependencies: [ "109C57B63EE95E35" "5826EC76931359B8" + "00A2566109144D7F" + "4D0ADC66D2CF09B1" ] dependency_requirement: "one_completed" description: [ @@ -832,7 +834,7 @@ type: "item" }] x: -6.0d - y: -2.0d + y: -3.0d } { dependencies: ["4D0ADC66D2CF09B1"] @@ -1147,8 +1149,10 @@ { dependencies: [ "0585527D1854628B" - "05E2F203DA46A5E8" + "7AF726555D721DFC" + "5FA09DA68D309548" ] + dependency_requirement: "one_completed" description: [ "{quests.gregtech_energy.large_solar_t2.desc.1}" "{@pagebreak}" @@ -1162,12 +1166,12 @@ type: "item" }] x: -6.0d - y: 1.0d + y: -1.0d } { dependencies: [ "3AEAB1930F4CC034" - "1DB543EFEEB67238" + "05E2F203DA46A5E8" ] description: ["{quests.gregtech_energy.large_solar_t3.desc}"] id: "7CA3A5EFE3D5B688" @@ -1178,7 +1182,7 @@ type: "item" }] x: -6.0d - y: 3.0d + y: 1.0d } { dependencies: [ diff --git a/config/ftbquests/quests/chapters/hv__high_voltage.snbt b/config/ftbquests/quests/chapters/hv__high_voltage.snbt index 7fad3ab38..9c349efe9 100644 --- a/config/ftbquests/quests/chapters/hv__high_voltage.snbt +++ b/config/ftbquests/quests/chapters/hv__high_voltage.snbt @@ -53,6 +53,12 @@ x: 0.0d y: -13.0d } + { + id: "3274381865E7D011" + linked_quest: "0585527D1854628B" + x: 14.0d + y: 1.5d + } ] quests: [ { @@ -1384,7 +1390,7 @@ type: "checkmark" }] title: "{quests.high_voltage.space_survival.title}" - x: 13.0d + x: 12.0d y: 1.5d } { diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index 9a5e01028..01852da68 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -2197,6 +2197,57 @@ x: 0.0d y: -12.0d } + { + dependencies: ["2EFB241490502DB3"] + description: ["{quests.tfg_tips.composter.desc}"] + guide_page: "tfc:field_guide tfc:mechanics/composter" + id: "264D138DFFE13BD0" + subtitle: "{quests.tfg_tips.composter.subtitle}" + tasks: [{ + id: "2EE61FD71FE330D3" + item: "tfc:composter" + type: "item" + }] + title: "{quests.tfg_tips.composter.title}" + x: 2.0d + y: -4.0d + } + { + dependencies: ["264D138DFFE13BD0"] + description: ["{quests.tfg_tips.universal_compost.desc}"] + id: "13E4AE4F46A1A1A0" + subtitle: "{quests.tfg_tips.universal_compost.subtitle}" + tasks: [ + { + id: "6F3BD81EAD7CC109" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(tfg:universal_compost_browns)item(tfg:universal_compost_greens))" + } + } + title: "{quests.tfg_tips.universal_compost.task.1}" + type: "item" + } + { + id: "787E7A402B3162B5" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(tfg:universal_compost_browns_bag)item(tfg:universal_compost_greens_bag))" + } + } + optional_task: true + title: "{quests.tfg_tips.universal_compost.task.2}" + type: "item" + } + ] + title: "{quests.tfg_tips.universal_compost.title}" + x: 4.0d + y: -4.0d + } ] subtitle: ["{quests.tfg_tips.subtitle}"] title: "{quests.tfg_tips}" diff --git a/kubejs/assets/tfg/textures/item/universal_compost_browns_bag.png b/kubejs/assets/tfg/textures/item/universal_compost_browns_bag.png new file mode 100644 index 000000000..b18d34ffd Binary files /dev/null and b/kubejs/assets/tfg/textures/item/universal_compost_browns_bag.png differ diff --git a/kubejs/assets/tfg/textures/item/universal_compost_greens_bag.png b/kubejs/assets/tfg/textures/item/universal_compost_greens_bag.png new file mode 100644 index 000000000..2306b1a31 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/universal_compost_greens_bag.png differ diff --git a/kubejs/server_scripts/extended_ae2/recipes.js b/kubejs/server_scripts/extended_ae2/recipes.js index b1dbcb69b..e1c91f24d 100644 --- a/kubejs/server_scripts/extended_ae2/recipes.js +++ b/kubejs/server_scripts/extended_ae2/recipes.js @@ -561,7 +561,7 @@ const registerExtendedAE2Recipes = (event) => { event.recipes.gtceu.assembler('expatternprovider:ex_pattern_access_part') .itemInputs( 'ae2:pattern_access_terminal', - '4x ae2:logic_processor', + Item.of('ae2:engineering_processor', 4), '2x megacells:accumulation_processor') .itemOutputs('expatternprovider:ex_pattern_access_part') .duration(100) @@ -569,7 +569,7 @@ const registerExtendedAE2Recipes = (event) => { event.recipes.gtceu.assembler('expatternprovider:pattern_terminal_upgrade') .itemInputs( - '4x ae2:logic_processor', + '4x ae2:calculation_processor', '2x megacells:accumulation_processor') .itemOutputs('expatternprovider:pattern_terminal_upgrade') .duration(100) diff --git a/kubejs/server_scripts/gtceu_terminal/recipes.js b/kubejs/server_scripts/gtceu_terminal/recipes.js index e1f75679d..5a6f749c9 100644 --- a/kubejs/server_scripts/gtceu_terminal/recipes.js +++ b/kubejs/server_scripts/gtceu_terminal/recipes.js @@ -35,7 +35,6 @@ function registerGTCEUTerminalRecipes(event) { }).id(`tfg:shaped/multi_structure_manager`) event.remove({ id : 'gtceuterminal:schematic_interface' }) - /* Broken for now as it can duplicate resources in the I/O Ports event.shaped('1x gtceuterminal:schematic_interface', [ 'ABA', 'CDC', @@ -48,6 +47,5 @@ function registerGTCEUTerminalRecipes(event) { E: '#gtceu:batteries/iv', F: '#forge:plates/tungsten_steel' }).id(`tfg:shaped/schematic_interface`) - */ - + } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/data.js b/kubejs/server_scripts/tfg/data.js index 3dc19fcf5..40b7c076c 100644 --- a/kubejs/server_scripts/tfg/data.js +++ b/kubejs/server_scripts/tfg/data.js @@ -338,6 +338,10 @@ function registerTFGItemSize(event) { "medium", "Molds" ) + + //Universal Compost Bags + event.itemSize("tfg:universal_compost_browns_bag", "tiny", "medium") + event.itemSize("tfg:universal_compost_greens_bag", "tiny", "medium") } //#endregion diff --git a/kubejs/server_scripts/tfg/machines/recipes.casings.js b/kubejs/server_scripts/tfg/machines/recipes.casings.js index 814409db3..8e3318e24 100644 --- a/kubejs/server_scripts/tfg/machines/recipes.casings.js +++ b/kubejs/server_scripts/tfg/machines/recipes.casings.js @@ -22,7 +22,7 @@ function registerTFGCasingRecipes(event) { ) .inputFluids(Fluid.of('gtceu:epoxy', 144)) .itemOutputs(Item.of('tfg:superconductor_coil_small', 4 * multiplier)) - .circuit(4) + .circuit(6) .duration(400) .EUt(GTValues.VA[GTValues.MV]) @@ -34,7 +34,7 @@ function registerTFGCasingRecipes(event) { ChemicalHelper.get(TagPrefix.wireGtSingle, GTMaterials[type.materialId], 4)) .inputFluids(Fluid.of('gtceu:epoxy', 144)) .itemOutputs(Item.of('tfg:superconductor_coil_large', 4 * multiplier)) - .circuit(7) + .circuit(6) .duration(600) .EUt(GTValues.VA[GTValues.MV]) }) @@ -148,13 +148,21 @@ function registerTFGCasingRecipes(event) { // Heat Battery deafission:battery_heat_port_ev event.recipes.gtceu.assembler('tfg:battery_heat_port_ev') - .itemInputs(Item.of('gtceu:iv_machine_hull', 1), Item.of('gtceu:rtm_alloy_coil_block'), Item.of('gtceu:silicon_plate', 6)) + .itemInputs(Item.of('gtceu:ev_machine_hull', 1), Item.of('gtceu:rtm_alloy_coil_block'), Item.of('gtceu:silicon_plate', 6)) .inputFluids(Fluid.of('gtceu:mercury', 4000)) .itemOutputs('deafission:battery_heat_port_ev') //.circuit(6) .duration(2.5 * 20) .EUt(GTValues.VA[GTValues.EV]) + event.recipes.gtceu.assembler('tfg:heat_input_hatch_ev') + .itemInputs(Item.of('gtceu:ev_machine_hull', 1), Item.of('gtceu:rtm_alloy_coil_block'), Item.of('gtceu:beryllium_plate', 6)) + .inputFluids(Fluid.of('gtceu:mercury', 4000)) + .itemOutputs(Item.of('deafission:heat_input_hatch_ev', 1)) + //.circuit(6) + .duration(2.5 * 20) + .EUt(GTValues.VA[GTValues.EV]) + // Small Modular Turbine event.recipes.gtceu.assembler('tfg:machine_casing_desh_ptfe') diff --git a/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js b/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js index 558ffbdbc..4732864d1 100644 --- a/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js +++ b/kubejs/server_scripts/tfg/powergen/nuclear/recipes.nuclear.js @@ -136,7 +136,7 @@ function registerTFGNuclearRecipes(event) { event.recipes.gtceu.assembler('tfg:empty_rod') - .itemInputs('3x gtceu:cobalt_large_restrictive_item_pipe', '9x #forge:double_plates/cadmium', '4x #forge:dense_plates/maraging_steel_300') + .itemInputs('3x gtceu:cobalt_large_restrictive_item_pipe', '9x #forge:double_plates/cadmium', '4x #forge:dense_plates/hsla_steel') .itemOutputs('tfg:empty_rod') .duration(20*15) .EUt(GTValues.VA[GTValues.HV]) @@ -551,7 +551,7 @@ function registerTFGNuclearRecipes(event) { let g = event.recipes.gtceu.nuclear_fuel_factory('tfg:depleted_americium_241_rod') //.inputItemNbtPredicate(Item.of('tfg:depleted_thorium_rod'), NBTPredicates.gte("avgHeat", 5000)) - .itemInputs(Item.of('tfg:americium_241_rod')) + .itemInputs(Item.of('tfg:depleted_americium_241_rod')) .itemOutputs(Item.of('tfg:empty_rod_t2')) .EUt(GTValues.VA[GTValues.HV]) .duration(20*16) @@ -562,7 +562,7 @@ function registerTFGNuclearRecipes(event) { let h = event.recipes.gtceu.nuclear_fuel_factory('tfg:depleted_neptunium_237_rod') //.inputItemNbtPredicate(Item.of('tfg:depleted_thorium_rod'), NBTPredicates.gte("avgHeat", 5000)) - .itemInputs(Item.of('tfg:neptunium_237_rod')) + .itemInputs(Item.of('tfg:depleted_neptunium_237_rod')) .itemOutputs(Item.of('tfg:empty_rod_t2')) .EUt(GTValues.VA[GTValues.HV]) .duration(20*16) @@ -573,7 +573,7 @@ function registerTFGNuclearRecipes(event) { let i = event.recipes.gtceu.nuclear_fuel_factory('tfg:depleted_californium_252_rod') //.inputItemNbtPredicate(Item.of('tfg:depleted_thorium_rod'), NBTPredicates.gte("avgHeat", 5000)) - .itemInputs(Item.of('tfg:californium_252_rod')) + .itemInputs(Item.of('tfg:depleted_californium_252_rod')) .itemOutputs(Item.of('tfg:empty_rod_t3')) .EUt(GTValues.VA[GTValues.HV]) .duration(20*16) @@ -794,6 +794,13 @@ function registerTFGNuclearRecipes(event) { .EUt(GTValues.VA[GTValues.EV]) .duration(20*4) + event.recipes.gtceu.assembler('tfg:titanium_exhaust_vent') + .itemInputs(Item.of('gtceu:double_titanium_plate', 6), Item.of('gtceu:double_magnalium_plate', 2), Item.of('gtceu:titanium_rotor', 1)) + .itemOutputs(Item.of('tfg:titanium_exhaust_vent', 1)) + .circuit(6) + .EUt(GTValues.VA[GTValues.EV]) + .duration(20*30) + event.shaped('tfg:cooling_tower', [ 'ABA', 'CDC', diff --git a/kubejs/server_scripts/tfg/powergen/recipes.solar.js b/kubejs/server_scripts/tfg/powergen/recipes.solar.js index e74ec4cb7..f3e530709 100644 --- a/kubejs/server_scripts/tfg/powergen/recipes.solar.js +++ b/kubejs/server_scripts/tfg/powergen/recipes.solar.js @@ -22,12 +22,12 @@ function registerTFGSolarRecipes(event) { { S: 'ad_astra:photovoltaic_etrium_cell', Z: 'gtceu:large_solar_panel', - W: '#gtceu:circuits/iv', - U: '#forge:gears/rocket_alloy_t1', - T: '#forge:gears/desh' + W: '#gtceu:circuits/ev', + U: '#forge:gears/rocket_alloy_t2', + T: '#forge:gears/ostrum_iodide' } ).id('gtceu:shaped/large_solar_panel_tier2') - + // Remember to change the Mk3 when Venus is out event.shaped( 'gtceu:large_solar_panel_tier3', ['WSW', 'TZT', 'WUW'], @@ -35,8 +35,8 @@ function registerTFGSolarRecipes(event) { S: 'ad_astra:photovoltaic_vesnium_cell', Z: 'gtceu:large_solar_panel_tier2', W: '#gtceu:circuits/luv', - U: '#forge:gears/rocket_alloy_t1', - T: '#forge:gears/desh' + U: '#forge:gears/rocket_alloy_t2', + T: '#forge:gears/ostrum_iodide' } ).id('gtceu:shaped/large_solar_panel_tier3') diff --git a/kubejs/server_scripts/tfg/primitive/recipes.compost.js b/kubejs/server_scripts/tfg/primitive/recipes.compost.js index 80f255cd3..5c82b5541 100644 --- a/kubejs/server_scripts/tfg/primitive/recipes.compost.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.compost.js @@ -1,5 +1,9 @@ "use strict"; +/** + * + * @param {Internal.RecipesEventJS} event + */ function registerTFGCompostRecipes(event) { //#region Fertiliser event.recipes.gtceu.mixer('tfg:fertilizer') @@ -208,4 +212,26 @@ function registerTFGCompostRecipes(event) { .itemOutputs(Item.of('tfg:universal_compost_browns', 4)) .duration(20) .EUt(8) + + //Universal Brown Compost Bag + event.shapeless(Item.of('tfg:universal_compost_browns_bag', 1), + [ + "4x tfg:universal_compost_browns" + ]).id('tfg:shapeless/universal_compost_browns_bag') + + event.shapeless(Item.of('tfg:universal_compost_browns', 4), + [ + "tfg:universal_compost_browns_bag" + ]).id("tfg:shapeless/universal_compost_browns_from_bag") + + //Universal Green Compost Bag + event.shapeless(Item.of('tfg:universal_compost_greens_bag', 1), + [ + "4x tfg:universal_compost_greens" + ]).id('tfg:shapeless/universal_compost_greens_bag') + + event.shapeless(Item.of('tfg:universal_compost_greens', 4), + [ + "tfg:universal_compost_greens_bag" + ]).id("tfg:shapeless/universal_compost_greens_from_bag") } diff --git a/kubejs/startup_scripts/extended_ae2/constants.js b/kubejs/startup_scripts/extended_ae2/constants.js index 26cf04231..7a437aa22 100644 --- a/kubejs/startup_scripts/extended_ae2/constants.js +++ b/kubejs/startup_scripts/extended_ae2/constants.js @@ -11,5 +11,7 @@ global.EXTENDED_AE2_DISABLED_ITEMS = [ 'expatternprovider:ex_charger', 'expatternprovider:caner', 'expatternprovider:circuit_cutter', - 'expatternprovider:silicon_block' + 'expatternprovider:silicon_block', + 'expatternprovider:ex_crafting_terminal', // Allow to use an anvil so we remove it as it's pretty useless + 'expatternprovider:wireless_hub' // I will add this one back one day (maybe IV or LuV) ] \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/primitive/items.primitive.js b/kubejs/startup_scripts/tfg/primitive/items.primitive.js index fcc217dd5..dc917114e 100644 --- a/kubejs/startup_scripts/tfg/primitive/items.primitive.js +++ b/kubejs/startup_scripts/tfg/primitive/items.primitive.js @@ -101,9 +101,20 @@ function registerTFGPrimitiveItems(event) { // Universal compost items event.create('tfg:universal_compost_browns') .tag('tfc:compost_browns_low') + .translationKey('item.tfg.universal_compost_browns') event.create('tfg:universal_compost_greens') .tag('tfc:compost_greens_low') + .translationKey('item.tfg.universal_compost_greens') + + // Universal compost bag items + event.create('tfg:universal_compost_browns_bag') + .tag('tfc:compost_browns_high') + .translationKey('item.tfg.universal_compost_browns_bag') + + event.create('tfg:universal_compost_greens_bag') + .tag('tfc:compost_greens_high') + .translationKey('item.tfg.universal_compost_greens_bag') // Etched Diamond Etching Tip event.create('tfg:etching_diamond_tip')