diff --git a/kubejs/client_scripts/debug.js b/kubejs/client_scripts/debug.js index 4e264072..7908652d 100644 --- a/kubejs/client_scripts/debug.js +++ b/kubejs/client_scripts/debug.js @@ -1,11 +1,11 @@ global.debug = {} const before = "===KUBEJS CUSTOM DEBUG===" -const after = "========================" +const after = "========================" ClientEvents.leftDebugInfo(event => { - if (global.debug == undefined) return - event.lines.add(before) - for (let key in global.debug) { - event.lines.add(key + ": " + global.debug[key]) - } - event.lines.add(after) -}) \ No newline at end of file + if (global.debug == undefined) return + event.lines.add(before) + for (let key in global.debug) { + event.lines.add(key + ": " + global.debug[key]) + } + event.lines.add(after) +}) diff --git a/kubejs/client_scripts/jei_hide.js b/kubejs/client_scripts/jei_hide.js index 74e13a0e..f08b1964 100644 --- a/kubejs/client_scripts/jei_hide.js +++ b/kubejs/client_scripts/jei_hide.js @@ -1,23 +1,50 @@ JEIEvents.hideItems(event => { - //Create - - event.hide(/create:(.*)_sheet/) - event.hide(/create:crushed_raw_(.*)/) + //Create + event.hide(/create:(.*)_sheet/) + event.hide(/create:crushed_raw_(.*)/) - //Wands - event.hide('constructionwand:core_angel') - event.hide('constructionwand:core_destruction') + //Wands + event.hide("constructionwand:core_angel") + event.hide("constructionwand:core_destruction") - //TomSimpleStorage - const storage = ['toms_storage:ts.inventory_proxy','toms_storage:ts.open_crate', 'toms_storage:ts.inventory_hopper_basic', 'toms_storage:ts.level_emitter', 'toms_storage:ts.painted_trim', 'toms_storage:ts.storage_terminal', 'toms_storage:ts.adv_wireless_terminal'] - storage.forEach((element) => event.hide(element)); + //TomSimpleStorage + const storage = [ + "toms_storage:ts.inventory_proxy", + "toms_storage:ts.open_crate", + "toms_storage:ts.inventory_hopper_basic", + "toms_storage:ts.level_emitter", + "toms_storage:ts.painted_trim", + "toms_storage:ts.storage_terminal", + "toms_storage:ts.adv_wireless_terminal", + ] + storage.forEach(element => event.hide(element)) - //SophisticatedBackpacks - const backpack = ['sophisticatedbackpacks:inception_upgrade','sophisticatedbackpacks:pump_upgrade', 'sophisticatedbackpacks:stack_upgrade_tier_3', 'sophisticatedbackpacks:stack_upgrade_tier_1', 'sophisticatedbackpacks:stack_upgrade_tier_4', 'sophisticatedbackpacks:stack_upgrade_tier_2','sophisticatedbackpacks:everlasting_upgrade', 'sophisticatedbackpacks:auto_blasting_upgrade', 'sophisticatedbackpacks:auto_smoking_upgrade', 'sophisticatedbackpacks:auto_smelting_upgrade', 'sophisticatedbackpacks:crafting_upgrade', 'sophisticatedbackpacks:smoking_upgrade', 'sophisticatedbackpacks:stonecutter_upgrade', 'sophisticatedbackpacks:tank_upgrade', 'sophisticatedbackpacks:battery_upgrade', 'sophisticatedbackpacks:advanced_pump_upgrade', 'sophisticatedbackpacks:xp_pump_upgrade', 'sophisticatedbackpacks:smelting_upgrade', 'sophisticatedbackpacks:blasting_upgrade'] - backpack.forEach((element) => event.hide(element)); + //SophisticatedBackpacks + const backpack = [ + "sophisticatedbackpacks:inception_upgrade", + "sophisticatedbackpacks:pump_upgrade", + "sophisticatedbackpacks:stack_upgrade_tier_3", + "sophisticatedbackpacks:stack_upgrade_tier_1", + "sophisticatedbackpacks:stack_upgrade_tier_4", + "sophisticatedbackpacks:stack_upgrade_tier_2", + "sophisticatedbackpacks:everlasting_upgrade", + "sophisticatedbackpacks:auto_blasting_upgrade", + "sophisticatedbackpacks:auto_smoking_upgrade", + "sophisticatedbackpacks:auto_smelting_upgrade", + "sophisticatedbackpacks:crafting_upgrade", + "sophisticatedbackpacks:smoking_upgrade", + "sophisticatedbackpacks:stonecutter_upgrade", + "sophisticatedbackpacks:tank_upgrade", + "sophisticatedbackpacks:battery_upgrade", + "sophisticatedbackpacks:advanced_pump_upgrade", + "sophisticatedbackpacks:xp_pump_upgrade", + "sophisticatedbackpacks:smelting_upgrade", + "sophisticatedbackpacks:blasting_upgrade", + ] + backpack.forEach(element => event.hide(element)) - // Ad Astra - event.hide(/ad_astra:(.*)_plate/) - event.hide('ad_astra:steel_ingot') - event.hide('ad_astra:steel_block') - }) \ No newline at end of file + // Ad Astra + event.hide(/ad_astra:(.*)_plate/) + event.hide("ad_astra:steel_ingot") + event.hide("ad_astra:steel_block") +}) diff --git a/kubejs/data/productivebees/productivebees/gtceu/chromium.json b/kubejs/data/productivebees/productivebees/gtceu/chromium.json index 10c8c766..3c079556 100644 --- a/kubejs/data/productivebees/productivebees/gtceu/chromium.json +++ b/kubejs/data/productivebees/productivebees/gtceu/chromium.json @@ -1,12 +1,12 @@ { - "primaryColor": "#d1d1d3", - "particleColor": "#e9e9e9", - "beeTexture": "productivebees:textures/entity/bee/chromium/bee", - "flowerItem": "chemlib:chromium", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "gtceu" - } - ] - } \ No newline at end of file + "primaryColor": "#d1d1d3", + "particleColor": "#e9e9e9", + "beeTexture": "productivebees:textures/entity/bee/chromium/bee", + "flowerItem": "chemlib:chromium", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "gtceu" + } + ] +} diff --git a/kubejs/data/productivebees/productivebees/gtceu/europium.json b/kubejs/data/productivebees/productivebees/gtceu/europium.json index 3595106c..c1c3b66d 100644 --- a/kubejs/data/productivebees/productivebees/gtceu/europium.json +++ b/kubejs/data/productivebees/productivebees/gtceu/europium.json @@ -1,13 +1,13 @@ { - "primaryColor": "#6067d3", - "particleColor": "#e2d91e", - "size:": 0.8, - "beeTexture": "productivebees:textures/entity/bee/europium/bee", - "flowerItem": "chemlib:europium", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "gtceu" - } - ] - } \ No newline at end of file + "primaryColor": "#6067d3", + "particleColor": "#e2d91e", + "size:": 0.8, + "beeTexture": "productivebees:textures/entity/bee/europium/bee", + "flowerItem": "chemlib:europium", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "gtceu" + } + ] +} diff --git a/kubejs/data/productivebees/productivebees/gtceu/neodymium.json b/kubejs/data/productivebees/productivebees/gtceu/neodymium.json index c512cc29..7b85328a 100644 --- a/kubejs/data/productivebees/productivebees/gtceu/neodymium.json +++ b/kubejs/data/productivebees/productivebees/gtceu/neodymium.json @@ -1,13 +1,13 @@ { - "primaryColor": "#998784", - "particleColor": "#ab9d9a", - "beeTexture": "productivebees:textures/entity/bee/neodymium/bee", - "description": "productivebees.ingredient.description.only_spawnegg", - "flowerItem": "chemlib:neodymium", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "gtceu" - } - ] - } \ No newline at end of file + "primaryColor": "#998784", + "particleColor": "#ab9d9a", + "beeTexture": "productivebees:textures/entity/bee/neodymium/bee", + "description": "productivebees.ingredient.description.only_spawnegg", + "flowerItem": "chemlib:neodymium", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "gtceu" + } + ] +} diff --git a/kubejs/data/productivebees/productivebees/gtceu/niobium.json b/kubejs/data/productivebees/productivebees/gtceu/niobium.json index 0b54cb91..2e1172fb 100644 --- a/kubejs/data/productivebees/productivebees/gtceu/niobium.json +++ b/kubejs/data/productivebees/productivebees/gtceu/niobium.json @@ -1,12 +1,12 @@ { - "primaryColor": "#bfb1e6", - "particleColor": "#c3beea", - "beeTexture": "productivebees:textures/entity/bee/niobium/bee", - "flowerItem": "chemlib:niobium", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "gtceu" - } - ] - } \ No newline at end of file + "primaryColor": "#bfb1e6", + "particleColor": "#c3beea", + "beeTexture": "productivebees:textures/entity/bee/niobium/bee", + "flowerItem": "chemlib:niobium", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "gtceu" + } + ] +} diff --git a/kubejs/data/productivebees/productivebees/gtceu/palladium.json b/kubejs/data/productivebees/productivebees/gtceu/palladium.json index b6c49886..9720d052 100644 --- a/kubejs/data/productivebees/productivebees/gtceu/palladium.json +++ b/kubejs/data/productivebees/productivebees/gtceu/palladium.json @@ -1,12 +1,12 @@ { - "primaryColor": "#b78187", - "particleColor": "#c3989a", - "beeTexture": "productivebees:textures/entity/bee/palladium/bee", - "flowerItem": "chemlib:palladium", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "gtceu" - } - ] - } \ No newline at end of file + "primaryColor": "#b78187", + "particleColor": "#c3989a", + "beeTexture": "productivebees:textures/entity/bee/palladium/bee", + "flowerItem": "chemlib:palladium", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "gtceu" + } + ] +} diff --git a/kubejs/data/productivebees/productivebees/gtceu/rhodium.json b/kubejs/data/productivebees/productivebees/gtceu/rhodium.json index 980e7001..349f8952 100644 --- a/kubejs/data/productivebees/productivebees/gtceu/rhodium.json +++ b/kubejs/data/productivebees/productivebees/gtceu/rhodium.json @@ -1,13 +1,13 @@ { - "primaryColor": "#cccac9", - "particleColor": "#cccac1", - "beeTexture": "productivebees:textures/entity/bee/rhodium/bee", - "description": "productivebees.ingredient.description.only_spawnegg", - "flowerItem": "chemlib:rhodium", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "gtceu" - } - ] - } \ No newline at end of file + "primaryColor": "#cccac9", + "particleColor": "#cccac1", + "beeTexture": "productivebees:textures/entity/bee/rhodium/bee", + "description": "productivebees.ingredient.description.only_spawnegg", + "flowerItem": "chemlib:rhodium", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "gtceu" + } + ] +} diff --git a/kubejs/data/productivebees/productivebees/gtceu/ruthenium.json b/kubejs/data/productivebees/productivebees/gtceu/ruthenium.json index f59e4f2d..694f416b 100644 --- a/kubejs/data/productivebees/productivebees/gtceu/ruthenium.json +++ b/kubejs/data/productivebees/productivebees/gtceu/ruthenium.json @@ -1,13 +1,13 @@ { - "primaryColor": "#a68994", - "particleColor": "#ba9ca6", - "beeTexture": "productivebees:textures/entity/bee/ruthenium/bee", - "description": "productivebees.ingredient.description.only_spawnegg", - "flowerItem": "chemlib:ruthenium", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "gtceu" - } - ] - } \ No newline at end of file + "primaryColor": "#a68994", + "particleColor": "#ba9ca6", + "beeTexture": "productivebees:textures/entity/bee/ruthenium/bee", + "description": "productivebees.ingredient.description.only_spawnegg", + "flowerItem": "chemlib:ruthenium", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "gtceu" + } + ] +} diff --git a/kubejs/data/productivebees/productivebees/gtceu/samarium.json b/kubejs/data/productivebees/productivebees/gtceu/samarium.json index 31821090..2e2bb4c8 100644 --- a/kubejs/data/productivebees/productivebees/gtceu/samarium.json +++ b/kubejs/data/productivebees/productivebees/gtceu/samarium.json @@ -1,13 +1,13 @@ { - "primaryColor": "#d5db8c", - "particleColor": "#e3f696", - "beeTexture": "productivebees:textures/entity/bee/samarium/bee", - "description": "productivebees.ingredient.description.only_spawnegg", - "flowerItem": "chemlib:samarium", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "gtceu" - } - ] - } \ No newline at end of file + "primaryColor": "#d5db8c", + "particleColor": "#e3f696", + "beeTexture": "productivebees:textures/entity/bee/samarium/bee", + "description": "productivebees.ingredient.description.only_spawnegg", + "flowerItem": "chemlib:samarium", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "gtceu" + } + ] +} diff --git a/kubejs/data/productivebees/productivebees/gtceu/vanadium.json b/kubejs/data/productivebees/productivebees/gtceu/vanadium.json index 13ce7fca..dc00fcdd 100644 --- a/kubejs/data/productivebees/productivebees/gtceu/vanadium.json +++ b/kubejs/data/productivebees/productivebees/gtceu/vanadium.json @@ -1,12 +1,12 @@ { - "primaryColor": "#9da1d6", - "particleColor": "#adafd5", - "beeTexture": "productivebees:textures/entity/bee/vanadium/bee", - "flowerItem": "chemlib:vanadium", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "gtceu" - } - ] - } \ No newline at end of file + "primaryColor": "#9da1d6", + "particleColor": "#adafd5", + "beeTexture": "productivebees:textures/entity/bee/vanadium/bee", + "flowerItem": "chemlib:vanadium", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "gtceu" + } + ] +} diff --git a/kubejs/data/productivebees/productivebees/gtceu/yttrium.json b/kubejs/data/productivebees/productivebees/gtceu/yttrium.json index 3e113866..d1c7255f 100644 --- a/kubejs/data/productivebees/productivebees/gtceu/yttrium.json +++ b/kubejs/data/productivebees/productivebees/gtceu/yttrium.json @@ -1,12 +1,12 @@ { - "primaryColor": "#dbe2b1", - "particleColor": "#d0e6b6", - "beeTexture": "productivebees:textures/entity/bee/yttrium/bee", - "flowerItem": "gtceu:yttrium", - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "gtceu" - } - ] - } \ No newline at end of file + "primaryColor": "#dbe2b1", + "particleColor": "#d0e6b6", + "beeTexture": "productivebees:textures/entity/bee/yttrium/bee", + "flowerItem": "gtceu:yttrium", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "gtceu" + } + ] +} diff --git a/kubejs/data/productivebees/productivebees/neutronium.json b/kubejs/data/productivebees/productivebees/neutronium.json index 010cf71e..aee30e41 100644 --- a/kubejs/data/productivebees/productivebees/neutronium.json +++ b/kubejs/data/productivebees/productivebees/neutronium.json @@ -1,21 +1,19 @@ { - "primaryColor": "#fafafa", - "secondaryColor": "#c9c9c9", - "tertiaryColor": "#919191", - "renderer": "default_shell", - "size": 4.20, - "selfbreed": false, - "selfheal": true, - "fireproof": true, - "flowerItem": "gtceu:uv_fusion_reactor", - "name": "Not a Neutronium", - "invulnerability": [ - "mekanism.radiation" - ], - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "gtceu" - } - ] + "primaryColor": "#fafafa", + "secondaryColor": "#c9c9c9", + "tertiaryColor": "#919191", + "renderer": "default_shell", + "size": 4.2, + "selfbreed": false, + "selfheal": true, + "fireproof": true, + "flowerItem": "gtceu:uv_fusion_reactor", + "name": "Not a Neutronium", + "invulnerability": ["mekanism.radiation"], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "gtceu" + } + ] } diff --git a/kubejs/data/productivebees/recipes/bee_conversion/gtceu/neutronium_bee.json b/kubejs/data/productivebees/recipes/bee_conversion/gtceu/neutronium_bee.json index 6f87729c..a4fbf08b 100644 --- a/kubejs/data/productivebees/recipes/bee_conversion/gtceu/neutronium_bee.json +++ b/kubejs/data/productivebees/recipes/bee_conversion/gtceu/neutronium_bee.json @@ -1,14 +1,14 @@ { - "type": "productivebees:bee_conversion", - "source": "productivebees:starry", - "result": "productivebees:neutronium", - "item": { - "item": "gtceu:nan_certificate" - }, - "conditions": [ - { - "type": "productivebees:bee_exists", - "bee": "productivebees:neutronium" - } - ] -} \ No newline at end of file + "type": "productivebees:bee_conversion", + "source": "productivebees:starry", + "result": "productivebees:neutronium", + "item": { + "item": "gtceu:nan_certificate" + }, + "conditions": [ + { + "type": "productivebees:bee_exists", + "bee": "productivebees:neutronium" + } + ] +} diff --git a/kubejs/data/productivebees/recipes/bee_conversion/gtceu/yttrium_bee.json b/kubejs/data/productivebees/recipes/bee_conversion/gtceu/yttrium_bee.json index 85f3c65f..754e2832 100644 --- a/kubejs/data/productivebees/recipes/bee_conversion/gtceu/yttrium_bee.json +++ b/kubejs/data/productivebees/recipes/bee_conversion/gtceu/yttrium_bee.json @@ -1,14 +1,14 @@ { - "type": "productivebees:bee_conversion", - "source": "productivebees:draconic", - "result": "productivebees:yttrium", - "item": { - "item": "gtceu:yttrium" - }, - "conditions": [ - { - "type": "productivebees:bee_exists", - "bee": "productivebees:yttrium" - } - ] - } \ No newline at end of file + "type": "productivebees:bee_conversion", + "source": "productivebees:draconic", + "result": "productivebees:yttrium", + "item": { + "item": "gtceu:yttrium" + }, + "conditions": [ + { + "type": "productivebees:bee_exists", + "bee": "productivebees:yttrium" + } + ] +} diff --git a/kubejs/data/productivebees/recipes/bee_produce/neutronium_bee.json b/kubejs/data/productivebees/recipes/bee_produce/neutronium_bee.json index 61947214..2e3b830e 100644 --- a/kubejs/data/productivebees/recipes/bee_produce/neutronium_bee.json +++ b/kubejs/data/productivebees/recipes/bee_produce/neutronium_bee.json @@ -1,23 +1,23 @@ { - "type": "productivebees:advanced_beehive", - "ingredient": "productivebees:neutronium", - "results": [ - { - "item": { - "type": "forge:nbt", - "item": "productivebees:configurable_honeycomb", - "nbt": { - "EntityTag": { - "type": "productivebees:neutronium" - } - } - } - } - ], - "conditions": [ - { - "type": "productivebees:bee_exists", - "bee": "productivebees:neutronium" - } - ] -} \ No newline at end of file + "type": "productivebees:advanced_beehive", + "ingredient": "productivebees:neutronium", + "results": [ + { + "item": { + "type": "forge:nbt", + "item": "productivebees:configurable_honeycomb", + "nbt": { + "EntityTag": { + "type": "productivebees:neutronium" + } + } + } + } + ], + "conditions": [ + { + "type": "productivebees:bee_exists", + "bee": "productivebees:neutronium" + } + ] +} diff --git a/kubejs/data/productivebees/recipes/centrifuge/dusts/honeycomb_titanium.json b/kubejs/data/productivebees/recipes/centrifuge/dusts/honeycomb_titanium.json index c84c69b0..62418031 100644 --- a/kubejs/data/productivebees/recipes/centrifuge/dusts/honeycomb_titanium.json +++ b/kubejs/data/productivebees/recipes/centrifuge/dusts/honeycomb_titanium.json @@ -1,40 +1,40 @@ { - "type": "productivebees:centrifuge", - "ingredient": { - "type": "forge:nbt", - "item": "productivebees:configurable_honeycomb", - "nbt": { - "EntityTag": { - "type": "productivebees:titanium" - } - } - }, - "outputs": [ - { - "item": { - "tag": "forge:dusts/rutile" - }, - "chance": 40 - }, - { - "item": { - "tag": "forge:wax" - } - }, - { - "fluid": { - "fluid": "productivebees:honey" - }, - "amount": 50 - } - ], - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:tag_empty", - "tag": "forge:dusts/rutile" - } - } - ] -} \ No newline at end of file + "type": "productivebees:centrifuge", + "ingredient": { + "type": "forge:nbt", + "item": "productivebees:configurable_honeycomb", + "nbt": { + "EntityTag": { + "type": "productivebees:titanium" + } + } + }, + "outputs": [ + { + "item": { + "tag": "forge:dusts/rutile" + }, + "chance": 40 + }, + { + "item": { + "tag": "forge:wax" + } + }, + { + "fluid": { + "fluid": "productivebees:honey" + }, + "amount": 50 + } + ], + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/rutile" + } + } + ] +} diff --git a/kubejs/data/productivebees/recipes/centrifuge/dusts/neodymium.json b/kubejs/data/productivebees/recipes/centrifuge/dusts/neodymium.json index 1f6eea98..70c1cafa 100644 --- a/kubejs/data/productivebees/recipes/centrifuge/dusts/neodymium.json +++ b/kubejs/data/productivebees/recipes/centrifuge/dusts/neodymium.json @@ -1,40 +1,40 @@ { - "type": "productivebees:centrifuge", - "ingredient": { - "type": "forge:nbt", - "item": "productivebees:configurable_honeycomb", - "nbt": { - "EntityTag": { - "type": "productivebees:neodymium" - } - } - }, - "outputs": [ - { - "item": { - "tag": "forge:dusts/neodymium" - }, - "chance": 40 - }, - { - "item": { - "tag": "forge:wax" - } - }, - { - "fluid": { - "fluid": "productivebees:honey" - }, - "amount": 50 - } - ], - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:tag_empty", - "tag": "forge:dusts/rutile" - } - } - ] -} \ No newline at end of file + "type": "productivebees:centrifuge", + "ingredient": { + "type": "forge:nbt", + "item": "productivebees:configurable_honeycomb", + "nbt": { + "EntityTag": { + "type": "productivebees:neodymium" + } + } + }, + "outputs": [ + { + "item": { + "tag": "forge:dusts/neodymium" + }, + "chance": 40 + }, + { + "item": { + "tag": "forge:wax" + } + }, + { + "fluid": { + "fluid": "productivebees:honey" + }, + "amount": 50 + } + ], + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "forge:dusts/rutile" + } + } + ] +} diff --git a/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/buried_stargate/buried_stargate_biomes.json b/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/buried_stargate/buried_stargate_biomes.json index f65aabd3..478ac580 100644 --- a/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/buried_stargate/buried_stargate_biomes.json +++ b/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/buried_stargate/buried_stargate_biomes.json @@ -1,7 +1,5 @@ { - "replace": true, + "replace": true, - - "values": [ - ] -} \ No newline at end of file + "values": [] +} diff --git a/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/buried_stargate/buried_stargate_desert_biomes.json b/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/buried_stargate/buried_stargate_desert_biomes.json index 034b1bc1..478ac580 100644 --- a/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/buried_stargate/buried_stargate_desert_biomes.json +++ b/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/buried_stargate/buried_stargate_desert_biomes.json @@ -1,7 +1,5 @@ { - "replace": true, + "replace": true, - - "values": [ - ] -} \ No newline at end of file + "values": [] +} diff --git a/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/common_stargate/classic/pedestal/classic_stargate_pedestal_badlands_biomes.json b/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/common_stargate/classic/pedestal/classic_stargate_pedestal_badlands_biomes.json index e37b1f7c..478ac580 100644 --- a/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/common_stargate/classic/pedestal/classic_stargate_pedestal_badlands_biomes.json +++ b/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/common_stargate/classic/pedestal/classic_stargate_pedestal_badlands_biomes.json @@ -1,8 +1,5 @@ { "replace": true, - - - "values": - [ - ] -} \ No newline at end of file + + "values": [] +} diff --git a/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/common_stargate/classic/pedestal/classic_stargate_pedestal_biomes.json b/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/common_stargate/classic/pedestal/classic_stargate_pedestal_biomes.json index a20b2ad6..478ac580 100644 --- a/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/common_stargate/classic/pedestal/classic_stargate_pedestal_biomes.json +++ b/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/common_stargate/classic/pedestal/classic_stargate_pedestal_biomes.json @@ -1,9 +1,5 @@ { "replace": true, - - - "values": - [ - ] -} \ No newline at end of file + "values": [] +} diff --git a/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/common_stargate/classic/pedestal/classic_stargate_pedestal_desert_biomes.json b/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/common_stargate/classic/pedestal/classic_stargate_pedestal_desert_biomes.json index 2304b2c6..478ac580 100644 --- a/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/common_stargate/classic/pedestal/classic_stargate_pedestal_desert_biomes.json +++ b/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/common_stargate/classic/pedestal/classic_stargate_pedestal_desert_biomes.json @@ -1,9 +1,5 @@ { "replace": true, - - - "values": - [ - ] -} \ No newline at end of file + "values": [] +} diff --git a/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/pegasus_stargate_biomes.json b/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/pegasus_stargate_biomes.json index faac5c75..478ac580 100644 --- a/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/pegasus_stargate_biomes.json +++ b/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/pegasus_stargate_biomes.json @@ -1,8 +1,5 @@ { "replace": true, - - "values": - [ - ] -} \ No newline at end of file + "values": [] +} diff --git a/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/stargate/pedestal/classic_stargate_pedestal_biomes.json b/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/stargate/pedestal/classic_stargate_pedestal_biomes.json index 5da329ac..237fb383 100644 --- a/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/stargate/pedestal/classic_stargate_pedestal_biomes.json +++ b/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/stargate/pedestal/classic_stargate_pedestal_biomes.json @@ -1,7 +1,6 @@ { "replace": true, - + "_comment": " This biome tag can specify the biome directly. Or specify another biome tag by starting with # ", - "values": - [] -} \ No newline at end of file + "values": [] +} diff --git a/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/terra_stargate_biomes.json b/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/terra_stargate_biomes.json index faac5c75..478ac580 100644 --- a/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/terra_stargate_biomes.json +++ b/kubejs/data/sgjourney/tags/worldgen/biome/has_structure/terra_stargate_biomes.json @@ -1,8 +1,5 @@ { "replace": true, - - "values": - [ - ] -} \ No newline at end of file + "values": [] +} diff --git a/kubejs/server_scripts/Armor/AD Astra/JetSuit.js b/kubejs/server_scripts/Armor/AD Astra/JetSuit.js index 5833cbcb..91a6adfb 100644 --- a/kubejs/server_scripts/Armor/AD Astra/JetSuit.js +++ b/kubejs/server_scripts/Armor/AD Astra/JetSuit.js @@ -1,54 +1,52 @@ ServerEvents.recipes(event => { event.shaped( - Item.of('ad_astra:jet_suit_helmet', 1), - [ - 'AAA', - 'ABA', - ], - { - A: 'gtceu:hsss_double_plate', - B: 'ad_astra:netherite_space_helmet' - } - -) - -event.shaped( - Item.of('ad_astra:jet_suit', 1), - [ - 'ABA', - 'ACA', - 'ADA' - ], - { - A: 'gtceu:hsss_double_plate', - B: 'ad_astra:netherite_space_suit', - C: 'gtceu:iv_vanadium_battery', - D: 'gtceu:iv_quantum_tank' - } -) + Item.of('ad_astra:jet_suit_helmet', 1), + [ + 'AAA', + 'ABA', + ], + { + A: 'gtceu:hsss_double_plate', + B: 'ad_astra:netherite_space_helmet' + } + ) + event.shaped( + Item.of('ad_astra:jet_suit', 1), + [ + 'ABA', + 'ACA', + 'ADA' + ], + { + A: 'gtceu:hsss_double_plate', + B: 'ad_astra:netherite_space_suit', + C: 'gtceu:iv_vanadium_battery', + D: 'gtceu:iv_quantum_tank' + } + ) event.shaped( - Item.of('ad_astra:jet_suit_pants', 1), - [ - 'AAA', - 'ABA', - 'A A' - ], - { - A: 'gtceu:hsss_double_plate', - B: 'ad_astra:netherite_space_pants' - } -) + Item.of('ad_astra:jet_suit_pants', 1), + [ + 'AAA', + 'ABA', + 'A A' + ], + { + A: 'gtceu:hsss_double_plate', + B: 'ad_astra:netherite_space_pants' + } + ) event.shaped( - Item.of('ad_astra:jet_suit_boots', 1), - [ - 'ABA', - 'A A', - ' ' - ], - { - A: 'gtceu:hsss_double_plate', - B: 'ad_astra:netherite_space_boots' - } -) -}) \ No newline at end of file + Item.of('ad_astra:jet_suit_boots', 1), + [ + 'ABA', + 'A A', + ' ' + ], + { + A: 'gtceu:hsss_double_plate', + B: 'ad_astra:netherite_space_boots' + } + ) +}) diff --git a/kubejs/server_scripts/Armor/AD Astra/NetheriteSpaceSuit.js b/kubejs/server_scripts/Armor/AD Astra/NetheriteSpaceSuit.js index 4907e3c5..84f2c0cb 100644 --- a/kubejs/server_scripts/Armor/AD Astra/NetheriteSpaceSuit.js +++ b/kubejs/server_scripts/Armor/AD Astra/NetheriteSpaceSuit.js @@ -1,124 +1,122 @@ ServerEvents.recipes(event => { - event.recipes.createMechanicalCrafting( - Item.of('ad_astra:netherite_space_helmet', 1), - [ - 'AAAAAAA', - 'ABBBBBA', - 'ABCCCBA', - 'AB C BA', - 'AB D BA' - ], - { - A: 'gtceu:tungsten_carbide_plate', - B: 'gtceu:tungsten_steel_plate', - C: 'kubejs:netherite_plate', - D: 'ad_astra:space_helmet' - - } - ) + event.recipes.createMechanicalCrafting( + Item.of('ad_astra:netherite_space_helmet', 1), + [ + 'AAAAAAA', + 'ABBBBBA', + 'ABCCCBA', + 'AB C BA', + 'AB D BA' + ], + { + A: 'gtceu:tungsten_carbide_plate', + B: 'gtceu:tungsten_steel_plate', + C: 'kubejs:netherite_plate', + D: 'ad_astra:space_helmet' + } + ) event.recipes.createMechanicalCrafting( - Item.of('ad_astra:netherite_space_suit', 1), - [ - 'ABBBDBBBA', - 'ABBCCCBBA', - ' ABCBA ', - ' ABCBA ', - ' ABBBA ', - ' AAAAA ' - ], - { - A: 'gtceu:tungsten_carbide_plate', - B: 'gtceu:tungsten_steel_plate', - C: 'kubejs:netherite_plate', - D: 'ad_astra:space_suit' - } - ) + Item.of('ad_astra:netherite_space_suit', 1), + [ + 'ABBBDBBBA', + 'ABBCCCBBA', + ' ABCBA ', + ' ABCBA ', + ' ABBBA ', + ' AAAAA ' + ], + { + A: 'gtceu:tungsten_carbide_plate', + B: 'gtceu:tungsten_steel_plate', + C: 'kubejs:netherite_plate', + D: 'ad_astra:space_suit' + } + ) event.recipes.createMechanicalCrafting( - Item.of('ad_astra:netherite_space_pants', 1), - [ - 'AAAAAA', - 'ABBBBA', - 'ABCCBA', - 'AB DBA', - 'AB BA', - 'AB BA', - 'AB BA' - ], - { - A: 'gtceu:tungsten_carbide_plate', - B: 'gtceu:tungsten_steel_plate', - C: 'kubejs:netherite_plate', - D: 'ad_astra:space_pants' - } - ) + Item.of('ad_astra:netherite_space_pants', 1), + [ + 'AAAAAA', + 'ABBBBA', + 'ABCCBA', + 'AB DBA', + 'AB BA', + 'AB BA', + 'AB BA' + ], + { + A: 'gtceu:tungsten_carbide_plate', + B: 'gtceu:tungsten_steel_plate', + C: 'kubejs:netherite_plate', + D: 'ad_astra:space_pants' + } + ) event.recipes.createMechanicalCrafting( - Item.of('ad_astra:netherite_space_boots'), - [ - ' ABA ABA ', - ' ABA ABA ', - ' ABA ABA ', - ' ABA ABA ', - 'CAA D AAC' - ], - { - A: 'gtceu:tungsten_carbide_plate', - B: 'gtceu:tungsten_steel_plate', - C: 'kubejs:netherite_plate', - D: 'ad_astra:space_boots' - } - ) + Item.of('ad_astra:netherite_space_boots'), + [ + ' ABA ABA ', + ' ABA ABA ', + ' ABA ABA ', + ' ABA ABA ', + 'CAA D AAC' + ], + { + A: 'gtceu:tungsten_carbide_plate', + B: 'gtceu:tungsten_steel_plate', + C: 'kubejs:netherite_plate', + D: 'ad_astra:space_boots' + } + ) event.shaped( - Item.of('ad_astra:netherite_space_helmet', 1), - [ - 'AAA', - 'ABA', - 'ACA' - ], - { - A: 'gtceu:tungsten_carbide_double_plate', - B: 'gtceu:laminated_glass', - C: 'minecraft:netherite_helmet' - - } -) + Item.of('ad_astra:netherite_space_helmet', 1), + [ + 'AAA', + 'ABA', + 'ACA' + ], + { + A: 'gtceu:tungsten_carbide_double_plate', + B: 'gtceu:laminated_glass', + C: 'minecraft:netherite_helmet' + } + ) event.shaped( - Item.of('ad_astra:netherite_space_suit', 1), - [ - 'ABA', - 'ACA', - 'AAA' - ], - { - A: 'gtceu:tungsten_carbide_double_plate', - B: 'minecraft:netherite_chestplate', - C: 'gtceu:tungsten_steel_drum' - } -) + Item.of('ad_astra:netherite_space_suit', 1), + [ + 'ABA', + 'ACA', + 'AAA' + ], + { + A: 'gtceu:tungsten_carbide_double_plate', + B: 'minecraft:netherite_chestplate', + C: 'gtceu:tungsten_steel_drum' + } + ) event.shaped( - Item.of('ad_astra:netherite_space_pants', 1), - [ - 'AAA', - 'ABA', - 'A A' - ], - { - A: 'gtceu:tungsten_carbide_double_plate', - B: 'minecraft:netherite_leggings' - } -) + Item.of('ad_astra:netherite_space_pants', 1), + [ + 'AAA', + 'ABA', + 'A A' + ], + { + A: 'gtceu:tungsten_carbide_double_plate', + B: 'minecraft:netherite_leggings' + } + ) event.shaped( - Item.of('ad_astra:netherite_space_boots', 1), - [ - 'ABA', - 'A A', - ' ' - ], - { - A: 'gtceu:tungsten_carbide_double_plate', - B: 'minecraft:netherite_boots' - } -) -}) \ No newline at end of file + Item.of('ad_astra:netherite_space_boots', 1), + [ + 'ABA', + 'A A', + ' ' + ], + { + A: 'gtceu:tungsten_carbide_double_plate', + B: 'minecraft:netherite_boots' + } + ) +}) diff --git a/kubejs/server_scripts/Armor/AD Astra/SpaceSuit.js b/kubejs/server_scripts/Armor/AD Astra/SpaceSuit.js index 6a46789a..435e7bc8 100644 --- a/kubejs/server_scripts/Armor/AD Astra/SpaceSuit.js +++ b/kubejs/server_scripts/Armor/AD Astra/SpaceSuit.js @@ -1,54 +1,52 @@ ServerEvents.recipes(event => { - event.shaped( - Item.of('ad_astra:space_helmet', 1), - [ - 'AAA', - 'ABA', - 'ACA' - ], - { - A: 'minecraft:white_wool', - B: 'gtceu:tempered_glass', - C: 'minecraft:iron_helmet' - - } -) + Item.of('ad_astra:space_helmet', 1), + [ + 'AAA', + 'ABA', + 'ACA' + ], + { + A: 'minecraft:white_wool', + B: 'gtceu:tempered_glass', + C: 'minecraft:iron_helmet' + } + ) event.shaped( - Item.of('ad_astra:space_suit', 1), - [ - 'ABA', - 'ACA', - 'AAA' - ], - { - A: 'minecraft:white_wool', - B: 'minecraft:iron_chestplate', - C: 'gtceu:steel_drum' - } -) + Item.of('ad_astra:space_suit', 1), + [ + 'ABA', + 'ACA', + 'AAA' + ], + { + A: 'minecraft:white_wool', + B: 'minecraft:iron_chestplate', + C: 'gtceu:steel_drum' + } + ) event.shaped( - Item.of('ad_astra:space_pants', 1), - [ - 'AAA', - 'ABA', - 'A A' - ], - { - A: 'minecraft:white_wool', - B: 'minecraft:iron_leggings' - } -) + Item.of('ad_astra:space_pants', 1), + [ + 'AAA', + 'ABA', + 'A A' + ], + { + A: 'minecraft:white_wool', + B: 'minecraft:iron_leggings' + } + ) event.shaped( - Item.of('ad_astra:space_boots', 1), - [ - 'ABA', - 'A A', - ' ' - ], - { - A: 'minecraft:white_wool', - B: 'minecraft:iron_boots' - } -) -}) \ No newline at end of file + Item.of('ad_astra:space_boots', 1), + [ + 'ABA', + 'A A', + ' ' + ], + { + A: 'minecraft:white_wool', + B: 'minecraft:iron_boots' + } + ) +}) diff --git a/kubejs/server_scripts/Armor/Create/CopperDiving.js b/kubejs/server_scripts/Armor/Create/CopperDiving.js index becf5b93..e6a0df23 100644 --- a/kubejs/server_scripts/Armor/Create/CopperDiving.js +++ b/kubejs/server_scripts/Armor/Create/CopperDiving.js @@ -1,43 +1,42 @@ ServerEvents.recipes(event => { event.shaped( - Item.of('create:copper_diving_helmet', 1), - [ - 'AAA', - 'ABA', - 'DCD' - ], - { - A: 'gtceu:copper_double_plate', - B: 'gtceu:tempered_glass', - C: 'gtceu:polyethylene_small_fluid_pipe', - D: 'gtceu:rubber_plate' - } -) - + Item.of('create:copper_diving_helmet', 1), + [ + 'AAA', + 'ABA', + 'DCD' + ], + { + A: 'gtceu:copper_double_plate', + B: 'gtceu:tempered_glass', + C: 'gtceu:polyethylene_small_fluid_pipe', + D: 'gtceu:rubber_plate' + } + ) event.shaped( - Item.of('create:copper_backtank', 1), - [ - 'DCD', - 'ABA', - 'AAA' - ], - { - A: 'gtceu:copper_double_plate', - B: 'gtceu:bronze_drum', - C: 'gtceu:polyethylene_small_fluid_pipe', - D: 'gtceu:rubber_plate' - } -) + Item.of('create:copper_backtank', 1), + [ + 'DCD', + 'ABA', + 'AAA' + ], + { + A: 'gtceu:copper_double_plate', + B: 'gtceu:bronze_drum', + C: 'gtceu:polyethylene_small_fluid_pipe', + D: 'gtceu:rubber_plate' + } + ) event.shaped( - Item.of('create:copper_diving_boots', 1), - [ - 'D D', - 'A A', - 'A A' - ], - { - A: 'gtceu:copper_double_plate', - D: 'gtceu:rubber_plate' - } -) -}) \ No newline at end of file + Item.of('create:copper_diving_boots', 1), + [ + 'D D', + 'A A', + 'A A' + ], + { + A: 'gtceu:copper_double_plate', + D: 'gtceu:rubber_plate' + } + ) +}) diff --git a/kubejs/server_scripts/Armor/Create/NetheriteDiving.js b/kubejs/server_scripts/Armor/Create/NetheriteDiving.js index 15af0bde..1d8453e6 100644 --- a/kubejs/server_scripts/Armor/Create/NetheriteDiving.js +++ b/kubejs/server_scripts/Armor/Create/NetheriteDiving.js @@ -1,45 +1,43 @@ ServerEvents.recipes(event => { - event.shaped( - Item.of('create:netherite_diving_helmet', 1), - [ - 'AAA', - 'ABA', - 'DCD' - ], - { - A: 'gtceu:tungsten_carbide_double_plate', - B: 'minecraft:netherite_helmet', - C: 'gtceu:polytetrafluoroethylene_normal_fluid_pipe', - D: 'gtceu:styrene_butadiene_rubber_plate' - } -) - + Item.of('create:netherite_diving_helmet', 1), + [ + 'AAA', + 'ABA', + 'DCD' + ], + { + A: 'gtceu:tungsten_carbide_double_plate', + B: 'minecraft:netherite_helmet', + C: 'gtceu:polytetrafluoroethylene_normal_fluid_pipe', + D: 'gtceu:styrene_butadiene_rubber_plate' + } + ) event.shaped( - Item.of('create:netherite_backtank', 1), - [ - 'DCD', - 'ABA', - 'AAA' - ], - { - A: 'gtceu:tungsten_carbide_double_plate', - B: 'gtceu:tungsten_steel_drum', - C: 'gtceu:polytetrafluoroethylene_normal_fluid_pipe', - D: 'gtceu:styrene_butadiene_rubber_plate' - } -) + Item.of('create:netherite_backtank', 1), + [ + 'DCD', + 'ABA', + 'AAA' + ], + { + A: 'gtceu:tungsten_carbide_double_plate', + B: 'gtceu:tungsten_steel_drum', + C: 'gtceu:polytetrafluoroethylene_normal_fluid_pipe', + D: 'gtceu:styrene_butadiene_rubber_plate' + } + ) event.shaped( - Item.of('create:netherite_diving_boots', 1), - [ - 'DBD', - 'A A', - 'A A' - ], - { - A: 'gtceu:tungsten_carbide_double_plate', - B: 'minecraft:netherite_boots', - D: 'gtceu:styrene_butadiene_rubber_plate' - } -) -}) \ No newline at end of file + Item.of('create:netherite_diving_boots', 1), + [ + 'DBD', + 'A A', + 'A A' + ], + { + A: 'gtceu:tungsten_carbide_double_plate', + B: 'minecraft:netherite_boots', + D: 'gtceu:styrene_butadiene_rubber_plate' + } + ) +}) diff --git a/kubejs/server_scripts/Armor/Vanilla/Chain.js b/kubejs/server_scripts/Armor/Vanilla/Chain.js index 31830ee3..89827414 100644 --- a/kubejs/server_scripts/Armor/Vanilla/Chain.js +++ b/kubejs/server_scripts/Armor/Vanilla/Chain.js @@ -1,55 +1,53 @@ ServerEvents.recipes(event => { - event.recipes.createMechanicalCrafting( - Item.of('minecraft:chainmail_helmet', 1), - [ - ' AAA ', - 'AB BA', - 'AB BA' - ], - { - A: 'gtceu:iron_ring', - B: 'minecraft:leather' - } - ) + Item.of('minecraft:chainmail_helmet', 1), + [ + ' AAA ', + 'AB BA', + 'AB BA' + ], + { + A: 'gtceu:iron_ring', + B: 'minecraft:leather' + } + ) event.recipes.createMechanicalCrafting( - Item.of('minecraft:chainmail_chestplate', 1), - [ - 'AA AA', - ' ABBA ', - ' AA ', - ' AA ' - ], - { - A: 'gtceu:iron_ring', - B: 'minecraft:leather' - } - ) + Item.of('minecraft:chainmail_chestplate', 1), + [ + 'AA AA', + ' ABBA ', + ' AA ', + ' AA ' + ], + { + A: 'gtceu:iron_ring', + B: 'minecraft:leather' + } + ) event.recipes.createMechanicalCrafting( - Item.of('minecraft:chainmail_leggings', 1), - [ - 'AAAA', - 'A A', - 'A A', - 'A A', - 'B B' - ], - { - A: 'gtceu:iron_ring', - B: 'minecraft:leather' - } - ) + Item.of('minecraft:chainmail_leggings', 1), + [ + 'AAAA', + 'A A', + 'A A', + 'A A', + 'B B' + ], + { + A: 'gtceu:iron_ring', + B: 'minecraft:leather' + } + ) event.recipes.createMechanicalCrafting( - Item.of('minecraft:chainmail_boots', 1), - [ - ' A A ', - ' A A ', - 'AB BA' - ], - { - A: 'gtceu:iron_ring', - B: 'minecraft:leather' - } - ) - - }) \ No newline at end of file + Item.of('minecraft:chainmail_boots', 1), + [ + ' A A ', + ' A A ', + 'AB BA' + ], + { + A: 'gtceu:iron_ring', + B: 'minecraft:leather' + } + ) +}) diff --git a/kubejs/server_scripts/Armor/Vanilla/Diamond.js b/kubejs/server_scripts/Armor/Vanilla/Diamond.js index 9139a720..9daa1dc0 100644 --- a/kubejs/server_scripts/Armor/Vanilla/Diamond.js +++ b/kubejs/server_scripts/Armor/Vanilla/Diamond.js @@ -1,62 +1,60 @@ ServerEvents.recipes(event => { - event.recipes.createMechanicalCrafting( - Item.of('minecraft:diamond_helmet', 1), - [ - 'AAAAAA', - 'ABBBBA', - 'AC CA', - 'AC CA' - ], - { - A: 'gtceu:diamond_plate', - B: 'gtceu:stainless_steel_plate', - C: 'gtceu:titanium_plate' - } - ) + Item.of('minecraft:diamond_helmet', 1), + [ + 'AAAAAA', + 'ABBBBA', + 'AC CA', + 'AC CA' + ], + { + A: 'gtceu:diamond_plate', + B: 'gtceu:stainless_steel_plate', + C: 'gtceu:titanium_plate' + } + ) event.recipes.createMechanicalCrafting( - Item.of('minecraft:diamond_chestplate', 1), - [ - 'CBB BBC', - 'CBCCCBC', - ' ABCBA ', - ' ABCBA ', - ' ABBBA ' - ], - { - A: 'gtceu:diamond_plate', - B: 'gtceu:stainless_steel_plate', - C: 'gtceu:titanium_plate' - } - ) + Item.of('minecraft:diamond_chestplate', 1), + [ + 'CBB BBC', + 'CBCCCBC', + ' ABCBA ', + ' ABCBA ', + ' ABBBA ' + ], + { + A: 'gtceu:diamond_plate', + B: 'gtceu:stainless_steel_plate', + C: 'gtceu:titanium_plate' + } + ) event.recipes.createMechanicalCrafting( - Item.of('minecraft:diamond_leggings', 1), - [ - 'AAAAAA', - 'ABCCBA', - 'AB BA', - 'AB BA', - 'AB BA' - ], - { - A: 'gtceu:diamond_plate', - B: 'gtceu:stainless_steel_plate', - C: 'gtceu:titanium_plate' - } - ) + Item.of('minecraft:diamond_leggings', 1), + [ + 'AAAAAA', + 'ABCCBA', + 'AB BA', + 'AB BA', + 'AB BA' + ], + { + A: 'gtceu:diamond_plate', + B: 'gtceu:stainless_steel_plate', + C: 'gtceu:titanium_plate' + } + ) event.recipes.createMechanicalCrafting( - Item.of('minecraft:diamond_boots', 1), - [ - ' AA AA ', - ' AA AA ', - ' AA AA ', - 'CBB BBC' - ], - { - A: 'gtceu:diamond_plate', - B: 'gtceu:stainless_steel_plate', - C: 'gtceu:titanium_plate' - } - ) - - }) \ No newline at end of file + Item.of('minecraft:diamond_boots', 1), + [ + ' AA AA ', + ' AA AA ', + ' AA AA ', + 'CBB BBC' + ], + { + A: 'gtceu:diamond_plate', + B: 'gtceu:stainless_steel_plate', + C: 'gtceu:titanium_plate' + } + ) +}) diff --git a/kubejs/server_scripts/Armor/Vanilla/Gold.js b/kubejs/server_scripts/Armor/Vanilla/Gold.js index 0a3cdac5..3224c176 100644 --- a/kubejs/server_scripts/Armor/Vanilla/Gold.js +++ b/kubejs/server_scripts/Armor/Vanilla/Gold.js @@ -1,3 +1 @@ -ServerEvents.recipes(event => { - -}) \ No newline at end of file +ServerEvents.recipes(event => {}) diff --git a/kubejs/server_scripts/Armor/Vanilla/Iron.js b/kubejs/server_scripts/Armor/Vanilla/Iron.js index 287a5070..ea5242db 100644 --- a/kubejs/server_scripts/Armor/Vanilla/Iron.js +++ b/kubejs/server_scripts/Armor/Vanilla/Iron.js @@ -1,61 +1,59 @@ ServerEvents.recipes(event => { - event.recipes.createMechanicalCrafting( - Item.of('minecraft:iron_helmet', 1), - [ - ' ABA ', - 'AC CA', - 'AC CA' - ], - { - A: 'gtceu:iron_plate', - B: 'gtceu:invar_plate', - C: 'gtceu:carbon_fiber_mesh' - } - ) + Item.of('minecraft:iron_helmet', 1), + [ + ' ABA ', + 'AC CA', + 'AC CA' + ], + { + A: 'gtceu:iron_plate', + B: 'gtceu:invar_plate', + C: 'gtceu:carbon_fiber_mesh' + } + ) event.recipes.createMechanicalCrafting( - Item.of('minecraft:iron_chestplate', 1), - [ - 'CB BC', - 'CBCCBC', - ' ABBA ', - ' ABBA ', - ' ABBA ', - ], - { - A: 'gtceu:iron_plate', - B: 'gtceu:invar_plate', - C: 'gtceu:carbon_fiber_mesh' - } - ) + Item.of('minecraft:iron_chestplate', 1), + [ + 'CB BC', + 'CBCCBC', + ' ABBA ', + ' ABBA ', + ' ABBA ', + ], + { + A: 'gtceu:iron_plate', + B: 'gtceu:invar_plate', + C: 'gtceu:carbon_fiber_mesh' + } + ) event.recipes.createMechanicalCrafting( - Item.of('minecraft:iron_leggings', 1), - [ - 'AAAA', - 'ACCA', - 'A A', - 'A A', - 'B B' - ], - { - A: 'gtceu:iron_plate', - B: 'gtceu:invar_plate', - C: 'gtceu:carbon_fiber_mesh' - } - ) + Item.of('minecraft:iron_leggings', 1), + [ + 'AAAA', + 'ACCA', + 'A A', + 'A A', + 'B B' + ], + { + A: 'gtceu:iron_plate', + B: 'gtceu:invar_plate', + C: 'gtceu:carbon_fiber_mesh' + } + ) event.recipes.createMechanicalCrafting( - Item.of('minecraft:iron_boots', 1), - [ - ' A A ', - ' A A ', - ' A A ', - 'CB BC' - ], - { - A: 'gtceu:iron_plate', - B: 'gtceu:invar_plate', - C: 'gtceu:carbon_fiber_mesh' - } - ) - - }) \ No newline at end of file + Item.of('minecraft:iron_boots', 1), + [ + ' A A ', + ' A A ', + ' A A ', + 'CB BC' + ], + { + A: 'gtceu:iron_plate', + B: 'gtceu:invar_plate', + C: 'gtceu:carbon_fiber_mesh' + } + ) +}) diff --git a/kubejs/server_scripts/Armor/Vanilla/Leather.js b/kubejs/server_scripts/Armor/Vanilla/Leather.js index cc26e8e4..bf4eaa89 100644 --- a/kubejs/server_scripts/Armor/Vanilla/Leather.js +++ b/kubejs/server_scripts/Armor/Vanilla/Leather.js @@ -2,47 +2,47 @@ ServerEvents.recipes(event => { event.remove({output: '#forge:armors'}) event.shaped( - Item.of('minecraft:leather_helmet', 1), - [ - 'AAA', - 'A A', - ' ' - ], - { - A: 'minecraft:leather' - } -) + Item.of('minecraft:leather_helmet', 1), + [ + 'AAA', + 'A A', + ' ' + ], + { + A: 'minecraft:leather' + } + ) event.shaped( - Item.of('minecraft:leather_chestplate', 1), - [ - 'A A', - 'AAA', - 'AAA' - ], - { - A: 'minecraft:leather' - } -) + Item.of('minecraft:leather_chestplate', 1), + [ + 'A A', + 'AAA', + 'AAA' + ], + { + A: 'minecraft:leather' + } + ) event.shaped( - Item.of('minecraft:leather_leggings', 1), - [ - 'AAA', - 'A A', - 'A A' - ], - { - A: 'minecraft:leather' - } -) + Item.of('minecraft:leather_leggings', 1), + [ + 'AAA', + 'A A', + 'A A' + ], + { + A: 'minecraft:leather' + } + ) event.shaped( - Item.of('minecraft:leather_boots', 1), - [ - 'A A', - 'A A', - ' ' - ], - { - A: 'minecraft:leather' - } -) -}) \ No newline at end of file + Item.of('minecraft:leather_boots', 1), + [ + 'A A', + 'A A', + ' ' + ], + { + A: 'minecraft:leather' + } + ) +}) diff --git a/kubejs/server_scripts/Armor/Vanilla/Netherite.js b/kubejs/server_scripts/Armor/Vanilla/Netherite.js index 607953d5..189ad348 100644 --- a/kubejs/server_scripts/Armor/Vanilla/Netherite.js +++ b/kubejs/server_scripts/Armor/Vanilla/Netherite.js @@ -1,67 +1,65 @@ ServerEvents.recipes(event => { - - event.recipes.createMechanicalCrafting( - Item.of('minecraft:netherite_helmet', 1), - [ - 'AAAAAAA', - 'ABBBBBA', - 'ABCCCBA', - 'AB C BA', - 'AB BA' - ], - { - A: 'gtceu:tungsten_carbide_plate', - B: 'gtceu:tungsten_steel_plate', - C: 'kubejs:netherite_plate' - } - ) event.recipes.createMechanicalCrafting( - Item.of('minecraft:netherite_chestplate', 1), - [ - 'ABBB BBBA', - 'ABBCCCBBA', - ' ABCBA ', - ' ABCBA ', - ' ABBBA ', - ' AAAAA ' - ], - { - A: 'gtceu:tungsten_carbide_plate', - B: 'gtceu:tungsten_steel_plate', - C: 'kubejs:netherite_plate' - } - ) + Item.of('minecraft:netherite_helmet', 1), + [ + 'AAAAAAA', + 'ABBBBBA', + 'ABCCCBA', + 'AB C BA', + 'AB BA' + ], + { + A: 'gtceu:tungsten_carbide_plate', + B: 'gtceu:tungsten_steel_plate', + C: 'kubejs:netherite_plate' + } + ) event.recipes.createMechanicalCrafting( - Item.of('minecraft:netherite_leggings', 1), - [ - 'AAAAAA', - 'ABBBBA', - 'ABCCBA', - 'AB BA', - 'AB BA', - 'AB BA', - 'AB BA' - ], - { - A: 'gtceu:tungsten_carbide_plate', - B: 'gtceu:tungsten_steel_plate', - C: 'kubejs:netherite_plate' - } - ) + Item.of('minecraft:netherite_chestplate', 1), + [ + 'ABBB BBBA', + 'ABBCCCBBA', + ' ABCBA ', + ' ABCBA ', + ' ABBBA ', + ' AAAAA ' + ], + { + A: 'gtceu:tungsten_carbide_plate', + B: 'gtceu:tungsten_steel_plate', + C: 'kubejs:netherite_plate' + } + ) event.recipes.createMechanicalCrafting( - Item.of('minecraft:netherite_boots'), - [ - ' ABA ABA ', - ' ABA ABA ', - ' ABA ABA ', - ' ABA ABA ', - 'CAA AAC' - ], - { - A: 'gtceu:tungsten_carbide_plate', - B: 'gtceu:tungsten_steel_plate', - C: 'kubejs:netherite_plate' - } - ) - - }) \ No newline at end of file + Item.of('minecraft:netherite_leggings', 1), + [ + 'AAAAAA', + 'ABBBBA', + 'ABCCBA', + 'AB BA', + 'AB BA', + 'AB BA', + 'AB BA' + ], + { + A: 'gtceu:tungsten_carbide_plate', + B: 'gtceu:tungsten_steel_plate', + C: 'kubejs:netherite_plate' + } + ) + event.recipes.createMechanicalCrafting( + Item.of('minecraft:netherite_boots'), + [ + ' ABA ABA ', + ' ABA ABA ', + ' ABA ABA ', + ' ABA ABA ', + 'CAA AAC' + ], + { + A: 'gtceu:tungsten_carbide_plate', + B: 'gtceu:tungsten_steel_plate', + C: 'kubejs:netherite_plate' + } + ) +}) diff --git a/kubejs/server_scripts/GregMultiRecipe.js b/kubejs/server_scripts/GregMultiRecipe.js index 9c8ad94c..3b662014 100644 --- a/kubejs/server_scripts/GregMultiRecipe.js +++ b/kubejs/server_scripts/GregMultiRecipe.js @@ -1,12 +1,11 @@ ServerEvents.recipes(event => { + event.remove({ type: 'gtceu:ilmenite_ore' }) - event.remove({type: 'gtceu:ilmenite_ore'}) - - - event.recipes.gtceu.ore_proc('gtceu:multi') //'gtceu:test' + event.recipes.gtceu + .ore_proc('gtceu:multi') //'gtceu:test' .itemInputs('#forge:ores/ilmenite') .itemOutputs('2x gtceu:raw_ilmenite') .inputFluids('gtceu:sulfuric_acid 100') - .duration(100) - .EUt(512) -}) \ No newline at end of file + .duration(100) + .EUt(512) +}) diff --git a/kubejs/server_scripts/Items/Compass.js b/kubejs/server_scripts/Items/Compass.js index 73b6cd1d..5417bd0f 100644 --- a/kubejs/server_scripts/Items/Compass.js +++ b/kubejs/server_scripts/Items/Compass.js @@ -1,52 +1,52 @@ ServerEvents.recipes(event => { //removal event.remove({output: 'naturescompass:naturescompass'}) - - //NatureCompass + //NatureCompass event.shaped( - Item.of('naturescompass:naturescompass', 1), - [ - 'AFB', - 'FEF', - 'CGD' - ], - { - A: '@pamhc2trees', - B: '@pamhc2crops', - C: '@pamhc2foodextended', - D: '@pamhc2foodcore', - E: 'minecraft:compass', - F: 'gtceu:treated_wood_planks', - G: 'create:bar_of_chocolate' - } - ) + Item.of('naturescompass:naturescompass', 1), + [ + 'AFB', + 'FEF', + 'CGD' + ], + { + A: '@pamhc2trees', + B: '@pamhc2crops', + C: '@pamhc2foodextended', + D: '@pamhc2foodcore', + E: 'minecraft:compass', + F: 'gtceu:treated_wood_planks', + G: 'create:bar_of_chocolate' + } + ) - //EmptyCompass - event.shaped( - Item.of('kubejs:empty_compass', 1), - [ - ' B ', - 'BAB', - ' B ' - ], - { - A: 'gtceu:steel_plate', - B: 'gtceu:tin_ingot' - } - ) - - let empty_compass = 'kubejs:empty_compass'; + //EmptyCompass + event.shaped( + Item.of('kubejs:empty_compass', 1), + [ + ' B ', + 'BAB', + ' B ' + ], + { + A: 'gtceu:steel_plate', + B: 'gtceu:tin_ingot' + } + ) - event.remove({output: 'minecraft:compass'}); + let empty_compass = 'kubejs:empty_compass' - event.recipes.createSequencedAssembly([ - 'minecraft:compass', - ], empty_compass, [ - event.recipes.createFilling('kubejs:empty_compass', ['kubejs:empty_compass', Fluid.of('minecraft:water', 1000)]), - event.recipes.createDeploying('kubejs:empty_compass', ['kubejs:empty_compass', 'gtceu:magnetic_iron_rod']), - event.recipes.createDeploying('kubejs:empty_compass', ['kubejs:empty_compass', 'gtceu:red_alloy_bolt']), - event.recipes.createDeploying('kubejs:empty_compass', ['kubejs:empty_compass', 'minecraft:glass_pane']) - ]).transitionalItem('kubejs:empty_compass').loops(1) + event.remove({output: 'minecraft:compass'}) -}) \ No newline at end of file + event.recipes.createSequencedAssembly( + ['minecraft:compass'], + empty_compass, + [ + event.recipes.createFilling('kubejs:empty_compass', ['kubejs:empty_compass', Fluid.of('minecraft:water', 1000)]), + event.recipes.createDeploying('kubejs:empty_compass', ['kubejs:empty_compass', 'gtceu:magnetic_iron_rod']), + event.recipes.createDeploying('kubejs:empty_compass', ['kubejs:empty_compass', 'gtceu:red_alloy_bolt']), + event.recipes.createDeploying('kubejs:empty_compass', ['kubejs:empty_compass', 'minecraft:glass_pane']) + ] + ).transitionalItem('kubejs:empty_compass').loops(1) +}) diff --git a/kubejs/server_scripts/Items/Piston.js b/kubejs/server_scripts/Items/Piston.js index 4a13015b..ed9e7a0c 100644 --- a/kubejs/server_scripts/Items/Piston.js +++ b/kubejs/server_scripts/Items/Piston.js @@ -1,21 +1,20 @@ ServerEvents.recipes(event => { //removal event.remove({output: 'minecraft:piston'}) - - event.shaped( - Item.of( 'minecraft:piston', 1), - [ - 'DDD', - 'ABA', - 'ECE' - ], - { - A: '#forge:cobblestone', - B: 'gtceu:bronze_frame', - C: 'gtceu:red_alloy_plate', - D: 'gtceu:treated_wood_plate', - E: 'gtceu:tin_spring' - } - ) - -}) \ No newline at end of file + + event.shaped( + Item.of('minecraft:piston', 1), + [ + 'DDD', + 'ABA', + 'ECE' + ], + { + A: '#forge:cobblestone', + B: 'gtceu:bronze_frame', + C: 'gtceu:red_alloy_plate', + D: 'gtceu:treated_wood_plate', + E: 'gtceu:tin_spring' + } + ) +}) diff --git a/kubejs/server_scripts/JSONRecipes/Ad_Astra/T1Rocket.js b/kubejs/server_scripts/JSONRecipes/Ad_Astra/T1Rocket.js index d6892fcc..8bfac864 100644 --- a/kubejs/server_scripts/JSONRecipes/Ad_Astra/T1Rocket.js +++ b/kubejs/server_scripts/JSONRecipes/Ad_Astra/T1Rocket.js @@ -1,85 +1,82 @@ -ServerEvents.recipes (event => { +ServerEvents.recipes(event => { event.remove({ output: 'ad_astra:tier_1_rocket' }) event.remove({ output: 'ad_astra:tier_2_rocket' }) event.remove({ output: 'ad_astra:tier_3_rocket' }) event.remove({ output: 'ad_astra:tier_4_rocket' }) event.custom({ - - - "type": "ad_astra:nasa_workbench", - "ingredients": [ - { - "ingredient": { - "item": 'kubejs:stainless_steel_cone' - } - }, - { - "ingredient": { - "item": "gtceu:stainless_steel_block" - } - }, - { - "ingredient": { - "item": "gtceu:stainless_steel_block" - } - }, - { - "ingredient": { - "item": "gtceu:stainless_steel_block" - } - }, - { - "ingredient": { - "item": "gtceu:stainless_steel_block" - } - }, - { - "ingredient": { - "item": "gtceu:stainless_steel_block" - } - }, - { - "ingredient": { - "item": "gtceu:stainless_steel_block" - } - }, - { - "ingredient": { - "item": "kubejs:stainless_steel_fin" - } - }, - { - "ingredient": { - "item": 'gtceu:hv_super_tank' - } - }, - { - "ingredient": { - "item": 'gtceu:hv_super_tank' - } - }, - { - "ingredient": { - "item": "kubejs:stainless_steel_fin" - } - }, - { - "ingredient": { - "item": "kubejs:stainless_steel_fin" - } - }, - { - "ingredient": { - "item": "kubejs:stainless_steel_engine" - } - }, - { - "ingredient": { - "item": "kubejs:stainless_steel_fin" - } - } - ], - "output": "ad_astra:tier_1_rocket" + type: 'ad_astra:nasa_workbench', + ingredients: [ + { + ingredient: { + item: 'kubejs:stainless_steel_cone', + }, + }, + { + ingredient: { + item: 'gtceu:stainless_steel_block', + }, + }, + { + ingredient: { + item: 'gtceu:stainless_steel_block', + }, + }, + { + ingredient: { + item: 'gtceu:stainless_steel_block', + }, + }, + { + ingredient: { + item: 'gtceu:stainless_steel_block', + }, + }, + { + ingredient: { + item: 'gtceu:stainless_steel_block', + }, + }, + { + ingredient: { + item: 'gtceu:stainless_steel_block', + }, + }, + { + ingredient: { + item: 'kubejs:stainless_steel_fin', + }, + }, + { + ingredient: { + item: 'gtceu:hv_super_tank', + }, + }, + { + ingredient: { + item: 'gtceu:hv_super_tank', + }, + }, + { + ingredient: { + item: 'kubejs:stainless_steel_fin', + }, + }, + { + ingredient: { + item: 'kubejs:stainless_steel_fin', + }, + }, + { + ingredient: { + item: 'kubejs:stainless_steel_engine', + }, + }, + { + ingredient: { + item: 'kubejs:stainless_steel_fin', + }, + }, + ], + output: 'ad_astra:tier_1_rocket', }) - -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/JSONRecipes/Ad_Astra/T2Rocket.js b/kubejs/server_scripts/JSONRecipes/Ad_Astra/T2Rocket.js index 81545e33..b925e01c 100644 --- a/kubejs/server_scripts/JSONRecipes/Ad_Astra/T2Rocket.js +++ b/kubejs/server_scripts/JSONRecipes/Ad_Astra/T2Rocket.js @@ -1,81 +1,78 @@ -ServerEvents.recipes (event => { +ServerEvents.recipes(event => { event.custom({ - - - "type": "ad_astra:nasa_workbench", - "ingredients": [ - { - "ingredient": { - "item": 'kubejs:tungsten_steel_cone' - } - }, - { - "ingredient": { - "item": "gtceu:tungsten_carbide_block" - } - }, - { - "ingredient": { - "item": "gtceu:tungsten_carbide_block" - } - }, - { - "ingredient": { - "item": "gtceu:tungsten_carbide_block" - } - }, - { - "ingredient": { - "item": "gtceu:tungsten_carbide_block" - } - }, - { - "ingredient": { - "item": "gtceu:tungsten_carbide_block" - } - }, - { - "ingredient": { - "item": "gtceu:tungsten_carbide_block" - } - }, - { - "ingredient": { - "item": "kubejs:tungsten_steel_fin" - } - }, - { - "ingredient": { - "item": 'gtceu:ev_super_tank' - } - }, - { - "ingredient": { - "item": 'gtceu:ev_super_tank' - } - }, - { - "ingredient": { - "item": "kubejs:tungsten_steel_fin" - } - }, - { - "ingredient": { - "item": "kubejs:tungsten_steel_fin" - } - }, - { - "ingredient": { - "item": "kubejs:tungsten_steel_engine" - } - }, - { - "ingredient": { - "item": "kubejs:tungsten_steel_fin" - } - } - ], - "output": "ad_astra:tier_2_rocket" + type: 'ad_astra:nasa_workbench', + ingredients: [ + { + ingredient: { + item: 'kubejs:tungsten_steel_cone', + }, + }, + { + ingredient: { + item: 'gtceu:tungsten_carbide_block', + }, + }, + { + ingredient: { + item: 'gtceu:tungsten_carbide_block', + }, + }, + { + ingredient: { + item: 'gtceu:tungsten_carbide_block', + }, + }, + { + ingredient: { + item: 'gtceu:tungsten_carbide_block', + }, + }, + { + ingredient: { + item: 'gtceu:tungsten_carbide_block', + }, + }, + { + ingredient: { + item: 'gtceu:tungsten_carbide_block', + }, + }, + { + ingredient: { + item: 'kubejs:tungsten_steel_fin', + }, + }, + { + ingredient: { + item: 'gtceu:ev_super_tank', + }, + }, + { + ingredient: { + item: 'gtceu:ev_super_tank', + }, + }, + { + ingredient: { + item: 'kubejs:tungsten_steel_fin', + }, + }, + { + ingredient: { + item: 'kubejs:tungsten_steel_fin', + }, + }, + { + ingredient: { + item: 'kubejs:tungsten_steel_engine', + }, + }, + { + ingredient: { + item: 'kubejs:tungsten_steel_fin', + }, + }, + ], + output: 'ad_astra:tier_2_rocket', }) - -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/JSONRecipes/Ad_Astra/T3Rocket.js b/kubejs/server_scripts/JSONRecipes/Ad_Astra/T3Rocket.js index 191cbbfc..cfbe79a2 100644 --- a/kubejs/server_scripts/JSONRecipes/Ad_Astra/T3Rocket.js +++ b/kubejs/server_scripts/JSONRecipes/Ad_Astra/T3Rocket.js @@ -1,81 +1,78 @@ -ServerEvents.recipes (event => { +ServerEvents.recipes(event => { event.custom({ - - - "type": "ad_astra:nasa_workbench", - "ingredients": [ - { - "ingredient": { - "item": 'kubejs:hsse_cone' - } - }, - { - "ingredient": { - "item": "gtceu:hsse_block" - } - }, - { - "ingredient": { - "item": "gtceu:hsse_block" - } - }, - { - "ingredient": { - "item": "gtceu:hsse_block" - } - }, - { - "ingredient": { - "item": "gtceu:hsse_block" - } - }, - { - "ingredient": { - "item": "gtceu:hsse_block" - } - }, - { - "ingredient": { - "item": "gtceu:hsse_block" - } - }, - { - "ingredient": { - "item": "kubejs:hsse_fin" - } - }, - { - "ingredient": { - "item": 'gtceu:iv_quantum_tank' - } - }, - { - "ingredient": { - "item": 'gtceu:iv_quantum_tank' - } - }, - { - "ingredient": { - "item": "kubejs:hsse_fin" - } - }, - { - "ingredient": { - "item": "kubejs:hsse_fin" - } - }, - { - "ingredient": { - "item": "kubejs:hsse_engine" - } - }, - { - "ingredient": { - "item": "kubejs:hsse_fin" - } - } - ], - "output": "ad_astra:tier_3_rocket" + type: 'ad_astra:nasa_workbench', + ingredients: [ + { + ingredient: { + item: 'kubejs:hsse_cone', + }, + }, + { + ingredient: { + item: 'gtceu:hsse_block', + }, + }, + { + ingredient: { + item: 'gtceu:hsse_block', + }, + }, + { + ingredient: { + item: 'gtceu:hsse_block', + }, + }, + { + ingredient: { + item: 'gtceu:hsse_block', + }, + }, + { + ingredient: { + item: 'gtceu:hsse_block', + }, + }, + { + ingredient: { + item: 'gtceu:hsse_block', + }, + }, + { + ingredient: { + item: 'kubejs:hsse_fin', + }, + }, + { + ingredient: { + item: 'gtceu:iv_quantum_tank', + }, + }, + { + ingredient: { + item: 'gtceu:iv_quantum_tank', + }, + }, + { + ingredient: { + item: 'kubejs:hsse_fin', + }, + }, + { + ingredient: { + item: 'kubejs:hsse_fin', + }, + }, + { + ingredient: { + item: 'kubejs:hsse_engine', + }, + }, + { + ingredient: { + item: 'kubejs:hsse_fin', + }, + }, + ], + output: 'ad_astra:tier_3_rocket', }) - -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/JSONRecipes/Ad_Astra/T4Rocket.js b/kubejs/server_scripts/JSONRecipes/Ad_Astra/T4Rocket.js index 4e89f19d..b235bac7 100644 --- a/kubejs/server_scripts/JSONRecipes/Ad_Astra/T4Rocket.js +++ b/kubejs/server_scripts/JSONRecipes/Ad_Astra/T4Rocket.js @@ -1,81 +1,78 @@ -ServerEvents.recipes (event => { +ServerEvents.recipes(event => { event.custom({ - - - "type": "ad_astra:nasa_workbench", - "ingredients": [ - { - "ingredient": { - "item": 'kubejs:trinium_cone' - } - }, - { - "ingredient": { - "item": "gtceu:trinium_block" - } - }, - { - "ingredient": { - "item": "gtceu:trinium_block" - } - }, - { - "ingredient": { - "item": "gtceu:trinium_block" - } - }, - { - "ingredient": { - "item": "gtceu:trinium_block" - } - }, - { - "ingredient": { - "item": "gtceu:trinium_block" - } - }, - { - "ingredient": { - "item": "gtceu:trinium_block" - } - }, - { - "ingredient": { - "item": "kubejs:trinium_fin" - } - }, - { - "ingredient": { - "item": 'gtceu:luv_quantum_tank' - } - }, - { - "ingredient": { - "item": 'gtceu:luv_quantum_tank' - } - }, - { - "ingredient": { - "item": "kubejs:trinium_fin" - } - }, - { - "ingredient": { - "item": "kubejs:trinium_fin" - } - }, - { - "ingredient": { - "item": "kubejs:trinium_engine" - } - }, - { - "ingredient": { - "item": "kubejs:trinium_fin" - } - } - ], - "output": "ad_astra:tier_4_rocket" + type: 'ad_astra:nasa_workbench', + ingredients: [ + { + ingredient: { + item: 'kubejs:trinium_cone', + }, + }, + { + ingredient: { + item: 'gtceu:trinium_block', + }, + }, + { + ingredient: { + item: 'gtceu:trinium_block', + }, + }, + { + ingredient: { + item: 'gtceu:trinium_block', + }, + }, + { + ingredient: { + item: 'gtceu:trinium_block', + }, + }, + { + ingredient: { + item: 'gtceu:trinium_block', + }, + }, + { + ingredient: { + item: 'gtceu:trinium_block', + }, + }, + { + ingredient: { + item: 'kubejs:trinium_fin', + }, + }, + { + ingredient: { + item: 'gtceu:luv_quantum_tank', + }, + }, + { + ingredient: { + item: 'gtceu:luv_quantum_tank', + }, + }, + { + ingredient: { + item: 'kubejs:trinium_fin', + }, + }, + { + ingredient: { + item: 'kubejs:trinium_fin', + }, + }, + { + ingredient: { + item: 'kubejs:trinium_engine', + }, + }, + { + ingredient: { + item: 'kubejs:trinium_fin', + }, + }, + ], + output: 'ad_astra:tier_4_rocket', }) - -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/Mods/AE2.js b/kubejs/server_scripts/Mods/AE2.js index 2606f91e..d1b63305 100644 --- a/kubejs/server_scripts/Mods/AE2.js +++ b/kubejs/server_scripts/Mods/AE2.js @@ -10,272 +10,269 @@ ServerEvents.recipes(event => { event.remove({ output: /ae2:(.*)_(.*)k/ }) event.remove({ id: 'ae2:charger/charged_certus_quartz_crystal' }) - event.shaped( - Item.of('ae2:energy_acceptor'), - [ - 'CCC', - 'ADA', - 'ABA' - ], - { - A:'ae2:fluix_block', - B:'ae2:energy_cell', - C:'gtceu:polyvinyl_chloride_foil', - D:'#forge:circuits/hv' - } + Item.of('ae2:energy_acceptor'), + [ + 'CCC', + 'ADA', + 'ABA' + ], + { + A:'ae2:fluix_block', + B:'ae2:energy_cell', + C:'gtceu:polyvinyl_chloride_foil', + D:'#forge:circuits/hv' + } ) - + event.shaped( - Item.of('ae2:controller'), - [ - 'CCC', - 'ADA', - 'ABA' - ], - { - A:'ae2:fluix_block', - B:'ae2:chest', - C:'gtceu:polyvinyl_chloride_foil', - D:'#forge:circuits/hv' - } + Item.of('ae2:controller'), + [ + 'CCC', + 'ADA', + 'ABA' + ], + { + A:'ae2:fluix_block', + B:'ae2:chest', + C:'gtceu:polyvinyl_chloride_foil', + D:'#forge:circuits/hv' + } ) + event.shaped( - Item.of('ae2:chest'), - [ - 'EDE', - 'AFA', - 'CBC' - ], - { - A:'ae2:fluix_covered_cable', - B:'ae2:terminal', - C:'gtceu:polyethylene_foil', - D:'#forge:circuits/mv', - E:'minecraft:glass', - F:'gtceu:hv_machine_casing' - } + Item.of('ae2:chest'), + [ + 'EDE', + 'AFA', + 'CBC' + ], + { + A:'ae2:fluix_covered_cable', + B:'ae2:terminal', + C:'gtceu:polyethylene_foil', + D:'#forge:circuits/mv', + E:'minecraft:glass', + F:'gtceu:hv_machine_casing' + } ) + event.shaped( - Item.of('ae2:item_storage_cell_1k'), - [ - 'ABA', - 'BCB', - 'DDD' - ], - { - A:'ae2:quartz_glass', - B:'gtceu:rubber_plate', - C:'ae2:cell_component_1k', - D:'gtceu:wrought_iron_plate' - } + Item.of('ae2:item_storage_cell_1k'), + [ + 'ABA', + 'BCB', + 'DDD' + ], + { + A:'ae2:quartz_glass', + B:'gtceu:rubber_plate', + C:'ae2:cell_component_1k', + D:'gtceu:wrought_iron_plate' + } ) - - + event.shaped( - Item.of('ae2:item_storage_cell_4k'), - [ - 'AEA', - 'BCB', - 'DDD' - ], - { - A:'ae2:quartz_glass', - B:'gtceu:polyethylene_plate', - C:'ae2:cell_component_4k', - D:'gtceu:steel_plate', - E:'#forge:circuits/lv' - } + Item.of('ae2:item_storage_cell_4k'), + [ + 'AEA', + 'BCB', + 'DDD' + ], + { + A:'ae2:quartz_glass', + B:'gtceu:polyethylene_plate', + C:'ae2:cell_component_4k', + D:'gtceu:steel_plate', + E:'#forge:circuits/lv' + } ) - - + event.shaped( - Item.of('ae2:item_storage_cell_16k'), - [ - 'AEA', - 'BCB', - 'DDD' - ], - { - A:'ae2:quartz_glass', - B:'gtceu:polyvinyl_chloride_plate', - C:'ae2:cell_component_16k', - D:'gtceu:vanadium_steel_plate', - E:'#forge:circuits/mv' - } + Item.of('ae2:item_storage_cell_16k'), + [ + 'AEA', + 'BCB', + 'DDD' + ], + { + A:'ae2:quartz_glass', + B:'gtceu:polyvinyl_chloride_plate', + C:'ae2:cell_component_16k', + D:'gtceu:vanadium_steel_plate', + E:'#forge:circuits/mv' + } ) - - + event.shaped( - Item.of('ae2:item_storage_cell_64k'), - [ - 'AEA', - 'BCB', - 'DDD' - ], - { - A:'ae2:quartz_glass', - B:'gtceu:polytetrafluoroethylene_plate', - C:'ae2:cell_component_64k', - D:'gtceu:stainless_steel_plate', - E:'#forge:circuits/hv' - } + Item.of('ae2:item_storage_cell_64k'), + [ + 'AEA', + 'BCB', + 'DDD' + ], + { + A:'ae2:quartz_glass', + B:'gtceu:polytetrafluoroethylene_plate', + C:'ae2:cell_component_64k', + D:'gtceu:stainless_steel_plate', + E:'#forge:circuits/hv' + } ) - + event.shaped( - Item.of('ae2:item_storage_cell_256k'), - [ - 'AEA', - 'BCB', - 'DDD' - ], - { - A:'ae2:quartz_glass', - B:'gtceu:polybenzimidazole_plate', - C:'ae2:cell_component_256k', - D:'gtceu:tungsten_steel_plate', - E:'#forge:circuits/ev' - } + Item.of('ae2:item_storage_cell_256k'), + [ + 'AEA', + 'BCB', + 'DDD' + ], + { + A:'ae2:quartz_glass', + B:'gtceu:polybenzimidazole_plate', + C:'ae2:cell_component_256k', + D:'gtceu:tungsten_steel_plate', + E:'#forge:circuits/ev' + } ) - + event.shaped( - Item.of('ae2:blank_pattern'), - [ - 'AEA', - 'BCB', - 'DDD' - ], - { - A:'ae2:quartz_glass', - B:'gtceu:polyvinyl_chloride_foil', - C:'#forge:gems/certus_quartz', - D:'gtceu:stainless_steel_plate', - E:'#forge:circuits/hv' - } + Item.of('ae2:blank_pattern'), + [ + 'AEA', + 'BCB', + 'DDD' + ], + { + A:'ae2:quartz_glass', + B:'gtceu:polyvinyl_chloride_foil', + C:'#forge:gems/certus_quartz', + D:'gtceu:stainless_steel_plate', + E:'#forge:circuits/hv' + } ) - + event.shaped( - Item.of('ae2:fluid_storage_cell_1k'), - [ - 'ABA', - 'BCB', - 'DDD' - ], - { - A:'gtceu:annealed_copper_double_plate', - B:'gtceu:rubber_plate', - C:'ae2:cell_component_1k', - D:'gtceu:wrought_iron_plate' - } + Item.of('ae2:fluid_storage_cell_1k'), + [ + 'ABA', + 'BCB', + 'DDD' + ], + { + A:'gtceu:annealed_copper_double_plate', + B:'gtceu:rubber_plate', + C:'ae2:cell_component_1k', + D:'gtceu:wrought_iron_plate' + } ) - - + event.shaped( - Item.of('ae2:fluid_storage_cell_4k'), - [ - 'AEA', - 'BCB', - 'DDD' - ], - { - A:'gtceu:annealed_copper_double_plate', - B:'gtceu:polyethylene_plate', - C:'ae2:cell_component_4k', - D:'gtceu:steel_plate', - E:'#forge:circuits/lv' - } + Item.of('ae2:fluid_storage_cell_4k'), + [ + 'AEA', + 'BCB', + 'DDD' + ], + { + A:'gtceu:annealed_copper_double_plate', + B:'gtceu:polyethylene_plate', + C:'ae2:cell_component_4k', + D:'gtceu:steel_plate', + E:'#forge:circuits/lv' + } ) - - + event.shaped( - Item.of('ae2:fluid_storage_cell_16k'), - [ - 'AEA', - 'BCB', - 'DDD' - ], - { - A:'gtceu:annealed_copper_double_plate', - B:'gtceu:polyvinyl_chloride_plate', - C:'ae2:cell_component_16k', - D:'gtceu:vanadium_steel_plate', - E:'#forge:circuits/mv' - } + Item.of('ae2:fluid_storage_cell_16k'), + [ + 'AEA', + 'BCB', + 'DDD' + ], + { + A:'gtceu:annealed_copper_double_plate', + B:'gtceu:polyvinyl_chloride_plate', + C:'ae2:cell_component_16k', + D:'gtceu:vanadium_steel_plate', + E:'#forge:circuits/mv' + } ) - - - event.shaped('ae2:fluid_storage_cell_64k', [ - 'AEA', - 'BCB', - 'DDD' - ],{ - A:'gtceu:annealed_copper_double_plate', - B:'gtceu:polytetrafluoroethylene_plate', - C:'ae2:cell_component_64k', - D:'gtceu:stainless_steel_plate', - E:'#forge:circuits/hv' - } + + event.shaped('ae2:fluid_storage_cell_64k', + [ + 'AEA', + 'BCB', + 'DDD' + ], + { + A:'gtceu:annealed_copper_double_plate', + B:'gtceu:polytetrafluoroethylene_plate', + C:'ae2:cell_component_64k', + D:'gtceu:stainless_steel_plate', + E:'#forge:circuits/hv' + } ) - + event.shaped( - Item.of('ae2:fluid_storage_cell_256k'), - [ - 'AEA', - 'BCB', - 'DDD' - ], - { - A:'gtceu:annealed_copper_double_plate', - B:'gtceu:polybenzimidazole_plate', - C:'ae2:cell_component_256k', - D:'gtceu:tungsten_steel_plate', - E:'#forge:circuits/ev' - } + Item.of('ae2:fluid_storage_cell_256k'), + [ + 'AEA', + 'BCB', + 'DDD' + ], + { + A:'gtceu:annealed_copper_double_plate', + B:'gtceu:polybenzimidazole_plate', + C:'ae2:cell_component_256k', + D:'gtceu:tungsten_steel_plate', + E:'#forge:circuits/ev' + } ) - + event.shaped( - Item.of('ae2:cell_workbench'), - [ - 'BCB', - 'BAB', - 'BBB' - ], - { - A:'ae2:chest', - B:'gtceu:stainless_steel_plate', - C:'ae2:calculation_processor' - } + Item.of('ae2:cell_workbench'), + [ + 'BCB', + 'BAB', + 'BBB' + ], + { + A:'ae2:chest', + B:'gtceu:stainless_steel_plate', + C:'ae2:calculation_processor' + } ) - - event.recipes.createMechanicalCrafting(Item.of('ae2:creative_item_cell'), - - [ - 'CBC', - 'ADA', - 'AAA' - ], - { - A:'avaritia:infinity_ingot', - B:'gtceu:wetware_processor_mainframe', - C:'kubejs:ruthenium_trinium_americium_neutronate_plate', - D:'kubejs:infinity_me_storage_wafer' - } - ) - event.recipes.createMechanicalCrafting(Item.of('ae2:creative_fluid_cell'), - - [ - 'CBC', - 'ADA', - 'AAA' - ], - { - A:'avaritia:infinity_ingot', - B:'gtceu:wetware_processor_mainframe', - C:'gtceu:darmstadtium_double_plate', - D:'kubejs:infinity_me_storage_wafer' - } - ) + event.recipes.createMechanicalCrafting( + Item.of('ae2:creative_item_cell'), + [ + 'CBC', + 'ADA', + 'AAA' + ], + { + A:'avaritia:infinity_ingot', + B:'gtceu:wetware_processor_mainframe', + C:'kubejs:ruthenium_trinium_americium_neutronate_plate', + D:'kubejs:infinity_me_storage_wafer' + } + ) + + event.recipes.createMechanicalCrafting( + Item.of('ae2:creative_fluid_cell'), + [ + 'CBC', + 'ADA', + 'AAA' + ], + { + A:'avaritia:infinity_ingot', + B:'gtceu:wetware_processor_mainframe', + C:'gtceu:darmstadtium_double_plate', + D:'kubejs:infinity_me_storage_wafer' + } + ) //Wafers event.recipes.gtceu.cutter('kubejs:cutting_1k_wafer_lubricant') @@ -387,4 +384,3 @@ ServerEvents.recipes(event => { .itemOutputs('16x kubejs:256k_me_storage_base') .EUt(32767) }) - diff --git a/kubejs/server_scripts/Mods/Create.js b/kubejs/server_scripts/Mods/Create.js index 38b8bb5b..da5d7439 100644 --- a/kubejs/server_scripts/Mods/Create.js +++ b/kubejs/server_scripts/Mods/Create.js @@ -1,157 +1,157 @@ ServerEvents.recipes(event => { + var removed = [ + 'potato_cannon', + 'fluid_pipe', + 'smart_fluid_pipe', + 'mechanical_pump', + 'fluid_valve', + 'water_wheel', + 'large_water_wheel', + 'andesite_casing', + 'windmill_bearing', + 'steam_engine', + 'belt_connector', + 'cogwheel', + 'large_cogwheel', + 'brass_hand', + ] - var removed = [ - 'potato_cannon', - 'fluid_pipe', - 'smart_fluid_pipe', - 'mechanical_pump', - 'fluid_valve', - 'water_wheel', - 'large_water_wheel', - 'andesite_casing', - 'windmill_bearing', - 'steam_engine', - 'belt_connector', - 'cogwheel', - 'large_cogwheel', - 'brass_hand', - ] + removed.forEach(item => { + event.remove({output: `create:${item}`}) + }) - removed.forEach(item => { - event.remove({output: `create:${item}`}) - }) + event.remove({ output: 'create:iron_sheet'}) + event.remove({ output: 'create:brass_sheet'}) + event.remove({ output: 'create:copper_sheet'}) + event.remove({ output: 'create:golden_sheet'}) + event.remove({ id: 'create:iron_sheet'}) + + event.recipes.createMixing('minecraft:netherite_ingot', [ + 'minecraft:netherite_scrap', + 'minecraft:netherite_scrap', + 'minecraft:netherite_scrap', + 'minecraft:netherite_scrap', + Fluid.of('gtceu:hssg', 576) + ]).superheated() - event.remove({ output: 'create:iron_sheet'}) - event.remove({ output: 'create:brass_sheet'}) - event.remove({ output: 'create:copper_sheet'}) - event.remove({ output: 'create:golden_sheet'}) - event.remove({ id: 'create:iron_sheet'}) - - event.recipes.createMixing('minecraft:netherite_ingot', [ - 'minecraft:netherite_scrap', - 'minecraft:netherite_scrap', - 'minecraft:netherite_scrap', - 'minecraft:netherite_scrap', - Fluid.of('gtceu:hssg', 576) - ]).superheated() + event.recipes.createMixing('minecraft:turtle_helmet', [ + 'kubejs:unf_turtle_helmet', + Fluid.of('create:potion', 576, {Bottle:'REGULAR', Potion:'minecraft:water_breathing'}) + ]).heated() - event.recipes.createMixing('minecraft:turtle_helmet', [ - 'kubejs:unf_turtle_helmet', - Fluid.of('create:potion', 576, {Bottle:'REGULAR', Potion:'minecraft:water_breathing'}) - ]).heated() - - //mechanical belts - event.recipes.createMixing(Fluid.of('gtceu:rubber', 500), [ - Item.of('gtceu:raw_rubber_dust', 8), - Item.of('gtceu:sulfur_dust', 1) - ]).heated() + //mechanical belts + event.recipes.createMixing(Fluid.of('gtceu:rubber', 500), [ + Item.of('gtceu:raw_rubber_dust', 8), + Item.of('gtceu:sulfur_dust', 1) + ]).heated() - event.recipes.createFilling(Item.of('create:belt_connector', 1), [ - 'gtceu:steel_plate', - Fluid.of('gtceu:rubber', 250) - ]) + event.recipes.createFilling(Item.of('create:belt_connector', 1), [ + 'gtceu:steel_plate', + Fluid.of('gtceu:rubber', 250) + ]) - //#region SU gen - //water wheel small - event.shaped( - Item.of('create:water_wheel', 1), - [ - 'DCE', - 'CAC', - 'BCB' - ], - { - A:'create:andesite_casing', - B:'gtceu:bronze_screw', - C:'gtceu:wood_plate', - D:'#forge:tools/screwdrivers', - E:'#forge:tools/files', - } - ) - //water wheel large - event.shaped( - Item.of('create:large_water_wheel', 1), - [ - 'DCE', - 'CAC', - 'BCB' - ], - { - A:'create:andesite_casing', - B:'gtceu:steel_screw', - C:'gtceu:treated_wood_plate', - D:'#forge:tools/screwdrivers', - E:'#forge:tools/files', - } - ) - - - - //windmill bearing - event.shaped( - Item.of('create:windmill_bearing', 1), - [ - 'BDB', - 'CAC', - 'FEF' - ], - { - A:'gtceu:aluminium_frame', - B:'gtceu:steel_screw', - C:'gtceu:steel_plate', - D:'gtceu:treated_wood_plate', - E:'greate:large_steel_cogwheel', - F:'gtceu:steel_spring' - } - ) - //steam engine - event.recipes.createMechanicalCrafting( - Item.of('create:steam_engine', 1), - [ - ' C ', - ' F ', - ' C ', - 'BAB', - 'DED', - 'DDD', - ], - { - A: 'gtceu:lv_electric_piston', - B: 'gtceu:bronze_gear', - C: 'greate:steel_shaft', - D: 'gtceu:bronze_plate', - E: 'gtceu:steel_gearbox', - F: 'gtceu:gold_plate' - } - ) - // #endregion - // potato cannon - event.recipes.createMechanicalCrafting( - Item.of('create:potato_cannon', 1), - [ - 'ABCCC', - 'DD ' - ], - { - A:'greate:steel_cogwheel', - B:'create:precision_mechanism', - C:'gtceu:copper_normal_fluid_pipe', - D:'minecraft:copper_ingot', - }) + //#region SU gen + //water wheel small + event.shaped( + Item.of('create:water_wheel', 1), + [ + 'DCE', + 'CAC', + 'BCB' + ], + { + A:'create:andesite_casing', + B:'gtceu:bronze_screw', + C:'gtceu:wood_plate', + D:'#forge:tools/screwdrivers', + E:'#forge:tools/files', + } + ) + //water wheel large + event.shaped( + Item.of('create:large_water_wheel', 1), + [ + 'DCE', + 'CAC', + 'BCB' + ], + { + A:'create:andesite_casing', + B:'gtceu:steel_screw', + C:'gtceu:treated_wood_plate', + D:'#forge:tools/screwdrivers', + E:'#forge:tools/files', + } + ) - event.shaped( - Item.of('create:electron_tube', 1), - [ - ' B ', - 'CAC', - 'DDD', - ], - { - A: 'create:polished_rose_quartz', - B: 'gtceu:glass_tube', //needs recipe pre LV - C: 'gtceu:steel_bolt', - D: 'gtceu:copper_single_wire' - } - ) - }) \ No newline at end of file + + + //windmill bearing + event.shaped( + Item.of('create:windmill_bearing', 1), + [ + 'BDB', + 'CAC', + 'FEF' + ], + { + A:'gtceu:aluminium_frame', + B:'gtceu:steel_screw', + C:'gtceu:steel_plate', + D:'gtceu:treated_wood_plate', + E:'greate:large_steel_cogwheel', + F:'gtceu:steel_spring' + } + ) + //steam engine + event.recipes.createMechanicalCrafting( + Item.of('create:steam_engine', 1), + [ + ' C ', + ' F ', + ' C ', + 'BAB', + 'DED', + 'DDD', + ], + { + A: 'gtceu:lv_electric_piston', + B: 'gtceu:bronze_gear', + C: 'greate:steel_shaft', + D: 'gtceu:bronze_plate', + E: 'gtceu:steel_gearbox', + F: 'gtceu:gold_plate' + } +) + // #endregion + // potato cannon + event.recipes.createMechanicalCrafting( + Item.of('create:potato_cannon', 1), + [ + 'ABCCC', + 'DD ' + ], + { + A:'greate:steel_cogwheel', + B:'create:precision_mechanism', + C:'gtceu:copper_normal_fluid_pipe', + D:'minecraft:copper_ingot', + } + ) + + event.shaped( + Item.of('create:electron_tube', 1), + [ + ' B ', + 'CAC', + 'DDD', + ], + { + A: 'create:polished_rose_quartz', + B: 'gtceu:glass_tube', //needs recipe pre LV + C: 'gtceu:steel_bolt', + D: 'gtceu:copper_single_wire' + } + ) +}) diff --git a/kubejs/server_scripts/Mods/Greate.js b/kubejs/server_scripts/Mods/Greate.js index a6f00d3c..cdef6a58 100644 --- a/kubejs/server_scripts/Mods/Greate.js +++ b/kubejs/server_scripts/Mods/Greate.js @@ -1,76 +1,74 @@ // priority: 0 ServerEvents.recipes(event => { + let tiers = [ + 'andesite', + 'steel', + 'aluminium', + 'stainless_steel', + 'titanium', + 'tungstensteel', + 'palladium', + 'naquadah', + 'darmstadtium', + 'neutronium' + ]; - let tiers = [ - 'andesite', - 'steel', - 'aluminium', - 'stainless_steel', - 'titanium', - 'tungstensteel', - 'palladium', - 'naquadah', - 'darmstadtium', - 'neutronium' - ]; + let plates = [ + 'gtceu:wood_plate', + 'gtceu:stone_plate', + 'gtceu:steel_plate', + 'gtceu:aluminium_plate', + 'gtceu:stainless_steel_plate', + 'gtceu:titanium_plate', + 'gtceu:tungsten_steel_plate', + 'gtceu:palladium_plate', + 'gtceu:naquadah_plate', + 'gtceu:darmstadtium_plate' + ]; + let nuggets = [ + 'gtceu:zinc_nugget', + 'gtceu:steel_nugget', + 'gtceu:aluminium_nugget', + 'gtceu:stainless_steel_nugget', + 'gtceu:titanium_nugget', + 'gtceu:tungsten_steel_nugget', + 'gtceu:palladium_nugget', + 'gtceu:naquadah_nugget', + 'gtceu:darmstadtium_nugget', + 'gtceu:neutronium_nugget' + ]; - let plates = [ - 'gtceu:wood_plate', - 'gtceu:stone_plate', - 'gtceu:steel_plate', - 'gtceu:aluminium_plate', - 'gtceu:stainless_steel_plate', - 'gtceu:titanium_plate', - 'gtceu:tungsten_steel_plate', - 'gtceu:palladium_plate', - 'gtceu:naquadah_plate', - 'gtceu:darmstadtium_plate' - ]; - let nuggets = [ - 'gtceu:zinc_nugget', - 'gtceu:steel_nugget', - 'gtceu:aluminium_nugget', - 'gtceu:stainless_steel_nugget', - 'gtceu:titanium_nugget', - 'gtceu:tungsten_steel_nugget', - 'gtceu:palladium_nugget', - 'gtceu:naquadah_nugget', - 'gtceu:darmstadtium_nugget', - 'gtceu:neutronium_nugget' - ]; + let materials = [ + 'minecraft:andesite', + 'minecraft:glowstone_dust', + 'minecraft:andesite', + 'minecraft:andesite', + 'minecraft:andesite', + 'minecraft:andesite', + 'minecraft:andesite', + 'minecraft:andesite', + 'minecraft:andesite', + 'minecraft:andesite', + // TODO change after magic mods are established + ] - let materials = [ - 'minecraft:andesite', - 'minecraft:glowstone_dust', - 'minecraft:andesite', - 'minecraft:andesite', - 'minecraft:andesite', - 'minecraft:andesite', - 'minecraft:andesite', - 'minecraft:andesite', - 'minecraft:andesite', - 'minecraft:andesite', - // TODO change after magic mods are established - - ] - - tiers.forEach((tier, index) => { - // small cogwheel - event.recipes.create.deploying(`greate:${tier}_cogwheel`, [`greate:${tier}_shaft`, `${plates[index]}`]); - // large cogwheel - event.recipes.create.deploying(`greate:large_${tier}_cogwheel`, [`greate:${tier}_cogwheel`, `${plates[index]}`]); - event.recipes.create.sequenced_assembly([ - `greate:large_${tier}_cogwheel` - ], `greate:${tier}_shaft`, [ - event.recipes.create.deploying(`greate:${tier}_cogwheel`, [`greate:${tier}_cogwheel`, `${plates[index]}`]) - ]).transitionalItem(`greate:${tier}_cogwheel`).loops(2) - // alloys - event.recipes.create.mixing( - Item.of(`greate:${tier}_alloy`, 1), - [ - `${materials[index]}`, - `${nuggets[index]}` - ] - ) - }); -}); + tiers.forEach((tier, index) => { + // small cogwheel + event.recipes.create.deploying(`greate:${tier}_cogwheel`, [`greate:${tier}_shaft`, `${plates[index]}`]); + // large cogwheel + event.recipes.create.deploying(`greate:large_${tier}_cogwheel`, [`greate:${tier}_cogwheel`, `${plates[index]}`]); + event.recipes.create.sequenced_assembly([ + `greate:large_${tier}_cogwheel` + ], `greate:${tier}_shaft`, [ + event.recipes.create.deploying(`greate:${tier}_cogwheel`, [`greate:${tier}_cogwheel`, `${plates[index]}`]) + ]).transitionalItem(`greate:${tier}_cogwheel`).loops(2) + // alloys + event.recipes.create.mixing( + Item.of(`greate:${tier}_alloy`, 1), + [ + `${materials[index]}`, + `${nuggets[index]}` + ] + ) + }) +}) diff --git a/kubejs/server_scripts/Mods/Greg/Greg.js b/kubejs/server_scripts/Mods/Greg/Greg.js index 9aa5dd48..14653d8c 100644 --- a/kubejs/server_scripts/Mods/Greg/Greg.js +++ b/kubejs/server_scripts/Mods/Greg/Greg.js @@ -1,27 +1,36 @@ // priority: 0 ServerEvents.recipes(event => { // #region removal - const tiers = ['lv', 'mv', 'hv', /*'ev', 'iv', 'luv', 'zpm', 'uv' */]; - const components = ['emitter', 'sensor', 'electric_motor', 'electric_piston', 'robot_arm', 'conveyor_module', 'electric_pump', 'fluid_regulator']; - event.remove({ output: 'gtceu:lp_steam_furnace'}) - tiers.forEach(tier => { - components.forEach(component => { - event.remove({output: `gtceu:${tier}_${component}`}); - }); - }); - //lv - event.remove({output: '#forge:circuits/lv'}) - //mv - event.remove({output: '#forge:circuits/mv'}) - //hv - event.remove({output: '#forge:circuits/hv'}) - - event.remove({id: 'gtceu:smelting/sticky_resin_from_slime'}) // <-- random bullshit go! - - event.remove({output: 'gtceu:vacuum_tube'}) + const tiers = ['lv', 'mv', 'hv' /*'ev', 'iv', 'luv', 'zpm', 'uv' */] + const components = [ + 'emitter', + 'sensor', + 'electric_motor', + 'electric_piston', + 'robot_arm', + 'conveyor_module', + 'electric_pump', + 'fluid_regulator', + ] + event.remove({ output: 'gtceu:lp_steam_furnace' }) + tiers.forEach(tier => { + components.forEach(component => { + event.remove({ output: `gtceu:${tier}_${component}` }) + }) + }) + //lv + event.remove({ output: '#forge:circuits/lv' }) + //mv + event.remove({ output: '#forge:circuits/mv' }) + //hv + event.remove({ output: '#forge:circuits/hv' }) + + event.remove({ id: 'gtceu:smelting/sticky_resin_from_slime' }) // <-- random bullshit go! + + event.remove({ output: 'gtceu:vacuum_tube' }) event.shaped( - Item.of('gtceu:wood_plate'), + Item.of('gtceu:wood_plate'), [ 'A', 'A', @@ -40,7 +49,9 @@ ServerEvents.recipes(event => { A:'gtceu:treated_wood_planks' } ) - event.shaped(Item.of('gtceu:stone_gear', 1), [ + event.shaped( + Item.of('gtceu:stone_gear', 1), + [ 'GFG', 'FPF', 'GFG', @@ -52,7 +63,8 @@ ServerEvents.recipes(event => { } ) - event.shaped(Item.of('gtceu:lp_steam_furnace', 1), + event.shaped( + Item.of('gtceu:lp_steam_furnace', 1), [ 'ABA', 'ACA', @@ -65,5 +77,4 @@ ServerEvents.recipes(event => { D:'minecraft:smoker' } ) - -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/Mods/Greg/bender.js b/kubejs/server_scripts/Mods/Greg/bender.js index f41a7926..cad7e498 100644 --- a/kubejs/server_scripts/Mods/Greg/bender.js +++ b/kubejs/server_scripts/Mods/Greg/bender.js @@ -1,15 +1,17 @@ ServerEvents.recipes(event => { - event.recipes.gtceu.bender('kubejs:bending_scute') - .duration(26) - .circuit(1) - .itemInputs('5x minecraft:scute') - .itemOutputs('kubejs:unf_turtle_helmet') - .EUt(24) + event.recipes.gtceu + .bender('kubejs:bending_scute') + .duration(26) + .circuit(1) + .itemInputs('5x minecraft:scute') + .itemOutputs('kubejs:unf_turtle_helmet') + .EUt(24) - event.recipes.gtceu.bender('kubejs:bending_ruthenium_trinium_americium_neutronate_ingot') - .duration(26) - .circuit(1) - .itemInputs('gtceu:ruthenium_trinium_americium_neutronate_ingot') - .itemOutputs('kubejs:ruthenium_trinium_americium_neutronate_plate') - .EUt(24) -}) \ No newline at end of file + event.recipes.gtceu + .bender('kubejs:bending_ruthenium_trinium_americium_neutronate_ingot') + .duration(26) + .circuit(1) + .itemInputs('gtceu:ruthenium_trinium_americium_neutronate_ingot') + .itemOutputs('kubejs:ruthenium_trinium_americium_neutronate_plate') + .EUt(24) +}) diff --git a/kubejs/server_scripts/Mods/Greg/circuit_assembler.js b/kubejs/server_scripts/Mods/Greg/circuit_assembler.js index 4e1fc220..3a181673 100644 --- a/kubejs/server_scripts/Mods/Greg/circuit_assembler.js +++ b/kubejs/server_scripts/Mods/Greg/circuit_assembler.js @@ -1,16 +1,27 @@ ServerEvents.recipes(event => { - event.recipes.gtceu.circuit_assembler('kubejs:circuit_assembler_nano_processor') - .duration(200) - .circuit(1) - .recipeConditions('cleanroom') - .itemInputs(['kubejs:inter_nano_processor', '2x gtceu:smd_resistor', '2x gtceu:smd_capacitor', '2x gtceu:smd_transistor', '2x #forge:wires/fine/electrum']) - .itemOutputs('2x gtceu:nano_processor') - .EUt(600) + event.recipes.gtceu + .circuit_assembler('kubejs:circuit_assembler_nano_processor') + .duration(200) + .circuit(1) + .recipeConditions('cleanroom') + .itemInputs([ + 'kubejs:inter_nano_processor', + '2x gtceu:smd_resistor', + '2x gtceu:smd_capacitor', + '2x gtceu:smd_transistor', + '2x #forge:wires/fine/electrum', + ]) + .itemOutputs('2x gtceu:nano_processor') + .EUt(600) - event.recipes.gtceu.circuit_assembler('kubejs:circuit_assembler_nano_processor_cheap') - .duration(100) - .recipeConditions('cleanroom') - .itemInputs(['kubejs:inter_nano_processor', '6x #forge:wires/fine/electrum']) - .itemOutputs('gtceu:nano_processor') - .EUt(600) -}) \ No newline at end of file + event.recipes.gtceu + .circuit_assembler('kubejs:circuit_assembler_nano_processor_cheap') + .duration(100) + .recipeConditions('cleanroom') + .itemInputs([ + 'kubejs:inter_nano_processor', + '6x #forge:wires/fine/electrum', + ]) + .itemOutputs('gtceu:nano_processor') + .EUt(600) +}) diff --git a/kubejs/server_scripts/Mods/Greg/engraver.js b/kubejs/server_scripts/Mods/Greg/engraver.js index b2910ec4..0dc8e283 100644 --- a/kubejs/server_scripts/Mods/Greg/engraver.js +++ b/kubejs/server_scripts/Mods/Greg/engraver.js @@ -1,150 +1,167 @@ ServerEvents.recipes(event => { - //Naquadah - event.recipes.gtceu.laser_engraver('kubejs:engraving_1k_me_storage_wafer_naquadah') - .duration(200) - .itemInputs('gtceu:naquadah_wafer') - .notConsumable('#forge:lenses/certus') - .itemOutputs('8x kubejs:1k_me_storage_wafer') - .circuit(1) - .EUt(1920) - - event.recipes.gtceu.laser_engraver('kubejs:engraving_4k_me_storage_wafer_naquadah') - .duration(200) - .itemInputs('gtceu:naquadah_wafer') - .notConsumable('#forge:lenses/certus') - .itemOutputs('8x kubejs:4k_me_storage_wafer') - .circuit(2) - .EUt(1920) - - event.recipes.gtceu.laser_engraver('kubejs:engraving_16k_me_storage_wafer_naquadah') - .duration(200) - .itemInputs('gtceu:naquadah_wafer') - .notConsumable('#forge:lenses/certus') - .itemOutputs('8x kubejs:16k_me_storage_wafer') - .circuit(3) - .EUt(1920) - - event.recipes.gtceu.laser_engraver('kubejs:engraving_64k_me_storage_wafer_naquadah') - .duration(200) - .itemInputs('gtceu:naquadah_wafer') - .notConsumable('#forge:lenses/certus') - .itemOutputs('4x kubejs:64k_me_storage_wafer') - .circuit(4) - .EUt(1920) - - event.recipes.gtceu.laser_engraver('kubejs:engraving_256k_me_storage_wafer_naquadah') - .duration(200) - .itemInputs('gtceu:naquadah_wafer') - .notConsumable('#forge:lenses/certus') - .itemOutputs('kubejs:256k_me_storage_wafer') - .circuit(5) - .EUt(1920) - - - //Neutronium - event.recipes.gtceu.laser_engraver('kubejs:engraving_1k_me_storage_wafer_neutronium') - .duration(50) - .itemInputs('gtceu:neutronium_wafer') - .notConsumable('#forge:lenses/certus') - .itemOutputs('16x kubejs:1k_me_storage_wafer') - .circuit(1) - .EUt(1920) - - event.recipes.gtceu.laser_engraver('kubejs:engraving_4k_me_storage_wafer_neutronium') - .duration(50) - .itemInputs('gtceu:neutronium_wafer') - .notConsumable('#forge:lenses/certus') - .itemOutputs('16x kubejs:4k_me_storage_wafer') - .circuit(2) - .EUt(1920) - - event.recipes.gtceu.laser_engraver('kubejs:engraving_16k_me_storage_wafer_neutronium') - .duration(50) - .itemInputs('gtceu:neutronium_wafer') - .notConsumable('#forge:lenses/certus') - .itemOutputs('16x kubejs:16k_me_storage_wafer') - .circuit(3) - .EUt(1920) - - event.recipes.gtceu.laser_engraver('kubejs:engraving_64k_me_storage_wafer_neutronium') - .duration(50) - .itemInputs('gtceu:neutronium_wafer') - .notConsumable('#forge:lenses/certus') - .itemOutputs('8x kubejs:64k_me_storage_wafer') - .circuit(4) - .EUt(1920) - - event.recipes.gtceu.laser_engraver('kubejs:engraving_256k_me_storage_wafer_neutronium') - .duration(50) - .itemInputs('gtceu:neutronium_wafer') - .notConsumable('#forge:lenses/certus') - .itemOutputs('2x kubejs:256k_me_storage_wafer') - .circuit(5) - .EUt(1920) - - event.recipes.gtceu.laser_engraver('kubejs:engraving_infinity_me_storage_wafer_neutronium') - .duration(9000) - .itemInputs('gtceu:neutronium_wafer') - .notConsumable('#forge:lenses/certus') - .itemOutputs('kubejs:256k_me_storage_wafer') - .circuit(6) - .EUt(135000000) - - //Phosphourus - event.recipes.gtceu.laser_engraver('kubejs:engraving_1k_me_storage_wafer_phosphorus') - .duration(500) - .itemInputs('gtceu:phosphorus_wafer') - .notConsumable('#forge:lenses/certus') - .itemOutputs('4x kubejs:1k_me_storage_wafer') - .circuit(1) - .EUt(1920) - - event.recipes.gtceu.laser_engraver('kubejs:engraving_4k_me_storage_wafer_phosphorus') - .duration(500) - .itemInputs('gtceu:phosphorus_wafer') - .notConsumable('#forge:lenses/certus') - .itemOutputs('4x kubejs:4k_me_storage_wafer') - .circuit(2) - .EUt(1920) - - event.recipes.gtceu.laser_engraver('kubejs:engraving_16k_me_storage_wafer_phosphorus') - .duration(500) - .itemInputs('gtceu:phosphorus_wafer') - .notConsumable('#forge:lenses/certus') - .itemOutputs('4x kubejs:16k_me_storage_wafer') - .circuit(3) - .EUt(1920) - - event.recipes.gtceu.laser_engraver('kubejs:engraving_64k_me_storage_wafer_phosphorus') - .duration(500) - .itemInputs('gtceu:phosphorus_wafer') - .notConsumable('#forge:lenses/certus') - .itemOutputs('4x kubejs:64k_me_storage_wafer') - .circuit(4) - .EUt(1920) - - //Silicon - event.recipes.gtceu.laser_engraver('kubejs:engraving_1k_me_storage_wafer_silicon') - .duration(900) - .itemInputs('gtceu:silicon_wafer') - .notConsumable('#forge:lenses/certus') - .itemOutputs('kubejs:1k_me_storage_wafer') - .circuit(1) - .EUt(1920) - - event.recipes.gtceu.laser_engraver('kubejs:engraving_4k_me_storage_wafer_silicon') - .duration(900) - .itemInputs('gtceu:silicon_wafer') - .notConsumable('#forge:lenses/certus') - .itemOutputs('kubejs:4k_me_storage_wafer') - .circuit(2) - .EUt(1920) - - event.recipes.gtceu.laser_engraver('kubejs:engraving_16k_me_storage_wafer_silicon') - .duration(900) - .itemInputs('gtceu:silicon_wafer') - .notConsumable('#forge:lenses/certus') - .itemOutputs('kubejs:16k_me_storage_wafer') - .circuit(3) - .EUt(1920) -}) \ No newline at end of file + //Naquadah + event.recipes.gtceu + .laser_engraver('kubejs:engraving_1k_me_storage_wafer_naquadah') + .duration(200) + .itemInputs('gtceu:naquadah_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('8x kubejs:1k_me_storage_wafer') + .circuit(1) + .EUt(1920) + + event.recipes.gtceu + .laser_engraver('kubejs:engraving_4k_me_storage_wafer_naquadah') + .duration(200) + .itemInputs('gtceu:naquadah_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('8x kubejs:4k_me_storage_wafer') + .circuit(2) + .EUt(1920) + + event.recipes.gtceu + .laser_engraver('kubejs:engraving_16k_me_storage_wafer_naquadah') + .duration(200) + .itemInputs('gtceu:naquadah_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('8x kubejs:16k_me_storage_wafer') + .circuit(3) + .EUt(1920) + + event.recipes.gtceu + .laser_engraver('kubejs:engraving_64k_me_storage_wafer_naquadah') + .duration(200) + .itemInputs('gtceu:naquadah_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('4x kubejs:64k_me_storage_wafer') + .circuit(4) + .EUt(1920) + + event.recipes.gtceu + .laser_engraver('kubejs:engraving_256k_me_storage_wafer_naquadah') + .duration(200) + .itemInputs('gtceu:naquadah_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('kubejs:256k_me_storage_wafer') + .circuit(5) + .EUt(1920) + + //Neutronium + event.recipes.gtceu + .laser_engraver('kubejs:engraving_1k_me_storage_wafer_neutronium') + .duration(50) + .itemInputs('gtceu:neutronium_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('16x kubejs:1k_me_storage_wafer') + .circuit(1) + .EUt(1920) + + event.recipes.gtceu + .laser_engraver('kubejs:engraving_4k_me_storage_wafer_neutronium') + .duration(50) + .itemInputs('gtceu:neutronium_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('16x kubejs:4k_me_storage_wafer') + .circuit(2) + .EUt(1920) + + event.recipes.gtceu + .laser_engraver('kubejs:engraving_16k_me_storage_wafer_neutronium') + .duration(50) + .itemInputs('gtceu:neutronium_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('16x kubejs:16k_me_storage_wafer') + .circuit(3) + .EUt(1920) + + event.recipes.gtceu + .laser_engraver('kubejs:engraving_64k_me_storage_wafer_neutronium') + .duration(50) + .itemInputs('gtceu:neutronium_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('8x kubejs:64k_me_storage_wafer') + .circuit(4) + .EUt(1920) + + event.recipes.gtceu + .laser_engraver('kubejs:engraving_256k_me_storage_wafer_neutronium') + .duration(50) + .itemInputs('gtceu:neutronium_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('2x kubejs:256k_me_storage_wafer') + .circuit(5) + .EUt(1920) + + event.recipes.gtceu + .laser_engraver('kubejs:engraving_infinity_me_storage_wafer_neutronium') + .duration(9000) + .itemInputs('gtceu:neutronium_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('kubejs:256k_me_storage_wafer') + .circuit(6) + .EUt(135000000) + + //Phosphourus + event.recipes.gtceu + .laser_engraver('kubejs:engraving_1k_me_storage_wafer_phosphorus') + .duration(500) + .itemInputs('gtceu:phosphorus_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('4x kubejs:1k_me_storage_wafer') + .circuit(1) + .EUt(1920) + + event.recipes.gtceu + .laser_engraver('kubejs:engraving_4k_me_storage_wafer_phosphorus') + .duration(500) + .itemInputs('gtceu:phosphorus_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('4x kubejs:4k_me_storage_wafer') + .circuit(2) + .EUt(1920) + + event.recipes.gtceu + .laser_engraver('kubejs:engraving_16k_me_storage_wafer_phosphorus') + .duration(500) + .itemInputs('gtceu:phosphorus_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('4x kubejs:16k_me_storage_wafer') + .circuit(3) + .EUt(1920) + + event.recipes.gtceu + .laser_engraver('kubejs:engraving_64k_me_storage_wafer_phosphorus') + .duration(500) + .itemInputs('gtceu:phosphorus_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('4x kubejs:64k_me_storage_wafer') + .circuit(4) + .EUt(1920) + + //Silicon + event.recipes.gtceu + .laser_engraver('kubejs:engraving_1k_me_storage_wafer_silicon') + .duration(900) + .itemInputs('gtceu:silicon_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('kubejs:1k_me_storage_wafer') + .circuit(1) + .EUt(1920) + + event.recipes.gtceu + .laser_engraver('kubejs:engraving_4k_me_storage_wafer_silicon') + .duration(900) + .itemInputs('gtceu:silicon_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('kubejs:4k_me_storage_wafer') + .circuit(2) + .EUt(1920) + + event.recipes.gtceu + .laser_engraver('kubejs:engraving_16k_me_storage_wafer_silicon') + .duration(900) + .itemInputs('gtceu:silicon_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('kubejs:16k_me_storage_wafer') + .circuit(3) + .EUt(1920) +}) diff --git a/kubejs/server_scripts/Mods/IronChest.js b/kubejs/server_scripts/Mods/IronChest.js index 954bf0a6..95ef6e39 100644 --- a/kubejs/server_scripts/Mods/IronChest.js +++ b/kubejs/server_scripts/Mods/IronChest.js @@ -1,7 +1,26 @@ //priority: 0 - var screws = ['gtceu:copper_screw', 'gtceu:iron_screw', 'gtceu:gold_screw', 'gtceu:diamond_screw', 'gtceu:diamond_screw'] - var plates = ['gtceu:copper_double_plate', 'gtceu:iron_double_plate', 'gtceu:gold_double_plate', 'kubejs:double_diamond_plate', 'kubejs:double_obsidian_plate'] - var chests = ['minecraft:chest', 'ironchest:copper_chest', 'ironchest:iron_chest', 'ironchest:gold_chest', 'ironchest:diamond_chest', 'ironchest:obsidian_chest'] +var screws = [ + 'gtceu:copper_screw', + 'gtceu:iron_screw', + 'gtceu:gold_screw', + 'gtceu:diamond_screw', + 'gtceu:diamond_screw', +] +var plates = [ + 'gtceu:copper_double_plate', + 'gtceu:iron_double_plate', + 'gtceu:gold_double_plate', + 'kubejs:double_diamond_plate', + 'kubejs:double_obsidian_plate', +] +var chests = [ + 'minecraft:chest', + 'ironchest:copper_chest', + 'ironchest:iron_chest', + 'ironchest:gold_chest', + 'ironchest:diamond_chest', + 'ironchest:obsidian_chest', +] ServerEvents.recipes(event => { event.remove({ output: 'ironchest:crystal_chest' }) event.remove({ output: 'ironchest:copper_chest' }) @@ -9,38 +28,40 @@ ServerEvents.recipes(event => { event.remove({ output: 'ironchest:gold_chest' }) event.remove({ output: 'ironchest:diamond_chest' }) event.remove({ output: 'ironchest:obsidian_chest' }) - var i = 0; - while (i < chests.length - 1){ - console.info(i) - - event.shaped(Item.of(chests[i + 1]), - [ - 'ABA', - 'BCB', - 'DBE' - ], - { - A: Item.of(screws[i]), - B: Item.of(plates[i]), - C: Item.of(chests[i]), - D: '#forge:tools/screwdrivers', - E: '#forge:tools/hammers' + var i = 0 + while (i < chests.length - 1) { + console.info(i) + + event.shaped( + Item.of(chests[i + 1]), + [ + 'ABA', + 'BCB', + 'DBE' + ], + { + A: Item.of(screws[i]), + B: Item.of(plates[i]), + C: Item.of(chests[i]), + D: '#forge:tools/screwdrivers', + E: '#forge:tools/hammers' + } + ) + i++ } + event.shaped( + Item.of('ironchest:crystal_chest'), + [ + 'ABA', + 'BCB', + 'DBE' + ], + { + A: 'gtceu:tempered_glass', + B: 'gtceu:glass_plate', + C: 'ironchest:diamond_chest', + D: '#forge:tools/screwdrivers', + E: '#forge:tools/saws' + } ) - i++ -} - event.shaped(Item.of('ironchest:crystal_chest'), - [ - 'ABA', - 'BCB', - 'DBE' - ], - { - A: 'gtceu:tempered_glass', - B: 'gtceu:glass_plate', - C: 'ironchest:diamond_chest', - D: '#forge:tools/screwdrivers', - E: '#forge:tools/saws' - } - ) -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/Mods/SophisticatedBackpacks.js b/kubejs/server_scripts/Mods/SophisticatedBackpacks.js index 9ae5f69c..9705390d 100644 --- a/kubejs/server_scripts/Mods/SophisticatedBackpacks.js +++ b/kubejs/server_scripts/Mods/SophisticatedBackpacks.js @@ -1,51 +1,47 @@ ServerEvents.recipes(event => { - - - const backpack = ['sophisticatedbackpacks:backpack','sophisticatedbackpacks:upgrade_base', 'sophisticatedbackpacks:filter_upgrade', 'sophisticatedbackpacks:advanced_filter_upgrade', - 'sophisticatedbackpacks:tool_swapper_upgrade', 'sophisticatedbackpacks:advanced_tool_swapper_upgrade', 'sophisticatedbackpacks:advanced_magnet_upgrade', - 'sophisticatedbackpacks:magnet_upgrade', 'sophisticatedbackpacks:stack_upgrade_tier_3', 'sophisticatedbackpacks:stack_upgrade_tier_1', 'sophisticatedbackpacks:restock_upgrade', - 'sophisticatedbackpacks:advanced_restock_upgrade', 'sophisticatedbackpacks:advanced_void_upgrade', 'sophisticatedbackpacks:feeding_upgrade', 'sophisticatedbackpacks:advanced_refill_upgrade', - 'sophisticatedbackpacks:stack_upgrade_tier_4', 'sophisticatedbackpacks:stack_upgrade_tier_2', 'sophisticatedbackpacks:advanced_deposit_upgrade', 'sophisticatedbackpacks:deposit_upgrade', - 'sophisticatedbackpacks:void_upgrade', 'sophisticatedbackpacks:advanced_feeding_upgrade', 'sophisticatedbackpacks:refill_upgrade', - 'sophisticatedbackpacks:iron_backpack', 'sophisticatedbackpacks:gold_backpack', 'sophisticatedbackpacks:advanced_pickup_upgrade', 'sophisticatedbackpacks:pickup_upgrade', - 'sophisticatedbackpacks:diamond_backpack','sophisticatedbackpacks:inception_upgrade', - 'sophisticatedbackpacks:everlasting_upgrade', 'sophisticatedbackpacks:auto_blasting_upgrade', - 'sophisticatedbackpacks:auto_smoking_upgrade', 'sophisticatedbackpacks:auto_smelting_upgrade', - 'sophisticatedbackpacks:crafting_upgrade', 'sophisticatedbackpacks:smoking_upgrade', - 'sophisticatedbackpacks:stonecutter_upgrade', 'sophisticatedbackpacks:tank_upgrade', - 'sophisticatedbackpacks:battery_upgrade', 'sophisticatedbackpacks:advanced_pump_upgrade', - 'sophisticatedbackpacks:xp_pump_upgrade', 'sophisticatedbackpacks:smelting_upgrade', 'sophisticatedbackpacks:advanced_compacting_upgrade', - 'sophisticatedbackpacks:pump_upgrade','sophisticatedbackpacks:blasting_upgrade','sophisticatedbackpacks:compacting_upgrade'] - + const backpack = [ + 'sophisticatedbackpacks:backpack', 'sophisticatedbackpacks:upgrade_base', 'sophisticatedbackpacks:filter_upgrade', 'sophisticatedbackpacks:advanced_filter_upgrade', + 'sophisticatedbackpacks:tool_swapper_upgrade', 'sophisticatedbackpacks:advanced_tool_swapper_upgrade', 'sophisticatedbackpacks:advanced_magnet_upgrade', + 'sophisticatedbackpacks:magnet_upgrade', 'sophisticatedbackpacks:stack_upgrade_tier_3', 'sophisticatedbackpacks:stack_upgrade_tier_1', 'sophisticatedbackpacks:restock_upgrade', + 'sophisticatedbackpacks:advanced_restock_upgrade', 'sophisticatedbackpacks:advanced_void_upgrade', 'sophisticatedbackpacks:feeding_upgrade', 'sophisticatedbackpacks:advanced_refill_upgrade', + 'sophisticatedbackpacks:stack_upgrade_tier_4', 'sophisticatedbackpacks:stack_upgrade_tier_2', 'sophisticatedbackpacks:advanced_deposit_upgrade', 'sophisticatedbackpacks:deposit_upgrade', + 'sophisticatedbackpacks:void_upgrade', 'sophisticatedbackpacks:advanced_feeding_upgrade', 'sophisticatedbackpacks:refill_upgrade', + 'sophisticatedbackpacks:iron_backpack', 'sophisticatedbackpacks:gold_backpack', 'sophisticatedbackpacks:advanced_pickup_upgrade', 'sophisticatedbackpacks:pickup_upgrade', + 'sophisticatedbackpacks:diamond_backpack','sophisticatedbackpacks:inception_upgrade', + 'sophisticatedbackpacks:everlasting_upgrade', 'sophisticatedbackpacks:auto_blasting_upgrade', + 'sophisticatedbackpacks:auto_smoking_upgrade', 'sophisticatedbackpacks:auto_smelting_upgrade', + 'sophisticatedbackpacks:crafting_upgrade', 'sophisticatedbackpacks:smoking_upgrade', + 'sophisticatedbackpacks:stonecutter_upgrade', 'sophisticatedbackpacks:tank_upgrade', + 'sophisticatedbackpacks:battery_upgrade', 'sophisticatedbackpacks:advanced_pump_upgrade', + 'sophisticatedbackpacks:xp_pump_upgrade', 'sophisticatedbackpacks:smelting_upgrade', 'sophisticatedbackpacks:advanced_compacting_upgrade', + 'sophisticatedbackpacks:pump_upgrade', 'sophisticatedbackpacks:blasting_upgrade', 'sophisticatedbackpacks:compacting_upgrade' + ] - backpack.forEach((element) => event.remove({output: element})); - - //DEFAULT - event.shaped( + backpack.forEach((element) => event.remove({output: element})) + + //DEFAULT + event.shaped( Item.of('sophisticatedbackpacks:backpack', 1), - [ - 'FAF', + [ + 'FAF', 'ECE', 'BDB' - ], { A:'minecraft:chest', B:'minecraft:leather', C:'botania:flower_bag', D:'gtceu:bronze_plate', - E:'gtceu:potin_gear', - F:'minecraft:chain' - - + E:'gtceu:potin_gear', + F:'minecraft:chain' } - ) + ) //IRON event.shaped( Item.of('sophisticatedbackpacks:iron_backpack', 1), - [ - 'FAF', + [ + 'FAF', 'ECE', 'BDB' @@ -55,41 +51,36 @@ ServerEvents.recipes(event => { B:'minecraft:leather', C:'sophisticatedbackpacks:backpack', D:'gtceu:steel_plate', - E:'gtceu:steel_gear', + E:'gtceu:steel_gear', F:'minecraft:chain' - - } - ) + ) //Gold event.shaped( Item.of('sophisticatedbackpacks:gold_backpack', 1), - [ - 'FAF', + [ + 'FAF', 'ECE', 'BDB' - ], { A:'ironchest:gold_chest', B:'gtceu:manganese_phosphide_ingot', C:'sophisticatedbackpacks:iron_backpack', D:'gtceu:aluminium_plate', - E:'gtceu:aluminium_gear', + E:'gtceu:aluminium_gear', F:'minecraft:chain' - - } - ) + ) + //Diamond event.shaped( Item.of('sophisticatedbackpacks:diamond_backpack', 1), - [ + [ 'FAF', 'ECE', 'BDB' - ], { A:'ironchest:diamond_chest', @@ -98,19 +89,16 @@ ServerEvents.recipes(event => { D:'gtceu:polyvinyl_chloride_plate', E:'gtceu:stainless_steel_gear', F:'minecraft:chain' - } ) //UPGRADE BASE event.shaped( Item.of('sophisticatedbackpacks:upgrade_base', 1), - [ - + [ 'ADA', 'BCB', 'ABA' - ], { A:'minecraft:bricks', @@ -118,17 +106,15 @@ ServerEvents.recipes(event => { C:'gtceu:annealed_copper_plate', D:'#forge:circuits/lv' } - ) + ) //COMPACTING UPGRADE event.shaped( Item.of('sophisticatedbackpacks:compacting_upgrade', 1), - [ - + [ 'ADA', 'ECE', 'ABA' - ], { A:'gtceu:iron_plate', @@ -137,34 +123,30 @@ ServerEvents.recipes(event => { D:'gtceu:aluminium_hammer', E:'minecraft:piston' } - ) + ) //ADVANCED COMPACTING UPGRADE event.shaped( Item.of('sophisticatedbackpacks:advanced_compacting_upgrade', 1), - [ - + [ 'ABA', 'BCB', 'ABA' - ], { A:'gtceu:gold_plate', B:'gtceu:stainless_steel_double_plate', C:'sophisticatedbackpacks:compacting_upgrade', } - ) + ) //PICKUP UPGRADE event.shaped( Item.of('sophisticatedbackpacks:pickup_upgrade', 1), - [ - + [ 'ADA', 'ECE', 'ABA' - ], { A:'gtceu:iron_plate', @@ -173,34 +155,30 @@ ServerEvents.recipes(event => { D:'minecraft:sticky_piston', E:'gtceu:red_alloy_ingot' } - ) + ) //ADVANCED PICKUP UPGRADE event.shaped( Item.of('sophisticatedbackpacks:advanced_pickup_upgrade', 1), - [ - + [ 'ABA', 'BCB', 'ABA' - ], { A:'gtceu:gold_plate', B:'gtceu:stainless_steel_double_plate', C:'sophisticatedbackpacks:pickup_upgrade', } - ) + ) //DEPOSIT UPGRADE event.shaped( Item.of('sophisticatedbackpacks:deposit_upgrade', 1), - [ - + [ 'ADA', 'ECE', 'ABA' - ], { A:'gtceu:iron_plate', @@ -209,34 +187,30 @@ ServerEvents.recipes(event => { D:'minecraft:chest', E:'minecraft:sticky_piston' } - ) + ) //ADVANCED PICKUP UPGRADE event.shaped( Item.of('sophisticatedbackpacks:advanced_deposit_upgrade', 1), - [ - + [ 'ABA', 'BCB', 'ABA' - ], { A:'gtceu:gold_plate', B:'gtceu:stainless_steel_double_plate', C:'sophisticatedbackpacks:deposit_upgrade', } - ) + ) //RESTOCK UPGRADE event.shaped( Item.of('sophisticatedbackpacks:restock_upgrade', 1), - [ - + [ 'ADA', 'ECE', 'ABA' - ], { A:'gtceu:iron_plate', @@ -245,34 +219,30 @@ ServerEvents.recipes(event => { D:'minecraft:chest', E:'minecraft:piston' } - ) + ) //ADVANCED RESTOCK UPGRADE event.shaped( Item.of('sophisticatedbackpacks:advanced_restock_upgrade', 1), - [ - + [ 'ABA', 'BCB', 'ABA' - ], { A:'gtceu:gold_plate', B:'gtceu:stainless_steel_double_plate', C:'sophisticatedbackpacks:restock_upgrade', } - ) + ) //VOID UPGRADE event.shaped( Item.of('sophisticatedbackpacks:void_upgrade', 1), - [ - + [ 'ADA', 'ECE', 'ABA' - ], { A:'gtceu:iron_plate', @@ -281,34 +251,30 @@ ServerEvents.recipes(event => { D:'gtceu:aluminium_hammer', //TRASHCAN IF ADDED E:'gtceu:obsidian_plate' } - ) + ) //ADVANCED VOID UPGRADE event.shaped( Item.of('sophisticatedbackpacks:advanced_void_upgrade', 1), - [ - + [ 'ABA', 'BCB', 'ABA' - ], { A:'gtceu:gold_plate', B:'gtceu:stainless_steel_double_plate', C:'sophisticatedbackpacks:void_upgrade', } - ) + ) //FEEDING UPGRADE event.shaped( Item.of('sophisticatedbackpacks:feeding_upgrade', 1), - [ - + [ 'ADA', 'FCE', 'GBH' - ], { A:'gtceu:iron_plate', @@ -320,33 +286,30 @@ ServerEvents.recipes(event => { G:'minecraft:golden_apple', H:'minecraft:golden_carrot' } - ) + ) //ADVANCED FEEDING UPGRADE event.shaped( Item.of('sophisticatedbackpacks:advanced_feeding_upgrade', 1), - [ - + [ 'ABA', 'BCB', 'ABA' - ], { A:'gtceu:gold_plate', B:'gtceu:stainless_steel_double_plate', C:'sophisticatedbackpacks:feeding_upgrade', } - ) + ) + //REFILL UPGRADE event.shaped( Item.of('sophisticatedbackpacks:refill_upgrade', 1), - [ - + [ 'ADA', 'ECE', 'ABA' - ], { A:'gtceu:iron_plate', @@ -355,33 +318,30 @@ ServerEvents.recipes(event => { D:'gtceu:ender_pearl_dust', E:'minecraft:chest' } - ) + ) //ADVANCED REFILL UPGRADE event.shaped( Item.of('sophisticatedbackpacks:advanced_refill_upgrade', 1), - [ - + [ 'ABA', 'BCB', 'ABA' - ], { A:'gtceu:gold_plate', B:'gtceu:stainless_steel_double_plate', C:'sophisticatedbackpacks:refill_upgrade', } - ) + ) + //MAGNET UPGRADE event.shaped( Item.of('sophisticatedbackpacks:magnet_upgrade', 1), - [ - + [ 'ADA', 'ECE', 'ABA' - ], { A:'gtceu:iron_plate', @@ -390,34 +350,30 @@ ServerEvents.recipes(event => { D:'gtceu:magnetic_steel_rod', E:'gtceu:ender_pearl_dust' } - ) + ) //ADVANCED MAGNET UPGRADE event.shaped( Item.of('sophisticatedbackpacks:advanced_magnet_upgrade', 1), - [ - + [ 'ABA', 'BCB', 'ABA' - ], { A:'gtceu:gold_plate', B:'gtceu:stainless_steel_double_plate', C:'sophisticatedbackpacks:magnet_upgrade', } - ) + ) //FILTER UPGRADE event.shaped( Item.of('sophisticatedbackpacks:filter_upgrade', 1), - [ - + [ 'ADA', 'ECE', 'ABA' - ], { A:'gtceu:iron_plate', @@ -426,33 +382,30 @@ ServerEvents.recipes(event => { D:'gtceu:item_filter', E:'gtceu:red_alloy_ingot' } - ) + ) //ADVANCED FILTER UPGRADE event.shaped( Item.of('sophisticatedbackpacks:advanced_filter_upgrade', 1), - [ - + [ 'ABA', 'BCB', 'ABA' - ], { A:'gtceu:gold_plate', B:'gtceu:stainless_steel_double_plate', C:'sophisticatedbackpacks:filter_upgrade', } - ) + ) + //TOOL SWAP UPGRADE event.shaped( Item.of('sophisticatedbackpacks:tool_swapper_upgrade', 1), - [ - + [ 'ADA', 'ECF', 'ABA' - ], { A:'gtceu:iron_plate', @@ -462,42 +415,20 @@ ServerEvents.recipes(event => { E:'#forge:tools/screwdrivers', F:'#forge:tools/wire_cutters' } - ) + ) //ADVANCED PICKUP UPGRADE event.shaped( Item.of('sophisticatedbackpacks:advanced_tool_swapper_upgrade', 1), - [ - + [ 'ABA', 'BCB', 'ABA' - ], { A:'gtceu:gold_plate', B:'gtceu:stainless_steel_double_plate', C:'sophisticatedbackpacks:tool_swapper_upgrade', } - ) - - - - - - - - - - - - - - - - - - - - + ) }) diff --git a/kubejs/server_scripts/Mods/TomsSimpleStorage.js b/kubejs/server_scripts/Mods/TomsSimpleStorage.js index 7d13a4b3..744a5930 100644 --- a/kubejs/server_scripts/Mods/TomsSimpleStorage.js +++ b/kubejs/server_scripts/Mods/TomsSimpleStorage.js @@ -1,19 +1,19 @@ ServerEvents.recipes(event => { - - //remove all - const storage = ['toms_storage:ts.inventory_connector', 'toms_storage:ts.storage_terminal', 'toms_storage:ts.crafting_terminal', 'toms_storage:ts.item_filter', 'toms_storage:ts.polymorphic_item_filter', - 'toms_storage:ts.trim', 'toms_storage:ts.open_crate', 'toms_storage:ts.inventory_cable', 'toms_storage:ts.tag_item_filter','toms_storage:ts.painted_trim', - 'toms_storage:ts.inventory_cable_connector', 'toms_storage:ts.inventory_proxy', 'toms_storage:ts.inventory_hopper_basic', 'toms_storage:ts.level_emitter', - 'toms_storage:ts.wireless_terminal', 'toms_storage:ts.adv_wireless_terminal', 'toms_storage:ts.paint_kit','toms_storage:ts.inventory_cable_connector_filtered'] - - - storage.forEach((element) => event.remove({output: element})); - - //Storage Connector - event.recipes.createMechanicalCrafting( + //remove all + const storage = [ + 'toms_storage:ts.inventory_connector', 'toms_storage:ts.storage_terminal', 'toms_storage:ts.crafting_terminal', 'toms_storage:ts.item_filter', 'toms_storage:ts.polymorphic_item_filter', + 'toms_storage:ts.trim', 'toms_storage:ts.open_crate', 'toms_storage:ts.inventory_cable', 'toms_storage:ts.tag_item_filter','toms_storage:ts.painted_trim', + 'toms_storage:ts.inventory_cable_connector', 'toms_storage:ts.inventory_proxy', 'toms_storage:ts.inventory_hopper_basic', 'toms_storage:ts.level_emitter', + 'toms_storage:ts.wireless_terminal', 'toms_storage:ts.adv_wireless_terminal', 'toms_storage:ts.paint_kit', 'toms_storage:ts.inventory_cable_connector_filtered' + ] + + storage.forEach((element) => event.remove({output: element})) + + //Storage Connector + event.recipes.createMechanicalCrafting( Item.of('toms_storage:ts.inventory_connector', 1), - [ - ' BAB ', + [ + ' BAB ', 'BDEDB', 'AECEA', 'BDEDB', @@ -24,16 +24,15 @@ ServerEvents.recipes(event => { B:'gtceu:treated_wood_plate', C:'gtceu:mv_machine_casing', D:'gtceu:micro_processor', - E:'gtceu:lv_robot_arm' + E:'gtceu:lv_robot_arm' } - ) - - - //Terminal - event.recipes.createMechanicalCrafting( + ) + + //Terminal + event.recipes.createMechanicalCrafting( Item.of('toms_storage:ts.crafting_terminal', 1), - [ - 'ABCBA', + [ + 'ABCBA', 'BFDFB', 'CDEDC', 'BFDFB', @@ -44,123 +43,114 @@ ServerEvents.recipes(event => { B:'ironchest:iron_chest', C:'gtceu:mv_conveyor_module', D:'toms_storage:ts.inventory_cable', - E:'#forge:circuits/mv', - F:'toms_storage:ts.inventory_cable_connector', - - + E:'#forge:circuits/mv', + F:'toms_storage:ts.inventory_cable_connector', } - ) - - - //Inventory Cable - event.shaped( - Item.of('toms_storage:ts.inventory_cable'), - [ - 'CBC', - 'BAB', - 'CBC', - ], - { - A: 'gtceu:mv_conveyor_module', - B: 'gtceu:wood_plate', - C: 'gtceu:wood_long_rod' - } - ) + ) + + //Inventory Cable + event.shaped( + Item.of('toms_storage:ts.inventory_cable'), + [ + 'CBC', + 'BAB', + 'CBC', + ], + { + A: 'gtceu:mv_conveyor_module', + B: 'gtceu:wood_plate', + C: 'gtceu:wood_long_rod' + } + ) - //Inventory Cable Connector + //Inventory Cable Connector event.shaped( - Item.of('toms_storage:ts.inventory_cable_connector', 1), - [ - ' D ', - 'BAB', - ' C ', - ], - { + Item.of('toms_storage:ts.inventory_cable_connector', 1), + [ + ' D ', + 'BAB', + ' C ', + ], + { A:'gtceu:lv_robot_arm', B:'gtceu:treated_wood_plate', C:'gtceu:iron_screw', - D:'gtceu:micro_processor', - } + D:'gtceu:micro_processor', + } ) - event.shapeless( - Item.of('toms_storage:ts.inventory_cable_connector_filtered', 1), - [ - 'toms_storage:ts.item_filter', - 'toms_storage:ts.inventory_cable_connector' - - ] + event.shapeless( + Item.of('toms_storage:ts.inventory_cable_connector_filtered', 1), + [ + 'toms_storage:ts.item_filter', + 'toms_storage:ts.inventory_cable_connector' + ] ) - - //Wireless + //Wireless event.shaped( - Item.of('toms_storage:ts.wireless_terminal', 1), - [ - 'BDB', - 'EAE', - 'CDC', - ], - { - A: 'minecraft:ender_eye', - B: 'gtceu:mv_emitter', - C: 'gtceu:mv_sensor', - D: 'gtceu:aluminium_plate', - E: 'gtceu:wood_plate' - } - ) + Item.of('toms_storage:ts.wireless_terminal', 1), + [ + 'BDB', + 'EAE', + 'CDC', + ], + { + A: 'minecraft:ender_eye', + B: 'gtceu:mv_emitter', + C: 'gtceu:mv_sensor', + D: 'gtceu:aluminium_plate', + E: 'gtceu:wood_plate' + } + ) - event.shaped( - Item.of('toms_storage:ts.paint_kit', 1), - [ - 'DEA', - 'FB ', - 'C ', - ], - { - A: '#minecraft:wool', - B: 'gtceu:empty_spray_can', - C: 'gtceu:wood_long_rod', - D: '#railways:internal/dyes/blue_dyes', - E: '#railways:internal/dyes/red_dyes', - F: '#railways:internal/dyes/green_dyes', - } - ) - - //FILTER - event.shaped( - Item.of('toms_storage:ts.item_filter', 1), - [ - 'RBR', - 'BAB', - 'RBR', - ], - { + event.shaped( + Item.of('toms_storage:ts.paint_kit', 1), + [ + 'DEA', + 'FB ', + 'C ', + ], + { + A: '#minecraft:wool', + B: 'gtceu:empty_spray_can', + C: 'gtceu:wood_long_rod', + D: '#railways:internal/dyes/blue_dyes', + E: '#railways:internal/dyes/red_dyes', + F: '#railways:internal/dyes/green_dyes', + } + ) + + //FILTER + event.shaped( + Item.of('toms_storage:ts.item_filter', 1), + [ + 'RBR', + 'BAB', + 'RBR', + ], + { A:'gtceu:item_filter', B:'gtceu:treated_wood_plate', - R:'minecraft:redstone', - } + R:'minecraft:redstone', + } ) - event.shapeless( - Item.of('toms_storage:ts.polymorphic_item_filter', 1), - [ - 'toms_storage:ts.item_filter', - 'gtceu:hv_sensor' - - ] + event.shapeless( + Item.of('toms_storage:ts.polymorphic_item_filter', 1), + [ + 'toms_storage:ts.item_filter', + 'gtceu:hv_sensor' + ] ) - event.shapeless( - Item.of('toms_storage:ts.tag_item_filter', 1), - [ - 'toms_storage:ts.item_filter', - 'gtceu:item_tag_filter' - - ] + event.shapeless( + Item.of('toms_storage:ts.tag_item_filter', 1), + [ + 'toms_storage:ts.item_filter', + 'gtceu:item_tag_filter' + ] ) - - }) diff --git a/kubejs/server_scripts/Mods/Wands.js b/kubejs/server_scripts/Mods/Wands.js index bc5d5f62..2e2f963c 100644 --- a/kubejs/server_scripts/Mods/Wands.js +++ b/kubejs/server_scripts/Mods/Wands.js @@ -1,7 +1,6 @@ // priority: 0 ServerEvents.recipes(event => { // #region removal - event.remove({ output: 'constructionwand:stone_wand' }) event.remove({ output: 'constructionwand:iron_wand'}) event.remove({ output: 'constructionwand:diamond_wand'}) @@ -10,17 +9,16 @@ ServerEvents.recipes(event => { event.remove({ output: 'constructionwand:core_destruction'}) event.shaped( - Item.of('constructionwand:stone_wand'), - [ - ' B', - ' A ', - 'A ', - ], - { - A:'minecraft:stick', - B:'create:andesite_alloy' - - } + Item.of('constructionwand:stone_wand'), + [ + ' B', + ' A ', + 'A ', + ], + { + A:'minecraft:stick', + B:'create:andesite_alloy' + } ) event.shaped( Item.of('constructionwand:iron_wand'), @@ -35,9 +33,9 @@ ServerEvents.recipes(event => { C:'gtceu:iron_screw' } ) - event.recipes.createMechanicalCrafting( + event.recipes.createMechanicalCrafting( Item.of('constructionwand:diamond_wand', 1), - [ + [ ' BB', ' CDB', ' AC ', @@ -49,11 +47,10 @@ ServerEvents.recipes(event => { C:'gtceu:diamond_screw', D:'gtceu:diamond_gear' } - ) - - event.recipes.createMechanicalCrafting( + ) + event.recipes.createMechanicalCrafting( Item.of('constructionwand:infinity_wand', 1), - [ + [ ' CB', ' DC', ' A ', @@ -64,7 +61,6 @@ ServerEvents.recipes(event => { B:'gtceu:nether_star_plate', C:'kubejs:netherite_plate', D:'gtceu:diamond_gear' - } - ) -}); \ No newline at end of file + ) +}) diff --git a/kubejs/server_scripts/Mods/ad_astra.js b/kubejs/server_scripts/Mods/ad_astra.js index 908f5ff9..53c1e817 100644 --- a/kubejs/server_scripts/Mods/ad_astra.js +++ b/kubejs/server_scripts/Mods/ad_astra.js @@ -1,15 +1,12 @@ ServerEvents.recipes( event => { - event.remove({ output:'ad_astra:rocket_fin' }) event.remove({ output:/ad_astra:(.*)engine/ }) event.remove({ output:'ad_astra:rocket_nose_cone' }) event.remove({ output: /ad_astra:(.*)_plate/ }) + event.remove({ output: 'ad_astra:steel_ingot' }) + event.remove({ output: 'ad_astra:steel_block' }) - event.remove({output: 'ad_astra:steel_ingot'}) - event.remove({output: 'ad_astra:steel_block'}) //stainless steel - - event.shaped( Item.of('kubejs:stainless_steel_engine', 1), [ @@ -24,8 +21,6 @@ ServerEvents.recipes( event => { D:'#forge:circuits/hv' } ) - - event.shaped( Item.of('kubejs:stainless_steel_fin', 1), [ @@ -37,7 +32,6 @@ ServerEvents.recipes( event => { A:'gtceu:stainless_steel_double_plate' } ) - event.shaped( Item.of('kubejs:stainless_steel_cone', 1), [ @@ -51,9 +45,8 @@ ServerEvents.recipes( event => { ) //tungsten steel/carbide - event.shaped( - Item.of('kubejs:tungsten_steel_engine', 1), + Item.of('kubejs:tungsten_steel_engine', 1), [ 'AAA', ' B ', @@ -66,7 +59,6 @@ ServerEvents.recipes( event => { D:'#forge:circuits/ev' } ) - event.shaped( Item.of('kubejs:tungsten_steel_fin', 1), [ @@ -78,7 +70,6 @@ ServerEvents.recipes( event => { A:'gtceu:tungsten_steel_double_plate' } ) - event.shaped( Item.of('kubejs:tungsten_steel_cone', 1), [ @@ -92,9 +83,8 @@ ServerEvents.recipes( event => { ) // HSS-E - event.shaped( - Item.of('kubejs:hsse_engine', 1), + Item.of('kubejs:hsse_engine', 1), [ 'AAA', ' B ', @@ -107,7 +97,6 @@ ServerEvents.recipes( event => { D:'#forge:circuits/iv' } ) - event.shaped( Item.of('kubejs:hsse_fin', 1), [ @@ -119,7 +108,6 @@ ServerEvents.recipes( event => { A:'gtceu:hsse_double_plate' } ) - event.shaped( Item.of('kubejs:hsse_cone'), [ @@ -133,9 +121,8 @@ ServerEvents.recipes( event => { ) // Trinium - event.shaped( - Item.of('kubejs:trinium_engine', 1), + Item.of('kubejs:trinium_engine', 1), [ 'AAA', ' B ', @@ -148,7 +135,6 @@ ServerEvents.recipes( event => { D:'#forge:circuits/luv' } ) - event.shaped( Item.of('kubejs:trinium_fin'), [ @@ -160,7 +146,6 @@ ServerEvents.recipes( event => { A:'gtceu:trinium_double_plate' } ) - event.shaped( Item.of('kubejs:trinium_cone'), [ diff --git a/kubejs/server_scripts/Mods/cc_tweaked.js b/kubejs/server_scripts/Mods/cc_tweaked.js index b4959a76..c1d7d64e 100644 --- a/kubejs/server_scripts/Mods/cc_tweaked.js +++ b/kubejs/server_scripts/Mods/cc_tweaked.js @@ -1,192 +1,191 @@ ServerEvents.recipes( event => { - event.remove({ id:'computercraft:cable' }) - event.recipes.gtceu.assembler('computercraft:cable') - .itemInputs('gtceu:gold_single_cable', 'gtceu:red_alloy_tiny_dust') - .itemOutputs('computercraft:cable') - .duration(200) - .EUt(120) - .circuit(1) + event.recipes.gtceu.assembler('computercraft:cable') + .itemInputs('gtceu:gold_single_cable', 'gtceu:red_alloy_tiny_dust') + .itemOutputs('computercraft:cable') + .duration(200) + .EUt(120) + .circuit(1) - event.remove({ id:'computercraft:disk_drive' }) - event.recipes.gtceu.assembler('computercraft:disk_drive') - .itemInputs('gtceu:lv_machine_casing', '2x #forge:circuits/hv', 'gtceu:mv_electric_motor', 'gtceu:copper_small_spring', 'gtceu:magnetic_iron_rod', 'gtceu:glass_lens') - .inputFluids('gtceu:polyethylene 72') - .itemOutputs('computercraft:disk_drive') - .duration(200) - .EUt(120) - - event.remove({ id:'computercraft:printer' }) - event.recipes.gtceu.assembler('computercraft:printer') - .itemInputs('gtceu:lv_machine_casing', '2x #forge:circuits/hv', 'gtceu:mv_electric_motor', '2x gtceu:copper_small_spring', 'gtceu:iron_rod') - .inputFluids('gtceu:polyethylene 72') - .itemOutputs('computercraft:printer') - .duration(200) - .EUt(120) - - event.remove({ id:'computercraft:speaker' }) - event.recipes.gtceu.assembler('computercraft:speaker') - .itemInputs('gtceu:lv_machine_casing', '2x #forge:circuits/hv', 'minecraft:note_block') - .inputFluids('gtceu:polyethylene 72') - .itemOutputs('computercraft:speaker') - .duration(200) - .EUt(120) - - event.remove({ id:'computercraft:monitor_normal' }) - event.recipes.gtceu.assembler('computercraft:monitor_normal') - .itemInputs('gtceu:lv_machine_casing', '2x #forge:circuits/hv', 'create:display_board') - .inputFluids('gtceu:polyethylene 72') - .itemOutputs('computercraft:monitor_normal') - .duration(200) - .EUt(120) - - event.remove({ id:'computercraft:monitor_advanced' }) - event.recipes.gtceu.assembler('computercraft:monitor_advanced') - .itemInputs('gtceu:hv_machine_casing', '2x #forge:circuits/ev', 'create:display_board') - .inputFluids('gtceu:polyethylene 72') - .itemOutputs('computercraft:monitor_advanced') - .duration(200) - .EUt(120) - - // Computers - event.remove({ id:'computercraft:computer_normal' }) - event.recipes.gtceu.assembler('computercraft:computer_normal') - .itemInputs('gtceu:mv_machine_casing', '2x gtceu:aluminium_plate', 'gtceu:plastic_printed_circuit_board', '#forge:circuits/mv', '2x gtceu:polyethylene_rotor') - .inputFluids('gtceu:polyethylene 72') - .itemOutputs('computercraft:computer_normal') - .duration(200) - .EUt(120) - event.remove({ id:'computercraft:computer_advanced' }) - event.remove({ id:'computercraft:computer_advanced_upgrade' }) - event.recipes.gtceu.assembler('computercraft:computer_advanced') - .itemInputs('gtceu:hv_machine_casing', '2x gtceu:aluminium_plate', 'gtceu:epoxy_printed_circuit_board', '#forge:circuits/hv', '2x gtceu:polyethylene_rotor') - .inputFluids('gtceu:polyethylene 72') - .itemOutputs('computercraft:computer_advanced') - .duration(200) - .EUt(256) - - // Pocket computers - event.remove({ id: 'computercraft:pocket_computer_normal' }) - event.recipes.gtceu.assembler('computercraft:pocket_computer_normal') - .itemInputs('2x gtceu:aluminium_plate', 'gtceu:plastic_printed_circuit_board', '#forge:circuits/mv', 'gtceu:polyethylene_rotor', 'create:display_board') - .inputFluids('gtceu:polyethylene 72') - .itemOutputs('computercraft:pocket_computer_normal') - .duration(200) - .EUt(120) - event.remove({ id:'computercraft:pocket_computer_advanced' }) - event.remove({ id:'computercraft:pocket_computer_advanced_upgrade' }) - event.recipes.gtceu.assembler('computercraft:pocket_computer_advanced') - .itemInputs('2x gtceu:aluminium_plate', 'gtceu:epoxy_printed_circuit_board', '#forge:circuits/hv', 'gtceu:polyethylene_rotor', 'create:display_board') - .inputFluids('gtceu:polyethylene 72') - .itemOutputs('computercraft:pocket_computer_advanced') - .duration(200) - .EUt(256) - - // Turtles - event.remove({ id: 'computercraft:turtle_normal' }) - event.recipes.gtceu.assembler('computercraft:turtle_normal') - .itemInputs('computercraft:computer_normal', '2x gtceu:aluminium_plate', '#forge:chests/wooden') - .inputFluids('gtceu:polyethylene 72') - .itemOutputs('computercraft:turtle_normal') - .duration(200) - .EUt(120) - event.remove({ id:'computercraft:turtle_advanced' }) - event.remove({ id:'computercraft:turtle_advanced_upgrade' }) - event.recipes.gtceu.assembler('computercraft:turtle_advanced') - .itemInputs('computercraft:computer_advanced', '2x gtceu:aluminium_plate', '#forge:chests/wooden') - .inputFluids('gtceu:polyethylene 72') - .itemOutputs('computercraft:turtle_advanced') - .duration(200) - .EUt(256) - - // Modems - event.remove({ id:'computercraft:wired_modem' }) - event.recipes.gtceu.assembler('computercraft:wired_modem') - .itemInputs('gtceu:lv_machine_casing', 'gtceu:plastic_circuit_board', '2x computercraft:cable', '#forge:circuits/mv') - .inputFluids('gtceu:polyethylene 72') - .itemOutputs('computercraft:wired_modem') - .duration(200) - .EUt(120) - .circuit(1) - event.remove({ id:'computercraft:wireless_modem_normal' }) - event.recipes.gtceu.assembler('computercraft:wireless_modem_normal') - .itemInputs('gtceu:mv_machine_casing', 'gtceu:epoxy_circuit_board', '2x computercraft:cable', '#forge:circuits/hv', 'gtceu:mv_emitter', 'gtceu:mv_sensor') - .inputFluids('gtceu:polyvinyl_chloride 72') - .itemOutputs('computercraft:wireless_modem_normal') - .duration(200) - .EUt(256) - .circuit(1) - event.remove({ id:'computercraft:wireless_modem_advanced' }) - event.recipes.gtceu.assembler('computercraft:wireless_modem_advanced') - .itemInputs('gtceu:hv_machine_casing', 'gtceu:fiber_reinforced_circuit_board', '2x computercraft:cable', '#forge:circuits/ev', 'gtceu:hv_emitter', 'gtceu:hv_sensor') - .inputFluids('gtceu:polyethylene 72') - .itemOutputs('computercraft:wireless_modem_advanced') - .duration(200) - .EUt(480) - .circuit(1) - - // Printed book - event.remove({ id: 'computercraft:printed_book' }) - event.shapeless('computercraft:printed_book', [ - 'minecraft:book', - 'computercraft:printed_page', - 'minecraft:string' - ]) - - // Disks - event.recipes.gtceu.assembler('computercraft:disk_16') - .itemInputs('gtceu:glass_lens', '4x gtceu:aluminium_foil', '4x gtceu:polyethylene_foil') - .inputFluids('gtceu:cobalt 36') - .itemOutputs('computercraft:disk') - .duration(200) - .EUt(120) - .circuit(1) - // Move dye_colors into a common script if it is needed by anything else - const dye_colors = [ - 'white', - 'orange', - 'magenta', - 'light_blue', - 'yellow', - 'lime', - 'pink', - 'gray', - 'light_gray', - 'cyan', - 'purple', - 'blue', - 'brown', - 'green', - 'red', - 'black', - ] - const disk_dye_hex_codes = [ - 1118481, - 13388876, - 5744206, - 8349260, - 3368652, - 11691749, - 5020082, - 10066329, - 5000268, - 15905484, - 8375321, - 14605932, - 10072818, - 150404472, - 15905331, - 15790320, - ] - for (let i = 0; i < 16; i++) { - var disk_number = i + 1 - event.remove({ id: 'computercraft:disk_' + disk_number }) - event.shapeless(Item.of('computercraft:disk', { 'Color': disk_dye_hex_codes[15 - i] }), [ - 'computercraft:disk', - '#forge:dyes/' + dye_colors[i] - ]).modifyResult((grid, result) => { - let disk = grid.find('computercraft:disk') - return disk.copy().nbt.merge({ 'Color': disk_dye_hex_codes[15 - i] }) - }) - } -}) \ No newline at end of file + event.remove({ id:'computercraft:disk_drive' }) + event.recipes.gtceu.assembler('computercraft:disk_drive') + .itemInputs('gtceu:lv_machine_casing', '2x #forge:circuits/hv', 'gtceu:mv_electric_motor', 'gtceu:copper_small_spring', 'gtceu:magnetic_iron_rod', 'gtceu:glass_lens') + .inputFluids('gtceu:polyethylene 72') + .itemOutputs('computercraft:disk_drive') + .duration(200) + .EUt(120) + + event.remove({ id:'computercraft:printer' }) + event.recipes.gtceu.assembler('computercraft:printer') + .itemInputs('gtceu:lv_machine_casing', '2x #forge:circuits/hv', 'gtceu:mv_electric_motor', '2x gtceu:copper_small_spring', 'gtceu:iron_rod') + .inputFluids('gtceu:polyethylene 72') + .itemOutputs('computercraft:printer') + .duration(200) + .EUt(120) + + event.remove({ id:'computercraft:speaker' }) + event.recipes.gtceu.assembler('computercraft:speaker') + .itemInputs('gtceu:lv_machine_casing', '2x #forge:circuits/hv', 'minecraft:note_block') + .inputFluids('gtceu:polyethylene 72') + .itemOutputs('computercraft:speaker') + .duration(200) + .EUt(120) + + event.remove({ id:'computercraft:monitor_normal' }) + event.recipes.gtceu.assembler('computercraft:monitor_normal') + .itemInputs('gtceu:lv_machine_casing', '2x #forge:circuits/hv', 'create:display_board') + .inputFluids('gtceu:polyethylene 72') + .itemOutputs('computercraft:monitor_normal') + .duration(200) + .EUt(120) + + event.remove({ id:'computercraft:monitor_advanced' }) + event.recipes.gtceu.assembler('computercraft:monitor_advanced') + .itemInputs('gtceu:hv_machine_casing', '2x #forge:circuits/ev', 'create:display_board') + .inputFluids('gtceu:polyethylene 72') + .itemOutputs('computercraft:monitor_advanced') + .duration(200) + .EUt(120) + + // Computers + event.remove({ id:'computercraft:computer_normal' }) + event.recipes.gtceu.assembler('computercraft:computer_normal') + .itemInputs('gtceu:mv_machine_casing', '2x gtceu:aluminium_plate', 'gtceu:plastic_printed_circuit_board', '#forge:circuits/mv', '2x gtceu:polyethylene_rotor') + .inputFluids('gtceu:polyethylene 72') + .itemOutputs('computercraft:computer_normal') + .duration(200) + .EUt(120) + event.remove({ id:'computercraft:computer_advanced' }) + event.remove({ id:'computercraft:computer_advanced_upgrade' }) + event.recipes.gtceu.assembler('computercraft:computer_advanced') + .itemInputs('gtceu:hv_machine_casing', '2x gtceu:aluminium_plate', 'gtceu:epoxy_printed_circuit_board', '#forge:circuits/hv', '2x gtceu:polyethylene_rotor') + .inputFluids('gtceu:polyethylene 72') + .itemOutputs('computercraft:computer_advanced') + .duration(200) + .EUt(256) + + // Pocket computers + event.remove({ id: 'computercraft:pocket_computer_normal' }) + event.recipes.gtceu.assembler('computercraft:pocket_computer_normal') + .itemInputs('2x gtceu:aluminium_plate', 'gtceu:plastic_printed_circuit_board', '#forge:circuits/mv', 'gtceu:polyethylene_rotor', 'create:display_board') + .inputFluids('gtceu:polyethylene 72') + .itemOutputs('computercraft:pocket_computer_normal') + .duration(200) + .EUt(120) + event.remove({ id:'computercraft:pocket_computer_advanced' }) + event.remove({ id:'computercraft:pocket_computer_advanced_upgrade' }) + event.recipes.gtceu.assembler('computercraft:pocket_computer_advanced') + .itemInputs('2x gtceu:aluminium_plate', 'gtceu:epoxy_printed_circuit_board', '#forge:circuits/hv', 'gtceu:polyethylene_rotor', 'create:display_board') + .inputFluids('gtceu:polyethylene 72') + .itemOutputs('computercraft:pocket_computer_advanced') + .duration(200) + .EUt(256) + + // Turtles + event.remove({ id: 'computercraft:turtle_normal' }) + event.recipes.gtceu.assembler('computercraft:turtle_normal') + .itemInputs('computercraft:computer_normal', '2x gtceu:aluminium_plate', '#forge:chests/wooden') + .inputFluids('gtceu:polyethylene 72') + .itemOutputs('computercraft:turtle_normal') + .duration(200) + .EUt(120) + event.remove({ id:'computercraft:turtle_advanced' }) + event.remove({ id:'computercraft:turtle_advanced_upgrade' }) + event.recipes.gtceu.assembler('computercraft:turtle_advanced') + .itemInputs('computercraft:computer_advanced', '2x gtceu:aluminium_plate', '#forge:chests/wooden') + .inputFluids('gtceu:polyethylene 72') + .itemOutputs('computercraft:turtle_advanced') + .duration(200) + .EUt(256) + + // Modems + event.remove({ id:'computercraft:wired_modem' }) + event.recipes.gtceu.assembler('computercraft:wired_modem') + .itemInputs('gtceu:lv_machine_casing', 'gtceu:plastic_circuit_board', '2x computercraft:cable', '#forge:circuits/mv') + .inputFluids('gtceu:polyethylene 72') + .itemOutputs('computercraft:wired_modem') + .duration(200) + .EUt(120) + .circuit(1) + event.remove({ id:'computercraft:wireless_modem_normal' }) + event.recipes.gtceu.assembler('computercraft:wireless_modem_normal') + .itemInputs('gtceu:mv_machine_casing', 'gtceu:epoxy_circuit_board', '2x computercraft:cable', '#forge:circuits/hv', 'gtceu:mv_emitter', 'gtceu:mv_sensor') + .inputFluids('gtceu:polyvinyl_chloride 72') + .itemOutputs('computercraft:wireless_modem_normal') + .duration(200) + .EUt(256) + .circuit(1) + event.remove({ id:'computercraft:wireless_modem_advanced' }) + event.recipes.gtceu.assembler('computercraft:wireless_modem_advanced') + .itemInputs('gtceu:hv_machine_casing', 'gtceu:fiber_reinforced_circuit_board', '2x computercraft:cable', '#forge:circuits/ev', 'gtceu:hv_emitter', 'gtceu:hv_sensor') + .inputFluids('gtceu:polyethylene 72') + .itemOutputs('computercraft:wireless_modem_advanced') + .duration(200) + .EUt(480) + .circuit(1) + + // Printed book + event.remove({ id: 'computercraft:printed_book' }) + event.shapeless('computercraft:printed_book', [ + 'minecraft:book', + 'computercraft:printed_page', + 'minecraft:string' + ]) + + // Disks + event.recipes.gtceu.assembler('computercraft:disk_16') + .itemInputs('gtceu:glass_lens', '4x gtceu:aluminium_foil', '4x gtceu:polyethylene_foil') + .inputFluids('gtceu:cobalt 36') + .itemOutputs('computercraft:disk') + .duration(200) + .EUt(120) + .circuit(1) + // Move dye_colors into a common script if it is needed by anything else + const dye_colors = [ + 'white', + 'orange', + 'magenta', + 'light_blue', + 'yellow', + 'lime', + 'pink', + 'gray', + 'light_gray', + 'cyan', + 'purple', + 'blue', + 'brown', + 'green', + 'red', + 'black', + ] + const disk_dye_hex_codes = [ + 1118481, + 13388876, + 5744206, + 8349260, + 3368652, + 11691749, + 5020082, + 10066329, + 5000268, + 15905484, + 8375321, + 14605932, + 10072818, + 150404472, + 15905331, + 15790320, + ] + for (let i = 0; i < 16; i++) { + var disk_number = i + 1 + event.remove({ id: 'computercraft:disk_' + disk_number }) + event.shapeless(Item.of('computercraft:disk', { 'Color': disk_dye_hex_codes[15 - i] }), [ + 'computercraft:disk', + '#forge:dyes/' + dye_colors[i] + ]).modifyResult((grid, result) => { + let disk = grid.find('computercraft:disk') + return disk.copy().nbt.merge({ 'Color': disk_dye_hex_codes[15 - i] }) + }) + } +}) diff --git a/kubejs/server_scripts/Mods/productive_bees.js b/kubejs/server_scripts/Mods/productive_bees.js index 3b5eeb25..96118c87 100644 --- a/kubejs/server_scripts/Mods/productive_bees.js +++ b/kubejs/server_scripts/Mods/productive_bees.js @@ -1,54 +1,74 @@ +var hives = [ + 'productivebees:advanced_bamboo_beehive', + 'productivebees:advanced_cherry_beehive', + 'productivebees:advanced_birch_beehive', + 'productivebees:advanced_acacia_beehive', + 'productivebees:advanced_warped_beehive', + 'productivebees:advanced_jungle_beehive', + 'productivebees:advanced_dark_oak_beehive', + 'productivebees:advanced_mangrove_beehive', + 'productivebees:advanced_snake_block_beehive', + 'productivebees:advanced_crimson_beehive', + 'productivebees:advanced_oak_beehive', + 'productivebees:advanced_spruce_beehive', +] -var hives = ['productivebees:advanced_bamboo_beehive', 'productivebees:advanced_cherry_beehive', -'productivebees:advanced_birch_beehive', 'productivebees:advanced_acacia_beehive', -'productivebees:advanced_warped_beehive', 'productivebees:advanced_jungle_beehive', -'productivebees:advanced_dark_oak_beehive', 'productivebees:advanced_mangrove_beehive', -'productivebees:advanced_snake_block_beehive', 'productivebees:advanced_crimson_beehive', -'productivebees:advanced_oak_beehive', 'productivebees:advanced_spruce_beehive'] - -var stripedWood = ['minecraft:stripped_bamboo_block', 'minecraft:stripped_cherry_log', -'minecraft:stripped_birch_wood', 'minecraft:stripped_acacia_log', -'minecraft:stripped_warped_stem', 'minecraft:stripped_jungle_log', -'minecraft:stripped_dark_oak_log', 'minecraft:stripped_mangrove_log', -'minecraft:prismarine_bricks', 'minecraft:stripped_crimson_stem', -'minecraft:stripped_oak_log', 'minecraft:stripped_spruce_log'] +var stripedWood = [ + 'minecraft:stripped_bamboo_block', + 'minecraft:stripped_cherry_log', + 'minecraft:stripped_birch_wood', + 'minecraft:stripped_acacia_log', + 'minecraft:stripped_warped_stem', + 'minecraft:stripped_jungle_log', + 'minecraft:stripped_dark_oak_log', + 'minecraft:stripped_mangrove_log', + 'minecraft:prismarine_bricks', + 'minecraft:stripped_crimson_stem', + 'minecraft:stripped_oak_log', + 'minecraft:stripped_spruce_log', +] ServerEvents.recipes(event => { + event.remove({ output: 'productivebees:titanium' }) - event.remove({output: 'productivebees:titanium'}) + event.remove({ output: '#forge:honeycombs' }) - event.remove({output: '#forge:honeycombs'}) + event.remove({ + output: Item.of( + 'productivebees:configurable_honeycomb', + '{EntityTag:{type:"productivebees:titanium"}}' + ).strongNBT(), + }) - event.remove({output: Item.of('productivebees:configurable_honeycomb', '{EntityTag:{type:"productivebees:titanium"}}').strongNBT()}) + hives.forEach(element => event.remove({ output: element })) - hives.forEach((element) => event.remove({output: element})); - - for(let i = 0; i < hives.length; i++){ + for (let i = 0; i < hives.length; i++) { event.shaped( Item.of(hives[i], 1), - [ - 'AAA', - 'EBE', - 'DCD' - + [ + "AAA", + "EBE", + "DCD" ], { - A:stripedWood[i], - B:'#forge:circuits/hv', - C:'gtceu:stainless_steel_plate', - D:'gtceu:bronze_plate', - E:'gtceu:potin_gear', - - + A: stripedWood[i], + B: "#forge:circuits/hv", + C: "gtceu:stainless_steel_plate", + D: "gtceu:bronze_plate", + E: "gtceu:potin_gear", } ) } - event.recipes.gtceu.centrifuge('gtceu:titanium_dust') - .itemInputs(Item.of('productivebees:configurable_honeycomb', '{EntityTag:{type:"productivebees:titanium"}}').strongNBT()) + event.recipes.gtceu + .centrifuge('gtceu:titanium_dust') + .itemInputs( + Item.of( + 'productivebees:configurable_honeycomb', + '{EntityTag:{type:"productivebees:titanium"}}' + ).strongNBT() + ) .itemOutputs('gtceu:titanium_dust') .duration(120) .EUt(16) - - -}); \ No newline at end of file +}) diff --git a/kubejs/server_scripts/SequencedAssembly/AE2sequence.js b/kubejs/server_scripts/SequencedAssembly/AE2sequence.js index ddb273fa..2d453c32 100644 --- a/kubejs/server_scripts/SequencedAssembly/AE2sequence.js +++ b/kubejs/server_scripts/SequencedAssembly/AE2sequence.js @@ -1,69 +1,172 @@ // priority: 0 ServerEvents.recipes(event => { - - let incStorageCell = 'kubejs:incomplete_storage_cell' - let incStorageComponent = 'kubejs:incomplete_storage_component' - - event.recipes.createSequencedAssembly([ - 'ae2:cell_component_1k', - ], 'kubejs:1k_me_storage_base', [ - event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'gtceu:red_alloy_double_wire']), - event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'gtceu:red_alloy_double_wire']), - event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', '#forge:gems/certus_quartz']), - event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:logic_processor']) - ]).transitionalItem('kubejs:incomplete_storage_component').loops(1) - event.recipes.createSequencedAssembly([ - 'ae2:cell_component_4k', - ], 'kubejs:4k_me_storage_base', [ - event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'gtceu:copper_double_wire']), - event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:cell_component_1k']), - event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:calculation_processor']) - ]).transitionalItem('kubejs:incomplete_storage_component').loops(3) - - event.recipes.createSequencedAssembly([ - 'ae2:cell_component_16k', - ], 'kubejs:16k_me_storage_base', [ - event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'gtceu:silver_double_wire']), - event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:cell_component_4k']), - event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:calculation_processor']) - ]).transitionalItem('kubejs:incomplete_storage_component').loops(3) - - event.recipes.createSequencedAssembly([ - 'ae2:cell_component_64k', - ], 'kubejs:64k_me_storage_base', [ - event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'gtceu:aluminium_quadruple_wire']), - event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:cell_component_16k']), - event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:calculation_processor']) - ]).transitionalItem('kubejs:incomplete_storage_component').loops(3) - - event.recipes.createSequencedAssembly([ - 'ae2:cell_component_256k', - ], 'kubejs:256k_me_storage_base', [ - event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'gtceu:platinum_double_wire']), - event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:cell_component_64k']), - event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:calculation_processor']), - event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:sky_dust']) - ]).transitionalItem('kubejs:incomplete_storage_component').loops(3) - - event.recipes.createSequencedAssembly([ - ('ae2:logic_processor'), - ], '#forge:circuits/lv', [ - event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:printed_logic_processor']), - event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:printed_silicon']) - ]).transitionalItem('kubejs:incomplete_storage_component').loops(1) - - event.recipes.createSequencedAssembly([ - 'ae2:engineering_processor', - ], '#forge:circuits/lv', [ - event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:printed_engineering_processor']), - event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:printed_silicon']) - ]).transitionalItem('kubejs:incomplete_storage_component').loops(1) - - event.recipes.createSequencedAssembly([ - 'ae2:calculation_processor', - ], '#forge:circuits/lv', [ - event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:printed_calculation_processor']), - event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:printed_silicon']) - ]).transitionalItem('kubejs:incomplete_storage_component').loops(1) - - }) + let incStorageCell = 'kubejs:incomplete_storage_cell' + let incStorageComponent = 'kubejs:incomplete_storage_component' + + event.recipes + .createSequencedAssembly( + ['ae2:cell_component_1k'], + 'kubejs:1k_me_storage_base', + [ + event.recipes.createDeploying('kubejs:incomplete_storage_component', [ + 'kubejs:incomplete_storage_component', + 'gtceu:red_alloy_double_wire', + ]), + event.recipes.createDeploying('kubejs:incomplete_storage_component', [ + 'kubejs:incomplete_storage_component', + 'gtceu:red_alloy_double_wire', + ]), + event.recipes.createDeploying('kubejs:incomplete_storage_component', [ + 'kubejs:incomplete_storage_component', + '#forge:gems/certus_quartz', + ]), + event.recipes.createDeploying('kubejs:incomplete_storage_component', [ + 'kubejs:incomplete_storage_component', + 'ae2:logic_processor', + ]), + ] + ) + .transitionalItem('kubejs:incomplete_storage_component') + .loops(1) + event.recipes + .createSequencedAssembly( + ['ae2:cell_component_4k'], + 'kubejs:4k_me_storage_base', + [ + event.recipes.createDeploying('kubejs:incomplete_storage_component', [ + 'kubejs:incomplete_storage_component', + 'gtceu:copper_double_wire', + ]), + event.recipes.createDeploying('kubejs:incomplete_storage_component', [ + 'kubejs:incomplete_storage_component', + 'ae2:cell_component_1k', + ]), + event.recipes.createDeploying('kubejs:incomplete_storage_component', [ + 'kubejs:incomplete_storage_component', + 'ae2:calculation_processor', + ]), + ] + ) + .transitionalItem('kubejs:incomplete_storage_component') + .loops(3) + + event.recipes + .createSequencedAssembly( + ['ae2:cell_component_16k'], + 'kubejs:16k_me_storage_base', + [ + event.recipes.createDeploying('kubejs:incomplete_storage_component', [ + 'kubejs:incomplete_storage_component', + 'gtceu:silver_double_wire', + ]), + event.recipes.createDeploying('kubejs:incomplete_storage_component', [ + 'kubejs:incomplete_storage_component', + 'ae2:cell_component_4k', + ]), + event.recipes.createDeploying('kubejs:incomplete_storage_component', [ + 'kubejs:incomplete_storage_component', + 'ae2:calculation_processor', + ]), + ] + ) + .transitionalItem('kubejs:incomplete_storage_component') + .loops(3) + + event.recipes + .createSequencedAssembly( + ['ae2:cell_component_64k'], + 'kubejs:64k_me_storage_base', + [ + event.recipes.createDeploying('kubejs:incomplete_storage_component', [ + 'kubejs:incomplete_storage_component', + 'gtceu:aluminium_quadruple_wire', + ]), + event.recipes.createDeploying('kubejs:incomplete_storage_component', [ + 'kubejs:incomplete_storage_component', + 'ae2:cell_component_16k', + ]), + event.recipes.createDeploying('kubejs:incomplete_storage_component', [ + 'kubejs:incomplete_storage_component', + 'ae2:calculation_processor', + ]), + ] + ) + .transitionalItem('kubejs:incomplete_storage_component') + .loops(3) + + event.recipes + .createSequencedAssembly( + ['ae2:cell_component_256k'], + 'kubejs:256k_me_storage_base', + [ + event.recipes.createDeploying('kubejs:incomplete_storage_component', [ + 'kubejs:incomplete_storage_component', + 'gtceu:platinum_double_wire', + ]), + event.recipes.createDeploying('kubejs:incomplete_storage_component', [ + 'kubejs:incomplete_storage_component', + 'ae2:cell_component_64k', + ]), + event.recipes.createDeploying('kubejs:incomplete_storage_component', [ + 'kubejs:incomplete_storage_component', + 'ae2:calculation_processor', + ]), + event.recipes.createDeploying('kubejs:incomplete_storage_component', [ + 'kubejs:incomplete_storage_component', + 'ae2:sky_dust', + ]), + ] + ) + .transitionalItem('kubejs:incomplete_storage_component') + .loops(3) + + event.recipes + .createSequencedAssembly(['ae2:logic_processor'], '#forge:circuits/lv', [ + event.recipes.createDeploying('kubejs:incomplete_storage_component', [ + 'kubejs:incomplete_storage_component', + 'ae2:printed_logic_processor', + ]), + event.recipes.createDeploying('kubejs:incomplete_storage_component', [ + 'kubejs:incomplete_storage_component', + 'ae2:printed_silicon', + ]), + ]) + .transitionalItem('kubejs:incomplete_storage_component') + .loops(1) + + event.recipes + .createSequencedAssembly( + ['ae2:engineering_processor'], + '#forge:circuits/lv', + [ + event.recipes.createDeploying('kubejs:incomplete_storage_component', [ + 'kubejs:incomplete_storage_component', + 'ae2:printed_engineering_processor', + ]), + event.recipes.createDeploying('kubejs:incomplete_storage_component', [ + 'kubejs:incomplete_storage_component', + 'ae2:printed_silicon', + ]), + ] + ) + .transitionalItem('kubejs:incomplete_storage_component') + .loops(1) + + event.recipes + .createSequencedAssembly( + ['ae2:calculation_processor'], + '#forge:circuits/lv', + [ + event.recipes.createDeploying('kubejs:incomplete_storage_component', [ + 'kubejs:incomplete_storage_component', + 'ae2:printed_calculation_processor', + ]), + event.recipes.createDeploying('kubejs:incomplete_storage_component', [ + 'kubejs:incomplete_storage_component', + 'ae2:printed_silicon', + ]), + ] + ) + .transitionalItem('kubejs:incomplete_storage_component') + .loops(1) +}) diff --git a/kubejs/server_scripts/SequencedAssembly/HV.js b/kubejs/server_scripts/SequencedAssembly/HV.js index cf3acb67..3570001d 100644 --- a/kubejs/server_scripts/SequencedAssembly/HV.js +++ b/kubejs/server_scripts/SequencedAssembly/HV.js @@ -1,10 +1,10 @@ // priority: 0 - ServerEvents.recipes(event => { +ServerEvents.recipes(event => { // #region variables let interAdvCirc = 'kubejs:inter_advanced_integrated_circuit' - let incAdvCirc = 'kubejs:inc_advanced_integrated_circuit' - let interMicroProcCirc = 'kubejs:inter_micro_processor_assembly' - let incMicroProcCirc = 'kubejs:inc_micro_processor_assembly' + let incAdvCirc = 'kubejs:inc_advanced_integrated_circuit' + let interMicroProcCirc = 'kubejs:inter_micro_processor_assembly' + let incMicroProcCirc = 'kubejs:inc_micro_processor_assembly' let incHvMotor = 'kubejs:inc_hv_motor' let incHvPiston = 'kubejs:inc_hv_piston' @@ -16,30 +16,30 @@ let incHvEmitter = 'kubejs:inc_hv_emitter' // #endregion // #region circuits - event.recipes.createSequencedAssembly([ - 'gtceu:advanced_integrated_circuit' - ], interAdvCirc, [ - event.recipes.createDeploying(incAdvCirc, [incAdvCirc, ['gtceu:transistor','gtceu:smd_transistor']]), - event.recipes.createDeploying(incAdvCirc, [incAdvCirc, 'gtceu:electrum_fine_wire']), - event.recipes.createDeploying(incAdvCirc, [incAdvCirc, 'gtceu:electrum_fine_wire']), - event.recipes.createDeploying(incAdvCirc, [incAdvCirc, 'gtceu:annealed_copper_bolt']), - event.recipes.createDeploying(incAdvCirc, [incAdvCirc, 'gtceu:annealed_copper_bolt']), - ]).transitionalItem(incAdvCirc).loops(4) + event.recipes.createSequencedAssembly([ + 'gtceu:advanced_integrated_circuit' + ], interAdvCirc, [ + event.recipes.createDeploying(incAdvCirc, [incAdvCirc, ['gtceu:transistor','gtceu:smd_transistor']]), + event.recipes.createDeploying(incAdvCirc, [incAdvCirc, 'gtceu:electrum_fine_wire']), + event.recipes.createDeploying(incAdvCirc, [incAdvCirc, 'gtceu:electrum_fine_wire']), + event.recipes.createDeploying(incAdvCirc, [incAdvCirc, 'gtceu:annealed_copper_bolt']), + event.recipes.createDeploying(incAdvCirc, [incAdvCirc, 'gtceu:annealed_copper_bolt']), + ]).transitionalItem(incAdvCirc).loops(4) event.recipes.createSequencedAssembly([ - 'gtceu:micro_processor_assembly' - ], interMicroProcCirc, [ - event.recipes.createDeploying(incMicroProcCirc, [incMicroProcCirc, 'gtceu:red_alloy_fine_wire']), - event.recipes.createDeploying(incMicroProcCirc, [incMicroProcCirc, 'gtceu:red_alloy_fine_wire']), - event.recipes.createDeploying(incMicroProcCirc, [incMicroProcCirc, ['gtceu:inductor', 'gtceu:smd_inductor']]), - event.recipes.createDeploying(incMicroProcCirc, [incMicroProcCirc, ['gtceu:capacitor', 'gtceu:smd_capacitor']]), - event.recipes.createDeploying(incMicroProcCirc, [incMicroProcCirc, ['gtceu:capacitor', 'gtceu:smd_capacitor']]) - ]).transitionalItem(incMicroProcCirc).loops(4) + 'gtceu:micro_processor_assembly' + ], interMicroProcCirc, [ + event.recipes.createDeploying(incMicroProcCirc, [incMicroProcCirc, 'gtceu:red_alloy_fine_wire']), + event.recipes.createDeploying(incMicroProcCirc, [incMicroProcCirc, 'gtceu:red_alloy_fine_wire']), + event.recipes.createDeploying(incMicroProcCirc, [incMicroProcCirc, ['gtceu:inductor', 'gtceu:smd_inductor']]), + event.recipes.createDeploying(incMicroProcCirc, [incMicroProcCirc, ['gtceu:capacitor', 'gtceu:smd_capacitor']]), + event.recipes.createDeploying(incMicroProcCirc, [incMicroProcCirc, ['gtceu:capacitor', 'gtceu:smd_capacitor']]) + ]).transitionalItem(incMicroProcCirc).loops(4) // #endregion // #region components event.recipes.createSequencedAssembly([ 'gtceu:hv_electric_motor', - ], 'gtceu:magnetic_steel_rod',[ + ], 'gtceu:magnetic_steel_rod',[ event.recipes.createDeploying(incHvMotor,[incHvMotor, 'gtceu:electrum_double_wire']), event.recipes.createDeploying(incHvMotor,[incHvMotor, 'gtceu:electrum_double_wire']), event.recipes.createDeploying(incHvMotor,[incHvMotor, 'gtceu:stainless_steel_rod']), @@ -48,7 +48,7 @@ event.recipes.createSequencedAssembly([ 'gtceu:hv_electric_piston', - ], 'gtceu:hv_electric_motor',[ + ], 'gtceu:hv_electric_motor',[ event.recipes.createDeploying(incHvPiston,[incHvPiston, 'gtceu:gold_single_cable']), event.recipes.createDeploying(incHvPiston,[incHvPiston, 'gtceu:stainless_steel_small_gear']), event.recipes.createDeploying(incHvPiston,[incHvPiston, 'gtceu:stainless_steel_rod']), @@ -57,7 +57,7 @@ event.recipes.createSequencedAssembly([ 'gtceu:hv_robot_arm', - ], 'gtceu:hv_electric_piston',[ + ], 'gtceu:hv_electric_piston',[ event.recipes.createDeploying(lncHvRobotArm,[lncHvRobotArm, '#forge:circuits/hv']), event.recipes.createDeploying(lncHvRobotArm,[lncHvRobotArm, 'gtceu:hv_electric_motor']), event.recipes.createDeploying(lncHvRobotArm,[lncHvRobotArm, 'gtceu:gold_single_cable']), @@ -66,7 +66,7 @@ event.recipes.createSequencedAssembly([ 'gtceu:hv_conveyor_module', - ], 'gtceu:gold_single_cable',[ + ], 'gtceu:gold_single_cable',[ event.recipes.createDeploying(incHvConveyor, [incHvConveyor, [ @@ -96,7 +96,7 @@ event.recipes.createSequencedAssembly([ 'gtceu:hv_electric_pump', - ], 'gtceu:stainless_steel_normal_fluid_pipe',[ + ], 'gtceu:stainless_steel_normal_fluid_pipe',[ event.recipes.createDeploying(incHvPump,[incHvPump, 'gtceu:steel_screw']), event.recipes.createDeploying(incHvPump,[incHvPump, 'gtceu:steel_rotor']), event.recipes.createDeploying(incHvPump, @@ -121,13 +121,13 @@ event.recipes.createSequencedAssembly([ 'gtceu:hv_fluid_regulator', - ], 'gtceu:hv_electric_pump', [ + ], 'gtceu:hv_electric_pump', [ event.recipes.createDeploying(invHvFluidRegulator, [invHvFluidRegulator, '#forge:circuits/hv']) ]).transitionalItem(invHvFluidRegulator).loops(2) event.recipes.createSequencedAssembly([ 'gtceu:hv_sensor', - ], 'gtceu:chromium_rod',[ + ], 'gtceu:chromium_rod',[ event.recipes.createDeploying(invHvSensor,[invHvSensor,'#forge:circuits/hv']), event.recipes.createDeploying(invHvSensor,[invHvSensor,'gtceu:stainless_steel_double_plate']), event.recipes.createDeploying(invHvSensor,[invHvSensor,'gtceu:stainless_steel_double_plate']), @@ -136,11 +136,11 @@ event.recipes.createSequencedAssembly([ 'gtceu:hv_emitter', - ], 'minecraft:ender_eye', [ + ], 'minecraft:ender_eye', [ event.recipes.createDeploying(incHvEmitter, [incHvEmitter, '#forge:circuits/hv']), event.recipes.createDeploying(incHvEmitter, [incHvEmitter, 'gtceu:gold_single_cable']), event.recipes.createDeploying(incHvEmitter, [incHvEmitter, 'gtceu:chromium_rod']), event.recipes.createDeploying(incHvEmitter, [incHvEmitter, 'gtceu:chromium_rod']), - ]).transitionalItem(incHvEmitter).loops(2) + ]).transitionalItem(incHvEmitter).loops(2) // #endregion -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/SequencedAssembly/IntermediateItems.js b/kubejs/server_scripts/SequencedAssembly/IntermediateItems.js index 4e01e723..e1691792 100644 --- a/kubejs/server_scripts/SequencedAssembly/IntermediateItems.js +++ b/kubejs/server_scripts/SequencedAssembly/IntermediateItems.js @@ -1,120 +1,147 @@ // priority: 0 - ServerEvents.recipes(event => { +ServerEvents.recipes(event => { let rawIntegratedCircBoard = 'kubejs:raw_integrated_circuit_board' let rawPlasticPrintedCircBoard = 'kubejs:raw_plastic_circuit_board' - let rawPhenolicCircBoard = 'kubejs:raw_phenolic_circuit_board' + let rawPhenolicCircBoard = 'kubejs:raw_phenolic_circuit_board' let interAdvCirc = 'kubejs:inter_advanced_integrated_circuit' let interMicroProcCirc = 'kubejs:inter_micro_processor_assembly' let rawEpoxyCircBoard = 'kubejs:raw_epoxy_circuit_board' let interNanoProc = 'kubejs:inter_nano_processor' let incNanoProc = 'kubejs:inc_inter_nano_processor' - - - event.recipes.createMixing([rawIntegratedCircBoard], + + event.recipes.createMixing( + [rawIntegratedCircBoard], [ 'gtceu:resin_printed_circuit_board', 'gtceu:ilc_chip', Fluid.of('gtceu:tin', 144) - ]).heated() - event.recipes.createMixing([rawIntegratedCircBoard], + ] + ).heated() + event.recipes.createMixing( + [rawIntegratedCircBoard], [ 'gtceu:resin_printed_circuit_board', 'gtceu:ilc_chip', Fluid.of('gtceu:soldering_alloy', 72) - ]).heated() + ] + ).heated() - event.recipes.createMixing([rawPlasticPrintedCircBoard], + event.recipes.createMixing( + [rawPlasticPrintedCircBoard], [ 'gtceu:plastic_printed_circuit_board', 'gtceu:cpu_chip', Fluid.of('gtceu:tin', 144) - ]).heated() - event.recipes.createMixing([rawPlasticPrintedCircBoard], + ] + ).heated() + event.recipes.createMixing( + [rawPlasticPrintedCircBoard], [ 'gtceu:plastic_printed_circuit_board', 'gtceu:cpu_chip', Fluid.of('gtceu:soldering_alloy', 72) - ]).heated() + ] + ).heated() - event.recipes.createSequencedAssembly([ - rawPhenolicCircBoard - ], 'gtceu:phenolic_printed_circuit_board', [ - event.recipes.createDeploying(rawPhenolicCircBoard, [rawPhenolicCircBoard, '#forge:circuits/lv']), - event.recipes.createFilling(rawPhenolicCircBoard, [rawPhenolicCircBoard, Fluid.of('gtceu:soldering_alloy', 36)]) - ]).transitionalItem(rawPhenolicCircBoard).loops(2) + event.recipes.createSequencedAssembly( + [rawPhenolicCircBoard], + 'gtceu:phenolic_printed_circuit_board', + [ + event.recipes.createDeploying(rawPhenolicCircBoard, [rawPhenolicCircBoard, '#forge:circuits/lv']), + event.recipes.createFilling(rawPhenolicCircBoard, [rawPhenolicCircBoard, Fluid.of('gtceu:soldering_alloy', 36)]) + ] + ).transitionalItem(rawPhenolicCircBoard).loops(2) - event.recipes.createSequencedAssembly([ - rawPhenolicCircBoard - ], 'gtceu:phenolic_printed_circuit_board', [ - event.recipes.createDeploying(rawPhenolicCircBoard, [rawPhenolicCircBoard, '#forge:circuits/lv']), - event.recipes.createFilling(rawPhenolicCircBoard, [rawPhenolicCircBoard, Fluid.of('gtceu:tin', 72)]) - ]).transitionalItem(rawPhenolicCircBoard).loops(2) + event.recipes.createSequencedAssembly( + [rawPhenolicCircBoard], + 'gtceu:phenolic_printed_circuit_board', + [ + event.recipes.createDeploying(rawPhenolicCircBoard, [rawPhenolicCircBoard, '#forge:circuits/lv']), + event.recipes.createFilling(rawPhenolicCircBoard, [rawPhenolicCircBoard, Fluid.of('gtceu:tin', 72)]) + ] + ).transitionalItem(rawPhenolicCircBoard).loops(2) - event.recipes.createMixing([interAdvCirc], + event.recipes.createMixing( + [interAdvCirc], [ '2x gtceu:good_integrated_circuit', '2x gtceu:ram_chip', '2x gtceu:ilc_chip', Fluid.of('gtceu:tin', 144) - ]).heated() - event.recipes.createMixing([interAdvCirc], + ] + ).heated() + event.recipes.createMixing( + [interAdvCirc], [ '2x gtceu:good_integrated_circuit', '2x gtceu:ram_chip', '2x gtceu:ilc_chip', Fluid.of('gtceu:soldering_alloy', 72) - ]).heated() + ] + ).heated() - event.recipes.createSequencedAssembly([ //textureneed for intermediate item - interMicroProcCirc - ], 'gtceu:plastic_printed_circuit_board', [ - event.recipes.createDeploying('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', 'gtceu:micro_processor']), - event.recipes.createDeploying('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', 'gtceu:ram_chip']), - event.recipes.createDeploying('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', 'gtceu:ram_chip']), - event.recipes.createFilling('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', Fluid.of('gtceu:tin', 144)]) - ]).transitionalItem('gtceu:plastic_printed_circuit_board').loops(2) + //textureneed for intermediate item + event.recipes.createSequencedAssembly( + [interMicroProcCirc], + 'gtceu:plastic_printed_circuit_board', + [ + event.recipes.createDeploying('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', 'gtceu:micro_processor']), + event.recipes.createDeploying('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', 'gtceu:ram_chip']), + event.recipes.createDeploying('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', 'gtceu:ram_chip']), + event.recipes.createFilling('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', Fluid.of('gtceu:tin', 144)]) + ] + ).transitionalItem('gtceu:plastic_printed_circuit_board').loops(2) - event.recipes.createSequencedAssembly([ - interMicroProcCirc - ], 'gtceu:plastic_printed_circuit_board', [ - event.recipes.createDeploying('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', 'gtceu:micro_processor']), - event.recipes.createDeploying('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', 'gtceu:ram_chip']), - event.recipes.createDeploying('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', 'gtceu:ram_chip']), - event.recipes.createFilling('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', Fluid.of('gtceu:soldering_alloy', 72)]) - ]).transitionalItem('gtceu:plastic_printed_circuit_board').loops(2) + event.recipes.createSequencedAssembly( + [interMicroProcCirc], + 'gtceu:plastic_printed_circuit_board', + [ + event.recipes.createDeploying('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', 'gtceu:micro_processor']), + event.recipes.createDeploying('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', 'gtceu:ram_chip']), + event.recipes.createDeploying('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', 'gtceu:ram_chip']), + event.recipes.createFilling('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', Fluid.of('gtceu:soldering_alloy', 72)]) + ] + ).transitionalItem('gtceu:plastic_printed_circuit_board').loops(2) - event.recipes.createMixing([rawEpoxyCircBoard], + event.recipes.createMixing( + [rawEpoxyCircBoard], [ 'gtceu:epoxy_printed_circuit_board', 'gtceu:nano_cpu_chip', Fluid.of('gtceu:soldering_alloy', 72) - ]).heated() - event.recipes.createMixing([rawEpoxyCircBoard], + ] + ).heated() + event.recipes.createMixing( + [rawEpoxyCircBoard], [ 'gtceu:epoxy_printed_circuit_board', 'gtceu:nano_cpu_chip', Fluid.of('gtceu:tin', 144) - ]).heated() + ] + ).heated() - event.recipes.createSequencedAssembly([ - interNanoProc - ], rawEpoxyCircBoard, [ - event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:smd_resistor']), - event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:smd_capacitor']), - event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:smd_transistor']), - event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:electrum_fine_wire']), - ]).transitionalItem(incNanoProc).loops(6) - - event.recipes.createSequencedAssembly([ - interNanoProc - ], rawEpoxyCircBoard, [ - event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:advanced_smd_resistor']), - event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:advanced_smd_capacitor']), - event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:advanced_smd_transistor']), - event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:electrum_fine_wire']), - event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:electrum_fine_wire']), - ]).transitionalItem(incNanoProc).loops(2) - }) + event.recipes.createSequencedAssembly( + [interNanoProc], + rawEpoxyCircBoard, + [ + event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:smd_resistor']), + event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:smd_capacitor']), + event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:smd_transistor']), + event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:electrum_fine_wire']), + ] + ).transitionalItem(incNanoProc).loops(6) + event.recipes.createSequencedAssembly( + [interNanoProc], + rawEpoxyCircBoard, + [ + event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:advanced_smd_resistor']), + event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:advanced_smd_capacitor']), + event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:advanced_smd_transistor']), + event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:electrum_fine_wire']), + event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:electrum_fine_wire']), + ] + ).transitionalItem(incNanoProc).loops(2) +}) diff --git a/kubejs/server_scripts/SequencedAssembly/LV.js b/kubejs/server_scripts/SequencedAssembly/LV.js index f2cb2d30..ad209cb4 100644 --- a/kubejs/server_scripts/SequencedAssembly/LV.js +++ b/kubejs/server_scripts/SequencedAssembly/LV.js @@ -1,11 +1,11 @@ // priority: 0 - ServerEvents.recipes(event => { +ServerEvents.recipes(event => { // #region variables let incBasicElectronicCirc = 'kubejs:inc_basic_electronic_circuit' let incBasicIntegrated = 'kubejs:inc_basic_integrated_circuit' let incMicrochipProcessor = 'kubejs:inc_microchip_processor' - let incLvMotor = 'kubejs:inc_lv_motor' + let incLvMotor = 'kubejs:inc_lv_motor' let incLvPiston = 'kubejs:inc_lv_piston' let lncLvRobotArm = 'kubejs:inc_lv_robot_arm' let incLvConveyor = 'kubejs:inc_lv_conveyor' @@ -17,149 +17,176 @@ let rawPlasticCircBoard = 'kubejs:raw_plastic_circuit_board' // #endregion // #region circuits - event.recipes.createSequencedAssembly([ - 'gtceu:basic_electronic_circuit', - ], 'gtceu:resin_printed_circuit_board', [ - event.recipes.createDeploying(incBasicElectronicCirc, [incBasicElectronicCirc, 'gtceu:red_alloy_single_wire']), - event.recipes.createDeploying(incBasicElectronicCirc, [incBasicElectronicCirc, ['gtceu:resistor', 'gtceu:smd_resistor']]), - event.recipes.createDeploying(incBasicElectronicCirc, [incBasicElectronicCirc, ['create:electron_tube', 'gtceu:nand_chip']]), - event.recipes.createFilling(incBasicElectronicCirc, [incBasicElectronicCirc, Fluid.of('gtceu:tin', 72)]) - ]).transitionalItem(incBasicElectronicCirc).loops(2) + event.recipes.createSequencedAssembly( + ['gtceu:basic_electronic_circuit'], + 'gtceu:resin_printed_circuit_board', + [ + event.recipes.createDeploying(incBasicElectronicCirc, [incBasicElectronicCirc, 'gtceu:red_alloy_single_wire']), + event.recipes.createDeploying(incBasicElectronicCirc, [incBasicElectronicCirc, ['gtceu:resistor', 'gtceu:smd_resistor']]), + event.recipes.createDeploying(incBasicElectronicCirc, [incBasicElectronicCirc, ['create:electron_tube', 'gtceu:nand_chip']]), + event.recipes.createFilling(incBasicElectronicCirc, [incBasicElectronicCirc, Fluid.of('gtceu:tin', 72)]) + ] + ).transitionalItem(incBasicElectronicCirc).loops(2) - event.recipes.createSequencedAssembly([ - 'gtceu:basic_electronic_circuit', - ], 'gtceu:resin_printed_circuit_board', [ - event.recipes.createDeploying(incBasicElectronicCirc, [incBasicElectronicCirc, 'gtceu:red_alloy_single_wire']), - event.recipes.createDeploying(incBasicElectronicCirc, [incBasicElectronicCirc, ['gtceu:resistor', 'gtceu:smd_resistor']]), - event.recipes.createDeploying(incBasicElectronicCirc, [incBasicElectronicCirc, ['create:electron_tube', 'gtceu:nand_chip']]), - event.recipes.createFilling(incBasicElectronicCirc, [incBasicElectronicCirc, Fluid.of('gtceu:soldering_alloy', 36)]) - ]).transitionalItem(incBasicElectronicCirc).loops(2) + event.recipes.createSequencedAssembly( + ['gtceu:basic_electronic_circuit'], + 'gtceu:resin_printed_circuit_board', + [ + event.recipes.createDeploying(incBasicElectronicCirc, [incBasicElectronicCirc, 'gtceu:red_alloy_single_wire']), + event.recipes.createDeploying(incBasicElectronicCirc, [incBasicElectronicCirc, ['gtceu:resistor', 'gtceu:smd_resistor']]), + event.recipes.createDeploying(incBasicElectronicCirc, [incBasicElectronicCirc, ['create:electron_tube', 'gtceu:nand_chip']]), + event.recipes.createFilling(incBasicElectronicCirc, [incBasicElectronicCirc, Fluid.of('gtceu:soldering_alloy', 36)]) + ] + ).transitionalItem(incBasicElectronicCirc).loops(2) - event.recipes.createSequencedAssembly([ - '2x gtceu:basic_integrated_circuit', - ], rawIntegratedCirc, [ - event.recipes.createDeploying(incBasicIntegrated, [incBasicIntegrated, ['gtceu:resistor', 'gtceu:smd_resistor']]), - event.recipes.createDeploying(incBasicIntegrated, [incBasicIntegrated, ['gtceu:diode', 'gtceu:smd_diode']]), - event.recipes.createDeploying(incBasicIntegrated, [incBasicIntegrated, 'gtceu:copper_fine_wire']), - event.recipes.createDeploying(incBasicIntegrated, [incBasicIntegrated, 'gtceu:tin_bolt']), - ]).transitionalItem(Item.of(incBasicIntegrated)).loops(2) + event.recipes.createSequencedAssembly( + ['2x gtceu:basic_integrated_circuit'], + rawIntegratedCirc, + [ + event.recipes.createDeploying(incBasicIntegrated, [incBasicIntegrated, ['gtceu:resistor', 'gtceu:smd_resistor']]), + event.recipes.createDeploying(incBasicIntegrated, [incBasicIntegrated, ['gtceu:diode', 'gtceu:smd_diode']]), + event.recipes.createDeploying(incBasicIntegrated, [incBasicIntegrated, 'gtceu:copper_fine_wire']), + event.recipes.createDeploying(incBasicIntegrated, [incBasicIntegrated, 'gtceu:tin_bolt']), + ] + ).transitionalItem(Item.of(incBasicIntegrated)).loops(2) - event.recipes.createSequencedAssembly([ - '3x gtceu:microchip_processor', - ], rawPlasticCircBoard, [ - event.recipes.createDeploying(incMicrochipProcessor, [incMicrochipProcessor, ['gtceu:resistor', 'gtceu:smd_resistor']]), - event.recipes.createDeploying(incMicrochipProcessor, [incMicrochipProcessor, ['gtceu:capacitor', 'gtceu:smd_capacitor']]), - event.recipes.createDeploying(incMicrochipProcessor, [incMicrochipProcessor, ['gtceu:transistor', 'gtceu:smd_transistor']]), - event.recipes.createDeploying(incMicrochipProcessor, [incMicrochipProcessor, 'gtceu:copper_fine_wire']), - ]).transitionalItem(incMicrochipProcessor).loops(2) + event.recipes.createSequencedAssembly( + ['3x gtceu:microchip_processor'], + rawPlasticCircBoard, + [ + event.recipes.createDeploying(incMicrochipProcessor, [incMicrochipProcessor, ['gtceu:resistor', 'gtceu:smd_resistor']]), + event.recipes.createDeploying(incMicrochipProcessor, [incMicrochipProcessor, ['gtceu:capacitor', 'gtceu:smd_capacitor']]), + event.recipes.createDeploying(incMicrochipProcessor, [incMicrochipProcessor, ['gtceu:transistor', 'gtceu:smd_transistor']]), + event.recipes.createDeploying(incMicrochipProcessor, [incMicrochipProcessor, 'gtceu:copper_fine_wire']), + ] + ).transitionalItem(incMicrochipProcessor).loops(2) // #endregion // #region components - event.recipes.createSequencedAssembly([ - 'gtceu:lv_electric_motor', - ], ['gtceu:magnetic_iron_rod', 'gtceu:magnetic_steel_rod'], [ - event.recipes.createDeploying(incLvMotor, [incLvMotor, 'gtceu:copper_single_wire']), - event.recipes.createDeploying(incLvMotor, [incLvMotor, 'gtceu:copper_single_wire']), - event.recipes.createDeploying(incLvMotor, [incLvMotor, ['gtceu:iron_rod','gtceu:steel_rod']]), - event.recipes.createDeploying(incLvMotor, [incLvMotor, 'gtceu:tin_single_cable']), - ]).transitionalItem(incLvMotor).loops(2) + event.recipes.createSequencedAssembly( + ['gtceu:lv_electric_motor'], + ['gtceu:magnetic_iron_rod', 'gtceu:magnetic_steel_rod'], + [ + event.recipes.createDeploying(incLvMotor, [incLvMotor, 'gtceu:copper_single_wire']), + event.recipes.createDeploying(incLvMotor, [incLvMotor, 'gtceu:copper_single_wire']), + event.recipes.createDeploying(incLvMotor, [incLvMotor, ['gtceu:iron_rod','gtceu:steel_rod']]), + event.recipes.createDeploying(incLvMotor, [incLvMotor, 'gtceu:tin_single_cable']), + ] + ).transitionalItem(incLvMotor).loops(2) - event.recipes.createSequencedAssembly([ - 'gtceu:lv_electric_piston', - ], 'gtceu:lv_electric_motor', [ - event.recipes.createDeploying(incLvPiston, [incLvPiston, 'gtceu:tin_single_cable']), - event.recipes.createDeploying(incLvPiston, [incLvPiston, 'gtceu:steel_small_gear']), - event.recipes.createDeploying(incLvPiston, [incLvPiston, 'gtceu:steel_rod']), - event.recipes.createDeploying(incLvPiston, [incLvPiston, 'gtceu:steel_plate']) - ]).transitionalItem(incLvPiston).loops(2) + event.recipes.createSequencedAssembly( + ['gtceu:lv_electric_piston'], + 'gtceu:lv_electric_motor', + [ + event.recipes.createDeploying(incLvPiston, [incLvPiston, 'gtceu:tin_single_cable']), + event.recipes.createDeploying(incLvPiston, [incLvPiston, 'gtceu:steel_small_gear']), + event.recipes.createDeploying(incLvPiston, [incLvPiston, 'gtceu:steel_rod']), + event.recipes.createDeploying(incLvPiston, [incLvPiston, 'gtceu:steel_plate']) + ] + ).transitionalItem(incLvPiston).loops(2) - event.recipes.createSequencedAssembly([ - 'gtceu:lv_robot_arm', - ], 'gtceu:lv_electric_piston', [ - event.recipes.createDeploying(lncLvRobotArm, [lncLvRobotArm, '#forge:circuits/lv']), - event.recipes.createDeploying(lncLvRobotArm, [lncLvRobotArm, 'gtceu:lv_electric_motor']), - event.recipes.createDeploying(lncLvRobotArm, [lncLvRobotArm, 'gtceu:tin_single_cable']), - event.recipes.createDeploying(lncLvRobotArm, [lncLvRobotArm, 'gtceu:steel_rod']) - ]).transitionalItem(lncLvRobotArm).loops(2) + event.recipes.createSequencedAssembly( + ['gtceu:lv_robot_arm'], + 'gtceu:lv_electric_piston', + [ + event.recipes.createDeploying(lncLvRobotArm, [lncLvRobotArm, '#forge:circuits/lv']), + event.recipes.createDeploying(lncLvRobotArm, [lncLvRobotArm, 'gtceu:lv_electric_motor']), + event.recipes.createDeploying(lncLvRobotArm, [lncLvRobotArm, 'gtceu:tin_single_cable']), + event.recipes.createDeploying(lncLvRobotArm, [lncLvRobotArm, 'gtceu:steel_rod']) + ] + ).transitionalItem(lncLvRobotArm).loops(2) - event.recipes.createSequencedAssembly([ - 'gtceu:lv_conveyor_module', - ], 'gtceu:tin_single_cable', [ - event.recipes.createDeploying(incLvConveyor, - [incLvConveyor, - [ - 'gtceu:rubber_plate', - 'gtceu:silicone_rubber_plate', - 'gtceu:styrene_butadiene_rubber_plate' - ] - ]), - event.recipes.createDeploying(incLvConveyor, - [incLvConveyor, - [ - 'gtceu:rubber_plate', - 'gtceu:silicone_rubber_plate', - 'gtceu:styrene_butadiene_rubber_plate' - ] - ]), - event.recipes.createDeploying(incLvConveyor, - [incLvConveyor, - [ - 'gtceu:rubber_plate', - 'gtceu:silicone_rubber_plate', - 'gtceu:styrene_butadiene_rubber_plate' - ] - ]), - event.recipes.createDeploying(incLvConveyor, [incLvConveyor, 'gtceu:lv_electric_motor']) - ]).transitionalItem(incLvConveyor).loops(2) + event.recipes.createSequencedAssembly( + ['gtceu:lv_conveyor_module'], + 'gtceu:tin_single_cable', + [ + event.recipes.createDeploying( + incLvConveyor, + [incLvConveyor, + [ + 'gtceu:rubber_plate', + 'gtceu:silicone_rubber_plate', + 'gtceu:styrene_butadiene_rubber_plate' + ] + ]), + event.recipes.createDeploying( + incLvConveyor, + [incLvConveyor, + [ + 'gtceu:rubber_plate', + 'gtceu:silicone_rubber_plate', + 'gtceu:styrene_butadiene_rubber_plate' + ] + ]), + event.recipes.createDeploying( + incLvConveyor, + [incLvConveyor, + [ + 'gtceu:rubber_plate', + 'gtceu:silicone_rubber_plate', + 'gtceu:styrene_butadiene_rubber_plate' + ] + ]), + event.recipes.createDeploying(incLvConveyor, [incLvConveyor, 'gtceu:lv_electric_motor']) + ] + ).transitionalItem(incLvConveyor).loops(2) - event.recipes.createSequencedAssembly([ - 'gtceu:lv_electric_pump', - ], 'gtceu:bronze_normal_fluid_pipe', [ - event.recipes.createDeploying(incLvPump, [incLvPump, 'gtceu:tin_screw']), - event.recipes.createDeploying(incLvPump, [incLvPump, 'gtceu:tin_rotor']), - event.recipes.createDeploying(incLvPump, - [incLvPump, - [ - 'gtceu:rubber_ring', - 'gtceu:silicone_rubber_ring', - 'gtceu:styrene_butadiene_rubber_ring' - ] - ]), - event.recipes.createDeploying(incLvPump, - [incLvPump, - [ - 'gtceu:rubber_ring', - 'gtceu:silicone_rubber_ring', - 'gtceu:styrene_butadiene_rubber_ring' - ] - ]), - event.recipes.createDeploying(incLvPump, [incLvPump, 'gtceu:tin_single_cable']), - event.recipes.createDeploying(incLvPump, [incLvPump, 'gtceu:lv_electric_motor']), - ]).transitionalItem(incLvPump).loops(1) + event.recipes.createSequencedAssembly( + ['gtceu:lv_electric_pump'], + 'gtceu:bronze_normal_fluid_pipe', + [ + event.recipes.createDeploying(incLvPump, [incLvPump, 'gtceu:tin_screw']), + event.recipes.createDeploying(incLvPump, [incLvPump, 'gtceu:tin_rotor']), + event.recipes.createDeploying(incLvPump, + [incLvPump, + [ + 'gtceu:rubber_ring', + 'gtceu:silicone_rubber_ring', + 'gtceu:styrene_butadiene_rubber_ring' + ] + ]), + event.recipes.createDeploying(incLvPump, + [incLvPump, + [ + 'gtceu:rubber_ring', + 'gtceu:silicone_rubber_ring', + 'gtceu:styrene_butadiene_rubber_ring' + ] + ]), + event.recipes.createDeploying(incLvPump, [incLvPump, 'gtceu:tin_single_cable']), + event.recipes.createDeploying(incLvPump, [incLvPump, 'gtceu:lv_electric_motor']), + ] + ).transitionalItem(incLvPump).loops(1) - event.recipes.createSequencedAssembly([ - 'gtceu:lv_fluid_regulator', - ], 'gtceu:lv_electric_piston', [ - event.recipes.createDeploying(invLvFluidRegulator, [invLvFluidRegulator, '#forge:circuits/lv']) - ]).transitionalItem(invLvFluidRegulator).loops(2) + event.recipes.createSequencedAssembly( + ['gtceu:lv_fluid_regulator'], + 'gtceu:lv_electric_piston', + [ + event.recipes.createDeploying(invLvFluidRegulator, [invLvFluidRegulator, '#forge:circuits/lv']) + ] + ).transitionalItem(invLvFluidRegulator).loops(2) - event.recipes.createSequencedAssembly([ - 'gtceu:lv_sensor', - ], '#forge:circuits/lv', [ - event.recipes.createDeploying(invLvSensor, [invLvSensor, 'gtceu:steel_double_plate']), - event.recipes.createDeploying(invLvSensor, [invLvSensor, 'gtceu:steel_double_plate']), - event.recipes.createDeploying(invLvSensor, [invLvSensor, 'gtceu:brass_rod']), - event.recipes.createDeploying(invLvSensor, [invLvSensor, 'gtceu:quartzite_gem']) - ]).transitionalItem(invLvSensor).loops(1) + event.recipes.createSequencedAssembly( + ['gtceu:lv_sensor'], + '#forge:circuits/lv', + [ + event.recipes.createDeploying(invLvSensor, [invLvSensor, 'gtceu:steel_double_plate']), + event.recipes.createDeploying(invLvSensor, [invLvSensor, 'gtceu:steel_double_plate']), + event.recipes.createDeploying(invLvSensor, [invLvSensor, 'gtceu:brass_rod']), + event.recipes.createDeploying(invLvSensor, [invLvSensor, 'gtceu:quartzite_gem']) + ] + ).transitionalItem(invLvSensor).loops(1) - event.recipes.createSequencedAssembly([ - 'gtceu:lv_emitter', - ], 'gtceu:quartzite_gem', [ - event.recipes.createDeploying(incLvEmitter, [incLvEmitter, '#forge:circuits/lv']), - event.recipes.createDeploying(incLvEmitter, [incLvEmitter, 'gtceu:tin_single_cable']), - event.recipes.createDeploying(incLvEmitter, [incLvEmitter, 'gtceu:brass_rod']), - event.recipes.createDeploying(incLvEmitter, [incLvEmitter, 'gtceu:brass_rod']) - ]).transitionalItem(incLvEmitter).loops(2) + event.recipes.createSequencedAssembly( + ['gtceu:lv_emitter'], + 'gtceu:quartzite_gem', + [ + event.recipes.createDeploying(incLvEmitter, [incLvEmitter, '#forge:circuits/lv']), + event.recipes.createDeploying(incLvEmitter, [incLvEmitter, 'gtceu:tin_single_cable']), + event.recipes.createDeploying(incLvEmitter, [incLvEmitter, 'gtceu:brass_rod']), + event.recipes.createDeploying(incLvEmitter, [incLvEmitter, 'gtceu:brass_rod']) + ] + ).transitionalItem(incLvEmitter).loops(2) // #endregion }) diff --git a/kubejs/server_scripts/SequencedAssembly/MV.js b/kubejs/server_scripts/SequencedAssembly/MV.js index 113b25c4..ecafe29e 100644 --- a/kubejs/server_scripts/SequencedAssembly/MV.js +++ b/kubejs/server_scripts/SequencedAssembly/MV.js @@ -1,5 +1,5 @@ // priority: 0 - ServerEvents.recipes(event => { +ServerEvents.recipes(event => { // #region variables let incGoodElectronicCirc = 'kubejs:inc_good_electronic_circuit' let incGoodIntegratedCirc = 'kubejs:inc_good_integrated_circuit' @@ -17,149 +17,173 @@ let rawPlasticCircBoard = 'kubejs:raw_plastic_circuit_board' // #endregion // #region circuits - event.recipes.createSequencedAssembly([ - 'gtceu:good_electronic_circuit' - ], 'gtceu:phenolic_printed_circuit_board',[ - event.recipes.createDeploying(incGoodElectronicCirc, [incGoodElectronicCirc, '#forge:circuits/lv']), - event.recipes.createDeploying(incGoodElectronicCirc, [incGoodElectronicCirc, ['gtceu:diode', 'gtceu:smd_diode']]), - event.recipes.createDeploying(incGoodElectronicCirc, [incGoodElectronicCirc, 'gtceu:copper_single_wire']), - event.recipes.createFilling(incGoodElectronicCirc, [incGoodElectronicCirc, Fluid.of('gtceu:soldering_alloy', 36)]) - ]).transitionalItem(incGoodElectronicCirc).loops(2) + event.recipes.createSequencedAssembly( + ['gtceu:good_electronic_circuit'], + 'gtceu:phenolic_printed_circuit_board', + [ + event.recipes.createDeploying(incGoodElectronicCirc, [incGoodElectronicCirc, '#forge:circuits/lv']), + event.recipes.createDeploying(incGoodElectronicCirc, [incGoodElectronicCirc, ['gtceu:diode', 'gtceu:smd_diode']]), + event.recipes.createDeploying(incGoodElectronicCirc, [incGoodElectronicCirc, 'gtceu:copper_single_wire']), + event.recipes.createFilling(incGoodElectronicCirc, [incGoodElectronicCirc, Fluid.of('gtceu:soldering_alloy', 36)]) + ] + ).transitionalItem(incGoodElectronicCirc).loops(2) - event.recipes.createSequencedAssembly([ - 'gtceu:good_electronic_circuit' - ], 'gtceu:phenolic_printed_circuit_board',[ - event.recipes.createDeploying(incGoodElectronicCirc, [incGoodElectronicCirc, '#forge:circuits/lv']), - event.recipes.createDeploying(incGoodElectronicCirc, [incGoodElectronicCirc, ['gtceu:diode', 'gtceu:smd_diode']]), - event.recipes.createDeploying(incGoodElectronicCirc, [incGoodElectronicCirc, 'gtceu:copper_single_wire']), - event.recipes.createFilling(incGoodElectronicCirc, [incGoodElectronicCirc, Fluid.of('gtceu:tin', 72)]) - ]).transitionalItem(incGoodElectronicCirc).loops(2) + event.recipes.createSequencedAssembly( + ['gtceu:good_electronic_circuit'], + 'gtceu:phenolic_printed_circuit_board', + [ + event.recipes.createDeploying(incGoodElectronicCirc, [incGoodElectronicCirc, '#forge:circuits/lv']), + event.recipes.createDeploying(incGoodElectronicCirc, [incGoodElectronicCirc, ['gtceu:diode', 'gtceu:smd_diode']]), + event.recipes.createDeploying(incGoodElectronicCirc, [incGoodElectronicCirc, 'gtceu:copper_single_wire']), + event.recipes.createFilling(incGoodElectronicCirc, [incGoodElectronicCirc, Fluid.of('gtceu:tin', 72)]) + ] + ).transitionalItem(incGoodElectronicCirc).loops(2) - event.recipes.createSequencedAssembly([ - '2x gtceu:good_integrated_circuit' - ], rawPhenolicCircBoard, [ - event.recipes.createDeploying(incGoodIntegratedCirc, [incGoodIntegratedCirc, ['gtceu:smd_resistor', 'gtceu:resistor']]), - event.recipes.createDeploying(incGoodIntegratedCirc, [incGoodIntegratedCirc, ['gtceu:smd_diode', 'gtceu:diode']]), - event.recipes.createDeploying(incGoodIntegratedCirc, [incGoodIntegratedCirc, 'gtceu:gold_fine_wire']), - event.recipes.createDeploying(incGoodIntegratedCirc, [incGoodIntegratedCirc, 'gtceu:gold_fine_wire']), - event.recipes.createDeploying(incGoodIntegratedCirc, [incGoodIntegratedCirc, 'gtceu:silver_bolt']), - event.recipes.createDeploying(incGoodIntegratedCirc, [incGoodIntegratedCirc, 'gtceu:silver_bolt']) - ]).transitionalItem(incGoodIntegratedCirc).loops(2) + event.recipes.createSequencedAssembly( + ['2x gtceu:good_integrated_circuit'], + rawPhenolicCircBoard, + [ + event.recipes.createDeploying(incGoodIntegratedCirc, [incGoodIntegratedCirc, ['gtceu:smd_resistor', 'gtceu:resistor']]), + event.recipes.createDeploying(incGoodIntegratedCirc, [incGoodIntegratedCirc, ['gtceu:smd_diode', 'gtceu:diode']]), + event.recipes.createDeploying(incGoodIntegratedCirc, [incGoodIntegratedCirc, 'gtceu:gold_fine_wire']), + event.recipes.createDeploying(incGoodIntegratedCirc, [incGoodIntegratedCirc, 'gtceu:gold_fine_wire']), + event.recipes.createDeploying(incGoodIntegratedCirc, [incGoodIntegratedCirc, 'gtceu:silver_bolt']), + event.recipes.createDeploying(incGoodIntegratedCirc, [incGoodIntegratedCirc, 'gtceu:silver_bolt']) + ] + ).transitionalItem(incGoodIntegratedCirc).loops(2) - event.recipes.createSequencedAssembly([ - '2x gtceu:micro_processor' - ], rawPlasticCircBoard, [ - event.recipes.createDeploying(incMicroProcessor, [incMicroProcessor, ['gtceu:resistor', 'gtceu:smd_resistor']]), - event.recipes.createDeploying(incMicroProcessor, [incMicroProcessor, ['gtceu:capacitor', 'gtceu:smd_capacitor']]), - event.recipes.createDeploying(incMicroProcessor, [incMicroProcessor, ['gtceu:transistor', 'gtceu:smd_transistor']]), - event.recipes.createDeploying(incMicroProcessor, [incMicroProcessor, 'gtceu:red_alloy_fine_wire']), - ]).transitionalItem(incMicroProcessor).loops(4) + event.recipes.createSequencedAssembly( + ['2x gtceu:micro_processor'], + rawPlasticCircBoard, + [ + event.recipes.createDeploying(incMicroProcessor, [incMicroProcessor, ['gtceu:resistor', 'gtceu:smd_resistor']]), + event.recipes.createDeploying(incMicroProcessor, [incMicroProcessor, ['gtceu:capacitor', 'gtceu:smd_capacitor']]), + event.recipes.createDeploying(incMicroProcessor, [incMicroProcessor, ['gtceu:transistor', 'gtceu:smd_transistor']]), + event.recipes.createDeploying(incMicroProcessor, [incMicroProcessor, 'gtceu:red_alloy_fine_wire']), + ] + ).transitionalItem(incMicroProcessor).loops(4) // #endregion // #region components - event.recipes.createSequencedAssembly([ - 'gtceu:mv_electric_motor', - ], 'gtceu:magnetic_steel_rod',[ - event.recipes.createDeploying(incMvMotor,[incMvMotor, 'gtceu:cupronickel_double_wire']), - event.recipes.createDeploying(incMvMotor,[incMvMotor, 'gtceu:cupronickel_double_wire']), - event.recipes.createDeploying(incMvMotor,[incMvMotor, 'gtceu:aluminium_rod']), - event.recipes.createDeploying(incMvMotor,[incMvMotor, 'gtceu:copper_single_cable']) - ]).transitionalItem(incMvMotor).loops(2) + event.recipes.createSequencedAssembly( + ['gtceu:mv_electric_motor'], + 'gtceu:magnetic_steel_rod', + [ + event.recipes.createDeploying(incMvMotor,[incMvMotor, 'gtceu:cupronickel_double_wire']), + event.recipes.createDeploying(incMvMotor,[incMvMotor, 'gtceu:cupronickel_double_wire']), + event.recipes.createDeploying(incMvMotor,[incMvMotor, 'gtceu:aluminium_rod']), + event.recipes.createDeploying(incMvMotor,[incMvMotor, 'gtceu:copper_single_cable']) + ] + ).transitionalItem(incMvMotor).loops(2) - event.recipes.createSequencedAssembly([ - 'gtceu:mv_electric_piston', - ], 'gtceu:mv_electric_motor',[ - event.recipes.createDeploying(incMvPiston,[incMvPiston, 'gtceu:copper_single_cable']), - event.recipes.createDeploying(incMvPiston,[incMvPiston, 'gtceu:aluminium_small_gear']), - event.recipes.createDeploying(incMvPiston,[incMvPiston, 'gtceu:aluminium_rod']), - event.recipes.createDeploying(incMvPiston,[incMvPiston, 'gtceu:aluminium_plate']), - ]).transitionalItem(incMvPiston).loops(2) + event.recipes.createSequencedAssembly( + ['gtceu:mv_electric_piston'], + 'gtceu:mv_electric_motor', + [ + event.recipes.createDeploying(incMvPiston,[incMvPiston, 'gtceu:copper_single_cable']), + event.recipes.createDeploying(incMvPiston,[incMvPiston, 'gtceu:aluminium_small_gear']), + event.recipes.createDeploying(incMvPiston,[incMvPiston, 'gtceu:aluminium_rod']), + event.recipes.createDeploying(incMvPiston,[incMvPiston, 'gtceu:aluminium_plate']), + ] + ).transitionalItem(incMvPiston).loops(2) - event.recipes.createSequencedAssembly([ - 'gtceu:mv_robot_arm', - ], 'gtceu:mv_electric_piston',[ - event.recipes.createDeploying(lncMvRobotArm,[lncMvRobotArm, '#forge:circuits/mv']), - event.recipes.createDeploying(lncMvRobotArm,[lncMvRobotArm, 'gtceu:mv_electric_motor']), - event.recipes.createDeploying(lncMvRobotArm,[lncMvRobotArm, 'gtceu:copper_single_cable']), - event.recipes.createDeploying(lncMvRobotArm,[lncMvRobotArm, 'gtceu:aluminium_rod']), - ]).transitionalItem(lncMvRobotArm).loops(2) + event.recipes.createSequencedAssembly( + ['gtceu:mv_robot_arm'], + 'gtceu:mv_electric_piston', + [ + event.recipes.createDeploying(lncMvRobotArm,[lncMvRobotArm, '#forge:circuits/mv']), + event.recipes.createDeploying(lncMvRobotArm,[lncMvRobotArm, 'gtceu:mv_electric_motor']), + event.recipes.createDeploying(lncMvRobotArm,[lncMvRobotArm, 'gtceu:copper_single_cable']), + event.recipes.createDeploying(lncMvRobotArm,[lncMvRobotArm, 'gtceu:aluminium_rod']), + ] + ).transitionalItem(lncMvRobotArm).loops(2) - event.recipes.createSequencedAssembly([ - 'gtceu:mv_conveyor_module', - ], 'gtceu:copper_single_cable',[ - event.recipes.createDeploying(incMvConveyor, - [incMvConveyor, - [ - 'gtceu:rubber_plate', - 'gtceu:silicone_rubber_plate', - 'gtceu:styrene_butadiene_rubber_plate' - ] - ]), - event.recipes.createDeploying(incMvConveyor, - [incMvConveyor, - [ - 'gtceu:rubber_plate', - 'gtceu:silicone_rubber_plate', - 'gtceu:styrene_butadiene_rubber_plate' - ] - ]), - event.recipes.createDeploying(incMvConveyor, - [incMvConveyor, - [ - 'gtceu:rubber_plate', - 'gtceu:silicone_rubber_plate', - 'gtceu:styrene_butadiene_rubber_plate' - ] - ]), - event.recipes.createDeploying(incMvConveyor,[incMvConveyor, 'gtceu:mv_electric_motor']), - ]).transitionalItem(incMvConveyor).loops(2) + event.recipes.createSequencedAssembly( + ['gtceu:mv_conveyor_module'], + 'gtceu:copper_single_cable', + [ + event.recipes.createDeploying(incMvConveyor, + [incMvConveyor, + [ + 'gtceu:rubber_plate', + 'gtceu:silicone_rubber_plate', + 'gtceu:styrene_butadiene_rubber_plate' + ] + ]), + event.recipes.createDeploying(incMvConveyor, + [incMvConveyor, + [ + 'gtceu:rubber_plate', + 'gtceu:silicone_rubber_plate', + 'gtceu:styrene_butadiene_rubber_plate' + ] + ]), + event.recipes.createDeploying(incMvConveyor, + [incMvConveyor, + [ + 'gtceu:rubber_plate', + 'gtceu:silicone_rubber_plate', + 'gtceu:styrene_butadiene_rubber_plate' + ] + ]), + event.recipes.createDeploying(incMvConveyor,[incMvConveyor, 'gtceu:mv_electric_motor']), + ] + ).transitionalItem(incMvConveyor).loops(2) - event.recipes.createSequencedAssembly([ - 'gtceu:mv_electric_pump', - ], 'gtceu:steel_normal_fluid_pipe',[ - event.recipes.createDeploying(incMvPump,[incMvPump, 'gtceu:bronze_screw']), - event.recipes.createDeploying(incMvPump,[incMvPump, 'gtceu:bronze_rotor']), - event.recipes.createDeploying(incMvPump, - [incMvPump, - [ - 'gtceu:rubber_ring', - 'gtceu:silicone_rubber_ring', - 'gtceu:styrene_butadiene_rubber_ring' - ] - ]), - event.recipes.createDeploying(incMvPump, - [incMvPump, - [ - 'gtceu:rubber_ring', - 'gtceu:silicone_rubber_ring', - 'gtceu:styrene_butadiene_rubber_ring' - ] - ]), - event.recipes.createDeploying(incMvPump,[incMvPump, 'gtceu:copper_single_cable']), - event.recipes.createDeploying(incMvPump,[incMvPump, 'gtceu:mv_electric_motor']), - ]).transitionalItem(incMvPump).loops(1) - - event.recipes.createSequencedAssembly([ - 'gtceu:mv_fluid_regulator', - ], 'gtceu:mv_electric_piston', [ - event.recipes.createDeploying(invMvFluidRegulator, [invMvFluidRegulator, '#forge:circuits/mv']) - ]).transitionalItem(invMvFluidRegulator).loops(2) + event.recipes.createSequencedAssembly( + ['gtceu:mv_electric_pump'], + 'gtceu:steel_normal_fluid_pipe', + [ + event.recipes.createDeploying(incMvPump,[incMvPump, 'gtceu:bronze_screw']), + event.recipes.createDeploying(incMvPump,[incMvPump, 'gtceu:bronze_rotor']), + event.recipes.createDeploying(incMvPump, + [incMvPump, + [ + 'gtceu:rubber_ring', + 'gtceu:silicone_rubber_ring', + 'gtceu:styrene_butadiene_rubber_ring' + ] + ]), + event.recipes.createDeploying(incMvPump, + [incMvPump, + [ + 'gtceu:rubber_ring', + 'gtceu:silicone_rubber_ring', + 'gtceu:styrene_butadiene_rubber_ring' + ] + ]), + event.recipes.createDeploying(incMvPump,[incMvPump, 'gtceu:copper_single_cable']), + event.recipes.createDeploying(incMvPump,[incMvPump, 'gtceu:mv_electric_motor']), + ] + ).transitionalItem(incMvPump).loops(1) + + event.recipes.createSequencedAssembly( + ['gtceu:mv_fluid_regulator'], + 'gtceu:mv_electric_piston', + [ + event.recipes.createDeploying(invMvFluidRegulator, [invMvFluidRegulator, '#forge:circuits/mv']) + ] + ).transitionalItem(invMvFluidRegulator).loops(2) - event.recipes.createSequencedAssembly([ - 'gtceu:mv_sensor', - ], 'gtceu:electrum_rod',[ - event.recipes.createDeploying(invMvSensor,[invMvSensor,'#forge:circuits/mv']), - event.recipes.createDeploying(invMvSensor,[invMvSensor,'gtceu:aluminium_double_plate']), - event.recipes.createDeploying(invMvSensor,[invMvSensor,'gtceu:aluminium_double_plate']), - event.recipes.createDeploying(invMvSensor,[invMvSensor,'gtceu:emerald_flawless_gem']), - ]).transitionalItem(invMvSensor).loops(1) + event.recipes.createSequencedAssembly( + ['gtceu:mv_sensor'], + 'gtceu:electrum_rod', + [ + event.recipes.createDeploying(invMvSensor,[invMvSensor,'#forge:circuits/mv']), + event.recipes.createDeploying(invMvSensor,[invMvSensor,'gtceu:aluminium_double_plate']), + event.recipes.createDeploying(invMvSensor,[invMvSensor,'gtceu:aluminium_double_plate']), + event.recipes.createDeploying(invMvSensor,[invMvSensor,'gtceu:emerald_flawless_gem']), + ] + ).transitionalItem(invMvSensor).loops(1) - event.recipes.createSequencedAssembly([ - 'gtceu:mv_emitter', - ], 'gtceu:emerald_flawless_gem', [ - event.recipes.createDeploying(incMvEmitter, [incMvEmitter, '#forge:circuits/mv']), - event.recipes.createDeploying(incMvEmitter, [incMvEmitter, 'gtceu:copper_single_cable']), - event.recipes.createDeploying(incMvEmitter, [incMvEmitter, 'gtceu:electrum_rod']), - event.recipes.createDeploying(incMvEmitter, [incMvEmitter, 'gtceu:electrum_rod']), - ]).transitionalItem(incMvEmitter).loops(2) + event.recipes.createSequencedAssembly( + ['gtceu:mv_emitter'], + 'gtceu:emerald_flawless_gem', + [ + event.recipes.createDeploying(incMvEmitter, [incMvEmitter, '#forge:circuits/mv']), + event.recipes.createDeploying(incMvEmitter, [incMvEmitter, 'gtceu:copper_single_cable']), + event.recipes.createDeploying(incMvEmitter, [incMvEmitter, 'gtceu:electrum_rod']), + event.recipes.createDeploying(incMvEmitter, [incMvEmitter, 'gtceu:electrum_rod']), + ] + ).transitionalItem(incMvEmitter).loops(2) // #endregion -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/Tags.js b/kubejs/server_scripts/Tags.js index c30775a6..376c14d5 100644 --- a/kubejs/server_scripts/Tags.js +++ b/kubejs/server_scripts/Tags.js @@ -1,10 +1,18 @@ //priority: 0 - ServerEvents.tags('item', event => { event.add('forge:lenses', 'kubejs:certus_quartz_lens') event.add('forge:lenses/certus', 'kubejs:certus_quartz_lens') - event.add('kubejs:fireproof_wood', ['minecraft:warped_stem', 'minecraft:stripped_warped_stem', 'minecraft:stripped_warped_hyphae', 'minecraft:warped_hyphae', 'minecraft:crimson_stem', 'minecraft:stripped_crimson_stem', 'minecraft:stripped_crimson_hyphae', 'minecraft:crimson_hyphae']) + event.add('kubejs:fireproof_wood', [ + 'minecraft:warped_stem', + 'minecraft:stripped_warped_stem', + 'minecraft:stripped_warped_hyphae', + 'minecraft:warped_hyphae', + 'minecraft:crimson_stem', + 'minecraft:stripped_crimson_stem', + 'minecraft:stripped_crimson_hyphae', + 'minecraft:crimson_hyphae', + ]) event.add('forge:tools/saws', 'kubejs:flint_saw') event.add('forge:armors', /ad_astra:jet(.*)/) event.add('forge:armors', /ad_astra:(.*)space(.*)/) -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/Vanilla.js b/kubejs/server_scripts/Vanilla.js index 3f86c356..4bac007b 100644 --- a/kubejs/server_scripts/Vanilla.js +++ b/kubejs/server_scripts/Vanilla.js @@ -1,11 +1,18 @@ //priority: 0 - ServerEvents.recipes(event => { event.remove({ output: 'minecraft:netherite_ingot' }) event.remove({ output: '#minecraft:planks' }) event.remove({ output: 'minecraft:stick' }) event.remove({ output: 'minecraft:chest' }) - event.remove({ output: [/(.*)a(.*):(.*)_hoe/,/(.*)a(.*):(.*)_shovel/,/(.*)a(.*):(.*)_pickaxe/,/(.*)a(.*):(.*)_sword/,/(.*)a(.*):(.*)_axe/,]}) + event.remove({ + output: [ + /(.*)a(.*):(.*)_hoe/, + /(.*)a(.*):(.*)_shovel/, + /(.*)a(.*):(.*)_pickaxe/, + /(.*)a(.*):(.*)_sword/, + /(.*)a(.*):(.*)_axe/, + ], + }) event.remove({ output: 'minecraft:furnace' }) event.remove({ output: 'gtceu:stone_gear' }) event.remove({ output: 'minecraft:crafting_table' }) @@ -16,144 +23,178 @@ ServerEvents.recipes(event => { event.remove({ output: 'minecraft:shield' }) event.remove({ output: '#minecraft:boats' }) event.remove({ output: 'minecraft:minecart' }) - event.remove({ output: 'minecraft:bucket'}) + event.remove({ output: 'minecraft:bucket' }) -var planks = ['minecraft:acacia_planks', 'minecraft:oak_planks', 'minecraft:birch_planks', 'minecraft:spruce_planks','minecraft:dark_oak_planks', 'minecraft:mangrove_planks', 'minecraft:jungle_planks', 'minecraft:warped_planks', 'minecraft:crimson_planks', 'gtceu:rubber_planks']; -var boats = ['minecraft:acacia_boat', 'minecraft:oak_boat', 'minecraft:birch_boat', 'minecraft:spruce_boat', 'minecraft:dark_oak_boat', 'minecraft:mangrove_boat', 'minecraft:jungle_boat' ] -var chestboats = ['minecraft:acacia_chest_boat', 'minecraft:oak_chest_boat', 'minecraft:birch_chest_boat', 'minecraft:spruce_chest_boat', 'minecraft:dark_oak_chest_boat', 'minecraft:mangrove_chest_boat', 'minecraft:jungle_chest_boat' ] -var logs = ['#minecraft:acacia_logs', '#minecraft:oak_logs', '#minecraft:birch_logs', '#minecraft:spruce_logs', '#minecraft:dark_oak_logs', '#minecraft:mangrove_logs', '#minecraft:jungle_logs', '#minecraft:warped_stems','#minecraft:crimson_stems', 'gtceu:rubber_log' ] - -//addition - var i = 0; - - var j = 0; + var planks = [ + 'minecraft:acacia_planks', + 'minecraft:oak_planks', + 'minecraft:birch_planks', + 'minecraft:spruce_planks', + 'minecraft:dark_oak_planks', + 'minecraft:mangrove_planks', + 'minecraft:jungle_planks', + 'minecraft:warped_planks', + 'minecraft:crimson_planks', + 'gtceu:rubber_planks', + ] + var boats = [ + 'minecraft:acacia_boat', + 'minecraft:oak_boat', + 'minecraft:birch_boat', + 'minecraft:spruce_boat', + 'minecraft:dark_oak_boat', + 'minecraft:mangrove_boat', + 'minecraft:jungle_boat', + ] + var chestboats = [ + 'minecraft:acacia_chest_boat', + 'minecraft:oak_chest_boat', + 'minecraft:birch_chest_boat', + 'minecraft:spruce_chest_boat', + 'minecraft:dark_oak_chest_boat', + 'minecraft:mangrove_chest_boat', + 'minecraft:jungle_chest_boat', + ] + var logs = [ + '#minecraft:acacia_logs', + '#minecraft:oak_logs', + '#minecraft:birch_logs', + '#minecraft:spruce_logs', + '#minecraft:dark_oak_logs', + '#minecraft:mangrove_logs', + '#minecraft:jungle_logs', + '#minecraft:warped_stems', + '#minecraft:crimson_stems', + 'gtceu:rubber_log', + ] - while (i < planks.length){ - event.shapeless( + //addition + var i = 0 + var j = 0 + while (i < planks.length) { + event.shapeless( Item.of(planks[i], 2), [Item.of(logs[i], 1)] ) event.shaped( - Item.of('minecraft:stick', 2), - [ - 'A ', - 'A ', - ' ' - ], - { - A: planks[i] - } - ) + Item.of('minecraft:stick', 2), + [ + 'A ', + 'A ', + ' ' + ], + { + A: planks[i] + } + ) event.shapeless( Item.of(planks[i], 4), - ['#forge:tools/saws', - logs[i] + [ + '#forge:tools/saws', + logs[i] ] ).damageIngredient(Item.of('#forge:tools/saws')) - - event.shapeless( Item.of('minecraft:stick', 4), - ['#forge:tools/files', - planks[i] + [ + '#forge:tools/files', + planks[i] ] ).damageIngredient(Item.of('#forge:tools/files')) - - event.recipes.createCutting(Item.of( - planks[i], 6), - logs[i], ).processingTime(20) + event.recipes.createCutting( + Item.of(planks[i], 6), + logs[i] + ).processingTime(20) event.shapeless( Item.of(planks[i], 4), - ['#forge:tools/saws', - logs[i] + [ + '#forge:tools/saws', + logs[i] ] ).damageIngredient(Item.of('#forge:tools/saws')) i++ - - } - while (j < boats.length){ + while (j < boats.length) { event.shaped( - Item.of(boats[j], 1), - [ - 'ABA', - 'AAA', - ' ' - ], - { - A: planks[j], - B:'#forge:tools/saws' - } - ) - - event.shaped( - Item.of(chestboats[j], 1), - [ - ' C ', - 'BDB', - ' A ' - ], - { - A: boats[j], - B: 'gtceu:iron_screw', - C: '#forge:tools/screwdrivers', - D: 'minecraft:chest' - } - ) + Item.of(boats[j], 1), + [ + 'ABA', + 'AAA', + ' ' + ], + { + A: planks[j], + B: '#forge:tools/saws' + } + ) + event.shaped( + Item.of(chestboats[j], 1), + [ + ' C ', + 'BDB', + ' A ' + ], + { + A: boats[j], + B: 'gtceu:iron_screw', + C: '#forge:tools/screwdrivers', + D: 'minecraft:chest' + } + ) j++ } -event.shaped( - Item.of('minecraft:chest'), + event.shaped( + Item.of('minecraft:chest'), [ 'CBC', 'BDB', 'ABA' ], { - A:'minecraft:flint', - B:'gtceu:wood_plate', - C:'gtceu:wood_gear', - D:'gtceu:wood_frame' + A: 'minecraft:flint', + B: 'gtceu:wood_plate', + C: 'gtceu:wood_gear', + D: 'gtceu:wood_frame' } -) -event.shaped( - Item.of('minecraft:furnace', 1), + ) + event.shaped( + Item.of('minecraft:furnace', 1), [ 'PFP', 'FPF', 'GFG', - ], + ], { P: 'gtceu:stone_gear', F: 'minecraft:cobblestone', G: 'gtceu:stone_rod' } -) -event.shapeless( - Item.of('gtceu:stone_rod', 2), - [ + ) + event.shapeless( + Item.of('gtceu:stone_rod', 2), + [ '2x minecraft:cobblestone' ] -) -event.shaped( - Item.of('minecraft:crafting_table'), + ) + event.shaped( + Item.of('minecraft:crafting_table'), [ 'AA ', 'AA ', ' ' ], { - A:'#minecraft:logs' + A: '#minecraft:logs' } -) + ) event.shaped( - Item.of('minecraft:blast_furnace'), + Item.of('minecraft:blast_furnace'), [ 'AAA', 'ABA', @@ -164,53 +205,53 @@ event.shaped( B: 'minecraft:furnace', C: 'minecraft:smooth_stone' } -) - -event.shaped( - Item.of('minecraft:smoker', 1), + ) + + event.shaped( + Item.of('minecraft:smoker', 1), [ 'ABA', 'BCB', 'ABA' ], { - A:'#kubejs:fireproof_wood', - B:'gtceu:invar_plate', - C:'minecraft:furnace' + A: '#kubejs:fireproof_wood', + B: 'gtceu:invar_plate', + C: 'minecraft:furnace' } -) + ) -event.shaped( - Item.of('minecraft:barrel'), + event.shaped( + Item.of('minecraft:barrel'), [ 'BAB', 'BDB', 'BAB' ], { - A:'minecraft:flint', - B:'gtceu:wood_plate', - D:'gtceu:wood_frame' + A: 'minecraft:flint', + B: 'gtceu:wood_plate', + D: 'gtceu:wood_frame' } ) -event.shaped('kubejs:flint_saw', - [ - 'AAB', - 'CDB', - ' ' - ], - { - A:'minecraft:flint', - B:'minecraft:stick', - C:'#forge:tools/files', - D:'#forge:tools/hammers' - } -) + event.shaped('kubejs:flint_saw', + [ + 'AAB', + 'CDB', + ' ' + ], + { + A: 'minecraft:flint', + B: 'minecraft:stick', + C: '#forge:tools/files', + D: '#forge:tools/hammers' + } + ) -event.shaped( - Item.of('minecraft:shield'), + event.shaped( + Item.of('minecraft:shield'), [ 'ABA', 'AAA', @@ -222,8 +263,8 @@ event.shaped( } ) -event.shaped( - Item.of('minecraft:minecart'), + event.shaped( + Item.of('minecraft:minecart'), [ 'A A', 'AAA', @@ -232,19 +273,18 @@ event.shaped( { A: 'gtceu:steel_double_plate' } -) + ) -event.shaped( - Item.of('minecraft:bucket'), - [ - 'ABA', - ' A ', - ' ', - ], - { - A: 'gtceu:iron_plate', - B: '#forge:tools/hammers' - } -) - -}) \ No newline at end of file + event.shaped( + Item.of('minecraft:bucket'), + [ + 'ABA', + ' A ', + ' ', + ], + { + A: 'gtceu:iron_plate', + B: '#forge:tools/hammers' + } + ) +}) diff --git a/kubejs/startup_scripts/ItemGeneration.js b/kubejs/startup_scripts/ItemGeneration.js index 78042558..cfe70120 100644 --- a/kubejs/startup_scripts/ItemGeneration.js +++ b/kubejs/startup_scripts/ItemGeneration.js @@ -1,58 +1,57 @@ // Priority: 0 StartupEvents.registry('item', event => { - event.create('drinkable_liquid_concrete').useAnimation("drink").displayName('Bucket of Drinkable Liquid Concrete') - event.create('inc_mv_circuit', 'create:sequenced_assembly').displayName('Incomplete MV Circuit') - //lv circuits - event.create('inc_basic_electronic_circuit', 'create:sequenced_assembly').displayName('Incomplete Basic Electronic Circuit') - event.create('inc_basic_integrated_circuit', 'create:sequenced_assembly').displayName('Incomplete Basic Integrated Circuit') - event.create('inc_microchip_processor', 'create:sequenced_assembly').displayName('Incomplete Microchip Processor') - //hv circuits - event.create('inc_good_electronic_circuit', 'create:sequenced_assembly').displayName('Incomplete Godd Electronic Circuit') - event.create('inc_good_integrated_circuit', 'create:sequenced_assembly').displayName('Incomplete Good Integrated Circuit') - event.create('inc_micro_processor', 'create:sequenced_assembly').displayName('Incomplete Micro Processor') - //hv circuits missing texture for inter items - event.create('inter_advanced_integrated_circuit').displayName('Intermediate Advanced Integrated Circuit') - event.create('inc_advanced_integrated_circuit', 'create:sequenced_assembly').displayName('Incomplete Advanced Integrated Circuit') + event.create('inc_mv_circuit', 'create:sequenced_assembly').displayName('Incomplete MV Circuit') + //lv circuits + event.create('inc_basic_electronic_circuit', 'create:sequenced_assembly').displayName('Incomplete Basic Electronic Circuit') + event.create('inc_basic_integrated_circuit', 'create:sequenced_assembly').displayName('Incomplete Basic Integrated Circuit') + event.create('inc_microchip_processor', 'create:sequenced_assembly').displayName('Incomplete Microchip Processor') + //hv circuits + event.create('inc_good_electronic_circuit', 'create:sequenced_assembly').displayName('Incomplete Godd Electronic Circuit') + event.create('inc_good_integrated_circuit', 'create:sequenced_assembly').displayName('Incomplete Good Integrated Circuit') + event.create('inc_micro_processor', 'create:sequenced_assembly').displayName('Incomplete Micro Processor') + //hv circuits missing texture for inter items + event.create('inter_advanced_integrated_circuit').displayName('Intermediate Advanced Integrated Circuit') + event.create('inc_advanced_integrated_circuit', 'create:sequenced_assembly').displayName('Incomplete Advanced Integrated Circuit') - event.create('inter_micro_processor_assembly').displayName('Intermediate Micro Processor Assembly') - event.create('inc_micro_processor_assembly', 'create:sequenced_assembly').displayName('Incomplete Micro Processor Assembly') + event.create('inter_micro_processor_assembly').displayName('Intermediate Micro Processor Assembly') + event.create('inc_micro_processor_assembly', 'create:sequenced_assembly').displayName('Incomplete Micro Processor Assembly') - event.create('inc_inter_nano_processor', 'create:sequenced_assembly').displayName('Incomplete Nano Processor') - event.create('inter_nano_processor').displayName('Intermediate Nano Processor') - - event.create('raw_integrated_circuit_board').displayName("Raw Integrated Circuit Board") - event.create('raw_phenolic_circuit_board').displayName("Raw Phenolic Printed Circuit Board") - event.create('raw_plastic_circuit_board').displayName("Raw Plastic Printed Circuit Board") - event.create('raw_epoxy_circuit_board').displayName("Raw Epoxy Printed Circuit Board") - // LV components - event.create('inc_lv_motor', 'create:sequenced_assembly').displayName('Incomplete LV Motor') - event.create('inc_lv_piston', 'create:sequenced_assembly').displayName('Incomplete LV Piston') - event.create('inc_lv_pump', 'create:sequenced_assembly').displayName('Incomplete LV Pump') - event.create('inc_lv_fluid_regulator', 'create:sequenced_assembly').displayName('Incomplete LV Fluid Regulator') - event.create('inc_lv_sensor', 'create:sequenced_assembly').displayName('Incomplete LV Sensor') - event.create('inc_lv_emitter', 'create:sequenced_assembly').displayName('Incomplete LV Emitter') - event.create('inc_lv_conveyor', 'create:sequenced_assembly').displayName('Incomplete LV Conveyor') - event.create('inc_lv_robot_arm', 'create:sequenced_assembly').displayName('Incomplete LV Robot Arm') - // MV components - event.create('inc_mv_motor', 'create:sequenced_assembly').displayName('Incomplete MV Motor') - event.create('inc_mv_piston', 'create:sequenced_assembly').displayName('Incomplete MV Piston') - event.create('inc_mv_pump', 'create:sequenced_assembly').displayName('Incomplete MV Pump') - event.create('inc_mv_fluid_regulator', 'create:sequenced_assembly').displayName('Incomplete MV Fluid Regulator') - event.create('inc_mv_sensor', 'create:sequenced_assembly').displayName('Incomplete MV Sensor') - event.create('inc_mv_emitter', 'create:sequenced_assembly').displayName('Incomplete MV Emitter') - event.create('inc_mv_conveyor', 'create:sequenced_assembly').displayName('Incomplete MV Conveyor') - event.create('inc_mv_robot_arm', 'create:sequenced_assembly').displayName('Incomplete MV Robotic Arm') - // HV components - event.create('inc_hv_motor', 'create:sequenced_assembly') - event.create('inc_hv_piston', 'create:sequenced_assembly').displayName('Incomplete HV Piston') - event.create('inc_hv_pump', 'create:sequenced_assembly').displayName('Incomplete HV Pump') - event.create('inc_hv_fluid_regulator', 'create:sequenced_assembly').displayName('Incomplete HV Fluid Regulator') - event.create('inc_hv_sensor', 'create:sequenced_assembly').displayName('Incomplete HV Sensor') - event.create('inc_hv_emitter', 'create:sequenced_assembly').displayName('Incomplete HV Emitter') - event.create('inc_hv_conveyor', 'create:sequenced_assembly').displayName('Incomplete HV Conveyor') - event.create('inc_hv_robot_arm', 'create:sequenced_assembly').displayName('Incomplete HV Robot Arm') + event.create('inc_inter_nano_processor', 'create:sequenced_assembly').displayName('Incomplete Nano Processor') + event.create('inter_nano_processor').displayName('Intermediate Nano Processor') + + event.create('raw_integrated_circuit_board').displayName("Raw Integrated Circuit Board") + event.create('raw_phenolic_circuit_board').displayName("Raw Phenolic Printed Circuit Board") + event.create('raw_plastic_circuit_board').displayName("Raw Plastic Printed Circuit Board") + event.create('raw_epoxy_circuit_board').displayName("Raw Epoxy Printed Circuit Board") + // LV components + event.create('inc_lv_motor', 'create:sequenced_assembly').displayName('Incomplete LV Motor') + event.create('inc_lv_piston', 'create:sequenced_assembly').displayName('Incomplete LV Piston') + event.create('inc_lv_pump', 'create:sequenced_assembly').displayName('Incomplete LV Pump') + event.create('inc_lv_fluid_regulator', 'create:sequenced_assembly').displayName('Incomplete LV Fluid Regulator') + event.create('inc_lv_sensor', 'create:sequenced_assembly').displayName('Incomplete LV Sensor') + event.create('inc_lv_emitter', 'create:sequenced_assembly').displayName('Incomplete LV Emitter') + event.create('inc_lv_conveyor', 'create:sequenced_assembly').displayName('Incomplete LV Conveyor') + event.create('inc_lv_robot_arm', 'create:sequenced_assembly').displayName('Incomplete LV Robot Arm') + // MV components + event.create('inc_mv_motor', 'create:sequenced_assembly').displayName('Incomplete MV Motor') + event.create('inc_mv_piston', 'create:sequenced_assembly').displayName('Incomplete MV Piston') + event.create('inc_mv_pump', 'create:sequenced_assembly').displayName('Incomplete MV Pump') + event.create('inc_mv_fluid_regulator', 'create:sequenced_assembly').displayName('Incomplete MV Fluid Regulator') + event.create('inc_mv_sensor', 'create:sequenced_assembly').displayName('Incomplete MV Sensor') + event.create('inc_mv_emitter', 'create:sequenced_assembly').displayName('Incomplete MV Emitter') + event.create('inc_mv_conveyor', 'create:sequenced_assembly').displayName('Incomplete MV Conveyor') + event.create('inc_mv_robot_arm', 'create:sequenced_assembly').displayName('Incomplete MV Robotic Arm') + // HV components + event.create('inc_hv_motor', 'create:sequenced_assembly') + event.create('inc_hv_piston', 'create:sequenced_assembly').displayName('Incomplete HV Piston') + event.create('inc_hv_pump', 'create:sequenced_assembly').displayName('Incomplete HV Pump') + event.create('inc_hv_fluid_regulator', 'create:sequenced_assembly').displayName('Incomplete HV Fluid Regulator') + event.create('inc_hv_sensor', 'create:sequenced_assembly').displayName('Incomplete HV Sensor') + event.create('inc_hv_emitter', 'create:sequenced_assembly').displayName('Incomplete HV Emitter') + event.create('inc_hv_conveyor', 'create:sequenced_assembly').displayName('Incomplete HV Conveyor') + event.create('inc_hv_robot_arm', 'create:sequenced_assembly').displayName('Incomplete HV Robot Arm') // AE2 @@ -71,10 +70,11 @@ StartupEvents.registry('item', event => { event.create('256k_me_storage_wafer').displayName('256k ME Storage Wafer') event.create('256k_me_storage_base').displayName('256k ME Storage Base') - event.create('incomplete_storage_cell', 'create:sequenced_assembly').displayName('Incomplete Storage Cell') - event.create('incomplete_storage_component', 'create:sequenced_assembly').displayName('Incomplete Storage Component') + event.create('incomplete_storage_cell', 'create:sequenced_assembly').displayName('Incomplete Storage Cell') + event.create('incomplete_storage_component', 'create:sequenced_assembly').displayName('Incomplete Storage Component') // Ad Astra + // Stainless Steel event.create('stainless_steel_engine') event.create('stainless_steel_fin') @@ -94,10 +94,9 @@ StartupEvents.registry('item', event => { event.create('trinium_engine') event.create('trinium_fin') event.create('trinium_cone') - - - + // misc + event.create('unf_turtle_helmet').displayName('Turtle Helmet Shell') event.create('netherite_plate').displayName('Netherite Plate') event.create('double_obsidian_plate').displayName('Double Obsidian Plate') @@ -108,8 +107,6 @@ StartupEvents.registry('item', event => { event.create('ruthenium_trinium_americium_neutronate_plate').displayName('Ruthenium Trinium Americium Neutronate Plate') event.create('flint_saw').displayName('Flint Saw').maxDamage(64).unstackable() - //compass event.create('empty_compass').displayName('Empty Compass') - -}) \ No newline at end of file +}) diff --git a/kubejs/startup_scripts/ItemsModification.js b/kubejs/startup_scripts/ItemsModification.js index 2f5962fb..9869983e 100644 --- a/kubejs/startup_scripts/ItemsModification.js +++ b/kubejs/startup_scripts/ItemsModification.js @@ -1,15 +1,32 @@ // priority: 0 - console.info('Items Modified') ItemEvents.modification(event => { - event.modify([/minecraft:raw_(.*)/, /gtceu:raw_(.*)/, /ad_astra:raw_(.*)/, /gtceu:(.*)_ore/], item =>{ - item.maxStackSize = 32 - }) - event.modify([/minecraft:raw_(.*)_block/, /gtceu:raw_(.*)_(.*)/, /ad_astra:raw_(.*)_block/, /gtceu:(.*)_crushed_ore/, /gtceu:(.*)_refined_ore/, /gtceu:(.*)_purified_ore/], item =>{ - item.maxStackSize = 64 - }) - event.modify(/gtceu:raw_(.*)_bucket/, item =>{ + event.modify( + [ + /minecraft:raw_(.*)/, + /gtceu:raw_(.*)/, + /ad_astra:raw_(.*)/, + /gtceu:(.*)_ore/, + ], + item => { + item.maxStackSize = 32 + } + ) + event.modify( + [ + /minecraft:raw_(.*)_block/, + /gtceu:raw_(.*)_(.*)/, + /ad_astra:raw_(.*)_block/, + /gtceu:(.*)_crushed_ore/, + /gtceu:(.*)_refined_ore/, + /gtceu:(.*)_purified_ore/, + ], + item => { + item.maxStackSize = 64 + } + ) + event.modify(/gtceu:raw_(.*)_bucket/, item => { item.maxStackSize = 1 }) event.modify('kubejs:drinkable_liquid_concrete', item => { @@ -19,4 +36,4 @@ ItemEvents.modification(event => { food.saturation(24) } }) -}) \ No newline at end of file +}) diff --git a/kubejs/startup_scripts/Materials.js b/kubejs/startup_scripts/Materials.js index d898f5fd..be52dd96 100644 --- a/kubejs/startup_scripts/Materials.js +++ b/kubejs/startup_scripts/Materials.js @@ -1,3 +1,3 @@ GTCEuStartupEvents.registry('gtceu:material', event => { - GTMaterials.Polyethylene.addFlags(GTMaterialFlags.GENERATE_ROTOR) + GTMaterials.Polyethylene.addFlags(GTMaterialFlags.GENERATE_ROTOR) }) diff --git a/kubejs/startup_scripts/MultiBlock.js b/kubejs/startup_scripts/MultiBlock.js index 9d7f03ba..97c62a9b 100644 --- a/kubejs/startup_scripts/MultiBlock.js +++ b/kubejs/startup_scripts/MultiBlock.js @@ -1,37 +1,43 @@ GTCEuStartupEvents.registry('gtceu:machine', event => { + //multi + event + .create('ore_proc', 'multiblock') + .rotationState(RotationState.NON_Y_AXIS) + .recipeTypes(['ore_proc']) + .appearanceBlock(GTBlocks.CASING_STAINLESS_CLEAN) + .pattern(definition => + FactoryBlockPattern.start() + .aisle('PPPPP', 'PTTTP', 'PTTTP', 'PPPPP') + .aisle('PPPPP', 'SWGWS', 'SWGWS', 'PPPPP') + .aisle('PPPPP', 'S#G#S', 'S#G#S', 'PPMPP') + .aisle('PPPPP', 'SWGWS', 'SWGWS', 'PPPPP') + .aisle('PPPPP', 'PTCTP', 'PTTTP', 'PPPPP') + .where('C', Predicates.controller(Predicates.blocks(definition.get()))) + .where('P', Predicates.blocks('gtceu:inert_machine_casing') + .setMinGlobalLimited(5) + .or(Predicates.autoAbilities(definition.getRecipeTypes()))) + .where('S', Predicates.blocks('gtceu:stainless_steel_frame')) + .where('T', Predicates.blocks('gtceu:tempered_glass')) + .where('G', Predicates.blocks('gtceu:steel_gearbox')) + .where('W', Predicates.blocks('create:crushing_wheel')) + .where('M', Predicates.abilities(PartAbility.MUFFLER).setExactLimit(1)) + .where('#', Predicates.air()) + .build() + ) + .workableCasingRenderer( + 'gtceu:block/casings/solid/machine_casing_inert_ptfe', + 'gtceu:block/multiblock/implosion_compressor', + false + ) +}) - //multi - event.create('ore_proc', 'multiblock') - .rotationState(RotationState.NON_Y_AXIS) - .recipeTypes(['ore_proc']) - .appearanceBlock(GTBlocks.CASING_STAINLESS_CLEAN) - .pattern(definition => FactoryBlockPattern.start() - .aisle("PPPPP", "PTTTP", "PTTTP", "PPPPP") - .aisle("PPPPP", "SWGWS", "SWGWS", "PPPPP") - .aisle("PPPPP", "S#G#S", "S#G#S", "PPMPP") - .aisle("PPPPP", "SWGWS", "SWGWS", "PPPPP") - .aisle("PPPPP", "PTCTP", "PTTTP", "PPPPP") - .where('C', Predicates.controller(Predicates.blocks(definition.get()))) - .where('P', Predicates.blocks('gtceu:inert_machine_casing').setMinGlobalLimited(5).or(Predicates.autoAbilities(definition.getRecipeTypes()))) - .where('S', Predicates.blocks('gtceu:stainless_steel_frame')) - .where('T', Predicates.blocks('gtceu:tempered_glass')) - .where('G', Predicates.blocks('gtceu:steel_gearbox')) - .where('W', Predicates.blocks('create:crushing_wheel')) - .where('M', Predicates.abilities(PartAbility.MUFFLER).setExactLimit(1)) - .where('#', Predicates.air()) - .build()) - .workableCasingRenderer("gtceu:block/casings/solid/machine_casing_inert_ptfe", - "gtceu:block/multiblock/implosion_compressor", false) - - }) - - GTCEuStartupEvents.registry('gtceu:recipe_type', event => { - - event.create('ore_proc') - .category('multi') //Used in the GTlib / LDlib ui editor - .setEUIO('in') - .setMaxIOSize(3, 4, 4, 3) //Max Item Inputs, Max Item Outputs, Max Fluid Inputs, Max Fluid Outputs - .setSlotOverlay(false, false, GuiTextures.SOLIDIFIER_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) - .setSound(GTSoundEntries.FIRE); - }) \ No newline at end of file +GTCEuStartupEvents.registry('gtceu:recipe_type', event => { + event + .create('ore_proc') + .category('multi') //Used in the GTlib / LDlib ui editor + .setEUIO('in') + .setMaxIOSize(3, 4, 4, 3) //Max Item Inputs, Max Item Outputs, Max Fluid Inputs, Max Fluid Outputs + .setSlotOverlay(false, false, GuiTextures.SOLIDIFIER_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) + .setSound(GTSoundEntries.FIRE) +}) diff --git a/kubejs/startup_scripts/Ores.js b/kubejs/startup_scripts/Ores.js index 44525245..1b878e72 100644 --- a/kubejs/startup_scripts/Ores.js +++ b/kubejs/startup_scripts/Ores.js @@ -1,10 +1,9 @@ // priority: 0 - console.info('Ores Modified') WorldgenEvents.remove(event => { event.removeOres(props => { - props.worldgenLayer = 'underground_ores' - props.blocks = [/minecraft:(.*)/, /create:(.*)/, /byg:(.*)/] + props.worldgenLayer = 'underground_ores' + props.blocks = [/minecraft:(.*)/, /create:(.*)/, /byg:(.*)/] }) -}) \ No newline at end of file +})