Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add some stricter rules around whitespace. #1456

Merged
merged 2 commits into from
Jan 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kubejs/client_scripts/Fixes_Client.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/** Empty atm */
/** Empty atm */
1 change: 0 additions & 1 deletion kubejs/client_scripts/JEI.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'])

Expand Down
6 changes: 3 additions & 3 deletions kubejs/client_scripts/JEI_modespecific.js
Original file line number Diff line number Diff line change
Expand Up @@ -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/)
Expand All @@ -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/)
}
})
})
2 changes: 1 addition & 1 deletion kubejs/client_scripts/_initial.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
]
]
2 changes: 1 addition & 1 deletion kubejs/client_scripts/_packmode.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/** Pack mode */
const isNormalMode = !!global.isNormalMode;
const isHardMode = !!global.isHardMode;
const isExpertMode = !!global.isExpertMode;
const isExpertMode = !!global.isExpertMode;
2 changes: 1 addition & 1 deletion kubejs/client_scripts/mods/RPC.js
Original file line number Diff line number Diff line change
Expand Up @@ -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")
})
})
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ if (Platform.isLoaded('projectred_transmission')) {
// Hide CBMultipart blocks
event.hide(/cb_microblock:.*/)
})
}
}
6 changes: 3 additions & 3 deletions kubejs/client_scripts/tooltips.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'))
})
Expand All @@ -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"))
Expand Down
4 changes: 2 additions & 2 deletions kubejs/dx/eslint-plugin/custom-plugin.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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]) =>
Expand All @@ -30,4 +30,4 @@ export const MoniLabs = customPluginWithAllRulesError("moni-labs", {
"recipe-spacing": recipeSpacing,
"multiblock-declaration": multiblockDeclaration,
"call-chains": callChains
})
})
2 changes: 1 addition & 1 deletion kubejs/dx/eslint-plugin/multiblock-declaration.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion kubejs/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
];
2 changes: 1 addition & 1 deletion kubejs/server_scripts/Early_Game.js
Original file line number Diff line number Diff line change
Expand Up @@ -142,4 +142,4 @@ ServerEvents.recipes(event => {

// Battery Alloy Dust
event.shapeless("4x gtceu:battery_alloy_dust", ["4x gtceu:lead_dust", "gtceu:antimony_dust"])
})
})
1 change: 0 additions & 1 deletion kubejs/server_scripts/Infinity_Toolset.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/** Infinity Toolset recipes and subrecipes */



ServerEvents.recipes(event => {

// Infinity File
Expand Down
2 changes: 1 addition & 1 deletion kubejs/server_scripts/Remove_Recipes.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions kubejs/server_scripts/_hardmode/actualization_chamber.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -482,4 +482,4 @@ ServerEvents.recipes(event => {
.duration(780)
.EUt(30720)
}
})
})
2 changes: 1 addition & 1 deletion kubejs/server_scripts/_hardmode/hardmode.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ ServerEvents.recipes(event => {
.duration(2000)
.EUt(65520)

// Mob Heads
// Mob Heads
event.shaped('minecraft:skeleton_skull', [
' A ',
'ABA',
Expand Down
2 changes: 1 addition & 1 deletion kubejs/server_scripts/_hardmode/universal_crystallizer.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,4 @@ ServerEvents.recipes(event => {
.duration(7)
.EUt(1000000)
}
})
})
2 changes: 1 addition & 1 deletion kubejs/server_scripts/_initial.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
]
]
2 changes: 1 addition & 1 deletion kubejs/server_scripts/_moni_motd.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ PlayerEvents.loggedIn(event => {
.clickOpenUrl('https://github.com/ThePansmith/Monifactory')
.hover('Click to open'), '.'
]);
})
})
2 changes: 1 addition & 1 deletion kubejs/server_scripts/aa_planet_resources.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
});
});
2 changes: 1 addition & 1 deletion kubejs/server_scripts/extractor_solidifer.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ ServerEvents.recipes(event => {
.duration(180)
.EUt(6)
}
})
})
4 changes: 2 additions & 2 deletions kubejs/server_scripts/fixes_tweaks/Better_Dynamo_Placement.js
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand All @@ -36,4 +36,4 @@ BlockEvents.placed(event => {
}
}

})
})
2 changes: 1 addition & 1 deletion kubejs/server_scripts/fixes_tweaks/Starting_Items.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ PlayerEvents.loggedIn(event => {
// Give qb to player
event.player.give('ftbquests:book')
}
})
})
2 changes: 1 addition & 1 deletion kubejs/server_scripts/fixes_tweaks/enchantments.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

