diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index 1fa773789..263685e65 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -985,14 +985,14 @@ function registerGTCEuMachineRecipes(event) { event.recipes.gtceu.assembler('red_solar_casing') .itemInputs('gtceu:steel_machine_casing', 'ad_astra:photovoltaic_vesnium_cell') - .itemOutputs('tfg:block/casings/machine_casing_red_solar_panel') + .itemOutputs('tfg:casings/machine_casing_red_solar_panel') .circuit(6) .duration(2.5*20) .EUt(16) event.recipes.gtceu.assembler('iron_desh_casing') .itemInputs('6x gtceu:steel_plate', 'gtceu:desh_frame') - .itemOutputs('2x tfg:block/casings/machine_casing_iron_desh') + .itemOutputs('2x tfg:casings/machine_casing_iron_desh') .circuit(6) .duration(2.5*20) .EUt(16) diff --git a/kubejs/startup_scripts/ad_astra/materials.js b/kubejs/startup_scripts/ad_astra/materials.js index aed616e19..3e58f8ddb 100644 --- a/kubejs/startup_scripts/ad_astra/materials.js +++ b/kubejs/startup_scripts/ad_astra/materials.js @@ -28,7 +28,8 @@ const registerAdAstraMaterials = (event) => { GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.GENERATE_DENSE, - GTMaterialFlags.GENERATE_GEAR + GTMaterialFlags.GENERATE_GEAR, + GTMaterialFlags.GENERATE_FRAME ) // mars? diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index d32fd69d0..f3ad77bae 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -6,7 +6,7 @@ const registerGTCEuMachines = (event) => { GTMachineUtils.registerCrate(GTMaterials.BlackBronze, 54, "Black Bronze Crate"); GTMachineUtils.registerDrum(GTMaterials.BismuthBronze, 32000, "Bismuth Bronze Drum"); GTMachineUtils.registerDrum(GTMaterials.BlackBronze, 32000, "Black Bronze Drum"); - + const $SteamMulti = Java.loadClass('com.gregtechceu.gtceu.common.machine.multiblock.steam.SteamParallelMultiblockMachine'); const $Tags = Java.loadClass("dev.latvian.mods.kubejs.util.Tags") @@ -221,36 +221,36 @@ const registerGTCEuMachines = (event) => { //#region Large Solar Pannel - From Sky of Grind for the code thanks a lot event.create('large_solar_panel', 'multiblock') - .rotationState(RotationState.NON_Y_AXIS) - .generator(true) - .recipeType('large_solar_panel') - .noRecipeModifier() - .appearanceBlock(() => Block.getBlock('tfg:block/casings/machine_casing_iron_desh')) - .pattern(definition => FactoryBlockPattern.start() - .aisle('P P', 'P P', 'P P', 'PPPPPPP', 'PKKKKKP') - .aisle(' ', ' ', ' ', 'P P', 'KIIIIIK') - .aisle(' PLP ', ' PLP ', ' RRR ', 'P RRR P', 'KIIIIIK') - .aisle(' LPL ', ' L#L ', ' RGR ', 'P RGR P', 'KIIGIIK') - .aisle(' PXP ', ' PLP ', ' RRR ', 'P RRR P', 'KIIIIIK') - .aisle(' ', ' ', ' ', 'P P', 'KIIIIIK') - .aisle('P P', 'P P', 'P P', 'PPPPPPP', 'PKKKKKP') - .where('X', Predicates.controller(Predicates.blocks(definition.get()))) - .where('R', Predicates.blocks('gtceu:cleanroom_glass')) - .where('I', Predicates.blocks('tfg:block/casings/machine_casing_red_solar_panel')) + .rotationState(RotationState.NON_Y_AXIS) + .generator(true) + .recipeType('large_solar_panel') + .noRecipeModifier() + .appearanceBlock(() => Block.getBlock('tfg:casings/machine_casing_iron_desh')) + .pattern(definition => FactoryBlockPattern.start() + .aisle('P P', 'P P', 'P P', 'PPPPPPP', 'PKKKKKP') + .aisle(' ', ' ', ' ', 'P P', 'KIIIIIK') + .aisle(' PLP ', ' PLP ', ' RRR ', 'P RRR P', 'KIIIIIK') + .aisle(' LPL ', ' L#L ', ' RGR ', 'P RGR P', 'KIIGIIK') + .aisle(' PXP ', ' PLP ', ' RRR ', 'P RRR P', 'KIIIIIK') + .aisle(' ', ' ', ' ', 'P P', 'KIIIIIK') + .aisle('P P', 'P P', 'P P', 'PPPPPPP', 'PKKKKKP') + .where('X', Predicates.controller(Predicates.blocks(definition.get()))) + .where('R', Predicates.blocks('gtceu:cleanroom_glass')) + .where('I', Predicates.blocks('tfg:casings/machine_casing_red_solar_panel')) .where('G', Predicates.blocks('ad_astra:glowing_iron_pillar')) - .where('P', Predicates.blocks('tfg:block/casings/machine_casing_iron_desh')) + .where('P', Predicates.blocks('tfg:casings/machine_casing_iron_desh')) .where('K', Predicates.blocks('ad_astra:iron_plateblock')) - .where('L', Predicates.blocks('tfg:block/casings/machine_casing_iron_desh') - .or(Predicates.abilities(PartAbility.IMPORT_ITEMS).setMaxGlobalLimited(2).setPreviewCount(1)) - .or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1)) - .or(Predicates.abilities(PartAbility.IMPORT_FLUIDS).setMaxGlobalLimited(2).setPreviewCount(1)) - .or(Predicates.abilities(PartAbility.EXPORT_FLUIDS).setMaxGlobalLimited(2).setPreviewCount(1)) - .or(Predicates.abilities(PartAbility.PARALLEL_HATCH).setMaxGlobalLimited(1)) - .or(Predicates.abilities(PartAbility.OUTPUT_ENERGY).setExactLimit(1))) + .where('L', Predicates.blocks('tfg:casings/machine_casing_iron_desh') + .or(Predicates.abilities(PartAbility.IMPORT_ITEMS).setMaxGlobalLimited(2).setPreviewCount(1)) + .or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1)) + .or(Predicates.abilities(PartAbility.IMPORT_FLUIDS).setMaxGlobalLimited(2).setPreviewCount(1)) + .or(Predicates.abilities(PartAbility.EXPORT_FLUIDS).setMaxGlobalLimited(2).setPreviewCount(1)) + .or(Predicates.abilities(PartAbility.PARALLEL_HATCH).setMaxGlobalLimited(1)) + .or(Predicates.abilities(PartAbility.OUTPUT_ENERGY).setExactLimit(1))) .where('#', Predicates.air()) .where(' ', Predicates.any()) - .build() - ) + .build() + ) .workableCasingRenderer( 'tfg:block/casings/machine_casing_iron_desh', 'gtceu:block/multiblock/hpca', true) diff --git a/kubejs/startup_scripts/tfg/blocks.js b/kubejs/startup_scripts/tfg/blocks.js index d22c46210..e70b623a2 100644 --- a/kubejs/startup_scripts/tfg/blocks.js +++ b/kubejs/startup_scripts/tfg/blocks.js @@ -34,7 +34,8 @@ const registerTFGBlocks = (event) => { // #region Machine Casings global.TFG_MACHINE_CASINGS.forEach(type => { - event.create(`tfg:block/casings/${type}`) + event.create(`tfg:casings/${type}`) + .translationKey(`block.tfg.casings.${type}`) .model(`tfg:block/casings/${type}`) .soundType('copper') .hardness(5)