diff --git a/kubejs/server_scripts/advancedperipherals/recipes.js b/kubejs/server_scripts/advancedperipherals/recipes.js index 10053f5ae..52d6f9412 100644 --- a/kubejs/server_scripts/advancedperipherals/recipes.js +++ b/kubejs/server_scripts/advancedperipherals/recipes.js @@ -80,14 +80,6 @@ const registerAdvancedPeripheralsRecipes = (event) => { .duration(1200) .EUt(GTValues.VA[GTValues.HV]) - //Chunk Controller - event.recipes.gtceu.assembler('advancedperipherals:assembler/chunk_controller') - .itemInputs('1x gtceu:hv_field_generator', '4x gtceu:hv_emitter', '4x gtceu:hv_sensor', '64x gtceu:ram_chip', '1x #forge:exquisite_gems/red_garnet', ChemicalHelper.get(TagPrefix.plate, GTMaterials.StainlessSteel, 4)) - .circuit(4) - .itemOutputs('advancedperipherals:chunk_controller') - .duration(1200) - .EUt(GTValues.VA[GTValues.HV]) - //End Automata Core event.recipes.gtceu.assembler('advancedperipherals:assembler/end_automata_core') .itemInputs('1x computercraft:wired_modem', '1x #forge:lenses/nether_star', '4x gtceu:quantum_eye', ChemicalHelper.get(TagPrefix.gear, GTMaterials.HSSS, 4), '1x gtceu:luv_robot_arm') @@ -112,14 +104,6 @@ const registerAdvancedPeripheralsRecipes = (event) => { .duration(2400) .EUt(GTValues.VA[GTValues.HV]) - //Overpowered End Automata Core - event.recipes.gtceu.assembler('advancedperipherals:assembler/overpowered_end_automata_core') - .itemInputs('advancedperipherals:end_automata_core', ChemicalHelper.get(TagPrefix.gear, GTMaterials.Osmiridium, 4), '8x #gtceu:circuits/zpm') - .circuit(4) - .itemOutputs('advancedperipherals:overpowered_end_automata_core') - .duration(2400) - .EUt(GTValues.VA[GTValues.ZPM]) - //Overpowered Husbandry Automata Core event.recipes.gtceu.assembler('advancedperipherals:assembler/overpowered_husbandry_automata_core') .itemInputs('advancedperipherals:husbandry_automata_core', ChemicalHelper.get(TagPrefix.gear, GTMaterials.HSSS, 4), '6x #gtceu:circuits/iv') diff --git a/kubejs/server_scripts/advancedperipherals/recipes.recycling.js b/kubejs/server_scripts/advancedperipherals/recipes.recycling.js index 47d518af7..f89581acd 100644 --- a/kubejs/server_scripts/advancedperipherals/recipes.recycling.js +++ b/kubejs/server_scripts/advancedperipherals/recipes.recycling.js @@ -10,7 +10,7 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 12), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Electrum, 5), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Emerald, 2) - ) + ) .duration(GTMaterials.Aluminium.getMass() * 12) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -21,7 +21,7 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 12), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Electrum, 5), ChemicalHelper.get(TagPrefix.gemFlawless, GTMaterials.Emerald, 2) - ) + ) .duration(GTMaterials.Aluminium.getMass() * 12) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) @@ -34,7 +34,7 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 19), ChemicalHelper.get(TagPrefix.dust, GTMaterials.MercuryBariumCalciumCuprate, 8), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 3) - ) + ) .duration(GTMaterials.Electrum.getMass() * 24) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -46,7 +46,7 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 19), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.MercuryBariumCalciumCuprate, 8), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 3) - ) + ) .duration(GTMaterials.Electrum.getMass() * 24) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) @@ -59,7 +59,7 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.dust, GTMaterials.CertusQuartz, 11), ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 6), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Titanium, 2) - ) + ) .duration(GTMaterials.Aluminium.getMass() * 19) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -71,7 +71,7 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.gem, GTMaterials.CertusQuartz, 11), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 6), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Titanium, 2) - ) + ) .duration(GTMaterials.Aluminium.getMass() * 19) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) @@ -82,7 +82,7 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { .itemOutputs( ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 8), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Chromium, 2) - ) + ) .duration(GTMaterials.StainlessSteel.getMass() * 8) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -92,7 +92,7 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { .itemOutputs( ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 8), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Chromium, 2) - ) + ) .duration(GTMaterials.StainlessSteel.getMass() * 8) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) @@ -127,7 +127,7 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.dust, GTMaterials.RedAlloy, 6), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Brass, 5), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 4) - ) + ) .duration(GTMaterials.RedAlloy.getMass() * 6) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -138,7 +138,7 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.ingot, GTMaterials.RedAlloy, 6), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Brass, 5), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 4) - ) + ) .duration(GTMaterials.RedAlloy.getMass() * 6) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) @@ -151,7 +151,7 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 6), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Electrum, 2), ChemicalHelper.get(TagPrefix.dust, GTMaterials.RedSteel, 1) - ) + ) .duration(GTMaterials.Steel.getMass() * 6) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -163,7 +163,7 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 6), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Electrum, 2), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.RedSteel, 1) - ) + ) .duration(GTMaterials.Steel.getMass() * 6) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) @@ -175,7 +175,7 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 11), ChemicalHelper.get(TagPrefix.dust, GTMaterials.BatteryAlloy, 4), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Chromium, 3) - ) + ) .duration(GTMaterials.StainlessSteel.getMass() * 11) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -186,7 +186,7 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 11), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.BatteryAlloy, 4), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Chromium, 3) - ) + ) .duration(GTMaterials.StainlessSteel.getMass() * 11) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) @@ -198,7 +198,7 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 10), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Titanium, 1), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 1) - ) + ) .duration(GTMaterials.StainlessSteel.getMass() * 10) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -209,43 +209,18 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 10), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Titanium, 1), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 1) - ) + ) .duration(GTMaterials.StainlessSteel.getMass() * 10) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) - // Chunk Controller - event.recipes.gtceu.macerator('advancedperipherals:macerator/recycling/chunk_controller') - .itemInputs('advancedperipherals:chunk_controller') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 11), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Chromium, 10), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.MercuryBariumCalciumCuprate, 4), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Gold, 2) - ) - .duration(GTMaterials.StainlessSteel.getMass() * 11) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('advancedperipherals:arc_furnace/recycling/chunk_controller') - .itemInputs('advancedperipherals:chunk_controller') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 11), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Chromium, 10), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.MercuryBariumCalciumCuprate, 4), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Gold, 2) - ) - .duration(GTMaterials.StainlessSteel.getMass() * 11) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - // Memory Card event.recipes.gtceu.macerator('advancedperipherals:macerator/recycling/memory_card') .itemInputs('advancedperipherals:memory_card') .itemOutputs( ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 2), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Gold, 1) - ) + ) .duration(GTMaterials.Steel.getMass() * 2) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -255,7 +230,7 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { .itemOutputs( ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 2), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Gold, 1) - ) + ) .duration(GTMaterials.Steel.getMass() * 2) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) @@ -268,7 +243,7 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.dust, GTMaterials.Ruridit, 12), ChemicalHelper.get(TagPrefix.dust, GTMaterials.NiobiumTitanium, 3), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Samarium, 2) - ) + ) .duration(GTMaterials.HSSS.getMass() * 37) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -280,7 +255,7 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Ruridit, 12), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.NiobiumTitanium, 3), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Samarium, 2) - ) + ) .duration(GTMaterials.HSSS.getMass() * 37) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) @@ -293,7 +268,7 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.dust, GTMaterials.Electrum, 6), ChemicalHelper.get(TagPrefix.dust, GTMaterials.BlueSteel, 2), ChemicalHelper.get(TagPrefix.dust, GTMaterials.RedSteel, 2) - ) + ) .duration(GTMaterials.StainlessSteel.getMass() * 11) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -305,7 +280,7 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Electrum, 6), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.BlueSteel, 2), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.RedSteel, 2) - ) + ) .duration(GTMaterials.StainlessSteel.getMass() * 11) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) @@ -318,7 +293,7 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 16), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Silver, 11), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Steel, 3) - ) + ) .duration(GTMaterials.Electrum.getMass() * 22) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -330,36 +305,11 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 16), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Silver, 11), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel, 3) - ) + ) .duration(GTMaterials.Electrum.getMass() * 22) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) - // Overpowered End Automata Core - event.recipes.gtceu.macerator('advancedperipherals:macerator/recycling/overpowered_end_automata_core') - .itemInputs('advancedperipherals:overpowered_end_automata_core') - .itemOutputs( - ChemicalHelper.get(TagPrefix.dust, GTMaterials.HSSS, 37), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Ruridit, 12), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Osmiridium, 8), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.NiobiumTitanium, 3) - ) - .duration(GTMaterials.HSSS.getMass() * 37) - .category(GTRecipeCategories.MACERATOR_RECYCLING) - .EUt(GTValues.VA[GTValues.ULV]) - - event.recipes.gtceu.arc_furnace('advancedperipherals:arc_furnace/recycling/overpowered_end_automata_core') - .itemInputs('advancedperipherals:overpowered_end_automata_core') - .itemOutputs( - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.HSSS, 37), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Ruridit, 12), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Osmiridium, 8), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.NiobiumTitanium, 3) - ) - .duration(GTMaterials.HSSS.getMass() * 37) - .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - .EUt(GTValues.VA[GTValues.LV]) - // Overpowered Husbandry Automata Core event.recipes.gtceu.macerator('advancedperipherals:macerator/recycling/overpowered_husbandry_automata_core') .itemInputs('advancedperipherals:overpowered_husbandry_automata_core') @@ -368,7 +318,7 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.dust, GTMaterials.HSSS, 8), ChemicalHelper.get(TagPrefix.dust, GTMaterials.BlueSteel, 2), ChemicalHelper.get(TagPrefix.dust, GTMaterials.RedSteel, 2) - ) + ) .duration(GTMaterials.StainlessSteel.getMass() * 11) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -380,7 +330,7 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.ingot, GTMaterials.HSSS, 8), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.BlueSteel, 2), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.RedSteel, 2) - ) + ) .duration(GTMaterials.StainlessSteel.getMass() * 11) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) @@ -393,7 +343,7 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 16), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Silver, 11), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.HSSS, 8) - ) + ) .duration(GTMaterials.Electrum.getMass() * 22) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -405,7 +355,7 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 16), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Silver, 11), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.HSSS, 8) - ) + ) .duration(GTMaterials.Electrum.getMass() * 22) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) diff --git a/kubejs/startup_scripts/advancedperipherals/constants.js b/kubejs/startup_scripts/advancedperipherals/constants.js index 13f681b5d..5cd612eab 100644 --- a/kubejs/startup_scripts/advancedperipherals/constants.js +++ b/kubejs/startup_scripts/advancedperipherals/constants.js @@ -6,5 +6,10 @@ global.ADVANCED_PERIPHERALS_DISABLED_ITEMS = [ 'advancedperipherals:rs_bridge', 'advancedperipherals:energy_detector', 'advancedperipherals:colony_integrator', - 'advancedperipherals:computer_tool' + 'advancedperipherals:computer_tool', + + // banned for trans-dimensional travel + 'advancedperipherals:overpowered_end_automata_core' + // banned for offline chunk loading (bad for server performance) + ];