From 4b864cef0e690847b3fe7d9ba98ca22b0950ac0a Mon Sep 17 00:00:00 2001 From: Tom Prince Date: Tue, 28 Jan 2025 20:37:04 -0700 Subject: [PATCH 1/2] Add some stricter rules around whitespace. - No trailing whitespace. - Always trailing new-lines. - No double spaces. - Limit number of consecutive blank lines (I found a couple of files with a screenful of empty lines). This is partly selfish, as my editor and git are configured to automaticaly remove trailing whitespace. --- kubejs/eslint.config.mjs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kubejs/eslint.config.mjs b/kubejs/eslint.config.mjs index cc03e9f66..02f257d36 100644 --- a/kubejs/eslint.config.mjs +++ b/kubejs/eslint.config.mjs @@ -22,7 +22,11 @@ export default [ "@stylistic/js/indent": ["error", 4], "@stylistic/js/spaced-comment": "error", "@stylistic/js/linebreak-style": ["error", "unix"], + "@stylistic/js/no-trailing-spaces": "error", + "@stylistic/js/eol-last": ["error", "always"], + "@stylistic/js/no-multi-spaces": ["error", { ignoreEOLComments: true }], + "@stylistic/js/no-multiple-empty-lines": ["error", { max: 2, maxEOF: 0 }], }, }, - MoniLabs + MoniLabs, ]; From 132bb81f0df25fdeb5fdc182be4ca5c995602f4d Mon Sep 17 00:00:00 2001 From: Tom Prince Date: Tue, 28 Jan 2025 20:40:08 -0700 Subject: [PATCH 2/2] Fix new formatting. --- kubejs/client_scripts/Fixes_Client.js | 2 +- kubejs/client_scripts/JEI.js | 1 - kubejs/client_scripts/JEI_modespecific.js | 6 +- kubejs/client_scripts/_initial.js | 2 +- kubejs/client_scripts/_packmode.js | 2 +- kubejs/client_scripts/mods/RPC.js | 2 +- .../projectred_transmission.js | 2 +- kubejs/client_scripts/tooltips.js | 6 +- kubejs/dx/eslint-plugin/custom-plugin.mjs | 4 +- .../eslint-plugin/multiblock-declaration.mjs | 2 +- kubejs/server_scripts/Early_Game.js | 2 +- kubejs/server_scripts/Infinity_Toolset.js | 1 - kubejs/server_scripts/Remove_Recipes.js | 2 +- .../_hardmode/actualization_chamber.js | 6 +- kubejs/server_scripts/_hardmode/hardmode.js | 2 +- .../_hardmode/universal_crystallizer.js | 2 +- kubejs/server_scripts/_initial.js | 2 +- kubejs/server_scripts/_moni_motd.js | 2 +- kubejs/server_scripts/aa_planet_resources.js | 2 +- kubejs/server_scripts/extractor_solidifer.js | 2 +- .../fixes_tweaks/Better_Dynamo_Placement.js | 4 +- .../fixes_tweaks/Starting_Items.js | 2 +- .../fixes_tweaks/enchantments.js | 2 +- .../fixes_tweaks/glass_breaking.js | 2 +- .../fixes_tweaks/gregtech_credits.js | 2 +- .../fixes_tweaks/no_structures.js | 2 +- .../fixes_tweaks/superconducting_coils.js | 2 +- .../fixes_tweaks/unification/loottables.js | 2 +- .../server_scripts/gregtech/Alloys_Recipes.js | 2 +- .../server_scripts/gregtech/Crystal_Matrix.js | 23 +------ kubejs/server_scripts/gregtech/PECA.js | 2 +- .../gregtech/Post_UV_Components.js | 2 +- kubejs/server_scripts/gregtech/dense_ores.js | 1 - .../server_scripts/gregtech/energy_cores.js | 2 +- kubejs/server_scripts/gregtech/greenhouse.js | 2 +- .../gregtech/microverse_recipes.js | 1 - .../server_scripts/gregtech/naquadah_fuel.js | 61 ++----------------- kubejs/server_scripts/gregtech/netherite.js | 2 +- .../gregtech/post_tank_wafers.js | 2 +- .../gregtech/rock_cycle_simulator.js | 2 +- kubejs/server_scripts/gregtech/scrap.js | 2 +- .../server_scripts/gregtech/sculk_bioalloy.js | 2 +- kubejs/server_scripts/gregtech/terbium.js | 2 +- kubejs/server_scripts/infinite_sources.js | 2 +- kubejs/server_scripts/microverse.js | 2 +- kubejs/server_scripts/mods/AE2.js | 2 - kubejs/server_scripts/mods/Ad_Astra.js | 1 - .../mods/HostileNeuralNetworks.js | 1 - kubejs/server_scripts/mods/NuclearCraft.js | 4 +- kubejs/server_scripts/mods/Packaged_Auto.js | 2 +- kubejs/server_scripts/mods/Shrink.js | 2 +- kubejs/server_scripts/mods/Solar_Flux.js | 4 +- kubejs/server_scripts/mods/Thermal_Series.js | 2 +- .../server_scripts/mods/buildinggadgets2.js | 2 +- kubejs/server_scripts/mods/laserio.js | 2 +- .../mods/optionalCompats/compactmachines.js | 6 +- .../mods/optionalCompats/computercraft.js | 2 +- .../mods/optionalCompats/create.js | 6 +- .../optionalCompats/create_steamandrails.js | 10 +-- .../mods/optionalCompats/createdeco.js | 2 +- .../mods/optionalCompats/modularrouters.js | 2 +- .../mods/optionalCompats/tempad.js | 2 +- .../mods/optionalCompats/xnet.js | 2 +- kubejs/server_scripts/mods/redstone_clock.js | 2 +- kubejs/server_scripts/mods/wirelesscharger.js | 2 +- kubejs/server_scripts/monicoins/ores.js | 1 - kubejs/server_scripts/random_recipes.js | 2 +- kubejs/server_scripts/worldgen/fluidVeins.js | 5 +- kubejs/startup_scripts/Custom_Conduits.js | 2 +- kubejs/startup_scripts/_packmode.js | 4 +- kubejs/startup_scripts/excrafting_schema.js | 2 +- .../gregtech_crafting_components.js | 4 +- .../gregtech_material_registry/chemicals.js | 2 +- .../gregtech_material_registry/enderio.js | 2 +- .../gregtech_material_registry/misc.js | 1 - .../hardmode/material_registry/chemicals.js | 2 +- .../hardmode/material_registry/endgame.js | 2 +- .../hardmode/material_registry/microverse.js | 2 +- .../missing_material_forms_hm.js | 2 +- kubejs/startup_scripts/modify_blocks.js | 2 +- kubejs/startup_scripts/oreVeins.js | 2 +- kubejs/startup_scripts/oreVeinsRemoval.js | 2 +- .../registry/block_registry.js | 2 +- .../registry/singleblock_registry.js | 6 -- 84 files changed, 99 insertions(+), 188 deletions(-) diff --git a/kubejs/client_scripts/Fixes_Client.js b/kubejs/client_scripts/Fixes_Client.js index e04f2640c..e8f8b0a04 100644 --- a/kubejs/client_scripts/Fixes_Client.js +++ b/kubejs/client_scripts/Fixes_Client.js @@ -1 +1 @@ -/** Empty atm */ \ No newline at end of file +/** Empty atm */ diff --git a/kubejs/client_scripts/JEI.js b/kubejs/client_scripts/JEI.js index 079cbe76f..600e67f30 100644 --- a/kubejs/client_scripts/JEI.js +++ b/kubejs/client_scripts/JEI.js @@ -64,7 +64,6 @@ JEIEvents.hideItems(event => { event.hide(['enderio:soularium_grinding_ball', 'enderio:conductive_alloy_grinding_ball', 'enderio:pulsating_alloy_grinding_ball', 'enderio:redstone_alloy_grinding_ball', 'enderio:energetic_alloy_grinding_ball', 'enderio:vibrant_alloy_grinding_ball', 'enderio:copper_alloy_grinding_ball', 'enderio:dark_steel_grinding_ball', 'enderio:end_steel_grinding_ball']) - // TelePastries event.hide(['telepastries:custom_cake2', 'telepastries:custom_cake3', 'telepastries:twilight_cake']) diff --git a/kubejs/client_scripts/JEI_modespecific.js b/kubejs/client_scripts/JEI_modespecific.js index f4f8dd887..217a515eb 100644 --- a/kubejs/client_scripts/JEI_modespecific.js +++ b/kubejs/client_scripts/JEI_modespecific.js @@ -10,13 +10,13 @@ JEIEvents.hideItems(event => { event.hide(['gtceu:firebrick', 'gtceu:firebricks', 'gtceu:primitive_blast_furnace']) event.hide(/fireclay/) event.hide('kubejs:meowni_plush') - + // Bronze tier storage event.hide('sophisticatedstorage:iron_barrel') event.hide('sophisticatedstorage:iron_chest') event.hide('sophisticatedstorage:iron_shulker_box') event.hide(/^sophisticatedstorage:.*iron.*tier_upgrade$/) - + } if (isHardMode) { event.hide(/hostilenetworks/) @@ -32,4 +32,4 @@ JEIEvents.hideItems(event => { event.hide(/gtceu:[A-Za-z0-9]+_[A-Za-z0-9]+_energy_converter/) event.hide(/gtceu:[A-Za-z0-9]+_[A-Za-z0-9]+_energy_converter/) } -}) \ No newline at end of file +}) diff --git a/kubejs/client_scripts/_initial.js b/kubejs/client_scripts/_initial.js index 58bd2d9e8..ac6789bc9 100644 --- a/kubejs/client_scripts/_initial.js +++ b/kubejs/client_scripts/_initial.js @@ -74,4 +74,4 @@ const TIER_MAX = 12; const TIER_END = 13; const TIER_ID_MAPPING = [ 'ULV', 'LV', 'MV', 'HV', 'EV', 'IV', 'LuV', 'ZPM', 'UV', 'UHV', 'UEV', 'UIV', 'MAX', 'END' -] \ No newline at end of file +] diff --git a/kubejs/client_scripts/_packmode.js b/kubejs/client_scripts/_packmode.js index f1e3d6f5f..3b640a169 100644 --- a/kubejs/client_scripts/_packmode.js +++ b/kubejs/client_scripts/_packmode.js @@ -1,4 +1,4 @@ /** Pack mode */ const isNormalMode = !!global.isNormalMode; const isHardMode = !!global.isHardMode; -const isExpertMode = !!global.isExpertMode; \ No newline at end of file +const isExpertMode = !!global.isExpertMode; diff --git a/kubejs/client_scripts/mods/RPC.js b/kubejs/client_scripts/mods/RPC.js index efbc3f81e..c0b5d7f43 100644 --- a/kubejs/client_scripts/mods/RPC.js +++ b/kubejs/client_scripts/mods/RPC.js @@ -24,4 +24,4 @@ sdrp.dimension_change(ev => { let tierID = TIER_ID_MAPPING[Math.round(global.tier)]; ev.updateSDRPState(`sdrp.${tierID.toLowerCase()}`, tierID, tierID.toLowerCase()) // console.log("SDRP Update Client By Dim") -}) \ No newline at end of file +}) diff --git a/kubejs/client_scripts/mods/optionalCompats/projectred_transmission.js b/kubejs/client_scripts/mods/optionalCompats/projectred_transmission.js index f09d4ff29..06b985a86 100644 --- a/kubejs/client_scripts/mods/optionalCompats/projectred_transmission.js +++ b/kubejs/client_scripts/mods/optionalCompats/projectred_transmission.js @@ -36,4 +36,4 @@ if (Platform.isLoaded('projectred_transmission')) { // Hide CBMultipart blocks event.hide(/cb_microblock:.*/) }) -} \ No newline at end of file +} diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index c3841f3e0..1c54ced8d 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -46,7 +46,7 @@ ItemEvents.tooltip(tooltip => { // Questbook tooltip.addAdvanced(`ftbquests:book`, (item, adv, text) => { text.add(2, Text.gray(Text.translatable('ftbquests.book.tooltip'))) }) - // Redstone Clock + // Redstone Clock tooltip.add('redstoneclock:redstone_clock', Text.translatable('redstoneclock.redstone_clock.tooltip')) // DML Data Model @@ -255,7 +255,7 @@ ItemEvents.tooltip(tooltip => { 'chipped:loom_table', 'chipped:mason_table', 'chipped:alchemy_bench', - 'chipped:tinkering_table'], (item, adv, text) => { + 'chipped:tinkering_table'], (item, adv, text) => { text.add(1, Text.translatable('chipped.workbenches.tooltip.1')) text.add(2, Text.translatable('chipped.workbenches.tooltip.2')) }) @@ -268,7 +268,7 @@ ItemEvents.tooltip(tooltip => { 'packagedexcrafting:ultimate_crafter', 'packagedexexcrafting:epic_crafter' ], Text.translatable("packagedexcrafting.crafterspeed.tooltip")) - + // Tempad if (Platform.isLoaded('tempad')) { tooltip.add('tempad:tempad', Text.translatable("tempad.tempad.tooltip")) diff --git a/kubejs/dx/eslint-plugin/custom-plugin.mjs b/kubejs/dx/eslint-plugin/custom-plugin.mjs index 155684358..bb3a6d088 100644 --- a/kubejs/dx/eslint-plugin/custom-plugin.mjs +++ b/kubejs/dx/eslint-plugin/custom-plugin.mjs @@ -15,7 +15,7 @@ import callChains from "./call-chains.mjs" function customPluginWithAllRulesError(name, rules) { return { plugins: { - [name]: { rules } + [name]: { rules } }, rules: Object.fromEntries( Object.entries(rules).map(([rule]) => @@ -30,4 +30,4 @@ export const MoniLabs = customPluginWithAllRulesError("moni-labs", { "recipe-spacing": recipeSpacing, "multiblock-declaration": multiblockDeclaration, "call-chains": callChains -}) \ No newline at end of file +}) diff --git a/kubejs/dx/eslint-plugin/multiblock-declaration.mjs b/kubejs/dx/eslint-plugin/multiblock-declaration.mjs index dc961addd..9f5b5322f 100644 --- a/kubejs/dx/eslint-plugin/multiblock-declaration.mjs +++ b/kubejs/dx/eslint-plugin/multiblock-declaration.mjs @@ -28,7 +28,7 @@ export function isInMultiblockBuilderCallChain(rootCall) { else break if(rootCallee.object.type === "CallExpression") rootCall = rootCallee.object - else break + else break } if(!rootCallee) return false const o = rootCallee.object diff --git a/kubejs/server_scripts/Early_Game.js b/kubejs/server_scripts/Early_Game.js index 47fcbe23c..05c3b7148 100644 --- a/kubejs/server_scripts/Early_Game.js +++ b/kubejs/server_scripts/Early_Game.js @@ -142,4 +142,4 @@ ServerEvents.recipes(event => { // Battery Alloy Dust event.shapeless("4x gtceu:battery_alloy_dust", ["4x gtceu:lead_dust", "gtceu:antimony_dust"]) -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/Infinity_Toolset.js b/kubejs/server_scripts/Infinity_Toolset.js index 6bc93a6ca..031098ea0 100644 --- a/kubejs/server_scripts/Infinity_Toolset.js +++ b/kubejs/server_scripts/Infinity_Toolset.js @@ -1,7 +1,6 @@ /** Infinity Toolset recipes and subrecipes */ - ServerEvents.recipes(event => { // Infinity File diff --git a/kubejs/server_scripts/Remove_Recipes.js b/kubejs/server_scripts/Remove_Recipes.js index 129e59706..287d4ed3c 100644 --- a/kubejs/server_scripts/Remove_Recipes.js +++ b/kubejs/server_scripts/Remove_Recipes.js @@ -50,7 +50,7 @@ ServerEvents.recipes(event => { // Angel Ring event.remove({ id: 'better_angel_ring:angel_ring' }) event.remove({ id: 'better_angel_ring:ring' }) - + // AA event.remove({ output: ['gtceu:flawless_palis_empowered_gem', 'gtceu:flawless_diamatine_empowered_gem', 'gtceu:flawless_emeradic_empowered_gem', 'gtceu:restonia_empowered_rod', 'gtceu:enori_empowered_rod', 'gtceu:void_empowered_rod', 'gtceu:palis_empowered_rod', 'gtceu:diamatine_empowered_rod', 'gtceu:emeradic_empowered_rod', 'gtceu:exquisite_restonia_empowered_gem', 'gtceu:exquisite_enori_empowered_gem', 'gtceu:exquisite_void_empowered_gem', 'gtceu:exquisite_palis_empowered_gem', 'gtceu:exquisite_diamatine_empowered_gem', 'gtceu:exquisite_emeradic_empowered_gem', 'gtceu:restonia_empowered_dust', 'gtceu:enori_empowered_dust', 'gtceu:void_empowered_dust', 'gtceu:palis_empowered_dust', 'gtceu:diamatine_empowered_dust', 'gtceu:emeradic_empowered_dust', 'gtceu:tiny_restonia_empowered_dust', 'gtceu:tiny_enori_empowered_dust', 'gtceu:tiny_void_empowered_dust', 'gtceu:tiny_palis_empowered_dust', 'gtceu:tiny_diamatine_empowered_dust', 'gtceu:tiny_emeradic_empowered_dust', 'gtceu:flawless_restonia_empowered_gem', 'gtceu:flawless_enori_empowered_gem', 'gtceu:flawless_void_empowered_gem'] }) event.remove({ output: ['gtceu:small_emeradic_empowered_dust', 'gtceu:small_diamatine_empowered_dust', 'gtceu:small_palis_empowered_dust', 'gtceu:small_void_empowered_dust', 'gtceu:small_enori_empowered_dust', 'gtceu:small_restonia_empowered_dust'] }) diff --git a/kubejs/server_scripts/_hardmode/actualization_chamber.js b/kubejs/server_scripts/_hardmode/actualization_chamber.js index 0eb334735..5a9554ddc 100644 --- a/kubejs/server_scripts/_hardmode/actualization_chamber.js +++ b/kubejs/server_scripts/_hardmode/actualization_chamber.js @@ -112,7 +112,7 @@ ServerEvents.recipes(event => { '64x gtceu:netherrack_scheelite_ore', '64x gtceu:netherrack_scheelite_ore', '64x gtceu:netherrack_scheelite_ore', - '64x gtceu:netherrack_scheelite_ore', // need to add an extra stack to + '64x gtceu:netherrack_scheelite_ore', // need to add an extra stack to '64x gtceu:netherrack_tungstate_ore', '64x gtceu:netherrack_tungstate_ore', '64x gtceu:netherrack_tungstate_ore', @@ -319,7 +319,7 @@ ServerEvents.recipes(event => { .itemOutputs( '64x gtceu:pollucite_ore', // why is this replaced with cooperite? shouldn't be end either '64x gtceu:pollucite_ore', - '64x gtceu:snowchestite_ore', // why is THIS replaced with naq? + '64x gtceu:snowchestite_ore', // why is THIS replaced with naq? '64x gtceu:snowchestite_ore', '64x gtceu:snowchestite_ore', '64x gtceu:snowchestite_ore', @@ -482,4 +482,4 @@ ServerEvents.recipes(event => { .duration(780) .EUt(30720) } -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/_hardmode/hardmode.js b/kubejs/server_scripts/_hardmode/hardmode.js index 3b0411505..319f250b2 100644 --- a/kubejs/server_scripts/_hardmode/hardmode.js +++ b/kubejs/server_scripts/_hardmode/hardmode.js @@ -81,7 +81,7 @@ ServerEvents.recipes(event => { .duration(2000) .EUt(65520) - // Mob Heads + // Mob Heads event.shaped('minecraft:skeleton_skull', [ ' A ', 'ABA', diff --git a/kubejs/server_scripts/_hardmode/universal_crystallizer.js b/kubejs/server_scripts/_hardmode/universal_crystallizer.js index 1b415b6e0..ac418decd 100644 --- a/kubejs/server_scripts/_hardmode/universal_crystallizer.js +++ b/kubejs/server_scripts/_hardmode/universal_crystallizer.js @@ -68,4 +68,4 @@ ServerEvents.recipes(event => { .duration(7) .EUt(1000000) } -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/_initial.js b/kubejs/server_scripts/_initial.js index 21c90de9b..24a2cdeb8 100644 --- a/kubejs/server_scripts/_initial.js +++ b/kubejs/server_scripts/_initial.js @@ -58,4 +58,4 @@ const TIER_UV = 8; const TIER_UHV = 9; const TIER_ID_MAPPING = [ 'ULV', 'LV', 'MV', 'HV', 'EV', 'IV', 'LuV', 'ZPM', 'UV', 'UHV' -] \ No newline at end of file +] diff --git a/kubejs/server_scripts/_moni_motd.js b/kubejs/server_scripts/_moni_motd.js index 707e250ce..3c6320478 100644 --- a/kubejs/server_scripts/_moni_motd.js +++ b/kubejs/server_scripts/_moni_motd.js @@ -8,4 +8,4 @@ PlayerEvents.loggedIn(event => { .clickOpenUrl('https://github.com/ThePansmith/Monifactory') .hover('Click to open'), '.' ]); -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/aa_planet_resources.js b/kubejs/server_scripts/aa_planet_resources.js index d060b1259..abd9426d3 100644 --- a/kubejs/server_scripts/aa_planet_resources.js +++ b/kubejs/server_scripts/aa_planet_resources.js @@ -96,4 +96,4 @@ LootJS.modifiers((event) => { event.addBlockLootModifier(/.*mars_.*_ore$/).randomChance(0.5).addLoot('kubejs:mars_dust'); event.addBlockLootModifier(/.*venus_.*_ore$/).randomChance(0.5).addLoot('kubejs:venus_dust'); event.addBlockLootModifier(/.*mercury_.*_ore$/).randomChance(0.5).addLoot('kubejs:mercury_dust'); -}); \ No newline at end of file +}); diff --git a/kubejs/server_scripts/extractor_solidifer.js b/kubejs/server_scripts/extractor_solidifer.js index 7027b3daa..7ac7c814b 100644 --- a/kubejs/server_scripts/extractor_solidifer.js +++ b/kubejs/server_scripts/extractor_solidifer.js @@ -46,4 +46,4 @@ ServerEvents.recipes(event => { .duration(180) .EUt(6) } -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/fixes_tweaks/Better_Dynamo_Placement.js b/kubejs/server_scripts/fixes_tweaks/Better_Dynamo_Placement.js index 2f13c406c..67355e66a 100644 --- a/kubejs/server_scripts/fixes_tweaks/Better_Dynamo_Placement.js +++ b/kubejs/server_scripts/fixes_tweaks/Better_Dynamo_Placement.js @@ -27,7 +27,7 @@ BlockEvents.placed(event => { // Blocks below these line only get their placements altered if they were placed by an entity if (event.getEntity() == null) return - // Reverse placed Dynamos on Sneak + // Reverse placed Dynamos on Sneak if (block.getId().startsWith('thermal:dynamo') || (block.getId().startsWith('systeams:'))) { // systeams:steam is not a block thankfully let properties = block.getProperties() if (event.getEntity().isCrouching()) { @@ -36,4 +36,4 @@ BlockEvents.placed(event => { } } -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/fixes_tweaks/Starting_Items.js b/kubejs/server_scripts/fixes_tweaks/Starting_Items.js index ad6cad346..992e280a6 100644 --- a/kubejs/server_scripts/fixes_tweaks/Starting_Items.js +++ b/kubejs/server_scripts/fixes_tweaks/Starting_Items.js @@ -12,4 +12,4 @@ PlayerEvents.loggedIn(event => { // Give qb to player event.player.give('ftbquests:book') } -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/fixes_tweaks/enchantments.js b/kubejs/server_scripts/fixes_tweaks/enchantments.js index 537f148f2..6cb0f79b4 100644 --- a/kubejs/server_scripts/fixes_tweaks/enchantments.js +++ b/kubejs/server_scripts/fixes_tweaks/enchantments.js @@ -2,4 +2,4 @@ MoreJSEvents.filterAvailableEnchantments((event) => { event.add("minecraft:unbreaking"); -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/fixes_tweaks/glass_breaking.js b/kubejs/server_scripts/fixes_tweaks/glass_breaking.js index 149b7170c..1059cb931 100644 --- a/kubejs/server_scripts/fixes_tweaks/glass_breaking.js +++ b/kubejs/server_scripts/fixes_tweaks/glass_breaking.js @@ -7,4 +7,4 @@ ServerEvents.tags('block', event => { event.add('minecraft:mineable/pickaxe', /xtonesreworked:glaxx_block_/); event.add('minecraft:mineable/pickaxe', /enderio:clear_glass/); event.add('minecraft:mineable/pickaxe', /enderio:fused_quartz/); -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/fixes_tweaks/gregtech_credits.js b/kubejs/server_scripts/fixes_tweaks/gregtech_credits.js index de5d1192d..d4a77a0e8 100644 --- a/kubejs/server_scripts/fixes_tweaks/gregtech_credits.js +++ b/kubejs/server_scripts/fixes_tweaks/gregtech_credits.js @@ -29,4 +29,4 @@ ServerEvents.recipes(event => { .EUt(energyIn / (20 * 5)) .duration(20 * 5) } -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/fixes_tweaks/no_structures.js b/kubejs/server_scripts/fixes_tweaks/no_structures.js index bbf4fe110..c619d52d1 100644 --- a/kubejs/server_scripts/fixes_tweaks/no_structures.js +++ b/kubejs/server_scripts/fixes_tweaks/no_structures.js @@ -11,4 +11,4 @@ ServerEvents.tags('worldgen/biome', event => { // Add the eye trim as an ender dragon drop LootJS.modifiers((event) => { event.addEntityLootModifier("minecraft:ender_dragon").addLoot("minecraft:eye_armor_trim_smithing_template"); -}); \ No newline at end of file +}); diff --git a/kubejs/server_scripts/fixes_tweaks/superconducting_coils.js b/kubejs/server_scripts/fixes_tweaks/superconducting_coils.js index 6032e5905..926bd9045 100644 --- a/kubejs/server_scripts/fixes_tweaks/superconducting_coils.js +++ b/kubejs/server_scripts/fixes_tweaks/superconducting_coils.js @@ -25,4 +25,4 @@ ServerEvents.recipes(event => { } } }) -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/fixes_tweaks/unification/loottables.js b/kubejs/server_scripts/fixes_tweaks/unification/loottables.js index eb31a1ff6..8880a15f9 100644 --- a/kubejs/server_scripts/fixes_tweaks/unification/loottables.js +++ b/kubejs/server_scripts/fixes_tweaks/unification/loottables.js @@ -8,4 +8,4 @@ ServerEvents.blockLootTables(event => { LootJS.modifiers((event) => { event.addBlockLootModifier(/ae2:.*quartz_bud/) .replaceLoot("ae2:certus_quartz_dust", "gtceu:certus_quartz_dust") -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/gregtech/Alloys_Recipes.js b/kubejs/server_scripts/gregtech/Alloys_Recipes.js index e9267ae31..312e22c06 100644 --- a/kubejs/server_scripts/gregtech/Alloys_Recipes.js +++ b/kubejs/server_scripts/gregtech/Alloys_Recipes.js @@ -321,4 +321,4 @@ ServerEvents.recipes(event => { .EUt(30720) .blastFurnaceTemp(6400) -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/gregtech/Crystal_Matrix.js b/kubejs/server_scripts/gregtech/Crystal_Matrix.js index 841e204f0..6ee2c0da8 100644 --- a/kubejs/server_scripts/gregtech/Crystal_Matrix.js +++ b/kubejs/server_scripts/gregtech/Crystal_Matrix.js @@ -95,25 +95,4 @@ ServerEvents.recipes(event => { .duration(1000) .EUt(GTValues.VA[GTValues.ZPM]) .blastFurnaceTemp(6800) - - - - - - - - - - - - - - - - - - - - - -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/gregtech/PECA.js b/kubejs/server_scripts/gregtech/PECA.js index e020dc01d..b7233708c 100644 --- a/kubejs/server_scripts/gregtech/PECA.js +++ b/kubejs/server_scripts/gregtech/PECA.js @@ -123,4 +123,4 @@ ServerEvents.recipes(event => { .itemOutputs('32x gtceu:duct_tape') .duration(100) .EUt(GTValues.VA[GTValues.LV]) -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/gregtech/Post_UV_Components.js b/kubejs/server_scripts/gregtech/Post_UV_Components.js index d39f4822f..8ad7c6c62 100644 --- a/kubejs/server_scripts/gregtech/Post_UV_Components.js +++ b/kubejs/server_scripts/gregtech/Post_UV_Components.js @@ -166,7 +166,7 @@ ServerEvents.recipes(event => { W: `gtceu:${value.wire}`, C: `gtceu:${value.tier}_machine_casing` }).id(`shaped/hull_${value.tier}`) - + event.recipes.gtceu.assembler(`hull_${value.tier}`) .itemInputs(`gtceu:${value.tier}_machine_casing`, `2x gtceu:${value.wire}`, `2x gtceu:${value.plastic}_plate`) .itemOutputs(`gtceu:${value.tier}_machine_hull`) diff --git a/kubejs/server_scripts/gregtech/dense_ores.js b/kubejs/server_scripts/gregtech/dense_ores.js index 0b1706a1f..67b5de22f 100644 --- a/kubejs/server_scripts/gregtech/dense_ores.js +++ b/kubejs/server_scripts/gregtech/dense_ores.js @@ -57,4 +57,3 @@ ServerEvents.tags('block', event => { event.add("forge:ores/dense", `forge:ores/dense/${ore}`, `kubejs:dense_${ore}`); }) }) - diff --git a/kubejs/server_scripts/gregtech/energy_cores.js b/kubejs/server_scripts/gregtech/energy_cores.js index 453baf6e9..02a47e223 100644 --- a/kubejs/server_scripts/gregtech/energy_cores.js +++ b/kubejs/server_scripts/gregtech/energy_cores.js @@ -74,4 +74,4 @@ ServerEvents.recipes(event => { .itemOutputs("kubejs:hadal_energy_core") .duration(100) .EUt(GTValues.VA[GTValues.UV]) -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/gregtech/greenhouse.js b/kubejs/server_scripts/gregtech/greenhouse.js index 9f0b759af..611df2e35 100644 --- a/kubejs/server_scripts/gregtech/greenhouse.js +++ b/kubejs/server_scripts/gregtech/greenhouse.js @@ -178,4 +178,4 @@ ServerEvents.recipes(event => { "energy_mod": 1.0, "water_mod": 1.0 }).id('kubejs:thermal/insolator/pink_petals') -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/gregtech/microverse_recipes.js b/kubejs/server_scripts/gregtech/microverse_recipes.js index a0be4d05a..bb7d29696 100644 --- a/kubejs/server_scripts/gregtech/microverse_recipes.js +++ b/kubejs/server_scripts/gregtech/microverse_recipes.js @@ -482,7 +482,6 @@ ServerEvents.recipes(event => { .EUt(194387) - event.recipes.gtceu.advanced_microverse_ii('kubejs:t_ten_first') .itemInputs( 'kubejs:microminer_t10', diff --git a/kubejs/server_scripts/gregtech/naquadah_fuel.js b/kubejs/server_scripts/gregtech/naquadah_fuel.js index a24d5ebf8..c2b2ada13 100644 --- a/kubejs/server_scripts/gregtech/naquadah_fuel.js +++ b/kubejs/server_scripts/gregtech/naquadah_fuel.js @@ -3,7 +3,7 @@ */ ServerEvents.recipes(event => { - // Liquid Fuel recipes + // Liquid Fuel recipes if (!isNormalMode) { // Piranha Solution @@ -44,7 +44,7 @@ ServerEvents.recipes(event => { .duration(300) .EUt(30720) - // Naquadah Activation + // Naquadah Activation event.recipes.gtceu.fusion_reactor('naquadah_activation') .inputFluids('gtceu:inert_naquadah_blend 20', 'gtceu:tritium_radon_difluoride 20') .outputFluids('gtceu:active_naquadah_blend 20') @@ -59,7 +59,7 @@ ServerEvents.recipes(event => { .duration(200) .EUt(15360) - // Refinery Recipes + // Refinery Recipes event.recipes.gtceu.naquadah_refinery('t1_naquadah_fuel') .itemInputs('4x kubejs:naquadah_fuel_dust', '4x gtceu:plutonium_dust', '4x gtceu:uranium_235_dust', '6x gtceu:enriched_sunnarium_dust') .inputFluids('gtceu:medium_naquadah_isotope_fraction 400', 'gtceu:light_naquadah_isotope_fraction 200', 'gtceu:jean_gasoline 10000', 'gtceu:neptunium 1000') @@ -81,7 +81,7 @@ ServerEvents.recipes(event => { .duration(800) .EUt(8388608) - // Cracker Recipes + // Cracker Recipes event.recipes.gtceu.cracker('light_isotope_cracking') .inputFluids('gtceu:light_naquadah_isotope_fraction 1000', 'gtceu:neutronium 100') @@ -317,55 +317,4 @@ ServerEvents.recipes(event => { .chancedOutput('kubejs:naquadah_waste', 3300, 0) .duration(80) .EUt(30720) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/gregtech/netherite.js b/kubejs/server_scripts/gregtech/netherite.js index d591ca38d..74c617e31 100644 --- a/kubejs/server_scripts/gregtech/netherite.js +++ b/kubejs/server_scripts/gregtech/netherite.js @@ -87,4 +87,4 @@ ServerEvents.recipes(event => { event.remove({ output: "minecraft:netherite_ingot" }) event.smelting('minecraft:netherite_scrap', 'kubejs:crushed_ancient_debris') -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/gregtech/post_tank_wafers.js b/kubejs/server_scripts/gregtech/post_tank_wafers.js index bac273f12..c5486484e 100644 --- a/kubejs/server_scripts/gregtech/post_tank_wafers.js +++ b/kubejs/server_scripts/gregtech/post_tank_wafers.js @@ -205,4 +205,4 @@ ServerEvents.recipes(event => { .cleanroom(CleanroomType.CLEANROOM) .duration(300) .EUt(GTValues.VA[GTValues.UIV]) -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/gregtech/rock_cycle_simulator.js b/kubejs/server_scripts/gregtech/rock_cycle_simulator.js index cd142e5fb..2d6441095 100644 --- a/kubejs/server_scripts/gregtech/rock_cycle_simulator.js +++ b/kubejs/server_scripts/gregtech/rock_cycle_simulator.js @@ -45,4 +45,4 @@ ServerEvents.recipes(event => { RockCycle('shale', 'quark:shale', 'quark:shale', 60) RockCycle('myalite', 'quark:myalite', 'quark:myalite', 60) -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/gregtech/scrap.js b/kubejs/server_scripts/gregtech/scrap.js index 8b42f996c..68ab879ba 100644 --- a/kubejs/server_scripts/gregtech/scrap.js +++ b/kubejs/server_scripts/gregtech/scrap.js @@ -99,4 +99,4 @@ ServerEvents.recipes(event => { .itemOutputs('gtceu:holmium_oxide_dust', 'gtceu:glass_dust') .duration(400) .EUt(16380) -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/gregtech/sculk_bioalloy.js b/kubejs/server_scripts/gregtech/sculk_bioalloy.js index 5468160ff..7ad03f50f 100644 --- a/kubejs/server_scripts/gregtech/sculk_bioalloy.js +++ b/kubejs/server_scripts/gregtech/sculk_bioalloy.js @@ -31,4 +31,4 @@ ServerEvents.recipes(event => { .duration(60) .EUt(GTValues.VA[GTValues.LuV]) .cleanroom(CleanroomType.STERILE_CLEANROOM) -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/gregtech/terbium.js b/kubejs/server_scripts/gregtech/terbium.js index ff8711a14..dabb64ac7 100644 --- a/kubejs/server_scripts/gregtech/terbium.js +++ b/kubejs/server_scripts/gregtech/terbium.js @@ -58,4 +58,4 @@ ServerEvents.recipes(event => { .itemOutputs('gtceu:long_magnetic_terbium_rod') .duration(200) .EUt(122880) -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/infinite_sources.js b/kubejs/server_scripts/infinite_sources.js index ea2134534..6e55d037b 100644 --- a/kubejs/server_scripts/infinite_sources.js +++ b/kubejs/server_scripts/infinite_sources.js @@ -26,7 +26,7 @@ ServerEvents.recipes(event => { S: "enderio:fused_quartz", C: "#forge:ingots/copper" }).id('kubejs:device_water_gen'); - + event.shaped('thermal:device_rock_gen', [ ' P ', 'PNP', diff --git a/kubejs/server_scripts/microverse.js b/kubejs/server_scripts/microverse.js index 7cc6bd5ef..d2386dc92 100644 --- a/kubejs/server_scripts/microverse.js +++ b/kubejs/server_scripts/microverse.js @@ -489,4 +489,4 @@ ServerEvents.recipes(event => { W: 'gtceu:tungsten_carbide_plate', C: 'gtceu:iv_sensor' }) -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/mods/AE2.js b/kubejs/server_scripts/mods/AE2.js index c984d0c04..d5fac6d0a 100644 --- a/kubejs/server_scripts/mods/AE2.js +++ b/kubejs/server_scripts/mods/AE2.js @@ -969,7 +969,6 @@ ServerEvents.recipes(event => { event.shapeless('expatternprovider:ex_pattern_access_part', ['#ae2:illuminated_panel', 'ae2:logic_processor']).id('kubejs:epp/epa_upgrade') - // ME packing tape event.shapeless('expatternprovider:me_packing_tape', ['gtceu:basic_tape', 'gtceu:fluix_dust']).id('expatternprovider:tape') @@ -1150,7 +1149,6 @@ ServerEvents.recipes(event => { } - washToFluix('covered') washToFluix('covered_dense') washToFluix('smart_dense') diff --git a/kubejs/server_scripts/mods/Ad_Astra.js b/kubejs/server_scripts/mods/Ad_Astra.js index b1547d657..cb2548f52 100644 --- a/kubejs/server_scripts/mods/Ad_Astra.js +++ b/kubejs/server_scripts/mods/Ad_Astra.js @@ -141,7 +141,6 @@ ServerEvents.recipes(event => { }) - // Nasa Work Bench event.recipes.extendedcrafting.shaped_table('ad_astra:nasa_workbench', [ "RPEPR", diff --git a/kubejs/server_scripts/mods/HostileNeuralNetworks.js b/kubejs/server_scripts/mods/HostileNeuralNetworks.js index eb02dc678..04a3f0539 100644 --- a/kubejs/server_scripts/mods/HostileNeuralNetworks.js +++ b/kubejs/server_scripts/mods/HostileNeuralNetworks.js @@ -32,7 +32,6 @@ ServerEvents.recipes(event => { .EUt(4) - event.shaped('hostilenetworks:blank_data_model', [ 'BBA', 'DCA', diff --git a/kubejs/server_scripts/mods/NuclearCraft.js b/kubejs/server_scripts/mods/NuclearCraft.js index cf2ae0cc9..e71673787 100644 --- a/kubejs/server_scripts/mods/NuclearCraft.js +++ b/kubejs/server_scripts/mods/NuclearCraft.js @@ -12,7 +12,7 @@ ServerEvents.recipes(event => { }) // Live Fuel decomp -// Could also use this to change how these fuels are created? +// Could also use this to change how these fuels are created? ServerEvents.recipes(event => { function decomp(name, fuel, ing1, ing2) { @@ -486,4 +486,4 @@ ServerEvents.tags('item', event => { event.add('forge:rubber_plates', 'gtceu:silicone_rubber_plate') event.add('forge:rubber_plates', 'gtceu:styrene_butadiene_rubber_plate') event.add('forge:rubber_plates', 'gtceu:rubber_plate') -}); \ No newline at end of file +}); diff --git a/kubejs/server_scripts/mods/Packaged_Auto.js b/kubejs/server_scripts/mods/Packaged_Auto.js index 954af74e0..15ecaff41 100644 --- a/kubejs/server_scripts/mods/Packaged_Auto.js +++ b/kubejs/server_scripts/mods/Packaged_Auto.js @@ -148,4 +148,4 @@ ServerEvents.recipes(event => { D: 'extendedcrafting:crystaltine_catalyst', E: 'extendedcrafting:crafting_core' }) -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/mods/Shrink.js b/kubejs/server_scripts/mods/Shrink.js index 9272ecde1..b49187c0e 100644 --- a/kubejs/server_scripts/mods/Shrink.js +++ b/kubejs/server_scripts/mods/Shrink.js @@ -13,4 +13,4 @@ ServerEvents.recipes(event => { F: 'gtceu:lv_field_generator', T: 'gtceu:terminal' }).id("kubejs:shrink/shrinking_device") -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/mods/Solar_Flux.js b/kubejs/server_scripts/mods/Solar_Flux.js index 122185684..5b46687b4 100644 --- a/kubejs/server_scripts/mods/Solar_Flux.js +++ b/kubejs/server_scripts/mods/Solar_Flux.js @@ -1,6 +1,6 @@ /** * Solar Flux mod script. - * + * * Adds recipes for: * Solar Flux Solars * Photovoltaic Cells @@ -45,7 +45,7 @@ ServerEvents.recipes(event => { solarCrafting.forEach((ingredients, index) => { // Account for the first recipe, which doesn't use a photovoltaic cell - let photovoltaic = index == 0? + let photovoltaic = index == 0? 'gtceu:tempered_glass' :`solarflux:photovoltaic_cell_${index}` event.shaped(`2x solarflux:sp_${index + 2}`, [ diff --git a/kubejs/server_scripts/mods/Thermal_Series.js b/kubejs/server_scripts/mods/Thermal_Series.js index c1759bc16..b2dc9f738 100644 --- a/kubejs/server_scripts/mods/Thermal_Series.js +++ b/kubejs/server_scripts/mods/Thermal_Series.js @@ -433,7 +433,7 @@ ServerEvents.recipes(event => { B: '#forge:rods/electrum', C: 'enderio:advanced_capacitor_bank' }).id('kubejs:energy_cell_frame') - + event.remove('thermal:energy_cell'); event.recipes.gtceu.canner('kubejs:energy_cell') .itemInputs('thermal:energy_cell_frame', '#forge:storage_blocks/redstone') diff --git a/kubejs/server_scripts/mods/buildinggadgets2.js b/kubejs/server_scripts/mods/buildinggadgets2.js index 7cb3b4ee4..3df3bb8af 100644 --- a/kubejs/server_scripts/mods/buildinggadgets2.js +++ b/kubejs/server_scripts/mods/buildinggadgets2.js @@ -90,4 +90,4 @@ ServerEvents.recipes(event => { B: '#gtceu:batteries/lv' }) } -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/mods/laserio.js b/kubejs/server_scripts/mods/laserio.js index c951f4f84..b552f9a1c 100644 --- a/kubejs/server_scripts/mods/laserio.js +++ b/kubejs/server_scripts/mods/laserio.js @@ -187,4 +187,4 @@ ServerEvents.recipes(event => { P: 'enderio:pulsating_crystal', A: 'ae2:advanced_card' }) -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/mods/optionalCompats/compactmachines.js b/kubejs/server_scripts/mods/optionalCompats/compactmachines.js index 2f6fbd3a1..0d78080a0 100644 --- a/kubejs/server_scripts/mods/optionalCompats/compactmachines.js +++ b/kubejs/server_scripts/mods/optionalCompats/compactmachines.js @@ -1,9 +1,9 @@ /** * Optional compat script for Compact Machines - * + * * Modeled after Nomifactory CEu's script for the same. * Gated to HV, with more unlocked at IV. - * + * * Replaces or modifies the recipe for every item in the mod. */ if (Platform.isLoaded('compactmachines')) { @@ -64,4 +64,4 @@ if (Platform.isLoaded('compactmachines')) { }) console.log("Compact Machines compat scripts successfully loaded!") -} else { console.log("Compact Machines not found, skipping its compat scripts.") } \ No newline at end of file +} else { console.log("Compact Machines not found, skipping its compat scripts.") } diff --git a/kubejs/server_scripts/mods/optionalCompats/computercraft.js b/kubejs/server_scripts/mods/optionalCompats/computercraft.js index 3a9d347cf..75e7dde36 100644 --- a/kubejs/server_scripts/mods/optionalCompats/computercraft.js +++ b/kubejs/server_scripts/mods/optionalCompats/computercraft.js @@ -198,4 +198,4 @@ if (Platform.isLoaded('computercraft')) { }) }) console.log("Computercraft Tweaked compat scripts successfully loaded!") -} else { console.log("Computercraft Tweaked not found, skipping its compat scripts.") } \ No newline at end of file +} else { console.log("Computercraft Tweaked not found, skipping its compat scripts.") } diff --git a/kubejs/server_scripts/mods/optionalCompats/create.js b/kubejs/server_scripts/mods/optionalCompats/create.js index b9a6f6c7d..22e76ad1b 100644 --- a/kubejs/server_scripts/mods/optionalCompats/create.js +++ b/kubejs/server_scripts/mods/optionalCompats/create.js @@ -5,7 +5,7 @@ if (Platform.isLoaded('create')) { console.log("Create found, loading compat scripts...") ServerEvents.recipes(event => { - // Removes any machines related to processing, the point of this compat is fun not functionality, + // Removes any machines related to processing, the point of this compat is fun not functionality, event.remove({ output: 'create:millstone' }) event.remove({ output: 'create:crushing_wheel' }) event.remove({ output: 'create:mechanical_plough' }) @@ -19,7 +19,7 @@ if (Platform.isLoaded('create')) { event.remove({ output: 'create:encased_fan' }) /* Removes recipes for machines that were not removed, deployers and mechanical crafters are fun! - Most recipe categories that are removed machines are hidden in + Most recipe categories that are removed machines are hidden in kubejs/assets/emi/recipe/filters/hidecategories.json as opposed to removing the actual recipes */ event.remove({ type: 'create:deploying' }) event.remove({ type: 'create:milling' }) @@ -245,4 +245,4 @@ if (Platform.isLoaded('create')) { event.remove({ type: 'create:cutting' }) }) console.log("Create compat scripts successfully loaded!") -} else { console.log("Create was not found, skipping its compat scripts.") } \ No newline at end of file +} else { console.log("Create was not found, skipping its compat scripts.") } diff --git a/kubejs/server_scripts/mods/optionalCompats/create_steamandrails.js b/kubejs/server_scripts/mods/optionalCompats/create_steamandrails.js index ac1dd586b..7df5a39fb 100644 --- a/kubejs/server_scripts/mods/optionalCompats/create_steamandrails.js +++ b/kubejs/server_scripts/mods/optionalCompats/create_steamandrails.js @@ -91,7 +91,7 @@ if (Platform.isLoaded('railways')) { ServerEvents.recipes(event => { event.remove({ output: '#kubejs:create_tracks' }) let normalTrackRecipes = function (sleeperItem, outputItem, railItem, outputCount) { - /* + /* This function makes normal-gauge track recipes for shaped crafting and the Gregtech Assembler based on 4 arguments: [STRING] sleeperItem is the item used as the sleeper for the track, typically a slab. [STRING] outputItem is the track that the recipe gives. @@ -117,9 +117,9 @@ if (Platform.isLoaded('railways')) { .EUt(16); }; let wideTrackRecipes = function (inputTrackItem, sleeperItem, outputItem, outputCount) { - /* + /* This function makes wide-gauge track recipes for shaped crafting and the Gregtech Assembler based on 4 arguments: - [STRING] inputTrackItem is the track used in the recipe. + [STRING] inputTrackItem is the track used in the recipe. [STRING] sleeperItem is the item used as the sleeper for the track, typically a slab. [STRING] outputItem is the track that the recipe gives. [INT] outputCount is the amount of tracks given from the recipe. @@ -143,7 +143,7 @@ if (Platform.isLoaded('railways')) { .EUt(16); }; let narrowTrackRecipes = function (inputTrackItem, outputItem, sleeperOutputItem, outputCount) { - /* + /* This function makes narrow-gauge track recipes for shaped crafting and the Gregtech Assembler based on 3 arguments: [STRING] inputTrackItem is the track used in the recipe. [STRING] outputItem is the track that the recipe gives. @@ -260,4 +260,4 @@ if (Platform.isLoaded('railways')) { } }); console.log("Create: Steam and Rails compat scripts successfully loaded!") -} else { console.log("Create: Steam and Rails was not found, skipping its compat scripts.") }; \ No newline at end of file +} else { console.log("Create: Steam and Rails was not found, skipping its compat scripts.") }; diff --git a/kubejs/server_scripts/mods/optionalCompats/createdeco.js b/kubejs/server_scripts/mods/optionalCompats/createdeco.js index efeb4dd93..52c3f691b 100644 --- a/kubejs/server_scripts/mods/optionalCompats/createdeco.js +++ b/kubejs/server_scripts/mods/optionalCompats/createdeco.js @@ -365,4 +365,4 @@ if (Platform.isLoaded('createdeco')) { bricks('verdant') }) -} \ No newline at end of file +} diff --git a/kubejs/server_scripts/mods/optionalCompats/modularrouters.js b/kubejs/server_scripts/mods/optionalCompats/modularrouters.js index c80a1e105..d423c90eb 100644 --- a/kubejs/server_scripts/mods/optionalCompats/modularrouters.js +++ b/kubejs/server_scripts/mods/optionalCompats/modularrouters.js @@ -1,6 +1,6 @@ /** * Optional compat script for Modular Routers - * + * * Midly gated behind LV circuits & alloys. Upgrades gated behind LV cutter. * Energy tx gated behind LV Autoclave & MV alloy wires. */ diff --git a/kubejs/server_scripts/mods/optionalCompats/tempad.js b/kubejs/server_scripts/mods/optionalCompats/tempad.js index 30d4ada6b..4ac72d432 100644 --- a/kubejs/server_scripts/mods/optionalCompats/tempad.js +++ b/kubejs/server_scripts/mods/optionalCompats/tempad.js @@ -32,4 +32,4 @@ if (Platform.isLoaded('tempad')) { .EUt(512) }) console.log("Tempad compat scripts successfully loaded!") -} else { console.log("Tempad was not found, skipping its compat scripts.") } \ No newline at end of file +} else { console.log("Tempad was not found, skipping its compat scripts.") } diff --git a/kubejs/server_scripts/mods/optionalCompats/xnet.js b/kubejs/server_scripts/mods/optionalCompats/xnet.js index f5775bf9d..f915091cc 100644 --- a/kubejs/server_scripts/mods/optionalCompats/xnet.js +++ b/kubejs/server_scripts/mods/optionalCompats/xnet.js @@ -147,4 +147,4 @@ if (Platform.isLoaded('xnet')) { event.shapeless('xnet:redstone_proxy_upd', ['xnet:redstone_proxy']) event.shapeless('xnet:redstone_proxy', ['xnet:redstone_proxy_upd']) }) -} \ No newline at end of file +} diff --git a/kubejs/server_scripts/mods/redstone_clock.js b/kubejs/server_scripts/mods/redstone_clock.js index 42837d4cc..6e968c843 100644 --- a/kubejs/server_scripts/mods/redstone_clock.js +++ b/kubejs/server_scripts/mods/redstone_clock.js @@ -3,4 +3,4 @@ */ ServerEvents.recipes(event => { event.replaceInput({ id: 'redstoneclock:redstone_clock' }, 'minecraft:bell', '#forge:storage_blocks/redstone') -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/mods/wirelesscharger.js b/kubejs/server_scripts/mods/wirelesscharger.js index f346b051e..1aed1de83 100644 --- a/kubejs/server_scripts/mods/wirelesscharger.js +++ b/kubejs/server_scripts/mods/wirelesscharger.js @@ -29,4 +29,4 @@ ServerEvents.recipes(event => { H: 'gtceu:hv_machine_hull', C: 'gtceu:gold_quadruple_wire', }) -}) \ No newline at end of file +}) diff --git a/kubejs/server_scripts/monicoins/ores.js b/kubejs/server_scripts/monicoins/ores.js index 4eed319d2..56cb3ca5e 100644 --- a/kubejs/server_scripts/monicoins/ores.js +++ b/kubejs/server_scripts/monicoins/ores.js @@ -644,7 +644,6 @@ ServerEvents.recipes(event => { }).noMirror().noShrink() - event.shaped(Item.of('gtceu:ilmenite_ore', 32), [ 'A ', ' A ', diff --git a/kubejs/server_scripts/random_recipes.js b/kubejs/server_scripts/random_recipes.js index c478eabb3..23c9157c1 100644 --- a/kubejs/server_scripts/random_recipes.js +++ b/kubejs/server_scripts/random_recipes.js @@ -625,7 +625,7 @@ ServerEvents.recipes(event => { .duration(3000) .EUt(30720) .stationResearch(b => b.researchStack('gtceu:electric_blast_furnace').CWUt(16, 64000).EUt(30720)) - + event.remove({ id: 'gtceu:shaped/mega_vacuum_freezer' }) event.recipes.gtceu.assembly_line('kubejs:assembly_line/mega_vacuum_freezer') .itemInputs('gtceu:vacuum_freezer', '4x #gtceu:circuits/zpm', '4x gtceu:luv_field_generator', '4x gtceu:naquadah_normal_fluid_pipe', '4x gtceu:dense_naquadah_alloy_plate', '4x gtceu:uranium_rhodium_dinaquadide_quadruple_wire') diff --git a/kubejs/server_scripts/worldgen/fluidVeins.js b/kubejs/server_scripts/worldgen/fluidVeins.js index fdcf9ef90..2554edf73 100644 --- a/kubejs/server_scripts/worldgen/fluidVeins.js +++ b/kubejs/server_scripts/worldgen/fluidVeins.js @@ -34,8 +34,7 @@ GTCEuServerEvents.fluidVeins(event => { }) - - // Luna fluid veins + // Luna fluid veins event.add('kubejs:moon/deuterium', vein => { vein.dimensions('ad_astra:moon') vein.fluid(() => Fluid.of("gtceu:deuterium").fluid) @@ -163,4 +162,4 @@ GTCEuServerEvents.fluidVeins(event => { vein.depletionChance(100) vein.depletedYield(0) }) -}) \ No newline at end of file +}) diff --git a/kubejs/startup_scripts/Custom_Conduits.js b/kubejs/startup_scripts/Custom_Conduits.js index fd8492674..f7db989ec 100644 --- a/kubejs/startup_scripts/Custom_Conduits.js +++ b/kubejs/startup_scripts/Custom_Conduits.js @@ -12,4 +12,4 @@ EnderIOEvents.conduits(event => { event.registerEnergyConduit("enderium_conduit", "Enderium Energy Conduit", 2097152) event.registerEnergyConduit("cryolobus_conduit", "Cryolobus Energy Conduit", 8388608) event.registerEnergyConduit("sculk_superconductor_conduit", "Sculk Superconductor Energy Conduit", 134217728) -}) \ No newline at end of file +}) diff --git a/kubejs/startup_scripts/_packmode.js b/kubejs/startup_scripts/_packmode.js index 165e4cf70..f01f755a3 100644 --- a/kubejs/startup_scripts/_packmode.js +++ b/kubejs/startup_scripts/_packmode.js @@ -1,6 +1,6 @@ // priority: 1000 /** - * Handles the interpretation of mode.json + * Handles the interpretation of mode.json * to determine the global pack mode booleans: isNormalMode, isHardMode, and isExpertMode. * These are used in other scripts to define pack mode-specific behavior. */ @@ -47,4 +47,4 @@ global.isHardMode = (packMode == 'Hard') || global.isExpertMode; // The !! is to cast the types into boolean since they got transformed into Java Objects from being globals const isNormalMode = !!global.isNormalMode; const isExpertMode = !!global.isExpertMode; -const isHardMode = !!global.isHardMode; \ No newline at end of file +const isHardMode = !!global.isHardMode; diff --git a/kubejs/startup_scripts/excrafting_schema.js b/kubejs/startup_scripts/excrafting_schema.js index 37cd31bea..2b5967471 100644 --- a/kubejs/startup_scripts/excrafting_schema.js +++ b/kubejs/startup_scripts/excrafting_schema.js @@ -68,4 +68,4 @@ StartupEvents.recipeSchemaRegistry(event => { $NumberComponent.INT.key("tier").defaultOptional().preferred("tier") ) ); -}); \ No newline at end of file +}); diff --git a/kubejs/startup_scripts/gregtech_crafting_components.js b/kubejs/startup_scripts/gregtech_crafting_components.js index 895a97ee2..b55068bc3 100644 --- a/kubejs/startup_scripts/gregtech_crafting_components.js +++ b/kubejs/startup_scripts/gregtech_crafting_components.js @@ -2,7 +2,7 @@ * Unlike how screret showcases the functionality of this event in his discord messge: * https://discord.com/channels/914926812948234260/1229854271613436066/1279802878822711407 * there is no "Map.of()" to create map objects out of varargs. - * + * * Worse still, I could not find an analog to that function. * Therefore we declare empty maps and then populate them afterwards. */ @@ -177,4 +177,4 @@ GTCEuStartupEvents.craftingComponents(event => { frameMap[GTValues.UIV] = UnificationEntry(TagPrefix.frameGt, GTMaterials.get('infinity')) frameMap[GTValues.MAX] = UnificationEntry(TagPrefix.frameGt, GTMaterials.get('monium')) event.modifyUnificationEntry(CraftingComponent.FRAME, frameMap) -}) \ No newline at end of file +}) diff --git a/kubejs/startup_scripts/gregtech_material_registry/chemicals.js b/kubejs/startup_scripts/gregtech_material_registry/chemicals.js index 1cf8b5a11..81cb6d09b 100644 --- a/kubejs/startup_scripts/gregtech_material_registry/chemicals.js +++ b/kubejs/startup_scripts/gregtech_material_registry/chemicals.js @@ -195,4 +195,4 @@ GTCEuStartupEvents.materialModification(() => { GTMaterials.get('ethyl_cyanoacetate').setFormula('C5H7NO2') GTMaterials.get('ethyl_cyanoacrylate').setFormula('C6H7NO2') GTMaterials.get('polyethyl_cyanoacrylate').setFormula('C6H7NO2') -}) \ No newline at end of file +}) diff --git a/kubejs/startup_scripts/gregtech_material_registry/enderio.js b/kubejs/startup_scripts/gregtech_material_registry/enderio.js index 4658e3845..350bd7795 100644 --- a/kubejs/startup_scripts/gregtech_material_registry/enderio.js +++ b/kubejs/startup_scripts/gregtech_material_registry/enderio.js @@ -69,4 +69,4 @@ GTCEuStartupEvents.registry('gtceu:material', event => { .color(0x7c674d).iconSet('metallic') .components('soularium', 'dark_steel', 'tritium') .flags(GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_DENSE, GTMaterialFlags.DISABLE_DECOMPOSITION) -}) \ No newline at end of file +}) diff --git a/kubejs/startup_scripts/gregtech_material_registry/misc.js b/kubejs/startup_scripts/gregtech_material_registry/misc.js index e1b453d34..44939cb31 100644 --- a/kubejs/startup_scripts/gregtech_material_registry/misc.js +++ b/kubejs/startup_scripts/gregtech_material_registry/misc.js @@ -229,4 +229,3 @@ GTCEuStartupEvents.materialModification(event => { GTMaterials.get('microversium').setFormula('Fe2(Si(FeS2)5(CrAl2O3)Hg3)(AuCa3(PO4)2)D') GTMaterials.get('thorium_hydroxide').setFormula('Th(OH)4') }) - diff --git a/kubejs/startup_scripts/hardmode/material_registry/chemicals.js b/kubejs/startup_scripts/hardmode/material_registry/chemicals.js index 9a52ae074..c90eb0f0d 100644 --- a/kubejs/startup_scripts/hardmode/material_registry/chemicals.js +++ b/kubejs/startup_scripts/hardmode/material_registry/chemicals.js @@ -106,7 +106,7 @@ GTCEuStartupEvents.registry('gtceu:material', event => { .color(0x777777).iconSet('rough') .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) .components('graphene', 'oxygen') - + // Kapton K event.create('durene') .dust() diff --git a/kubejs/startup_scripts/hardmode/material_registry/endgame.js b/kubejs/startup_scripts/hardmode/material_registry/endgame.js index b2c485cc9..f62d898a1 100644 --- a/kubejs/startup_scripts/hardmode/material_registry/endgame.js +++ b/kubejs/startup_scripts/hardmode/material_registry/endgame.js @@ -2,4 +2,4 @@ * Kapton K disabled in favor of GCYr's chain - keep this file in the case that it gets removed from the mod. * Draconic Superconductor -> Sculk Superconductor is not Hardmode-specific Crystal Matrix is not Hardmode-specific - */ \ No newline at end of file + */ diff --git a/kubejs/startup_scripts/hardmode/material_registry/microverse.js b/kubejs/startup_scripts/hardmode/material_registry/microverse.js index 6fe7c2f06..4eb42bfcc 100644 --- a/kubejs/startup_scripts/hardmode/material_registry/microverse.js +++ b/kubejs/startup_scripts/hardmode/material_registry/microverse.js @@ -20,4 +20,4 @@ GTCEuStartupEvents.registry('gtceu:material', event => { .addOreByproducts('sphalerite', 'duranium', 'europium') // Snowchestite is in naqline.js -}) \ No newline at end of file +}) diff --git a/kubejs/startup_scripts/hardmode/material_registry/missing_material_forms_hm.js b/kubejs/startup_scripts/hardmode/material_registry/missing_material_forms_hm.js index 9e3fa0c2d..563e153f4 100644 --- a/kubejs/startup_scripts/hardmode/material_registry/missing_material_forms_hm.js +++ b/kubejs/startup_scripts/hardmode/material_registry/missing_material_forms_hm.js @@ -14,4 +14,4 @@ GTCEuStartupEvents.registry('gtceu:material', event => { GTMaterials.Berkelium.addFlags(GTMaterialFlags.GENERATE_FRAME) addFluid(GTMaterials.Oganesson, $FluidStorageKeys.GAS, 7777); GTMaterials.Oganesson.setMaterialARGB(0x443936) -}) \ No newline at end of file +}) diff --git a/kubejs/startup_scripts/modify_blocks.js b/kubejs/startup_scripts/modify_blocks.js index 8a21d4ba8..04757efa8 100644 --- a/kubejs/startup_scripts/modify_blocks.js +++ b/kubejs/startup_scripts/modify_blocks.js @@ -6,4 +6,4 @@ BlockEvents.modification(event => { event.modify('watercollector:watercollector', block => { block.destroySpeed = 0.3 }) -}) \ No newline at end of file +}) diff --git a/kubejs/startup_scripts/oreVeins.js b/kubejs/startup_scripts/oreVeins.js index f84a540b4..77dcf9e86 100644 --- a/kubejs/startup_scripts/oreVeins.js +++ b/kubejs/startup_scripts/oreVeins.js @@ -70,4 +70,4 @@ GTCEuStartupEvents.registry('gtceu:tag_prefix', event => { .materialIconType(GTMaterialIconType.ore) .generationCondition(ItemGenerationCondition.hasOreProperty) .miningToolTag('forge:mineable/pickaxe') -}) \ No newline at end of file +}) diff --git a/kubejs/startup_scripts/oreVeinsRemoval.js b/kubejs/startup_scripts/oreVeinsRemoval.js index c7084f3a0..b58cc6962 100644 --- a/kubejs/startup_scripts/oreVeinsRemoval.js +++ b/kubejs/startup_scripts/oreVeinsRemoval.js @@ -84,4 +84,4 @@ WorldgenEvents.remove(event => { 'ad_astra:venus_calorite_ore' ] }) -}) \ No newline at end of file +}) diff --git a/kubejs/startup_scripts/registry/block_registry.js b/kubejs/startup_scripts/registry/block_registry.js index 91fc1ef3c..ac84ebec6 100644 --- a/kubejs/startup_scripts/registry/block_registry.js +++ b/kubejs/startup_scripts/registry/block_registry.js @@ -254,4 +254,4 @@ StartupEvents.registry("block", event => { .tag("mineable/pickaxe") .tagBlock("forge:mineable/wrench") .defaultCutout(); -}); \ No newline at end of file +}); diff --git a/kubejs/startup_scripts/registry/singleblock_registry.js b/kubejs/startup_scripts/registry/singleblock_registry.js index f326b3ade..55d124eb2 100644 --- a/kubejs/startup_scripts/registry/singleblock_registry.js +++ b/kubejs/startup_scripts/registry/singleblock_registry.js @@ -55,9 +55,3 @@ GTCEuStartupEvents.registry('gtceu:machine', event => { .workableTieredHullRenderer(GTCEu.id("block/machines/parallel_hatch_mk10")) ) }) - - - - - -