Skip to content

Commit

Permalink
🎨 fixed .editorconfig and applied it
Browse files Browse the repository at this point in the history
Took 42 seconds
  • Loading branch information
itsTyrion committed Nov 2, 2023
1 parent 783a96c commit 47e101b
Show file tree
Hide file tree
Showing 6 changed files with 138 additions and 19 deletions.
121 changes: 120 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,2 +1,121 @@
[*]
end_of_line = lf
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
insert_final_newline = false
max_line_length = 120
tab_width = 4
ij_continuation_indent_size = 8
ij_formatter_off_tag = @formatter:off
ij_formatter_on_tag = @formatter:on
ij_formatter_tags_enabled = true
ij_smart_tabs = false
ij_visual_guides =
ij_wrap_on_typing = false

[.editorconfig]
ij_editorconfig_align_group_field_declarations = false
ij_editorconfig_space_after_colon = false
ij_editorconfig_space_after_comma = true
ij_editorconfig_space_before_colon = false
ij_editorconfig_space_before_comma = false
ij_editorconfig_spaces_around_assignment_operators = true

[{*.kt,*.kts}]
ij_kotlin_align_in_columns_case_branch = false
ij_kotlin_align_multiline_binary_operation = false
ij_kotlin_align_multiline_extends_list = false
ij_kotlin_align_multiline_method_parentheses = false
ij_kotlin_align_multiline_parameters = true
ij_kotlin_align_multiline_parameters_in_calls = false
ij_kotlin_allow_trailing_comma = false
ij_kotlin_allow_trailing_comma_on_call_site = false
ij_kotlin_assignment_wrap = normal
ij_kotlin_blank_lines_after_class_header = 0
ij_kotlin_blank_lines_around_block_when_branches = 0
ij_kotlin_blank_lines_before_declaration_with_comment_or_annotation_on_separate_line = 1
ij_kotlin_block_comment_add_space = false
ij_kotlin_block_comment_at_first_column = true
ij_kotlin_call_parameters_new_line_after_left_paren = true
ij_kotlin_call_parameters_right_paren_on_new_line = true
ij_kotlin_call_parameters_wrap = on_every_item
ij_kotlin_catch_on_new_line = false
ij_kotlin_class_annotation_wrap = split_into_lines
ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
ij_kotlin_continuation_indent_for_chained_calls = false
ij_kotlin_continuation_indent_for_expression_bodies = false
ij_kotlin_continuation_indent_in_argument_lists = false
ij_kotlin_continuation_indent_in_elvis = false
ij_kotlin_continuation_indent_in_if_conditions = false
ij_kotlin_continuation_indent_in_parameter_lists = false
ij_kotlin_continuation_indent_in_supertype_lists = false
ij_kotlin_else_on_new_line = false
ij_kotlin_enum_constants_wrap = off
ij_kotlin_extends_list_wrap = normal
ij_kotlin_field_annotation_wrap = normal
ij_kotlin_finally_on_new_line = false
ij_kotlin_if_rparen_on_new_line = true
ij_kotlin_import_nested_classes = false
ij_kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^
ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
ij_kotlin_keep_blank_lines_before_right_brace = 2
ij_kotlin_keep_blank_lines_in_code = 2
ij_kotlin_keep_blank_lines_in_declarations = 2
ij_kotlin_keep_first_column_comment = true
ij_kotlin_keep_indents_on_empty_lines = false
ij_kotlin_keep_line_breaks = true
ij_kotlin_lbrace_on_next_line = false
ij_kotlin_line_break_after_multiline_when_entry = true
ij_kotlin_line_comment_add_space = false
ij_kotlin_line_comment_add_space_on_reformat = false
ij_kotlin_line_comment_at_first_column = true
ij_kotlin_method_annotation_wrap = normal
ij_kotlin_method_call_chain_wrap = normal
ij_kotlin_method_parameters_new_line_after_left_paren = true
ij_kotlin_method_parameters_right_paren_on_new_line = true
ij_kotlin_method_parameters_wrap = on_every_item
ij_kotlin_name_count_to_use_star_import = 5
ij_kotlin_name_count_to_use_star_import_for_members = 3
ij_kotlin_packages_to_use_import_on_demand = kotlinx.android.synthetic.**,io.ktor.**
ij_kotlin_parameter_annotation_wrap = off
ij_kotlin_space_after_comma = true
ij_kotlin_space_after_extend_colon = true
ij_kotlin_space_after_type_colon = true
ij_kotlin_space_before_catch_parentheses = true
ij_kotlin_space_before_comma = false
ij_kotlin_space_before_extend_colon = true
ij_kotlin_space_before_for_parentheses = true
ij_kotlin_space_before_if_parentheses = true
ij_kotlin_space_before_lambda_arrow = true
ij_kotlin_space_before_type_colon = false
ij_kotlin_space_before_when_parentheses = true
ij_kotlin_space_before_while_parentheses = true
ij_kotlin_spaces_around_additive_operators = true
ij_kotlin_spaces_around_assignment_operators = true
ij_kotlin_spaces_around_equality_operators = true
ij_kotlin_spaces_around_function_type_arrow = true
ij_kotlin_spaces_around_logical_operators = true
ij_kotlin_spaces_around_multiplicative_operators = true
ij_kotlin_spaces_around_range = false
ij_kotlin_spaces_around_relational_operators = true
ij_kotlin_spaces_around_unary_operator = false
ij_kotlin_spaces_around_when_arrow = true
ij_kotlin_variable_annotation_wrap = off
ij_kotlin_while_on_new_line = false
ij_kotlin_wrap_elvis_expressions = 1
ij_kotlin_wrap_expression_body_functions = 1
ij_kotlin_wrap_first_method_in_call_chain = false