MoreJSEvents.filterAvailableEnchantments((event) => {
event.add("minecraft:unbreaking");
})
})
2 changes: 1 addition & 1 deletion kubejs/server_scripts/fixes_tweaks/glass_breaking.js
Original file line number Diff line number Diff line change
Expand Up @@ -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/);
})
})
2 changes: 1 addition & 1 deletion kubejs/server_scripts/fixes_tweaks/gregtech_credits.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ ServerEvents.recipes(event => {
.EUt(energyIn / (20 * 5))
.duration(20 * 5)
}
})
})
2 changes: 1 addition & 1 deletion kubejs/server_scripts/fixes_tweaks/no_structures.js
Original file line number Diff line number Diff line change
Expand Up @@ -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");
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ ServerEvents.recipes(event => {
}
}
})
})
})
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ ServerEvents.blockLootTables(event => {
LootJS.modifiers((event) => {
event.addBlockLootModifier(/ae2:.*quartz_bud/)
.replaceLoot("ae2:certus_quartz_dust", "gtceu:certus_quartz_dust")
})
})
2 changes: 1 addition & 1 deletion kubejs/server_scripts/gregtech/Alloys_Recipes.js
Original file line number Diff line number Diff line change
Expand Up @@ -321,4 +321,4 @@ ServerEvents.recipes(event => {
.EUt(30720)
.blastFurnaceTemp(6400)

})
})
23 changes: 1 addition & 22 deletions kubejs/server_scripts/gregtech/Crystal_Matrix.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,25 +95,4 @@ ServerEvents.recipes(event => {
.duration(1000)
.EUt(GTValues.VA[GTValues.ZPM])
.blastFurnaceTemp(6800)





















})
})
2 changes: 1 addition & 1 deletion kubejs/server_scripts/gregtech/PECA.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,4 +123,4 @@ ServerEvents.recipes(event => {
.itemOutputs('32x gtceu:duct_tape')
.duration(100)
.EUt(GTValues.VA[GTValues.LV])
})
})
2 changes: 1 addition & 1 deletion kubejs/server_scripts/gregtech/Post_UV_Components.js
Original file line number Diff line number Diff line change
Expand Up @@ -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`)
Expand Down
1 change: 0 additions & 1 deletion kubejs/server_scripts/gregtech/dense_ores.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,3 @@ ServerEvents.tags('block', event => {
event.add("forge:ores/dense", `forge:ores/dense/${ore}`, `kubejs:dense_${ore}`);
})
})

2 changes: 1 addition & 1 deletion kubejs/server_scripts/gregtech/energy_cores.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@ ServerEvents.recipes(event => {
.itemOutputs("kubejs:hadal_energy_core")
.duration(100)
.EUt(GTValues.VA[GTValues.UV])
})
})
2 changes: 1 addition & 1 deletion kubejs/server_scripts/gregtech/greenhouse.js
Original file line number Diff line number Diff line change
Expand Up @@ -178,4 +178,4 @@ ServerEvents.recipes(event => {
"energy_mod": 1.0,
"water_mod": 1.0
}).id('kubejs:thermal/insolator/pink_petals')
})
})
1 change: 0 additions & 1 deletion kubejs/server_scripts/gregtech/microverse_recipes.js
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,6 @@ ServerEvents.recipes(event => {
.EUt(194387)



event.recipes.gtceu.advanced_microverse_ii('kubejs:t_ten_first')
.itemInputs(
'kubejs:microminer_t10',
Expand Down
Loading