diff --git a/kubejs/assets/tfg/blockstates/electromagnetic_accelerator.json b/kubejs/assets/tfg/blockstates/electromagnetic_accelerator.json new file mode 100644 index 000000000..5b3c414ea --- /dev/null +++ b/kubejs/assets/tfg/blockstates/electromagnetic_accelerator.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/casings/electromagnetic_accelerator" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/superconductor_coil_large.json b/kubejs/assets/tfg/blockstates/superconductor_coil_large.json new file mode 100644 index 000000000..9649a8a86 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/superconductor_coil_large.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/casings/superconductor_coil_large" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/superconductor_coil_small.json b/kubejs/assets/tfg/blockstates/superconductor_coil_small.json new file mode 100644 index 000000000..b3a456a13 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/superconductor_coil_small.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/casings/superconductor_coil_small" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/casings/electromagnetic_accelerator.json b/kubejs/assets/tfg/models/block/casings/electromagnetic_accelerator.json new file mode 100644 index 000000000..2672e7793 --- /dev/null +++ b/kubejs/assets/tfg/models/block/casings/electromagnetic_accelerator.json @@ -0,0 +1 @@ +{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/electromagnetic_accelerator"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/casings/superconductor_coil_large.json b/kubejs/assets/tfg/models/block/casings/superconductor_coil_large.json new file mode 100644 index 000000000..32a088018 --- /dev/null +++ b/kubejs/assets/tfg/models/block/casings/superconductor_coil_large.json @@ -0,0 +1 @@ +{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/superconductor_coil_large"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/casings/superconductor_coil_small.json b/kubejs/assets/tfg/models/block/casings/superconductor_coil_small.json new file mode 100644 index 000000000..66d082401 --- /dev/null +++ b/kubejs/assets/tfg/models/block/casings/superconductor_coil_small.json @@ -0,0 +1 @@ +{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/superconductor_coil_small"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/electromagnetic_accelerator.json b/kubejs/assets/tfg/models/item/electromagnetic_accelerator.json new file mode 100644 index 000000000..a9144b2a5 --- /dev/null +++ b/kubejs/assets/tfg/models/item/electromagnetic_accelerator.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/casings/electromagnetic_accelerator" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/superconductor_coil_large.json b/kubejs/assets/tfg/models/item/superconductor_coil_large.json new file mode 100644 index 000000000..45199ae81 --- /dev/null +++ b/kubejs/assets/tfg/models/item/superconductor_coil_large.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/casings/superconductor_coil_large" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/superconductor_coil_small.json b/kubejs/assets/tfg/models/item/superconductor_coil_small.json new file mode 100644 index 000000000..a09965304 --- /dev/null +++ b/kubejs/assets/tfg/models/item/superconductor_coil_small.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/casings/superconductor_coil_small" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator.png b/kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator.png new file mode 100644 index 000000000..3886d9195 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator.png.mcmeta new file mode 100644 index 000000000..1a3525e6f --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator.png.mcmeta @@ -0,0 +1,12 @@ +{ + "animation": { + "frametime": 1 + }, + "ldlib": { + "connection": "tfg:block/casings/electromagnetic_accelerator_ctm", + "emissive": true + }, + "shimmer": { + "bloom": true + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator_ctm.png b/kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator_ctm.png new file mode 100644 index 000000000..1d86b8616 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator_ctm.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator_ctm.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator_ctm.png.mcmeta new file mode 100644 index 000000000..1ecd38b81 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/electromagnetic_accelerator_ctm.png.mcmeta @@ -0,0 +1,8 @@ +{ + "animation": { + "frametime": 1 + }, + "shimmer": { + "bloom": true + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/superconductor_coil_large.png b/kubejs/assets/tfg/textures/block/casings/superconductor_coil_large.png new file mode 100644 index 000000000..1f8e602be Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/superconductor_coil_large.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/superconductor_coil_large.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/superconductor_coil_large.png.mcmeta new file mode 100644 index 000000000..2eb488edc --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/superconductor_coil_large.png.mcmeta @@ -0,0 +1,5 @@ +{ + "ldlib": { + "connection": "tfg:block/casings/superconductor_coil_large_ctm" + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/superconductor_coil_large_ctm.png b/kubejs/assets/tfg/textures/block/casings/superconductor_coil_large_ctm.png new file mode 100644 index 000000000..d66623038 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/superconductor_coil_large_ctm.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/superconductor_coil_small.png b/kubejs/assets/tfg/textures/block/casings/superconductor_coil_small.png new file mode 100644 index 000000000..1c24fc915 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/superconductor_coil_small.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/superconductor_coil_small.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/superconductor_coil_small.png.mcmeta new file mode 100644 index 000000000..53a687d86 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/superconductor_coil_small.png.mcmeta @@ -0,0 +1,5 @@ +{ + "ldlib": { + "connection": "tfg:block/casings/superconductor_coil_small_ctm" + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/superconductor_coil_small_ctm.png b/kubejs/assets/tfg/textures/block/casings/superconductor_coil_small_ctm.png new file mode 100644 index 000000000..2290a03d1 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/superconductor_coil_small_ctm.png differ diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index 1cdf1d57c..48ff94d40 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -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]) } diff --git a/kubejs/server_scripts/tfg/recipes.paper.js b/kubejs/server_scripts/tfg/recipes.paper.js index 5f02457f8..d764c6332 100644 --- a/kubejs/server_scripts/tfg/recipes.paper.js +++ b/kubejs/server_scripts/tfg/recipes.paper.js @@ -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) -} \ No newline at end of file +} diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 8a4c12254..dbe55d7b4 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -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 diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 67ffe8bb3..6a851fdfd 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -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 + diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index f04b5886f..584dd3a1d 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -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());