Jika/TFG
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed firmalife sprinklers, since now you can put gt pipes through walls

Browse Source
This commit is contained in:
Pyritie
2025-04-18 20:51:37 +01:00
parent a9f485ae73
commit fa22cd98fc
5 changed files with 17 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaultconfigs/firmalife-server.toml
View File

@@ -1,6 +1,4 @@
[general]
#If true, the tumbler and the pumping station work magically with a redstone signal and no power required.
mechanicalPowerCheatMode = true
#If true, sprinkler will not accept firmalife pipes and will instead require something that exposes a fluid capability, eg. a barrel.
usePipesForSprinklers = false

2
kubejs/assets/gtceu/lang/en_us.json
View File

@@ -5,6 +5,8 @@
"block.gtceu.ender_dome": "Enderarium",
"block.gtceu.greenhouse": "Greenhouse",
"block.gtceu.steam_bloomery": "Steam Bloomery",
"block.gtceu.copper_crate": "Copper Crate",
"block.gtceu.copper_drum": "Copper Drum",
"block.gtceu.black_bronze_crate": "Black Bronze Crate",
"block.gtceu.black_bronze_drum": "Black Bronze Drum",
"block.gtceu.bismuth_bronze_crate": "Bismuth Bronze Crate",

116
kubejs/server_scripts/firmalife/recipes.js
View File

