Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev
This commit is contained in:
commit
40a54fd1ff
7 changed files with 368 additions and 0 deletions
150
kubejs/assets/tfg/molecules/cyclohex_diperoxide.json
Normal file
150
kubejs/assets/tfg/molecules/cyclohex_diperoxide.json
Normal file
|
|
@ -0,0 +1,150 @@
|
|||
{
|
||||
"contents": [
|
||||
{
|
||||
"type": "atom",
|
||||
"index": 0,
|
||||
"x": -0.0008,
|
||||
"y": -2.0001
|
||||
},
|
||||
{
|
||||
"type": "atom",
|
||||
"index": 1,
|
||||
"x": 1.7296,
|
||||
"y": -1.9996
|
||||
},
|
||||
{
|
||||
"type": "atom",
|
||||
"index": 2,
|
||||
"x": 0.866,
|
||||
"y": -1.5
|
||||
},
|
||||
{
|
||||
"type": "atom",
|
||||
"index": 3,
|
||||
"x": 1.7296,
|
||||
"y": -3.0005
|
||||
},
|
||||
{
|
||||
"type": "atom",
|
||||
"index": 4,
|
||||
"x": -0.0008,
|
||||
"y": -3.005
|
||||
},
|
||||
{
|
||||
"type": "atom",
|
||||
"index": 5,
|
||||
"x": 0.8682,
|
||||
"y": -3.5
|
||||
},
|
||||
{
|
||||
"type": "atom",
|
||||
"element": "O",
|
||||
"index": 6,
|
||||
"x": 0.0,
|
||||
"y": -1.0
|
||||
},
|
||||
{
|
||||
"type": "atom",
|
||||
"element": "O",
|
||||
"index": 7,
|
||||
"x": 1.7321,
|
||||
"y": -1.0
|
||||
},
|
||||
{
|
||||
"type": "atom",
|
||||
"element": "O",
|
||||
"right": "H",
|
||||
"index": 8,
|
||||
"x": 1.7321,
|
||||
"y": 0.0
|
||||
},
|
||||
{
|
||||
"type": "atom",
|
||||
"element": "O",
|
||||
"right": "H",
|
||||
"index": 9,
|
||||
"x": 0.0,
|
||||
"y": 0.0
|
||||
},
|
||||
{
|
||||
"type": "bond",
|
||||
"a": 2,
|
||||
"b": 0,
|
||||
"lines": [
|
||||
"solid"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "bond",
|
||||
"a": 0,
|
||||
"b": 4,
|
||||
"lines": [
|
||||
"solid"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "bond",
|
||||
"a": 4,
|
||||
"b": 5,
|
||||
"lines": [
|
||||
"solid"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "bond",
|
||||
"a": 5,
|
||||
"b": 3,
|
||||
"lines": [
|
||||
"solid"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "bond",
|
||||
"a": 3,
|
||||
"b": 1,
|
||||
"lines": [
|
||||
"solid"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "bond",
|
||||
"a": 1,
|
||||
"b": 2,
|
||||
"lines": [
|
||||
"solid"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "bond",
|
||||
"a": 2,
|
||||
"b": 6,
|
||||
"lines": [
|
||||
"solid"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "bond",
|
||||
"a": 2,
|
||||
"b": 7,
|
||||
"lines": [
|
||||
"solid"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "bond",
|
||||
"a": 7,
|
||||
"b": 8,
|
||||
"lines": [
|
||||
"solid"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "bond",
|
||||
"a": 6,
|
||||
"b": 9,
|
||||
"lines": [
|
||||
"solid"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
105
kubejs/assets/tfg/molecules/cyclohexanone.json
Normal file
105
kubejs/assets/tfg/molecules/cyclohexanone.json
Normal file
|
|
@ -0,0 +1,105 @@
|
|||
{
|
||||
"contents": [
|
||||
{
|
||||
"type": "atom",
|
||||
"index": 0,
|
||||
"x": -0.8674,
|
||||
"y": -1.5001
|
||||
},
|
||||
{
|
||||
"type": "atom",
|
||||
"index": 1,
|
||||
"x": 0.863,
|
||||
"y": -1.4996
|
||||
},
|
||||
{
|
||||
"type": "atom",
|
||||
"index": 2,
|
||||
"x": -0.0006,
|
||||
"y": -1.0
|
||||
},
|
||||
{
|
||||
"type": "atom",
|
||||
"index": 3,
|
||||
"x": 0.863,
|
||||
"y": -2.5005
|
||||
},
|
||||
{
|
||||
"type": "atom",
|
||||
"index": 4,
|
||||
"x": -0.8674,
|
||||
"y": -2.505
|
||||
},
|
||||
{
|
||||
"type": "atom",
|
||||
"index": 5,
|
||||
"x": 0.0016,
|
||||
"y": -3.0
|
||||
},
|
||||
{
|
||||
"type": "atom",
|
||||
"element": "O",
|
||||
"index": 6,
|
||||
"x": 0.0,
|
||||
"y": 0.0
|
||||
},
|
||||
{
|
||||
"type": "bond",
|
||||
"a": 2,
|
||||
"b": 0,
|
||||
"lines": [
|
||||
"solid"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "bond",
|
||||
"a": 0,
|
||||
"b": 4,
|
||||
"lines": [
|
||||
"solid"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "bond",
|
||||
"a": 4,
|
||||
"b": 5,
|
||||
"lines": [
|
||||
"solid"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "bond",
|
||||
"a": 5,
|
||||
"b": 3,
|
||||
"lines": [
|
||||
"solid"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "bond",
|
||||
"a": 3,
|
||||
"b": 1,
|
||||
"lines": [
|
||||
"solid"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "bond",
|
||||
"a": 1,
|
||||
"b": 2,
|
||||
"lines": [
|
||||
"solid"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "bond",
|
||||
"a": 2,
|
||||
"b": 6,
|
||||
"lines": [
|
||||
"solid",
|
||||
"solid"
|
||||
],
|
||||
"centered": true
|
||||
}
|
||||
]
|
||||
}
|
||||
43
kubejs/assets/tfg/molecules/ozone.json
Normal file
43
kubejs/assets/tfg/molecules/ozone.json
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
{
|
||||
"contents": [
|
||||
{
|
||||
"type": "atom",
|
||||
"element": "O",
|
||||
"index": 0,
|
||||
"x": 0.0,
|
||||
"y": 0.0
|
||||
},
|
||||
{
|
||||
"type": "atom",
|
||||
"element": "O",
|
||||
"index": 1,
|
||||
"x": 0.866,
|
||||
"y": 0.5
|
||||
},
|
||||
{
|
||||
"type": "atom",
|
||||
"element": "O",
|
||||
"index": 2,
|
||||
"x": 1.7321,
|
||||
"y": 0.0
|
||||
},
|
||||
{
|
||||
"type": "bond",
|
||||
"a": 0,
|
||||
"b": 1,
|
||||
"lines": [
|
||||
"solid",
|
||||
"dotted"
|
||||
]
|
||||
},
|
||||
{
|
||||
"type": "bond",
|
||||
"a": 1,
|
||||
"b": 2,
|
||||
"lines": [
|
||||
"solid",
|
||||
"dotted"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
// priority: 0
|
||||
|
||||
function registerTFGSMRAdditives(event) {
|
||||
|
||||
event.recipes.gtceu.chemical_reactor('tfg:ozone_synthesis')
|
||||
.inputFluids(Fluid.of('gtceu:oxygen', 3000))
|
||||
.outputFluids(Fluid.of('tfg:ozone', 1000))
|
||||
.notConsumable('#tfg:components/uv_leds')
|
||||
.duration(200)
|
||||
.EUt(GTValues.VA[GTValues.EV])
|
||||
|
||||
event.recipes.gtceu.chemical_reactor('tfg:tin_chloride_combining')
|
||||
.itemInputs('#forge:dusts/tin')
|
||||
.inputFluids(Fluid.of('gtceu:chlorine', 2000))
|
||||
.itemOutputs('3x #forge:dusts/tin_chloride')
|
||||
.duration(100)
|
||||
.EUt(GTValues.VA[GTValues.MV])
|
||||
|
||||
event.recipes.gtceu.chemical_reactor('tfg:cyclohexanone_synthesis')
|
||||
.inputFluids(Fluid.of('gtceu:phenol', 1000), Fluid.of('gtceu:hydrogen', 4000))
|
||||
.outputFluids(Fluid.of('tfg:cyclohexanone', 1000))
|
||||
.notConsumable('#forge:dusts/palladium')
|
||||
.duration(120)
|
||||
.EUt(GTValues.VA[GTValues.HV])
|
||||
|
||||
event.recipes.gtceu.chemical_reactor('tfg:cyclohexanone_add_oxime')
|
||||
.itemInputs('#forge:dusts/tin')
|
||||
.inputFluids(Fluid.of('tfg:cyclohexanone', 1000), Fluid.of('gtceu:ammonia', 1000), Fluid.of('gtceu:hydrogen_peroxide', 1000))
|
||||
.itemOutputs('19x #forge:dusts/cyclohexanone_oxime')
|
||||
.outputFluids(Fluid.of('minecraft:water', 2000))
|
||||
.duration(200)
|
||||
.EUt(GTValues.VA[GTValues.HV])
|
||||
|
||||
event.recipes.gtceu.chemical_reactor('tfg:cyclohexanone_peroxidation')
|
||||
.inputFluids(Fluid.of('tfg:cyclohexanone', 1000), Fluid.of('gtceu:hydrogen_peroxide', 2000))
|
||||
.outputFluids(Fluid.of('tfg:cyclohex_diperoxide', 1000))
|
||||
.notConsumable('#forge:dusts/tin_chloride')
|
||||
.duration(120)
|
||||
.EUt(GTValues.VA[GTValues.IV])
|
||||
}
|
||||
|
|
@ -55,6 +55,7 @@ const registerTFGRecipes = (event) => {
|
|||
registerTFGBoilerRecipes(event)
|
||||
registerTFGBiodieselRecipes(event)
|
||||
registerTFGNuclearRecipes(event)
|
||||
registerTFGSMRAdditives(event)
|
||||
registerTFGNuclearComponentsRecipes(event)
|
||||
registerTFGSolarRecipes(event)
|
||||
registerTFGCoalRecipes(event)
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ const registerTFGMaterials = (event) => {
|
|||
|
||||
registerTFGPowerReworkMaterials(event);
|
||||
registerTFGNuclearMaterials(event);
|
||||
registerTFGSMRAdditiveMaterials(event)
|
||||
registerTFGBiolineMaterials(event);
|
||||
registerTFGPrimitiveMaterials(event);
|
||||
registerTFGRockMaterials(event);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
// priority: 0
|
||||
"use strict";
|
||||
|
||||
const registerTFGSMRAdditiveMaterials = (event) => {
|
||||
|
||||
event.create('tfg:ozone')
|
||||
.gas()
|
||||
.components('3x oxygen')
|
||||
.color(0x00FBFF)
|
||||
|
||||
event.create('tfg:tin_chloride')
|
||||
.dust()
|
||||
.components('1x tin', '2x chlorine')
|
||||
.color(0x77CF67)
|
||||
.iconSet(GTMaterialIconSet.ROUGH)
|
||||
|
||||
event.create('tfg:cyclohexanone')
|
||||
.liquid()
|
||||
.components('6x carbon', '10x hydrogen', '1x oxygen')
|
||||
.color(0xFCB16F)
|
||||
|
||||
event.create('tfg:cyclohex_diperoxide')
|
||||
.liquid()
|
||||
.components('6x carbon', '12x hydrogen', '4x oxygen')
|
||||
.flags(GTMaterialFlags.DISABLE_DECOMPOSITION)
|
||||
.color(0xBC8E63)
|
||||
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue