illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

Browse source
This commit is contained in:
Pyritie 2025-07-20 12:10:47 +01:00
commit 4c8b0ca545
24 changed files with 153 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
kubejs/assets/tfg/blockstates/electromagnetic_accelerator.json Normal file
View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "tfg:block/casings/electromagnetic_accelerator"
}
}
}

7
kubejs/assets/tfg/blockstates/superconductor_coil_large.json Normal file
View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "tfg:block/casings/superconductor_coil_large"
}
}
}

7
kubejs/assets/tfg/blockstates/superconductor_coil_small.json Normal file
View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "tfg:block/casings/superconductor_coil_small"
}
}
}

1
kubejs/assets/tfg/models/block/casings/electromagnetic_accelerator.json Normal file
View file

@ -0,0 +1 @@
{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/electromagnetic_accelerator"}}

1
kubejs/assets/tfg/models/block/casings/superconductor_coil_large.json Normal file
View file

@ -0,0 +1 @@
{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/superconductor_coil_large"}}

1
kubejs/assets/tfg/models/block/casings/superconductor_coil_small.json Normal file
View file

@ -0,0 +1 @@
{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/superconductor_coil_small"}}

3
kubejs/assets/tfg/models/item/electromagnetic_accelerator.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "tfg:block/casings/electromagnetic_accelerator"
}

3
kubejs/assets/tfg/models/item/superconductor_coil_large.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "tfg:block/casings/superconductor_coil_large"
}

3
kubejs/assets/tfg/models/item/superconductor_coil_small.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "tfg:block/casings/superconductor_coil_small"
}

BIN
kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7 KiB

12
kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator.png.mcmeta Normal file
View file

@ -0,0 +1,12 @@
{
"animation": {
"frametime": 1
},
"ldlib": {
"connection": "tfg:block/casings/electromagnetic_accelerator_ctm",
"emissive": true
},
"shimmer": {
"bloom": true
}
}

BIN
kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator_ctm.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 16 KiB

8
kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator_ctm.png.mcmeta Normal file
View file

@ -0,0 +1,8 @@
{
"animation": {
"frametime": 1
},
"shimmer": {
"bloom": true
}
}

BIN
kubejs/assets/tfg/textures/block/casings/superconductor_coil_large.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 566 B

5
kubejs/assets/tfg/textures/block/casings/superconductor_coil_large.png.mcmeta Normal file
View file

@ -0,0 +1,5 @@
{
"ldlib": {
"connection": "tfg:block/casings/superconductor_coil_large_ctm"
}
}

BIN
kubejs/assets/tfg/textures/block/casings/superconductor_coil_large_ctm.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 816 B

BIN
kubejs/assets/tfg/textures/block/casings/superconductor_coil_small.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 524 B

5
kubejs/assets/tfg/textures/block/casings/superconductor_coil_small.png.mcmeta Normal file
View file

@ -0,0 +1,5 @@
{
"ldlib": {
"connection": "tfg:block/casings/superconductor_coil_small_ctm"
}
}

BIN
kubejs/assets/tfg/textures/block/casings/superconductor_coil_small_ctm.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 631 B

43
kubejs/server_scripts/tfg/recipes.miscellaneous.js
View file

@ -885,4 +885,47 @@ function registerTFGMiscellaneousRecipes(event) {
event.shapeless('9x tfg:aes_insulation_sheet', [
'tfg:aes_insulation_roll'
]).id('tfg:shapeless/aes_insulation_sheet')
global.GTCEU_SUPERCONDUCTORS.forEach((type, index) => {
const multiplier = index + 1
event.recipes.gtceu.assembler(`tfg:assembler/superconductor_coil_small_from_${type.name}`)
.itemInputs(
ChemicalHelper.get(TagPrefix.plate, GTMaterials.HSLASteel, 4),
ChemicalHelper.get(TagPrefix.rod, GTMaterials.Steel, 2),
ChemicalHelper.get(TagPrefix.rod, GTMaterials.SteelMagnetic, 1),
ChemicalHelper.get(TagPrefix.wireFine, GTMaterials[type.materialId], 4),
)
.inputFluids(Fluid.of('gtceu:silicone_rubber', 144))
.itemOutputs(Item.of('tfg:superconductor_coil_small', 4 * multiplier))
.circuit(4)
.duration(400)
.EUt(GTValues.VA[GTValues.MV])
event.recipes.gtceu.assembler(`tfg:assembler/superconductor_coil_large_from_${type.name}`)
.itemInputs(
ChemicalHelper.get(TagPrefix.plate, GTMaterials.HSLASteel, 4),
ChemicalHelper.get(TagPrefix.rod, GTMaterials.Steel, 2),
ChemicalHelper.get(TagPrefix.rod, GTMaterials.SteelMagnetic, 1),
ChemicalHelper.get(TagPrefix.wireGtSingle, GTMaterials[type.materialId], 4),
)
.inputFluids(Fluid.of('gtceu:silicone_rubber', 144))
.itemOutputs(Item.of('tfg:superconductor_coil_large', 4 * multiplier))
.circuit(7)
.duration(600)
.EUt(GTValues.VA[GTValues.MV])
})
event.recipes.gtceu.assembler('tfg:assembler/electromagnetic_accelerator')
.itemInputs(
'2x #forge:plates/desh',
'gtceu:mv_voltage_coil',
'5x tfg:dry_ice',
'gtceu:nonconducting_casing'
)
.inputFluids(Fluid.of('gtceu:blue_alloy', 288))
.itemOutputs('6x tfg:electromagnetic_accelerator')
.circuit(4)
.duration(800)
.EUt(GTValues.VA[GTValues.MV])
}

14
kubejs/server_scripts/tfg/recipes.paper.js
View file

@ -46,8 +46,16 @@ function registerTFGPapermakingRecipes(event) {
.duration(160)
.EUt(7)
//Replace macerate logs into macerate softwood logs
event.replaceInput({ id: 'gtceu:macerator/macerate_logs' }, '#minecraft:logs', '#tfg:softwood')
removeMaceratorRecipe(event, 'macerate_logs')
// Create macerator recipes for softwood
event.recipes.gtceu.macerator('macerate_softwood')
.itemInputs('#tfg:softwood')
.itemOutputs('6x gtceu:wood_dust')
.chancedOutput('gtceu:wood_dust', 8000, 680)
.duration(70)
.EUt(2)
//Create identical macerator recipe for hardwood
event.recipes.gtceu.macerator('macerate_hardwood')
.itemInputs('#tfg:hardwood')
@ -152,4 +160,4 @@ function registerTFGPapermakingRecipes(event) {
.itemOutputs('minecraft:paper')
.duration(40)
.EUt(4)
}
}

7
kubejs/server_scripts/tfg/tags.js
View file

@ -349,6 +349,13 @@ const registerTFGBlockTags = (event) => {
event.add('tfg:harvester_harvestable', '#tfc:berry_bushes')
event.add('tfg:harvester_harvestable', '#tfc:any_spreading_bush')
event.add('minecraft:mineable/pickaxe', 'tfg:superconductor_coil_large')
event.add('minecraft:mineable/pickaxe', 'tfg:superconductor_coil_small')
event.add('minecraft:mineable/pickaxe', 'tfg:electromagnetic_accelerator')
event.add('forge:mineable/wrench', 'tfg:superconductor_coil_large')
event.add('forge:mineable/wrench', 'tfg:superconductor_coil_small')
event.add('forge:mineable/wrench', 'tfg:electromagnetic_accelerator')
// #endregion
}
//#endregion

15
kubejs/startup_scripts/gtceu/constants.js
View file

@ -299,3 +299,18 @@ global.ADD_CIRCUIT = [
];
//#endregion
//#region Superconductors
/** @global */
global.GTCEU_SUPERCONDUCTORS = [
{name: 'manganese_phosphide', materialId: 'ManganesePhosphide'},
{name: 'magnesium_diboride', materialId: 'MagnesiumDiboride'},
{name: 'mercury_barium_calcium_cuprate', materialId: 'MercuryBariumCalciumCuprate'},
{name: 'uranium_triplatinum', materialId: 'UraniumTriplatinum'},
{name: 'samarium_iron_arsenic_oxide', materialId: 'SamariumIronArsenicOxide'},
{name: 'indium_tin_barium_titanium_cuprate', materialId: 'IndiumTinBariumTitaniumCuprate'},
{name: 'uranium_rhodium_dinaquadide', materialId: 'UraniumRhodiumDinaquadide'},
{name: 'enriched_naquadah_trinium_europium_duranide', materialId: 'EnrichedNaquadahTriniumEuropiumDuranide'},
{name: 'ruthenium_trinium_americium_neutronate', materialId: 'RutheniumTriniumAmericiumNeutronate'}
]
//#endregion

16
kubejs/startup_scripts/gtceu/materials.js
View file

@ -40,7 +40,8 @@ const registerGTCEuMaterialModification = (event) => {
GENERATE_PLATE,
GENERATE_DENSE,
GENERATE_RING,
GENERATE_FOIL
GENERATE_FOIL,
GENERATE_FINE_WIRE,
} = $MATERIAL_FLAGS
var metalTooling = [
@ -183,7 +184,18 @@ const registerGTCEuMaterialModification = (event) => {
GTMaterials.TinAlloy.addFlags(GENERATE_DOUBLE_INGOTS);
GTMaterials.Lead.addFlags(GENERATE_DOUBLE_INGOTS);
//
// /* Другое */
// /* Superconductors */
GTMaterials.ManganesePhosphide.addFlags(GENERATE_FINE_WIRE);
GTMaterials.MagnesiumDiboride.addFlags(GENERATE_FINE_WIRE);
GTMaterials.MercuryBariumCalciumCuprate.addFlags(GENERATE_FINE_WIRE);
GTMaterials.UraniumTriplatinum.addFlags(GENERATE_FINE_WIRE);
GTMaterials.SamariumIronArsenicOxide.addFlags(GENERATE_FINE_WIRE);
//GTMaterials.IndiumTinBariumTitaniumCuprate.addFlags();
//GTMaterials.UraniumRhodiumDinaquadide.addFlags();
//GTMaterials.EnrichedNaquadahTriniumEuropiumDuranide.addFlags();
GTMaterials.RutheniumTriniumAmericiumNeutronate.addFlags(GENERATE_FINE_WIRE);
//
// /* Другое (Other) */
// TODO: Exception needs to check the wizardry
GTMaterials.Bismuth.setProperty(PropertyKey.ORE, new $ORE_PROPERTY());