[{*.yaml,*.yml}]
indent_size = 2
ij_yaml_align_values_properties = do_not_align
ij_yaml_autoinsert_sequence_marker = true
ij_yaml_block_mapping_on_new_line = false
ij_yaml_indent_sequence_value = true
ij_yaml_keep_indents_on_empty_lines = false
ij_yaml_keep_line_breaks = true
ij_yaml_sequence_on_new_line = false
ij_yaml_space_before_colon = false
ij_yaml_spaces_within_braces = true
ij_yaml_spaces_within_brackets = true
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import org.slf4j.Logger
import org.slf4j.LoggerFactory
import java.io.File
import java.io.IOException
import java.util.*
import java.util.UUID
import java.util.concurrent.TimeUnit

class BungeeOnlineTimePlugin : Plugin() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import lu.r3flexi0n.bungeeonlinetime.common.objects.OnlineTimePlayer
import lu.r3flexi0n.bungeeonlinetime.common.utils.asyncTask
import org.slf4j.Logger
import java.time.Duration
import java.util.*
import java.util.UUID
import java.util.function.BiConsumer
import java.util.function.Supplier

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package lu.r3flexi0n.bungeeonlinetime.common.config

class Config {
@JvmField
var language = Language()
@JvmField
var plugin = Plugin()
@JvmField
var mySQL = MySQL()
@JvmField var language = Language()

@JvmField var plugin = Plugin()

@JvmField var mySQL = MySQL()

@Suppress("PropertyName", "SpellCheckingInspection") // mb lemme use quotes in a variable name real quick
var version_dont_touch = 1

Expand All @@ -18,7 +18,7 @@ class Config {
&7/onlinetime top [page]
&7/onlinetime reset <player>
&7/onlinetime resetall
""".trimIndent()
""".trimIndent() // @formatter:off
var resetAll = "&7The database has been reset."
var playerNotFound = "&7Player '&6%PLAYER%&7' was not found."
var topTimeAbove = "&7====== &6Top 10 &7======"
Expand All @@ -29,24 +29,24 @@ class Config {
var error = "&7An error occurred."
var onlyPlayer = "&7This command can only be executed by players."
var resetPlayer = "&6%PLAYER%&7's onlinetime has been reset."
}
} // @formatter:on

class Plugin {
var commandAliases = arrayOf("onlinetime", "ot")
var disabledServers: List<String> = mutableListOf("lobby-1", "lobby-2")
var disabledServers = mutableListOf("lobby-1", "lobby-2")
var usePlaceholderApi = false
var topOnlineTimePageLimit = 10
var placeholderRefreshTimer = 1
}

class MySQL {
var enabled = false
var host = "localhost"
var port = 3306
class MySQL { // @formatter:off
var enabled = false
var host = "localhost"
var port = 3306
var database = "minecraft"
var username = "onlinetime"
var password = "abc123"
}
} // @formatter:on

companion object {
const val CURRENT_VERSION = 1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package lu.r3flexi0n.bungeeonlinetime.common.objects

import java.util.*
import java.util.UUID

data class OnlineTime(@JvmField val uuid: UUID, @JvmField val name: String, @JvmField val time: Long)
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class OnlineTimeCommand(private val plugin: VelocityOnlineTimePlugin) : SimpleCo
val name = args[1]
base.sendReset(name) { msg, placeholders -> sendMessage(sender, msg, placeholders) }
plugin.proxy.getPlayer(name)
.ifPresent { plugin.onlineTimePlayers[it.uniqueId]?.setSavedOnlineTime(0L) }
.ifPresent { plugin.onlineTimePlayers[it.uniqueId]?.setSavedOnlineTime(0L) }
}

} else if (args.size == 1 && arg0 == "resetall") {
Expand Down

0 comments on commit 47e101b

Please sign in to comment.