@@ -2,36 +2,13 @@
const registerFirmaLifeRecipes = (event) => {
//#region Удаление других рецептов
event.remove({ id: 'firmalife:crafting/compost_tumbler' })
event.remove({ id: 'firmalife:crafting/pumping_station' })
event.remove({ id: 'firmalife:crafting/pumping_station2' })
event.remove({ id: 'firmalife:crafting/pumping_station3' })
global.FIRMALIFE_DISABLED_ITEMS.forEach(item => {
event.remove({ input: item })
event.remove({ output: item })
})
// - Chromium
// Ingot
event.remove({ id: 'firmalife:casting/chromium_ingot' })
event.remove({ id: 'firmalife:casting/chromium_ingot_fire' })
event.remove({ id: 'firmalife:heating/metal/chromium_ingot' })
// Double Ingot
event.remove({ id: 'firmalife:welding/chromium_double_ingot' })
event.remove({ id: 'firmalife:heating/metal/chromium_double_ingot' })
// Sheet
event.remove({ id: 'firmalife:anvil/chromium_sheet' })
event.remove({ id: 'firmalife:heating/metal/chromium_sheet' })
// Double Sheet
event.remove({ id: 'firmalife:welding/chromium_double_sheet' })
event.remove({ id: 'firmalife:heating/metal/chromium_double_sheet' })
// Rod
event.remove({ id: 'firmalife:anvil/chromium_rod' })
event.remove({ id: 'firmalife:heating/metal/chromium_rod' })
// Ores
event.remove({ id: 'firmalife:heating/ore/small_chromite' })
event.remove({ id: 'firmalife:heating/ore/poor_chromite' })
@@ -49,27 +26,6 @@ const registerFirmaLifeRecipes = (event) => {
// - Stainless Steel
event.remove({ id: 'firmalife:alloy/stainless_steel' })
// Ingot
event.remove({ id: 'firmalife:casting/stainless_steel_ingot' })
event.remove({ id: 'firmalife:casting/stainless_steel_ingot_fire' })
event.remove({ id: 'firmalife:heating/metal/stainless_steel_ingot' })
// Double Ingot
event.remove({ id: 'firmalife:welding/stainless_steel_double_ingot' })
event.remove({ id: 'firmalife:heating/metal/stainless_steel_double_ingot' })
// Sheet
event.remove({ id: 'firmalife:anvil/stainless_steel_sheet' })
event.remove({ id: 'firmalife:heating/metal/stainless_steel_sheet' })
// Double Sheet
event.remove({ id: 'firmalife:welding/stainless_steel_double_sheet' })
event.remove({ id: 'firmalife:heating/metal/stainless_steel_double_sheet' })
// Rod
event.remove({ id: 'firmalife:anvil/stainless_steel_rod' })
event.remove({ id: 'firmalife:heating/stainless_steel_rod' })
// Jar lid
event.remove({ id: 'firmalife:heating/stainless_steel_jar_lid' })
@@ -176,48 +132,6 @@ const registerFirmaLifeRecipes = (event) => {
//#region Медная
event.shaped('firmalife:pumping_station',
[
' B ',
'ACA',
' D '
], {
A: 'firmalife:copper_pipe',
B: '#forge:plates/bronze',
C: '#tfc:barrels',
D: 'create:mechanical_pump'
}).id('tfg:shaped/pumping_station')
event.shaped('firmalife:pumping_station',
[
' B ',
'ACA',
' D '
], {
A: 'firmalife:copper_pipe',
B: '#forge:plates/black_bronze',
C: '#tfc:barrels',
D: 'create:mechanical_pump'
}).id('tfg:shaped/pumping_station2')
event.shaped('firmalife:pumping_station',
[
' B ',
'ACA',
' D '
], {
A: 'firmalife:copper_pipe',
B: '#forge:plates/bismuth_bronze',
C: '#tfc:barrels',
D: 'create:mechanical_pump'
}).id('tfg:shaped/pumping_station3')
event.recipes.gtceu.bender('tfg:firmalife/copper_pipe')
.itemInputs('#forge:plates/copper')
.itemOutputs('8x firmalife:copper_pipe')
.circuit(3)
.duration(40)
.EUt(8)
event.recipes.gtceu.bender('tfg:firmalife/sprinkler')
.itemInputs('#forge:plates/copper')
@@ -294,17 +208,6 @@ const registerFirmaLifeRecipes = (event) => {
B: 'minecraft:glass'
}).id('firmalife:crafting/greenhouse/copper_greenhouse_door')
// Порт
event.shaped('firmalife:copper_greenhouse_port', [
'AA',
'BC',
'AA'
], {
A: 'firmalife:reinforced_glass',
B: '#forge:rods/copper',
C: 'firmalife:copper_pipe'
}).id('firmalife:crafting/greenhouse/copper_greenhouse_port')
//#endregion
//#region Железная
@@ -377,17 +280,6 @@ const registerFirmaLifeRecipes = (event) => {
B: 'minecraft:glass'
}).id('firmalife:crafting/greenhouse/iron_greenhouse_door')
// Порт
event.shaped('firmalife:iron_greenhouse_port', [
'AA',
'BC',
'AA'
], {
A: 'firmalife:reinforced_glass',
B: '#forge:rods/wrought_iron',
C: 'firmalife:copper_pipe'
}).id('firmalife:crafting/greenhouse/iron_greenhouse_port')
//#endregion
//#region Нержавеющая теплица

11
kubejs/startup_scripts/firmalife/constants.js
View File

@@ -23,7 +23,16 @@ global.FIRMALIFE_DISABLED_ITEMS = [
'firmalife:metal/bucket/stainless_steel',
// Other
'firmalife:compost_tumbler'
'firmalife:compost_tumbler',
// Greenhouse shit
'firmalife:pumping_station',
'firmalife:copper_pipe',
'firmalife:oxidized_copper_pipe',
'firmalife:irrigation_tank',
'firmalife:iron_greenhouse_port',
'firmalife:copper_greenhouse_port',
'firmalife:treated_wood_greenhouse_port'
];
global.FIRMALIFE_HIDED_ITEMS = [

1
kubejs/startup_scripts/gtceu/materials.js
View File

@@ -179,6 +179,7 @@ const registerGTCEuMaterialModification = (event) => {
GTMaterials.CertusQuartz.addFlags(GENERATE_ROD);
GTMaterials.NetherQuartz.addFlags(GENERATE_ROD);
GTMaterials.Copper.addFlags(GENERATE_FRAME);
GTMaterials.BlackBronze.addFlags(GENERATE_FRAME);
GTMaterials.BismuthBronze.addFlags(GENERATE_FRAME);