diff --git a/kubejs/assets/tfg/models/item/tier_1_double_rocket.json b/kubejs/assets/tfg/models/item/tier_1_double_rocket.json new file mode 100644 index 000000000..367f272ed --- /dev/null +++ b/kubejs/assets/tfg/models/item/tier_1_double_rocket.json @@ -0,0 +1,44 @@ +{ + "credit": "Adapted from Ad Astra", + "parent": "builtin/entity", + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [-90, 0, -90], + "translation": [-25, 4.5, -1], + "scale": [0.8, 0.8, 0.8] + }, + "thirdperson_lefthand": { + "rotation": [-90, 0, -90], + "translation": [-25, 4.5, -13.5], + "scale": [0.8, 0.8, 0.8] + }, + "firstperson_righthand": { + "rotation": [-10, 180, 90], + "translation": [-18, 20, 0], + "scale": [0.45, 0.45, 0.45] + }, + "firstperson_lefthand": { + "rotation": [-10, 180, 90], + "translation": [-18, 12, 0], + "scale": [0.45, 0.45, 0.45] + }, + "ground": { + "translation": [2, 2, 2], + "scale": [0.2, 0.2, 0.2] + }, + "gui": { + "rotation": [-41, -170, 26], + "translation": [-0.5, -4.8, 0], + "scale": [0.2, 0.2, 0.2] + }, + "head": { + "translation": [2.5, 9, 2.25], + "scale": [0.3, 0.3, 0.3] + }, + "fixed": { + "translation": [1, -2.5, 0], + "scale": [0.2, 0.2, 0.2] + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/tier_2_double_rocket.json b/kubejs/assets/tfg/models/item/tier_2_double_rocket.json new file mode 100644 index 000000000..d3f52111d --- /dev/null +++ b/kubejs/assets/tfg/models/item/tier_2_double_rocket.json @@ -0,0 +1,44 @@ +{ + "credit": "Adapted from Ad Astra", + "parent": "builtin/entity", + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [-90, 0, -90], + "translation": [-25, 4.5, -1], + "scale": [0.8, 0.8, 0.8] + }, + "thirdperson_lefthand": { + "rotation": [-90, 0, -90], + "translation": [-25, 4.5, -13.5], + "scale": [0.8, 0.8, 0.8] + }, + "firstperson_righthand": { + "rotation": [-10, 180, 90], + "translation": [-20, 20, 0], + "scale": [0.45, 0.45, 0.45] + }, + "firstperson_lefthand": { + "rotation": [-10, 180, 90], + "translation": [-20, 12, 0], + "scale": [0.45, 0.45, 0.45] + }, + "ground": { + "translation": [2, 2, 2], + "scale": [0.2, 0.2, 0.2] + }, + "gui": { + "rotation": [-41, -170, 26], + "translation": [-0.5, -4.8, 0], + "scale": [0.2, 0.2, 0.2] + }, + "head": { + "translation": [2.5, 9, 2.25], + "scale": [0.3, 0.3, 0.3] + }, + "fixed": { + "translation": [1, -2.5, 0], + "scale": [0.2, 0.2, 0.2] + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/tier_3_double_rocket.json b/kubejs/assets/tfg/models/item/tier_3_double_rocket.json new file mode 100644 index 000000000..5c9cc42ed --- /dev/null +++ b/kubejs/assets/tfg/models/item/tier_3_double_rocket.json @@ -0,0 +1,44 @@ +{ + "credit": "Adapted from Ad Astra", + "parent": "builtin/entity", + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [-110, 0, -90], + "translation": [-25, 4.5, -4.5], + "scale": [0.8, 0.8, 0.8] + }, + "thirdperson_lefthand": { + "rotation": [-110, 0, -90], + "translation": [-25, 4.5, -15], + "scale": [0.8, 0.8, 0.8] + }, + "firstperson_righthand": { + "rotation": [-10, 180, 90], + "translation": [-25, 20, -5], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_lefthand": { + "rotation": [-10, 180, 90], + "translation": [-25, 12, -5], + "scale": [0.5, 0.5, 0.5] + }, + "ground": { + "translation": [2, 2, 2], + "scale": [0.2, 0.2, 0.2] + }, + "gui": { + "rotation": [-41, -170, 26], + "translation": [-0.5, -4.8, 0], + "scale": [0.2, 0.2, 0.2] + }, + "head": { + "translation": [2.5, 9, 2.25], + "scale": [0.3, 0.3, 0.3] + }, + "fixed": { + "translation": [1, -2.5, 0], + "scale": [0.2, 0.2, 0.2] + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/tier_4_double_rocket.json b/kubejs/assets/tfg/models/item/tier_4_double_rocket.json new file mode 100644 index 000000000..65f064315 --- /dev/null +++ b/kubejs/assets/tfg/models/item/tier_4_double_rocket.json @@ -0,0 +1,44 @@ +{ + "credit": "Adapted from Ad Astra", + "parent": "builtin/entity", + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [180, 0, -90], + "translation": [-35, 4.5, -14], + "scale": [0.8, 0.8, 0.8] + }, + "thirdperson_lefthand": { + "rotation": [180, 0, -90], + "translation": [-35, -7, -14], + "scale": [0.8, 0.8, 0.8] + }, + "firstperson_righthand": { + "rotation": [80, 180, 90], + "translation": [-25, 20, 6], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_lefthand": { + "rotation": [80, 180, 90], + "translation": [-25, 18, 0], + "scale": [0.5, 0.5, 0.5] + }, + "ground": { + "translation": [2, 2, 2], + "scale": [0.2, 0.2, 0.2] + }, + "gui": { + "rotation": [-41, -170, 26], + "translation": [0, -4.8, 0], + "scale": [0.17, 0.17, 0.17] + }, + "head": { + "translation": [2.5, 9, 2.25], + "scale": [0.3, 0.3, 0.3] + }, + "fixed": { + "translation": [1, -2.5, 0], + "scale": [0.2, 0.2, 0.2] + } + } +} \ No newline at end of file diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index 51505ec41..4deefb95b 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -51,6 +51,10 @@ const registerAdAstraItemTags = (event) => { event.add('c:hidden_from_recipe_viewers', 'ad_astra:aeronos_mushroom') event.add('c:hidden_from_recipe_viewers', 'ad_astra:strophar_mushroom') + event.add('c:hidden_from_recipe_viewers', 'tfg:tier_3_double_rocket') + event.add('c:hidden_from_recipe_viewers', 'tfg:tier_4_double_rocket') + + // Deco blocks const DECO_BLOCKS = [ 'iron', 'steel', 'desh', 'calorite', 'ostrum' ]; DECO_BLOCKS.forEach(block => { @@ -68,6 +72,12 @@ const registerAdAstraItemTags = (event) => { event.add('tfg:ad_astra_etrium_blocks', 'ad_astra:etrium_plateblock') event.add('tfg:ad_astra_etrium_blocks', 'ad_astra:etrium_panel') + event.add('ad_astra:held_over_head', 'tfg:tier_1_double_rocket') + event.add('ad_astra:held_over_head', 'tfg:tier_2_double_rocket') + event.add('ad_astra:held_over_head', 'tfg:tier_3_double_rocket') + event.add('ad_astra:held_over_head', 'tfg:tier_4_double_rocket') + + global.AD_ASTRA_WOOD.forEach(wood => { if (wood.log) { diff --git a/kubejs/server_scripts/tfg/space_general/recipes.rockets.js b/kubejs/server_scripts/tfg/space_general/recipes.rockets.js index 161eb46af..25a92c9c1 100644 --- a/kubejs/server_scripts/tfg/space_general/recipes.rockets.js +++ b/kubejs/server_scripts/tfg/space_general/recipes.rockets.js @@ -88,6 +88,22 @@ function registerTFGRocketRecipes(event) { .circuit(2) .EUt(GTValues.VA[GTValues.HV]) .addMaterialInfo(true, true) + + event.recipes.gtceu.assembler('ad_astra:assembler_tier_1_double_rocket') + .itemInputs( + ChemicalHelper.get(TagPrefix.plateDense, TFGHelpers.getMaterial('rocket_alloy_t1'), 12), + '4x ad_astra:rocket_fin', + '1x ad_astra:steel_engine', + '1x ad_astra:rocket_nose_cone', + '24x #forge:insulation_t1', + '6x #gtceu:circuits/hv' + ) + .inputFluids(Fluid.of('gtceu:silicon', 144 * 24)) + .itemOutputs('tfg:tier_1_double_rocket') + .duration(1800) + .circuit(3) + .EUt(GTValues.VA[GTValues.HV]) + .addMaterialInfo(true, true) //#endregion @@ -185,6 +201,22 @@ function registerTFGRocketRecipes(event) { .circuit(3) .EUt(GTValues.VA[GTValues.EV]) .addMaterialInfo(true, true) + + event.recipes.gtceu.assembler('ad_astra:tier_2_double_rocket') + .itemInputs( + ChemicalHelper.get(TagPrefix.plateDense, TFGHelpers.getMaterial('rocket_alloy_t2'), 18), + '4x tfg:rocket_fin_t2', + '1x ad_astra:desh_engine', + '1x tfg:rocket_cone_t2', + '18x #forge:insulation_t2/roll', + '6x #gtceu:circuits/ev' + ) + .inputFluids(Fluid.of('gtceu:titanium', 144 * 24)) + .itemOutputs('tfg:tier_2_double_rocket') + .duration(2166) + .circuit(4) + .EUt(GTValues.VA[GTValues.EV]) + .addMaterialInfo(true, true) //#endregion @@ -278,6 +310,22 @@ function registerTFGRocketRecipes(event) { .EUt(GTValues.VA[GTValues.IV]) .addMaterialInfo(true, true) + event.recipes.gtceu.assembler('ad_astra:tier_3_double_rocket') + .itemInputs( + '24x #forge:dense_plates/rocket_alloy_t3', + '4x tfg:rocket_fin_t3', + '1x ad_astra:ostrum_engine', + '2x ad_astra:ostrum_tank', + '1x tfg:rocket_cone_t3', + '12x #forge:insulation_t3/sheet' + ) + .inputFluids(Fluid.of('gtceu:bromine', 1000 * 24)) + .itemOutputs('tfg:tier_3_double_rocket') + .duration(2550) + .circuit(5) + .EUt(GTValues.VA[GTValues.IV]) + .addMaterialInfo(true, true) + //#endregion */ } \ No newline at end of file