diff --git a/config/extendedcrafting-common.toml b/config/extendedcrafting-common.toml index 38f493305..056eb4cb2 100644 --- a/config/extendedcrafting-common.toml +++ b/config/extendedcrafting-common.toml @@ -92,10 +92,10 @@ defaultPowerRate = 200000000 #How much FE the Flux Alternator should hold. #Range: > 0 - powerCapacity = 2000000000 + powerCapacity = 200000000 #How much FE the Auto Flux Crafter should hold. #Range: > 0 - autoCrafterPowerCapacity = 2000000000 + autoCrafterPowerCapacity = 200000000 #How much FE the Auto Flux Crafter should use when auto inserting items. #Range: > 0 autoCrafterInsertPowerRate = 100 diff --git a/config/ftbquests/quests/chapters/late_game.snbt b/config/ftbquests/quests/chapters/late_game.snbt index 86e9beda9..4a3b1221f 100644 --- a/config/ftbquests/quests/chapters/late_game.snbt +++ b/config/ftbquests/quests/chapters/late_game.snbt @@ -166,6 +166,18 @@ x: 17.0d y: 22.25d } + { + id: "33B08B68738FB6E3" + linked_quest: "49D33146A1F417E8" + x: -6.0d + y: 6.0d + } + { + id: "3580707E636655C2" + linked_quest: "11154356854B64DA" + x: -6.0d + y: 8.25d + } ] quests: [ { @@ -311,8 +323,8 @@ } { dependencies: [ - "71602D44E1D0013E" "6E5343E45E99CBAD" + "11154356854B64DA" ] description: [ "&6QBit CPUs&r are an advanced Circuit Wafer crucial for &6Quantum Circuits&r." @@ -1811,7 +1823,7 @@ description: [ "The multiblock uses energy cores to &erelease extremely large amounts of energy at once&r to craft things. While the batteries themselves are lost, you are able to recover some of the spent energy. " "" - "&5...once energy voiding is implmented in gtm." + "&5...once energy voiding is implemented in gtm." ] icon: "gtceu:discharger" id: "713FAECEE5046121" @@ -2297,7 +2309,6 @@ y: 15.25d } { - dependencies: ["71602D44E1D0013E"] description: [ "Some Micro Miner missions use a &6Gemstone Sensor&r to scout out gems instead of ores." "" @@ -2364,47 +2375,6 @@ x: 3.0d y: 24.0d } - { - dependencies: ["49D33146A1F417E8"] - description: [ - "&9Radon&r will be needed in large quantities." - "" - "For now, you'll need to obtain it from Tier Two Micro Miner missions, in the form of &6Radium Salt&r. Electrolyze it for Radon and &6Rock Salt&r. &2You can also get it from distilling liquid Ender Air.&r" - "" - "Later it will be possible to make Radon using a &bGregTech &3Fusion Reactor&r." - ] - disable_toast: true - icon: "gtceu:radon_bucket" - id: "6B0A547EA42CD35A" - shape: "hexagon" - tasks: [{ - amount: 1000L - fluid: "gtceu:radon" - id: "613824353565F9CF" - type: "fluid" - }] - title: "&2Radon" - x: -6.0d - y: 6.25d - } - { - dependencies: [ - "11154356854B64DA" - "6B0A547EA42CD35A" - ] - description: ["You'll need an HV or better &3Chemical Bath&r to make these. The recipe is quite slow, so invest in the highest tier Chemical Baths you can and consider parallelizing the recipe."] - disable_toast: true - id: "71602D44E1D0013E" - shape: "hexagon" - subtitle: "When &6Ender Eyes&r just aren't creepy enough." - tasks: [{ - id: "52E1C27170D352B7" - item: "gtceu:quantum_eye" - type: "item" - }] - x: -6.0d - y: 8.25d - } { dependencies: ["53EC3831D66769CA"] description: [ @@ -2734,10 +2704,11 @@ description: [ "Interestingly enough, sculk itself functions great as a &9biobattery&r, being able to store and quickly release mass amounts of energy, perfect for some upcoming items. The &9sculk charger&r should be able to get started in tacking advantage of it." "" - "To use it, set the recipe &ein the same way you would for an autocrafting table&r, then place an inventory (such as a barrel on top), and connect power to the charger. Items can be extacted from the charger in any manner." + "To use it, set the recipe &ein the same way you would for an autocrafting table&r, then place an inventory (such as a barrel on top), and connect power to the charger and a pylon. Items can be extacted from the charger in any manner." "" - "The charger itself &ehas extreme throughput&r, so don't worry about having to wait for it to craft items." + "The charger and pylon themselves &ehave extreme throughput&r, so don't worry about having to wait for it to craft items." ] + icon: "extendedcrafting:auto_flux_crafter" id: "7F75D961B102A72D" rewards: [{ id: "4CF3CFEF57B863A3" @@ -2746,11 +2717,18 @@ }] shape: "hexagon" size: 1.5d - tasks: [{ - id: "338DCAE7D9D78C51" - item: "extendedcrafting:auto_flux_crafter" - type: "item" - }] + tasks: [ + { + id: "338DCAE7D9D78C51" + item: "extendedcrafting:auto_flux_crafter" + type: "item" + } + { + id: "00EF32A94D627A37" + item: "extendedcrafting:flux_alternator" + type: "item" + } + ] title: "&9Sculk Charging" x: 25.25d y: 8.25d diff --git a/kubejs/assets/extendedcrafting/lang/en_us.json b/kubejs/assets/extendedcrafting/lang/en_us.json index d4008ab9c..b64afb9e1 100644 --- a/kubejs/assets/extendedcrafting/lang/en_us.json +++ b/kubejs/assets/extendedcrafting/lang/en_us.json @@ -26,7 +26,7 @@ "block.extendedcrafting.ender_alternator": "Ender Alternator", "block.extendedcrafting.ender_crafter": "Ender Crafter", "block.extendedcrafting.auto_ender_crafter": "Auto Ender Crafter", - "block.extendedcrafting.flux_alternator": "If you see this you have to eat a LuV circuit", + "block.extendedcrafting.flux_alternator": "Sculk Pylon", "block.extendedcrafting.flux_crafter": "Sculk Charger", "block.extendedcrafting.auto_flux_crafter": "Sculk Charger", @@ -78,7 +78,7 @@ "container.extendedcrafting.ultimate_table": "Ultimate Crafting", "container.extendedcrafting.compressor": "Quantum Compressor", "container.extendedcrafting.ender_crafter": "Ender Crafting", - "container.extendedcrafting.flux_alternator": "Flux Alternator", + "container.extendedcrafting.flux_alternator": "Sculk Pylon", "container.extendedcrafting.flux_crafter": "Sculk Charging", "screen.extendedcrafting.crafting_core.pedestals": "Pedestals: %s", diff --git a/kubejs/assets/extendedcrafting/textures/block/flux_alternator_base_side.png b/kubejs/assets/extendedcrafting/textures/block/flux_alternator_base_side.png new file mode 100644 index 000000000..1fc73acf6 Binary files /dev/null and b/kubejs/assets/extendedcrafting/textures/block/flux_alternator_base_side.png differ diff --git a/kubejs/assets/extendedcrafting/textures/block/flux_alternator_base_top.png b/kubejs/assets/extendedcrafting/textures/block/flux_alternator_base_top.png new file mode 100644 index 000000000..6c3fac8c4 Binary files /dev/null and b/kubejs/assets/extendedcrafting/textures/block/flux_alternator_base_top.png differ diff --git a/kubejs/assets/extendedcrafting/textures/block/flux_alternator_side.png b/kubejs/assets/extendedcrafting/textures/block/flux_alternator_side.png new file mode 100644 index 000000000..ca9734341 Binary files /dev/null and b/kubejs/assets/extendedcrafting/textures/block/flux_alternator_side.png differ diff --git a/kubejs/assets/extendedcrafting/textures/block/flux_alternator_top.png b/kubejs/assets/extendedcrafting/textures/block/flux_alternator_top.png new file mode 100644 index 000000000..3476df324 Binary files /dev/null and b/kubejs/assets/extendedcrafting/textures/block/flux_alternator_top.png differ diff --git a/kubejs/assets/extendedcrafting/textures/gui/flux_alternator.png b/kubejs/assets/extendedcrafting/textures/gui/flux_alternator.png new file mode 100644 index 000000000..71d43a7ae Binary files /dev/null and b/kubejs/assets/extendedcrafting/textures/gui/flux_alternator.png differ diff --git a/kubejs/client_scripts/JEI.js b/kubejs/client_scripts/JEI.js index 2560908e6..e2de2c7f0 100644 --- a/kubejs/client_scripts/JEI.js +++ b/kubejs/client_scripts/JEI.js @@ -27,7 +27,7 @@ JEIEvents.hideItems(event => { //Extended Crafting event.hide([Item.of('extendedcrafting:recipe_maker', '{Shapeless:0b,Type:"CraftTweaker"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:tin"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:copper"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:iron"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:coal"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:steel"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:invar"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:silver"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:platinum"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:lead"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:glowstone"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:lapis_lazuli"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:electrum"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:redstone"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:aluminum"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:diamond"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:nickel"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:gold"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:emerald"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:bronze"}')]) - event.hide(['extendedcrafting:enhanced_ender_catalyst', 'extendedcrafting:enhanced_redstone_catalyst', 'extendedcrafting:enhanced_redstone_component', 'extendedcrafting:enhanced_ender_component', 'extendedcrafting:ender_component', 'extendedcrafting:black_iron_block', 'extendedcrafting:black_iron_ingot', 'extendedcrafting:redstone_ingot_block', 'extendedcrafting:redstone_ingot', 'extendedcrafting:enhanced_redstone_ingot_block', 'extendedcrafting:enhanced_redstone_ingot', 'extendedcrafting:ender_ingot_block', 'extendedcrafting:ender_ingot', 'extendedcrafting:enhanced_ender_ingot_block', 'extendedcrafting:enhanced_ender_ingot', 'extendedcrafting:ender_star_block', 'extendedcrafting:ender_star', 'extendedcrafting:flux_star_block', 'extendedcrafting:flux_star', 'extendedcrafting:frame', 'extendedcrafting:basic_table', 'extendedcrafting:basic_auto_table', 'extendedcrafting:compressor', 'extendedcrafting:ender_alternator', 'extendedcrafting:ender_crafter', 'extendedcrafting:auto_ender_crafter', 'extendedcrafting:flux_alternator', 'extendedcrafting:flux_crafter', 'extendedcrafting:black_iron_slate', 'extendedcrafting:ender_catalyst']) + event.hide(['extendedcrafting:enhanced_ender_catalyst', 'extendedcrafting:enhanced_redstone_catalyst', 'extendedcrafting:enhanced_redstone_component', 'extendedcrafting:enhanced_ender_component', 'extendedcrafting:ender_component', 'extendedcrafting:black_iron_block', 'extendedcrafting:black_iron_ingot', 'extendedcrafting:redstone_ingot_block', 'extendedcrafting:redstone_ingot', 'extendedcrafting:enhanced_redstone_ingot_block', 'extendedcrafting:enhanced_redstone_ingot', 'extendedcrafting:ender_ingot_block', 'extendedcrafting:ender_ingot', 'extendedcrafting:enhanced_ender_ingot_block', 'extendedcrafting:enhanced_ender_ingot', 'extendedcrafting:ender_star_block', 'extendedcrafting:ender_star', 'extendedcrafting:flux_star_block', 'extendedcrafting:flux_star', 'extendedcrafting:frame', 'extendedcrafting:basic_table', 'extendedcrafting:basic_auto_table', 'extendedcrafting:compressor', 'extendedcrafting:ender_alternator', 'extendedcrafting:ender_crafter', 'extendedcrafting:auto_ender_crafter', 'extendedcrafting:flux_crafter', 'extendedcrafting:black_iron_slate', 'extendedcrafting:ender_catalyst']) event.hide(['extendedcrafting:black_iron_nugget', 'extendedcrafting:redstone_nugget', 'extendedcrafting:enhanced_redstone_nugget', 'extendedcrafting:ender_nugget', 'extendedcrafting:enhanced_ender_nugget']) //Thermal diff --git a/kubejs/server_scripts/energy_cores.js b/kubejs/server_scripts/energy_cores.js index 94f9429db..1bad58ea3 100644 --- a/kubejs/server_scripts/energy_cores.js +++ b/kubejs/server_scripts/energy_cores.js @@ -20,6 +20,22 @@ ServerEvents.recipes(event => { R: 'gtceu:luv_lapotronic_battery', X: 'kubejs:cryolobus_casing', A: 'gtceu:luv_charger_4x', + E: 'gtceu:luv_sensor', + C: '#gtceu:circuits/luv' + } + ) + + event.recipes.extendedcrafting.shaped_table( + 'extendedcrafting:flux_alternator', [ + " PEP ", + " PCP ", + " PCP ", + "PPCPP", + "XRRRX" + ], { + P: 'gtceu:double_cryolobus_plate', + R: 'gtceu:luv_lapotronic_battery', + X: 'kubejs:cryolobus_casing', E: 'gtceu:luv_emitter', C: '#gtceu:circuits/luv' } diff --git a/manifest.json b/manifest.json index d436fde09..f284e9999 100644 --- a/manifest.json +++ b/manifest.json @@ -637,7 +637,7 @@ }, { "projectID": 1018621, - "fileID": 5593016, + "fileID": 5597556, "required": true }, {