diff --git a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt index 13841b922..643d62723 100644 --- a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt +++ b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt @@ -2338,13 +2338,28 @@ { dependencies: ["617CF3335584DC8D"] description: ["{quests.extreme_voltage.heat_battery.desc}"] + icon: "tfg:heat_battery_mk1" id: "26AA29016BA23396" subtitle: "{quests.extreme_voltage.heat_battery.subtitle}" - tasks: [{ - id: "5C9A37E905A4030F" - item: "tfg:heat_battery_mk1" - type: "item" - }] + tasks: [ + { + id: "5C9A37E905A4030F" + item: "tfg:heat_battery_mk1" + type: "item" + } + { + id: "7B355A4ECACCBE5C" + item: "tfg:copper_sandy_frame" + optional_task: true + type: "item" + } + { + id: "36B68338FCD5F7F5" + item: "tfg:beryllium_sandy_frame" + optional_task: true + type: "item" + } + ] x: 22.0d y: 4.5d } diff --git a/kubejs/assets/gtceu/blockstates/ev_1024a_laser_source_hatch.json b/kubejs/assets/gtceu/blockstates/ev_1024a_laser_source_hatch.json new file mode 100644 index 000000000..ab095fc62 --- /dev/null +++ b/kubejs/assets/gtceu/blockstates/ev_1024a_laser_source_hatch.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "gtceu:block/machine/ev_1024a_laser_source_hatch", + "x": 90 + }, + "facing=east": { + "model": "gtceu:block/machine/ev_1024a_laser_source_hatch", + "y": 90 + }, + "facing=north": { + "model": "gtceu:block/machine/ev_1024a_laser_source_hatch" + }, + "facing=south": { + "model": "gtceu:block/machine/ev_1024a_laser_source_hatch", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "gtceu:block/machine/ev_1024a_laser_source_hatch", + "x": 270 + }, + "facing=west": { + "model": "gtceu:block/machine/ev_1024a_laser_source_hatch", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/blockstates/ev_1024a_laser_target_hatch.json b/kubejs/assets/gtceu/blockstates/ev_1024a_laser_target_hatch.json new file mode 100644 index 000000000..400b7cb0b --- /dev/null +++ b/kubejs/assets/gtceu/blockstates/ev_1024a_laser_target_hatch.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "gtceu:block/machine/ev_1024a_laser_target_hatch", + "x": 90 + }, + "facing=east": { + "model": "gtceu:block/machine/ev_1024a_laser_target_hatch", + "y": 90 + }, + "facing=north": { + "model": "gtceu:block/machine/ev_1024a_laser_target_hatch" + }, + "facing=south": { + "model": "gtceu:block/machine/ev_1024a_laser_target_hatch", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "gtceu:block/machine/ev_1024a_laser_target_hatch", + "x": 270 + }, + "facing=west": { + "model": "gtceu:block/machine/ev_1024a_laser_target_hatch", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/blockstates/ev_256a_laser_source_hatch.json b/kubejs/assets/gtceu/blockstates/ev_256a_laser_source_hatch.json new file mode 100644 index 000000000..b9614fa11 --- /dev/null +++ b/kubejs/assets/gtceu/blockstates/ev_256a_laser_source_hatch.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "gtceu:block/machine/ev_256a_laser_source_hatch", + "x": 90 + }, + "facing=east": { + "model": "gtceu:block/machine/ev_256a_laser_source_hatch", + "y": 90 + }, + "facing=north": { + "model": "gtceu:block/machine/ev_256a_laser_source_hatch" + }, + "facing=south": { + "model": "gtceu:block/machine/ev_256a_laser_source_hatch", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "gtceu:block/machine/ev_256a_laser_source_hatch", + "x": 270 + }, + "facing=west": { + "model": "gtceu:block/machine/ev_256a_laser_source_hatch", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/blockstates/ev_256a_laser_target_hatch.json b/kubejs/assets/gtceu/blockstates/ev_256a_laser_target_hatch.json new file mode 100644 index 000000000..4e662b935 --- /dev/null +++ b/kubejs/assets/gtceu/blockstates/ev_256a_laser_target_hatch.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "gtceu:block/machine/ev_256a_laser_target_hatch", + "x": 90 + }, + "facing=east": { + "model": "gtceu:block/machine/ev_256a_laser_target_hatch", + "y": 90 + }, + "facing=north": { + "model": "gtceu:block/machine/ev_256a_laser_target_hatch" + }, + "facing=south": { + "model": "gtceu:block/machine/ev_256a_laser_target_hatch", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "gtceu:block/machine/ev_256a_laser_target_hatch", + "x": 270 + }, + "facing=west": { + "model": "gtceu:block/machine/ev_256a_laser_target_hatch", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/blockstates/ev_4096a_laser_source_hatch.json b/kubejs/assets/gtceu/blockstates/ev_4096a_laser_source_hatch.json new file mode 100644 index 000000000..c325b47d6 --- /dev/null +++ b/kubejs/assets/gtceu/blockstates/ev_4096a_laser_source_hatch.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "gtceu:block/machine/ev_4096a_laser_source_hatch", + "x": 90 + }, + "facing=east": { + "model": "gtceu:block/machine/ev_4096a_laser_source_hatch", + "y": 90 + }, + "facing=north": { + "model": "gtceu:block/machine/ev_4096a_laser_source_hatch" + }, + "facing=south": { + "model": "gtceu:block/machine/ev_4096a_laser_source_hatch", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "gtceu:block/machine/ev_4096a_laser_source_hatch", + "x": 270 + }, + "facing=west": { + "model": "gtceu:block/machine/ev_4096a_laser_source_hatch", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/blockstates/ev_4096a_laser_target_hatch.json b/kubejs/assets/gtceu/blockstates/ev_4096a_laser_target_hatch.json new file mode 100644 index 000000000..751c8ab3d --- /dev/null +++ b/kubejs/assets/gtceu/blockstates/ev_4096a_laser_target_hatch.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "gtceu:block/machine/ev_4096a_laser_target_hatch", + "x": 90 + }, + "facing=east": { + "model": "gtceu:block/machine/ev_4096a_laser_target_hatch", + "y": 90 + }, + "facing=north": { + "model": "gtceu:block/machine/ev_4096a_laser_target_hatch" + }, + "facing=south": { + "model": "gtceu:block/machine/ev_4096a_laser_target_hatch", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "gtceu:block/machine/ev_4096a_laser_target_hatch", + "x": 270 + }, + "facing=west": { + "model": "gtceu:block/machine/ev_4096a_laser_target_hatch", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/block/machine/ev_1024a_laser_source_hatch.json b/kubejs/assets/gtceu/models/block/machine/ev_1024a_laser_source_hatch.json new file mode 100644 index 000000000..72e226dbd --- /dev/null +++ b/kubejs/assets/gtceu/models/block/machine/ev_1024a_laser_source_hatch.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtceu:ev_1024a_laser_source_hatch", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], + "variants": { + "is_formed=false": { + "model": { + "parent": "gtceu:block/machine/part/laser_source_hatch", + "textures": { + "bottom": "gtceu:block/casings/voltage/ev/bottom", + "side": "gtceu:block/casings/voltage/ev/side", + "top": "gtceu:block/casings/voltage/ev/top" + } + } + }, + "is_formed=true": { + "model": { + "parent": "gtceu:block/machine/part/laser_source_hatch", + "textures": { + "bottom": "gtceu:block/casings/voltage/ev/bottom", + "side": "gtceu:block/casings/voltage/ev/side", + "top": "gtceu:block/casings/voltage/ev/top" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/block/machine/ev_1024a_laser_target_hatch.json b/kubejs/assets/gtceu/models/block/machine/ev_1024a_laser_target_hatch.json new file mode 100644 index 000000000..48d96376e --- /dev/null +++ b/kubejs/assets/gtceu/models/block/machine/ev_1024a_laser_target_hatch.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtceu:ev_1024a_laser_target_hatch", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], + "variants": { + "is_formed=false": { + "model": { + "parent": "gtceu:block/machine/part/laser_target_hatch", + "textures": { + "bottom": "gtceu:block/casings/voltage/ev/bottom", + "side": "gtceu:block/casings/voltage/ev/side", + "top": "gtceu:block/casings/voltage/ev/top" + } + } + }, + "is_formed=true": { + "model": { + "parent": "gtceu:block/machine/part/laser_target_hatch", + "textures": { + "bottom": "gtceu:block/casings/voltage/ev/bottom", + "side": "gtceu:block/casings/voltage/ev/side", + "top": "gtceu:block/casings/voltage/ev/top" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/block/machine/ev_256a_laser_source_hatch.json b/kubejs/assets/gtceu/models/block/machine/ev_256a_laser_source_hatch.json new file mode 100644 index 000000000..79b9416ee --- /dev/null +++ b/kubejs/assets/gtceu/models/block/machine/ev_256a_laser_source_hatch.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtceu:ev_256a_laser_source_hatch", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], + "variants": { + "is_formed=false": { + "model": { + "parent": "gtceu:block/machine/part/laser_source_hatch", + "textures": { + "bottom": "gtceu:block/casings/voltage/ev/bottom", + "side": "gtceu:block/casings/voltage/ev/side", + "top": "gtceu:block/casings/voltage/ev/top" + } + } + }, + "is_formed=true": { + "model": { + "parent": "gtceu:block/machine/part/laser_source_hatch", + "textures": { + "bottom": "gtceu:block/casings/voltage/ev/bottom", + "side": "gtceu:block/casings/voltage/ev/side", + "top": "gtceu:block/casings/voltage/ev/top" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/block/machine/ev_256a_laser_target_hatch.json b/kubejs/assets/gtceu/models/block/machine/ev_256a_laser_target_hatch.json new file mode 100644 index 000000000..6541957d1 --- /dev/null +++ b/kubejs/assets/gtceu/models/block/machine/ev_256a_laser_target_hatch.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtceu:ev_256a_laser_target_hatch", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], + "variants": { + "is_formed=false": { + "model": { + "parent": "gtceu:block/machine/part/laser_target_hatch", + "textures": { + "bottom": "gtceu:block/casings/voltage/ev/bottom", + "side": "gtceu:block/casings/voltage/ev/side", + "top": "gtceu:block/casings/voltage/ev/top" + } + } + }, + "is_formed=true": { + "model": { + "parent": "gtceu:block/machine/part/laser_target_hatch", + "textures": { + "bottom": "gtceu:block/casings/voltage/ev/bottom", + "side": "gtceu:block/casings/voltage/ev/side", + "top": "gtceu:block/casings/voltage/ev/top" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/block/machine/ev_4096a_laser_source_hatch.json b/kubejs/assets/gtceu/models/block/machine/ev_4096a_laser_source_hatch.json new file mode 100644 index 000000000..99d0fddfc --- /dev/null +++ b/kubejs/assets/gtceu/models/block/machine/ev_4096a_laser_source_hatch.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtceu:ev_4096a_laser_source_hatch", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], + "variants": { + "is_formed=false": { + "model": { + "parent": "gtceu:block/machine/part/laser_source_hatch", + "textures": { + "bottom": "gtceu:block/casings/voltage/ev/bottom", + "side": "gtceu:block/casings/voltage/ev/side", + "top": "gtceu:block/casings/voltage/ev/top" + } + } + }, + "is_formed=true": { + "model": { + "parent": "gtceu:block/machine/part/laser_source_hatch", + "textures": { + "bottom": "gtceu:block/casings/voltage/ev/bottom", + "side": "gtceu:block/casings/voltage/ev/side", + "top": "gtceu:block/casings/voltage/ev/top" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/block/machine/ev_4096a_laser_target_hatch.json b/kubejs/assets/gtceu/models/block/machine/ev_4096a_laser_target_hatch.json new file mode 100644 index 000000000..a979c8181 --- /dev/null +++ b/kubejs/assets/gtceu/models/block/machine/ev_4096a_laser_target_hatch.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtceu:ev_4096a_laser_target_hatch", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], + "variants": { + "is_formed=false": { + "model": { + "parent": "gtceu:block/machine/part/laser_target_hatch", + "textures": { + "bottom": "gtceu:block/casings/voltage/ev/bottom", + "side": "gtceu:block/casings/voltage/ev/side", + "top": "gtceu:block/casings/voltage/ev/top" + } + } + }, + "is_formed=true": { + "model": { + "parent": "gtceu:block/machine/part/laser_target_hatch", + "textures": { + "bottom": "gtceu:block/casings/voltage/ev/bottom", + "side": "gtceu:block/casings/voltage/ev/side", + "top": "gtceu:block/casings/voltage/ev/top" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/item/ev_1024a_laser_source_hatch.json b/kubejs/assets/gtceu/models/item/ev_1024a_laser_source_hatch.json new file mode 100644 index 000000000..8e9a1040c --- /dev/null +++ b/kubejs/assets/gtceu/models/item/ev_1024a_laser_source_hatch.json @@ -0,0 +1,3 @@ +{ + "parent": "gtceu:block/machine/ev_1024a_laser_source_hatch" +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/item/ev_1024a_laser_target_hatch.json b/kubejs/assets/gtceu/models/item/ev_1024a_laser_target_hatch.json new file mode 100644 index 000000000..d3c960479 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/ev_1024a_laser_target_hatch.json @@ -0,0 +1,3 @@ +{ + "parent": "gtceu:block/machine/ev_1024a_laser_target_hatch" +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/item/ev_256a_laser_source_hatch.json b/kubejs/assets/gtceu/models/item/ev_256a_laser_source_hatch.json new file mode 100644 index 000000000..8e47764c5 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/ev_256a_laser_source_hatch.json @@ -0,0 +1,3 @@ +{ + "parent": "gtceu:block/machine/ev_256a_laser_source_hatch" +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/item/ev_256a_laser_target_hatch.json b/kubejs/assets/gtceu/models/item/ev_256a_laser_target_hatch.json new file mode 100644 index 000000000..8565b9d64 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/ev_256a_laser_target_hatch.json @@ -0,0 +1,3 @@ +{ + "parent": "gtceu:block/machine/ev_256a_laser_target_hatch" +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/item/ev_4096a_laser_source_hatch.json b/kubejs/assets/gtceu/models/item/ev_4096a_laser_source_hatch.json new file mode 100644 index 000000000..3bace741b --- /dev/null +++ b/kubejs/assets/gtceu/models/item/ev_4096a_laser_source_hatch.json @@ -0,0 +1,3 @@ +{ + "parent": "gtceu:block/machine/ev_4096a_laser_source_hatch" +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/item/ev_4096a_laser_target_hatch.json b/kubejs/assets/gtceu/models/item/ev_4096a_laser_target_hatch.json new file mode 100644 index 000000000..9b1c0448b --- /dev/null +++ b/kubejs/assets/gtceu/models/item/ev_4096a_laser_target_hatch.json @@ -0,0 +1,3 @@ +{ + "parent": "gtceu:block/machine/ev_4096a_laser_target_hatch" +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/machines/recipes.casings.js b/kubejs/server_scripts/tfg/machines/recipes.casings.js index 199fa44a9..814409db3 100644 --- a/kubejs/server_scripts/tfg/machines/recipes.casings.js +++ b/kubejs/server_scripts/tfg/machines/recipes.casings.js @@ -200,7 +200,7 @@ function registerTFGCasingRecipes(event) { .itemInputs('gtceu:ostrum_frame', '4x #forge:plates/titanium_tungsten_carbide', '16x #forge:fine_wires/copper', '16x #forge:fine_wires/tungsten_bismuth_oxide_composite') .inputFluids(Fluid.of('gtceu:reinforced_epoxy_resin', 288)) - .itemOutputs('2x tfg:machine_casing_power_casing') + .itemOutputs('4x tfg:machine_casing_power_casing') .circuit(6) .duration(2.5 * 20) .EUt(GTValues.VA[GTValues.EV])