diff --git a/kubejs/assets/tfg/blockstates/electric_greenhouse.json b/kubejs/assets/tfg/blockstates/electric_greenhouse.json new file mode 100644 index 000000000..09f5291fa --- /dev/null +++ b/kubejs/assets/tfg/blockstates/electric_greenhouse.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/electric_greenhouse", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/electric_greenhouse" + }, + "facing=south": { + "model": "tfg:block/machines/electric_greenhouse", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/electric_greenhouse", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/interplanetary_item_launcher.json b/kubejs/assets/tfg/blockstates/interplanetary_item_launcher.json new file mode 100644 index 000000000..953d769dd --- /dev/null +++ b/kubejs/assets/tfg/blockstates/interplanetary_item_launcher.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/interplanetary_item_launcher", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/interplanetary_item_launcher" + }, + "facing=south": { + "model": "tfg:block/machines/interplanetary_item_launcher", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/interplanetary_item_launcher", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/electric_greenhouse.json b/kubejs/assets/tfg/models/block/machines/electric_greenhouse.json new file mode 100644 index 000000000..9aec638bb --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/electric_greenhouse.json @@ -0,0 +1,90 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:electric_greenhouse", + "texture_overrides": { + "all": "gtceu:block/casings/steam/steel/side" + }, + "variants": { + "is_formed=false,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/steam/steel/side", + "overlay_front": "gtceu:block/multiblock/implosion_compressor/overlay_front", + "overlay_front_emissive": "gtceu:block/multiblock/implosion_compressor/overlay_front_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/steam/steel/side", + "overlay_front": "gtceu:block/multiblock/implosion_compressor/overlay_front_paused", + "overlay_front_emissive": "gtceu:block/multiblock/implosion_compressor/overlay_front_paused_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/steam/steel/side", + "overlay_front": "gtceu:block/multiblock/implosion_compressor/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/implosion_compressor/overlay_front_active_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/steam/steel/side", + "overlay_front": "gtceu:block/multiblock/implosion_compressor/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/implosion_compressor/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/steam/steel/side", + "overlay_front": "gtceu:block/multiblock/implosion_compressor/overlay_front", + "overlay_front_emissive": "gtceu:block/multiblock/implosion_compressor/overlay_front_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/steam/steel/side", + "overlay_front": "gtceu:block/multiblock/implosion_compressor/overlay_front_paused", + "overlay_front_emissive": "gtceu:block/multiblock/implosion_compressor/overlay_front_paused_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/steam/steel/side", + "overlay_front": "gtceu:block/multiblock/implosion_compressor/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/implosion_compressor/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/steam/steel/side", + "overlay_front": "gtceu:block/multiblock/implosion_compressor/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/implosion_compressor/overlay_front_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/interplanetary_item_launcher.json b/kubejs/assets/tfg/models/block/machines/interplanetary_item_launcher.json new file mode 100644 index 000000000..9bc85fe55 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/interplanetary_item_launcher.json @@ -0,0 +1,90 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:interplanetary_item_launcher", + "texture_overrides": { + "all": "gtceu:block/casings/solid/machine_casing_clean_stainless_steel" + }, + "variants": { + "is_formed=false,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_clean_stainless_steel", + "overlay_front": "tfg:block/machines/interplanetary_item_launcher/overlay_front", + "overlay_front_emissive": "tfg:block/machines/interplanetary_item_launcher/overlay_front_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_clean_stainless_steel", + "overlay_front": "tfg:block/machines/interplanetary_item_launcher/overlay_front", + "overlay_front_emissive": "tfg:block/machines/interplanetary_item_launcher/overlay_front_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_clean_stainless_steel", + "overlay_front": "tfg:block/machines/interplanetary_item_launcher/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/interplanetary_item_launcher/overlay_front_active_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_clean_stainless_steel", + "overlay_front": "tfg:block/machines/interplanetary_item_launcher/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/interplanetary_item_launcher/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_clean_stainless_steel", + "overlay_front": "tfg:block/machines/interplanetary_item_launcher/overlay_front", + "overlay_front_emissive": "tfg:block/machines/interplanetary_item_launcher/overlay_front_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_clean_stainless_steel", + "overlay_front": "tfg:block/machines/interplanetary_item_launcher/overlay_front", + "overlay_front_emissive": "tfg:block/machines/interplanetary_item_launcher/overlay_front_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_clean_stainless_steel", + "overlay_front": "tfg:block/machines/interplanetary_item_launcher/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/interplanetary_item_launcher/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_clean_stainless_steel", + "overlay_front": "tfg:block/machines/interplanetary_item_launcher/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/interplanetary_item_launcher/overlay_front_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/electric_greenhouse.json b/kubejs/assets/tfg/models/item/electric_greenhouse.json new file mode 100644 index 000000000..ac707342a --- /dev/null +++ b/kubejs/assets/tfg/models/item/electric_greenhouse.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/electric_greenhouse" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/interplanetary_item_launcher.json b/kubejs/assets/tfg/models/item/interplanetary_item_launcher.json new file mode 100644 index 000000000..61b8bec3a --- /dev/null +++ b/kubejs/assets/tfg/models/item/interplanetary_item_launcher.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/interplanetary_item_launcher" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/machines/interplanetary_item_launcher/overlay_front.png b/kubejs/assets/tfg/textures/block/machines/interplanetary_item_launcher/overlay_front.png new file mode 100644 index 000000000..2a87aa4c3 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/interplanetary_item_launcher/overlay_front.png differ diff --git a/kubejs/assets/tfg/textures/block/machines/interplanetary_item_launcher/overlay_front_active.png b/kubejs/assets/tfg/textures/block/machines/interplanetary_item_launcher/overlay_front_active.png new file mode 100644 index 000000000..f55f615de Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/interplanetary_item_launcher/overlay_front_active.png differ diff --git a/kubejs/assets/tfg/textures/block/machines/interplanetary_item_launcher/overlay_front_active.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/interplanetary_item_launcher/overlay_front_active.png.mcmeta new file mode 100644 index 000000000..92cc62352 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/machines/interplanetary_item_launcher/overlay_front_active.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/machines/interplanetary_item_launcher/overlay_front_active_emissive.png b/kubejs/assets/tfg/textures/block/machines/interplanetary_item_launcher/overlay_front_active_emissive.png new file mode 100644 index 000000000..f55f615de Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/interplanetary_item_launcher/overlay_front_active_emissive.png differ diff --git a/kubejs/assets/tfg/textures/block/machines/interplanetary_item_launcher/overlay_front_active_emissive.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/interplanetary_item_launcher/overlay_front_active_emissive.png.mcmeta new file mode 100644 index 000000000..92cc62352 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/machines/interplanetary_item_launcher/overlay_front_active_emissive.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/machines/interplanetary_item_launcher/overlay_front_emissive.png b/kubejs/assets/tfg/textures/block/machines/interplanetary_item_launcher/overlay_front_emissive.png new file mode 100644 index 000000000..c20a1c981 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/interplanetary_item_launcher/overlay_front_emissive.png differ diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index fcaa32d7f..07a0dfede 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -989,18 +989,26 @@ function registerGTCEuMachineRecipes(event) { event.recipes.gtceu.assembler('red_solar_casing') .itemInputs('gtceu:steel_machine_casing', 'ad_astra:photovoltaic_vesnium_cell') - .itemOutputs('tfg:casings/machine_casing_red_solar_panel') + .itemOutputs('8x tfg:casings/machine_casing_red_solar_panel') + .inputFluids(Fluid.of('gtceu:soldering_alloy', 288)) .circuit(6) .duration(2.5*20) .EUt(16) event.recipes.gtceu.assembler('iron_desh_casing') - .itemInputs('6x gtceu:steel_plate', 'gtceu:desh_frame') + .itemInputs(ChemicalHelper.get(TagPrefix.plate, GTMaterials.Steel, 6), 'gtceu:desh_frame') .itemOutputs('2x tfg:casings/machine_casing_iron_desh') .circuit(6) .duration(2.5*20) .EUt(16) + event.recipes.gtceu.assembler('steel_machine_casing') + .itemInputs(ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 4)) + .itemOutputs('gtceu:steel_machine_casing') + .circuit(4) + .duration(2.5*20) + .EUt(16) + //#endregion //#region Large Solar Panel