LIFE IS BEAUTIFUL
Items are created and working-ish in fabric forge is throwing a fit tho
This commit is contained in:
parent
b24bf0d8f2
commit
d9993e541e
41 changed files with 348 additions and 1446 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -16,3 +16,4 @@ classes/
|
||||||
.metadata
|
.metadata
|
||||||
.settings
|
.settings
|
||||||
*.launch
|
*.launch
|
||||||
|
.architectury-transformer
|
382
.vscode/java-formatter.xml
vendored
382
.vscode/java-formatter.xml
vendored
|
@ -1,382 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
||||||
<profiles version="20">
|
|
||||||
<profile kind="CodeFormatterProfile" name="JavaConventions" version="20">
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment" value="common_lines"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_logical_operator" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="common_lines"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration" value="common_lines"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration" value="common_lines"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.align_with_spaces" value="false"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block" value="0"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="16"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body" value="0"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="common_lines"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="false"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_record_components" value="16"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references" value="0"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_logical_operator" value="16"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line" value="one_line_if_empty"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.keep_method_body_on_one_line" value="one_line_if_empty"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line" value="one_line_never"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method" value="1"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line" value="one_line_if_empty"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns" value="false"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line" value="one_line_if_empty"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause" value="common_lines"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_additive_operator" value="16"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_relational_operator" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator" value="16"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line" value="one_line_if_empty"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.wrap_before_shift_operator" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line" value="one_line_if_empty"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block" value="0"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters" value="0"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_loops" value="16"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line" value="false"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_relational_operator" value="0"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="false"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation" value="common_lines"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_additive_operator" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_record_declaration" value="end_of_line"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.text_block_indentation" value="0"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_module_statements" value="16"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block" value="0"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions" value="false"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line" value="one_line_never"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns" value="false"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain" value="0"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_additive_operator" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_shift_operator" value="0"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="2147483647"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator" value="16"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="common_lines"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.keep_code_block_on_one_line" value="one_line_never"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="8"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_not_operator" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="common_lines"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line" value="one_line_never"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_arguments" value="0"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line" value="one_line_if_empty"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_assertion_message" value="16"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_logical_operator" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration" value="16"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.wrap_before_relational_operator" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.comment.indent_tag_description" value="false"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_record_constructor" value="end_of_line"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_string_concatenation" value="16"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration" value="0"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line" value="false"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.wrap_before_logical_operator" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_shift_operator" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch" value="0"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration" value="common_lines"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_shift_operator" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line" value="false"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line" value="one_line_if_empty"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header" value="0"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.wrap_before_additive_operator" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line" value="false"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="false"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block" value="0"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="mixed"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_relational_operator" value="insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.wrap_before_string_concatenation" value="true"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
|
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
|
|
||||||
</profile>
|
|
||||||
</profiles>
|
|
26
.vscode/launch.json
vendored
26
.vscode/launch.json
vendored
|
@ -3,35 +3,29 @@
|
||||||
"configurations": [
|
"configurations": [
|
||||||
{
|
{
|
||||||
"type": "java",
|
"type": "java",
|
||||||
"name": "Minecraft Client (:forge)",
|
"name": "Minecraft Client (:fabric)",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
"cwd": "${workspaceFolder}/forge/run",
|
"cwd": "${workspaceFolder}/fabric/run",
|
||||||
"console": "integratedTerminal",
|
"console": "integratedTerminal",
|
||||||
"stopOnEntry": false,
|
"stopOnEntry": false,
|
||||||
"mainClass": "dev.architectury.transformer.TransformerRuntime",
|
"mainClass": "dev.architectury.transformer.TransformerRuntime",
|
||||||
"vmArgs": "-Dfabric.dli.config\u003d/pool/git/SimplyCompat/forge/.gradle/loom-cache/launch.cfg -Dfabric.dli.env\u003dclient -Djava.net.preferIPv6Addresses\u003dsystem -p /home/toph/.gradle/caches/modules-2/files-2.1/cpw.mods/securejarhandler/2.1.10/51e6a22c6c716beb11e244bf5b8be480f51dd6b5/securejarhandler-2.1.10.jar:/home/toph/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-commons/9.7.1/406c6a2225cfe1819f102a161e54cc16a5c24f75/asm-commons-9.7.1.jar:/home/toph/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-util/9.7.1/9e23359b598ec6b74b23e53110dd5c577adf2243/asm-util-9.7.1.jar:/home/toph/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-analysis/9.7.1/f97a3b319f0ed6a8cd944dc79060d3912a28985f/asm-analysis-9.7.1.jar:/home/toph/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-tree/9.7.1/3a53139787663b139de76b627fca0084ab60d32c/asm-tree-9.7.1.jar:/home/toph/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm/9.7.1/f0ed132a49244b042cd0e15702ab9f2ce3cc8436/asm-9.7.1.jar:/home/toph/.gradle/caches/modules-2/files-2.1/net.minecraftforge/JarJarFileSystems/0.3.19/2464eb7d6b9ddb9db36a82cf8a95193e5c6fe020/JarJarFileSystems-0.3.19.jar --add-modules ALL-MODULE-PATH --add-opens java.base/java.util.jar\u003dcpw.mods.securejarhandler --add-opens java.base/java.lang.invoke\u003dcpw.mods.securejarhandler --add-exports java.base/sun.security.util\u003dcpw.mods.securejarhandler --add-exports jdk.naming.dns/com.sun.jndi.dns\u003djava.naming -Dfabric.dli.main\u003dcpw.mods.bootstraplauncher.BootstrapLauncher -Darchitectury.main.class\u003d/pool/git/SimplyCompat/forge/.gradle/architectury/.main_class -Darchitectury.runtime.transformer\u003d/pool/git/SimplyCompat/forge/.gradle/architectury/.transforms -Darchitectury.properties\u003d/pool/git/SimplyCompat/forge/.gradle/architectury/.properties -Djdk.attach.allowAttachSelf\u003dtrue -javaagent:/pool/git/SimplyCompat/.gradle/architectury/architectury-transformer-agent.jar",
|
"vmArgs": "-Dfabric.dli.config\u003d/home/toph/git/simplycompat-1.20.1-fabric-forge-template/fabric/.gradle/loom-cache/launch.cfg -Dfabric.dli.env\u003dclient -Dfabric.dli.main\u003dnet.fabricmc.loader.impl.launch.knot.KnotClient -Darchitectury.main.class\u003d/home/toph/git/simplycompat-1.20.1-fabric-forge-template/fabric/.gradle/architectury/.main_class -Darchitectury.runtime.transformer\u003d/home/toph/git/simplycompat-1.20.1-fabric-forge-template/fabric/.gradle/architectury/.transforms -Darchitectury.properties\u003d/home/toph/git/simplycompat-1.20.1-fabric-forge-template/fabric/.gradle/architectury/.properties -Djdk.attach.allowAttachSelf\u003dtrue -javaagent:/home/toph/git/simplycompat-1.20.1-fabric-forge-template/.gradle/architectury/architectury-transformer-agent.jar",
|
||||||
"args": "",
|
"args": "",
|
||||||
"env": {
|
"env": {},
|
||||||
"MOD_CLASSES": "main%%/pool/git/SimplyCompat/forge/build/resources/main:main%%/pool/git/SimplyCompat/forge/build/classes/java/main",
|
"projectName": "fabric"
|
||||||
"MCP_MAPPINGS": "loom.stub"
|
|
||||||
},
|
|
||||||
"projectName": "forge"
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "java",
|
"type": "java",
|
||||||
"name": "Minecraft Server (:forge)",
|
"name": "Minecraft Server (:fabric)",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
"cwd": "${workspaceFolder}/forge/run",
|
"cwd": "${workspaceFolder}/fabric/run",
|
||||||
"console": "integratedTerminal",
|
"console": "integratedTerminal",
|
||||||
"stopOnEntry": false,
|
"stopOnEntry": false,
|
||||||
"mainClass": "dev.architectury.transformer.TransformerRuntime",
|
"mainClass": "dev.architectury.transformer.TransformerRuntime",
|
||||||
"vmArgs": "-Dfabric.dli.config\u003d/pool/git/SimplyCompat/forge/.gradle/loom-cache/launch.cfg -Dfabric.dli.env\u003dserver -Djava.net.preferIPv6Addresses\u003dsystem -p /home/toph/.gradle/caches/modules-2/files-2.1/cpw.mods/securejarhandler/2.1.10/51e6a22c6c716beb11e244bf5b8be480f51dd6b5/securejarhandler-2.1.10.jar:/home/toph/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-commons/9.7.1/406c6a2225cfe1819f102a161e54cc16a5c24f75/asm-commons-9.7.1.jar:/home/toph/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-util/9.7.1/9e23359b598ec6b74b23e53110dd5c577adf2243/asm-util-9.7.1.jar:/home/toph/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-analysis/9.7.1/f97a3b319f0ed6a8cd944dc79060d3912a28985f/asm-analysis-9.7.1.jar:/home/toph/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-tree/9.7.1/3a53139787663b139de76b627fca0084ab60d32c/asm-tree-9.7.1.jar:/home/toph/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm/9.7.1/f0ed132a49244b042cd0e15702ab9f2ce3cc8436/asm-9.7.1.jar:/home/toph/.gradle/caches/modules-2/files-2.1/net.minecraftforge/JarJarFileSystems/0.3.19/2464eb7d6b9ddb9db36a82cf8a95193e5c6fe020/JarJarFileSystems-0.3.19.jar --add-modules ALL-MODULE-PATH --add-opens java.base/java.util.jar\u003dcpw.mods.securejarhandler --add-opens java.base/java.lang.invoke\u003dcpw.mods.securejarhandler --add-exports java.base/sun.security.util\u003dcpw.mods.securejarhandler --add-exports jdk.naming.dns/com.sun.jndi.dns\u003djava.naming -Dfabric.dli.main\u003dcpw.mods.bootstraplauncher.BootstrapLauncher -Darchitectury.main.class\u003d/pool/git/SimplyCompat/forge/.gradle/architectury/.main_class -Darchitectury.runtime.transformer\u003d/pool/git/SimplyCompat/forge/.gradle/architectury/.transforms -Darchitectury.properties\u003d/pool/git/SimplyCompat/forge/.gradle/architectury/.properties -Djdk.attach.allowAttachSelf\u003dtrue -javaagent:/pool/git/SimplyCompat/.gradle/architectury/architectury-transformer-agent.jar",
|
"vmArgs": "-Dfabric.dli.config\u003d/home/toph/git/simplycompat-1.20.1-fabric-forge-template/fabric/.gradle/loom-cache/launch.cfg -Dfabric.dli.env\u003dserver -Dfabric.dli.main\u003dnet.fabricmc.loader.impl.launch.knot.KnotServer -Darchitectury.main.class\u003d/home/toph/git/simplycompat-1.20.1-fabric-forge-template/fabric/.gradle/architectury/.main_class -Darchitectury.runtime.transformer\u003d/home/toph/git/simplycompat-1.20.1-fabric-forge-template/fabric/.gradle/architectury/.transforms -Darchitectury.properties\u003d/home/toph/git/simplycompat-1.20.1-fabric-forge-template/fabric/.gradle/architectury/.properties -Djdk.attach.allowAttachSelf\u003dtrue -javaagent:/home/toph/git/simplycompat-1.20.1-fabric-forge-template/.gradle/architectury/architectury-transformer-agent.jar",
|
||||||
"args": "nogui",
|
"args": "nogui",
|
||||||
"env": {
|
"env": {},
|
||||||
"MOD_CLASSES": "main%%/pool/git/SimplyCompat/forge/build/resources/main:main%%/pool/git/SimplyCompat/forge/build/classes/java/main",
|
"projectName": "fabric"
|
||||||
"MCP_MAPPINGS": "loom.stub"
|
|
||||||
},
|
|
||||||
"projectName": "forge"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
1
.vscode/settings.json
vendored
1
.vscode/settings.json
vendored
|
@ -15,7 +15,6 @@
|
||||||
},
|
},
|
||||||
"java.compile.nullAnalysis.mode": "automatic",
|
"java.compile.nullAnalysis.mode": "automatic",
|
||||||
"java.configuration.updateBuildConfiguration": "interactive",
|
"java.configuration.updateBuildConfiguration": "interactive",
|
||||||
"java.format.settings.url": ".vscode/java-formatter.xml",
|
|
||||||
"java.import.gradle.home": "/home/toph/.asdf/installs/gradle/8.8",
|
"java.import.gradle.home": "/home/toph/.asdf/installs/gradle/8.8",
|
||||||
"java.jdt.ls.java.home": "/home/toph/.asdf/installs/java/openjdk-17",
|
"java.jdt.ls.java.home": "/home/toph/.asdf/installs/java/openjdk-17",
|
||||||
"java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx4G -Xms100m -Xlog:disable",
|
"java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx4G -Xms100m -Xlog:disable",
|
||||||
|
|
87
build.gradle
87
build.gradle
|
@ -1,39 +1,27 @@
|
||||||
plugins {
|
plugins {
|
||||||
id "architectury-plugin" version "3.4-SNAPSHOT"
|
id 'dev.architectury.loom' version '1.7-SNAPSHOT' apply false
|
||||||
id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
|
id 'architectury-plugin' version '3.4-SNAPSHOT'
|
||||||
|
id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
|
||||||
}
|
}
|
||||||
|
|
||||||
architectury {
|
architectury {
|
||||||
minecraft = rootProject.minecraft_version
|
minecraft = project.minecraft_version
|
||||||
}
|
|
||||||
|
|
||||||
subprojects {
|
|
||||||
apply plugin: "dev.architectury.loom"
|
|
||||||
|
|
||||||
loom {
|
|
||||||
silentMojangMappingsLicense()
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
|
|
||||||
// The following line declares the mojmap mappings, you may use other mappings as well
|
|
||||||
// mappings loom.officialMojangMappings()
|
|
||||||
// The following line declares the yarn mappings you may select this one as well.
|
|
||||||
mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
allprojects {
|
allprojects {
|
||||||
apply plugin: "java"
|
group = rootProject.maven_group
|
||||||
apply plugin: "architectury-plugin"
|
version = rootProject.mod_version
|
||||||
apply plugin: "maven-publish"
|
|
||||||
|
|
||||||
base {
|
|
||||||
archivesName = rootProject.archives_base_name
|
|
||||||
}
|
}
|
||||||
|
|
||||||
version = rootProject.mod_version
|
subprojects {
|
||||||
group = rootProject.maven_group
|
apply plugin: 'dev.architectury.loom'
|
||||||
|
apply plugin: 'architectury-plugin'
|
||||||
|
apply plugin: 'maven-publish'
|
||||||
|
|
||||||
|
base {
|
||||||
|
// Set up a suffixed format for the mod jar names, e.g. `example-fabric`.
|
||||||
|
archivesName = "$rootProject.archives_name-$project.name"
|
||||||
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
// Add repositories to retrieve artifacts from in here.
|
// Add repositories to retrieve artifacts from in here.
|
||||||
|
@ -41,14 +29,53 @@ allprojects {
|
||||||
// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
|
// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
|
||||||
// See https://docs.gradle.org/current/userguide/declaring_repositories.html
|
// See https://docs.gradle.org/current/userguide/declaring_repositories.html
|
||||||
// for more information about repositories.
|
// for more information about repositories.
|
||||||
|
maven {
|
||||||
|
name = 'ParchmentMC'
|
||||||
|
url = 'https://maven.parchmentmc.org'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType(JavaCompile) {
|
loom {
|
||||||
options.encoding = "UTF-8"
|
silentMojangMappingsLicense()
|
||||||
options.release = 17
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
minecraft "net.minecraft:minecraft:$rootProject.minecraft_version"
|
||||||
|
mappings loom.layered() {
|
||||||
|
officialMojangMappings()
|
||||||
|
parchment("org.parchmentmc.data:parchment-$rootProject.parchment_version@zip")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
java {
|
java {
|
||||||
|
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
|
||||||
|
// if it is present.
|
||||||
|
// If you remove this line, sources will not be generated.
|
||||||
withSourcesJar()
|
withSourcesJar()
|
||||||
|
|
||||||
|
sourceCompatibility = JavaVersion.VERSION_17
|
||||||
|
targetCompatibility = JavaVersion.VERSION_17
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.withType(JavaCompile).configureEach {
|
||||||
|
it.options.release = 17
|
||||||
|
}
|
||||||
|
|
||||||
|
// Configure Maven publishing.
|
||||||
|
publishing {
|
||||||
|
publications {
|
||||||
|
mavenJava(MavenPublication) {
|
||||||
|
artifactId = base.archivesName.get()
|
||||||
|
from components.java
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
|
||||||
|
repositories {
|
||||||
|
// Add repositories to publish to here.
|
||||||
|
// Notice: This block does NOT have the same function as the block in the top level.
|
||||||
|
// The repositories here will be used for publishing your artifact, not for
|
||||||
|
// retrieving dependencies.
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,20 +1,11 @@
|
||||||
architectury {
|
architectury {
|
||||||
common(rootProject.enabled_platforms.split(","))
|
common rootProject.enabled_platforms.split(',')
|
||||||
}
|
}
|
||||||
|
|
||||||
loom {
|
|
||||||
accessWidenerPath = file("src/main/resources/simplycompat.accesswidener")
|
|
||||||
}
|
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
|
|
||||||
exclusiveContent {
|
|
||||||
forRepository {
|
|
||||||
maven {
|
maven {
|
||||||
url "https://cursemaven.com"
|
url "https://www.cursemaven.com"
|
||||||
}
|
content {
|
||||||
}
|
|
||||||
filter {
|
|
||||||
includeGroup "curse.maven"
|
includeGroup "curse.maven"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -23,36 +14,23 @@ repositories {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
// We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
|
// We depend on Fabric Loader here to use the Fabric @Environment annotations,
|
||||||
// Do NOT use other classes from fabric loader
|
// which get remapped to the correct annotations on each platform.
|
||||||
modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
|
// Do NOT use other classes from Fabric Loader.
|
||||||
// Remove the next line if you don't want to depend on the API
|
modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version"
|
||||||
modApi "dev.architectury:architectury:${rootProject.architectury_version}"
|
|
||||||
|
// Architectury API. This is optional, and you can comment it out if you don't need it.
|
||||||
|
modImplementation "dev.architectury:architectury:$rootProject.architectury_api_version"
|
||||||
|
|
||||||
|
|
||||||
modApi("me.shedaniel.cloth:cloth-config:${rootProject.cloth_config_version}") {
|
modApi("me.shedaniel.cloth:cloth-config:$rootProject.cloth_config_version") {
|
||||||
exclude(group: "net.fabricmc.fabric-api")
|
exclude(group: "net.fabricmc.fabric-api")
|
||||||
}
|
}
|
||||||
|
|
||||||
modImplementation("curse.maven:simplyswords-659887:5255981")
|
modImplementation "curse.maven:simplyswords-659887:5255981"
|
||||||
// runtimeOnly "curse.maven:better-combat-by-daedelus-639842:5625757"
|
// runtimeOnly "curse.maven:better-combat-by-daedelus-639842:5625757"
|
||||||
// runtimeOnly "curse.maven:playeranimator-658587:4587214"
|
// runtimeOnly "curse.maven:playeranimator-658587:4587214"
|
||||||
// implementation "curse.maven:additional-additions-forge-582387:5155724"
|
// implementation "curse.maven:additional-additions-forge-582387:5155724"
|
||||||
// implementation "curse.maven:create-328085:5838779"
|
// implementation "curse.maven:create-328085:5838779"
|
||||||
// implementation "curse.maven:create-industry-693815:5811638"
|
// implementation "curse.maven:create-industry-693815:5811638"
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
publishing {
|
|
||||||
publications {
|
|
||||||
mavenCommon(MavenPublication) {
|
|
||||||
artifactId = rootProject.archives_base_name
|
|
||||||
from components.java
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
|
|
||||||
repositories {
|
|
||||||
// Add repositories to publish to here.
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,26 +0,0 @@
|
||||||
package cc.toph.simplycompat;
|
|
||||||
|
|
||||||
import dev.architectury.platform.Platform;
|
|
||||||
import java.nio.file.Path;
|
|
||||||
|
|
||||||
public class ExpectPlatform {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* We can use {@link Platform#getConfigFolder()} but this is just an example of {@link dev.architectury.injectables.annotations.ExpectPlatform}.
|
|
||||||
* <p>
|
|
||||||
* This must be a <b>public static</b> method. The platform-implemented solution must be placed under a
|
|
||||||
* platform sub-package, with its class suffixed with {@code Impl}.
|
|
||||||
* <p>
|
|
||||||
* Example:
|
|
||||||
* Expect: cc.toph.simplycompat.ExampleExpectPlatform#getConfigDirectory()
|
|
||||||
* Actual Fabric: net.examplemod.fabric.ExampleExpectPlatformImpl#getConfigDirectory()
|
|
||||||
* Actual Forge: net.examplemod.forge.ExampleExpectPlatformImpl#getConfigDirectory()
|
|
||||||
* <p>
|
|
||||||
* <a href="https://plugins.jetbrains.com/plugin/16210-architectury">You should also get the IntelliJ plugin to help with @ExpectPlatform.</a>
|
|
||||||
*/
|
|
||||||
@dev.architectury.injectables.annotations.ExpectPlatform
|
|
||||||
public static Path getConfigDirectory() {
|
|
||||||
// Just throw an error, the content should get replaced at runtime.
|
|
||||||
throw new AssertionError();
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,111 +1,38 @@
|
||||||
package cc.toph.simplycompat;
|
package cc.toph.simplycompat;
|
||||||
|
|
||||||
import cc.toph.simplycompat.registry.ItemsRegistry;
|
import cc.toph.simplycompat.registry.ItemsRegistry;
|
||||||
import dev.architectury.platform.Platform;
|
|
||||||
import dev.architectury.registry.CreativeTabRegistry;
|
import dev.architectury.registry.CreativeTabRegistry;
|
||||||
import dev.architectury.registry.registries.DeferredRegister;
|
import dev.architectury.registry.registries.DeferredRegister;
|
||||||
import dev.architectury.registry.registries.RegistrySupplier;
|
import dev.architectury.registry.registries.RegistrySupplier;
|
||||||
import net.minecraft.item.ItemGroup;
|
import net.minecraft.core.registries.Registries;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.network.chat.Component;
|
||||||
import net.minecraft.item.Items;
|
import net.minecraft.world.item.CreativeModeTab;
|
||||||
import net.minecraft.registry.RegistryKeys;
|
import net.minecraft.world.item.ItemStack;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.world.item.Items;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
public class SimplyCompat {
|
public final class SimplyCompat {
|
||||||
|
|
||||||
public static final String MOD_ID = "simplycompat";
|
public static final String MOD_ID = "simplycompat";
|
||||||
|
|
||||||
public static final DeferredRegister<ItemGroup> TABS = DeferredRegister.create(
|
public static final DeferredRegister<CreativeModeTab> TABS = DeferredRegister.create(
|
||||||
SimplyCompat.MOD_ID,
|
MOD_ID,
|
||||||
RegistryKeys.ITEM_GROUP
|
Registries.CREATIVE_MODE_TAB
|
||||||
);
|
);
|
||||||
|
public static final RegistrySupplier<CreativeModeTab> SIMPLYCOMPAT = TABS.register(MOD_ID, () ->
|
||||||
public static final RegistrySupplier<ItemGroup> SIMPLYCOMPAT = TABS.register(
|
|
||||||
"simplycompat", // Tab ID
|
|
||||||
() ->
|
|
||||||
CreativeTabRegistry.create(
|
CreativeTabRegistry.create(
|
||||||
Text.translatable("itemGroup.simplycompat.simplycompat"), // Tab Name
|
Component.translatable("creativeTab.simplycompat.simplycompat"),
|
||||||
() -> new ItemStack(Items.AMETHYST_SHARD) // TODO: Icon
|
() -> new ItemStack(Items.AMETHYST_SHARD)
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
public static final Logger LOGGER = LogManager.getLogger(MOD_ID);
|
public static final Logger LOGGER = LogManager.getLogger(MOD_ID);
|
||||||
|
|
||||||
public static boolean isConfigOutdated;
|
|
||||||
|
|
||||||
// public static GeneralConfig generalConfig;
|
|
||||||
// public static LootConfig lootConfig;
|
|
||||||
// public static GemEffectsConfig gemEffectsConfig;
|
|
||||||
// public static RunicEffectsConfig runicEffectsConfig;
|
|
||||||
// public static StatusEffectsConfig statusEffectsConfig;
|
|
||||||
// public static UniqueEffectsConfig uniqueEffectsConfig;
|
|
||||||
// public static WeaponAttributesConfig weaponAttributesConfig;
|
|
||||||
//
|
|
||||||
// public static String minimumEldritchEndVersion = "0.2.40";
|
|
||||||
// public static String minimumSpellPowerVersion = "0.10.0+1.20.1";
|
|
||||||
|
|
||||||
public static void init() {
|
public static void init() {
|
||||||
//CONFIG
|
// Write common init code here.
|
||||||
|
|
||||||
// SimplyCompatConfig.init();
|
TABS.register();
|
||||||
//
|
|
||||||
// AutoConfig.register(ConfigWrapper.class, PartitioningSerializer.wrap(JanksonConfigSerializer::new));
|
|
||||||
// generalConfig = AutoConfig.getConfigHolder(ConfigWrapper.class).getConfig().general;
|
|
||||||
//// lootConfig = AutoConfig.getConfigHolder(ConfigWrapper.class).getConfig().loot;
|
|
||||||
//// gemEffectsConfig = AutoConfig.getConfigHolder(ConfigWrapper.class).getConfig().gem_effects;
|
|
||||||
//// runicEffectsConfig = AutoConfig.getConfigHolder(ConfigWrapper.class).getConfig().runic_effects;
|
|
||||||
//// statusEffectsConfig = AutoConfig.getConfigHolder(ConfigWrapper.class).getConfig().status_effects;
|
|
||||||
//// uniqueEffectsConfig = AutoConfig.getConfigHolder(ConfigWrapper.class).getConfig().unique_effects;
|
|
||||||
// weaponAttributesConfig = AutoConfig.getConfigHolder(ConfigWrapper.class).getConfig().weapon_attributes;
|
|
||||||
|
|
||||||
String version = SimplyCompatExpectPlatform.getVersion();
|
|
||||||
String defaultConfig = String.format(
|
|
||||||
"""
|
|
||||||
{
|
|
||||||
"regen_simplycompat_config_file": false,
|
|
||||||
"config_version": %s
|
|
||||||
}""",
|
|
||||||
version.substring(0, 4)
|
|
||||||
);
|
|
||||||
|
|
||||||
// File configFile = Config.createFile("config/simplycompat_extra/backupconfig.json", defaultConfig, false);
|
|
||||||
// JsonObject json = Config.getJsonObject(Config.readFile(configFile));
|
|
||||||
// isConfigOutdated = !json.has("config_version") || !version.startsWith(json.get("config_version").getAsString());
|
|
||||||
//
|
|
||||||
// SimplySwordsConfig.generateConfigs(json == null || !json.has("regen_simplyswords_config_file") || json.get("regen_simplyswords_config_file").getAsBoolean());
|
|
||||||
// SimplySwordsConfig.loadConfig();
|
|
||||||
|
|
||||||
SimplyCompat.TABS.register();
|
|
||||||
ItemsRegistry.ITEMS.register();
|
ItemsRegistry.ITEMS.register();
|
||||||
// SoundRegistry.SOUND.register();
|
|
||||||
// EffectRegistry.EFFECT.register();
|
|
||||||
// EntityRegistry.ENTITIES.register();
|
|
||||||
// ModLootTableModifiers.init();
|
|
||||||
// if (passVersionCheck("eldritch_end", minimumEldritchEndVersion)) {
|
|
||||||
// EldritchEndCompat.registerModItems();
|
|
||||||
// EldritchEndCompatRegistry.EFFECT.register();
|
|
||||||
// }
|
|
||||||
|
|
||||||
// try {
|
|
||||||
// FileCopier.copyFileToConfigDirectory();
|
|
||||||
// } catch (IOException e) {
|
|
||||||
// throw new RuntimeException(e);
|
|
||||||
// }
|
|
||||||
|
|
||||||
//Don't announce via in-game chat because that's kinda annoying
|
|
||||||
//ClientPlayerEvent.CLIENT_PLAYER_JOIN.register(new EventGameStart());
|
|
||||||
|
|
||||||
System.out.println(
|
|
||||||
SimplyCompatExpectPlatform.getConfigDirectory().toAbsolutePath().normalize().toString()
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean passVersionCheck(String modId, String requiredVersion) {
|
|
||||||
if (Platform.isModLoaded(modId)) {
|
|
||||||
return Platform.getMod(modId).getVersion().compareTo(requiredVersion) >= 0;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,36 +0,0 @@
|
||||||
package cc.toph.simplycompat;
|
|
||||||
|
|
||||||
public class SimplyCompat {
|
|
||||||
|
|
||||||
public static final String MOD_ID = "simplycompat";
|
|
||||||
// We can use this if we don't want to use DeferredRegister
|
|
||||||
public static final Supplier<RegistrarManager> REGISTRIES = Suppliers.memoize(() ->
|
|
||||||
RegistrarManager.get(MOD_ID)
|
|
||||||
);
|
|
||||||
|
|
||||||
// Registering a new creative tab
|
|
||||||
public static final DeferredRegister<ItemGroups> TABS = DeferredRegister.create(
|
|
||||||
MOD_ID,
|
|
||||||
Registries.CREATIVE_MODE_TAB
|
|
||||||
);
|
|
||||||
public static final RegistrySupplier<ItemGroups> EXAMPLE_TAB = TABS.register("example_tab", () ->
|
|
||||||
CreativeTabRegistry.create(Component.translatable("itemGroup." + MOD_ID + ".example_tab"), () ->
|
|
||||||
new ItemStack(ExampleMod.EXAMPLE_ITEM.get())
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(
|
|
||||||
MOD_ID,
|
|
||||||
Registries.ITEM
|
|
||||||
);
|
|
||||||
public static final RegistrySupplier<Item> EXAMPLE_ITEM = ITEMS.register("example_item", () ->
|
|
||||||
new Item(new Item.Properties().arch$tab(ExampleMod.EXAMPLE_TAB))
|
|
||||||
);
|
|
||||||
|
|
||||||
public static void init() {
|
|
||||||
// TABS.register();
|
|
||||||
// ITEMS.register();
|
|
||||||
//
|
|
||||||
System.out.println(ExpectPlatform.getConfigDirectory().toAbsolutePath().normalize().toString());
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,43 +0,0 @@
|
||||||
package cc.toph.simplycompat;
|
|
||||||
|
|
||||||
import dev.architectury.injectables.annotations.ExpectPlatform;
|
|
||||||
import java.nio.file.Path;
|
|
||||||
import net.minecraft.entity.player.PlayerEntity;
|
|
||||||
|
|
||||||
public class SimplyCompatExpectPlatform {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* We can use {@link Platform#getConfigFolder()} but this is just an example of {@link ExpectPlatform}.
|
|
||||||
* <p>
|
|
||||||
* This must be a <b>public static</b> method. The platform-implemented solution must be placed under a
|
|
||||||
* platform sub-package, with its class suffixed with {@code Impl}.
|
|
||||||
* <p>
|
|
||||||
* Example:
|
|
||||||
* Expect: net.examplemod.ExampleExpectPlatform#getConfigDirectory()
|
|
||||||
* Actual Fabric: net.examplemod.fabric.ExampleExpectPlatformImpl#getConfigDirectory()
|
|
||||||
* Actual Forge: net.examplemod.forge.ExampleExpectPlatformImpl#getConfigDirectory()
|
|
||||||
* <p>
|
|
||||||
* <a href="https://plugins.jetbrains.com/plugin/16210-architectury">You should also get the IntelliJ plugin to help with @ExpectPlatform.</a>
|
|
||||||
*/
|
|
||||||
@ExpectPlatform
|
|
||||||
public static Path getConfigDirectory() {
|
|
||||||
// Just throw an error, the content should get replaced at runtime.
|
|
||||||
throw new AssertionError();
|
|
||||||
}
|
|
||||||
|
|
||||||
@ExpectPlatform
|
|
||||||
public static String getVersion() {
|
|
||||||
// Just throw an error, the content should get replaced at runtime.
|
|
||||||
throw new AssertionError();
|
|
||||||
}
|
|
||||||
|
|
||||||
@ExpectPlatform
|
|
||||||
public static float getSpellPowerDamage(
|
|
||||||
float damageModifier,
|
|
||||||
PlayerEntity player,
|
|
||||||
String magicSchool
|
|
||||||
) {
|
|
||||||
// Just throw an error, the content should get replaced at runtime.
|
|
||||||
throw new AssertionError();
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,190 +0,0 @@
|
||||||
package cc.toph.simplycompat.config;
|
|
||||||
|
|
||||||
import com.google.gson.JsonElement;
|
|
||||||
import com.google.gson.JsonObject;
|
|
||||||
import com.google.gson.JsonParser;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.FileNotFoundException;
|
|
||||||
import java.io.FileWriter;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.nio.file.Files;
|
|
||||||
import java.nio.file.Path;
|
|
||||||
import java.nio.file.Paths;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.LinkedHashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Scanner;
|
|
||||||
|
|
||||||
public class Config {
|
|
||||||
|
|
||||||
public static File createFile(String path, String contents, boolean overwrite) {
|
|
||||||
File file = new File(path);
|
|
||||||
if (file.exists() && !overwrite) {
|
|
||||||
return file;
|
|
||||||
}
|
|
||||||
file.getParentFile().mkdirs();
|
|
||||||
try {
|
|
||||||
file.createNewFile();
|
|
||||||
} catch (IOException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
file.setReadable(true);
|
|
||||||
file.setWritable(true);
|
|
||||||
file.setExecutable(true);
|
|
||||||
if (contents == null || "".equals(contents)) {
|
|
||||||
return file;
|
|
||||||
}
|
|
||||||
try (FileWriter writer = new FileWriter(file)) {
|
|
||||||
writer.write(contents);
|
|
||||||
} catch (IOException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
return file;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public static String readFile(File file) {
|
|
||||||
String output = "";
|
|
||||||
try (Scanner scanner = new Scanner(file)) {
|
|
||||||
scanner.useDelimiter("\\Z");
|
|
||||||
output = scanner.next();
|
|
||||||
} catch (FileNotFoundException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
return output;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static JsonObject getJsonObject(String json) {
|
|
||||||
try {
|
|
||||||
return new JsonParser().parse(json).getAsJsonObject();
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// -- Safe Config Fetching --
|
|
||||||
// Allows safely fetching config values in a scenario where we do not know if they exist.
|
|
||||||
// EG. Addon mod for Simply Swords attempting to load config values before Simply Swords has initialised.
|
|
||||||
|
|
||||||
private static final HashMap<String, Boolean> BOOLEAN = new LinkedHashMap<>();
|
|
||||||
private static final HashMap<String, Float> FLOAT = new LinkedHashMap<>();
|
|
||||||
private static final HashMap<String, Double> DOUBLE = new LinkedHashMap<>();
|
|
||||||
private static final HashMap<String, Integer> INT = new LinkedHashMap<>();
|
|
||||||
|
|
||||||
public static boolean getBoolean(String key, String parent, boolean defaultValue) {
|
|
||||||
//System.out.println("Trying to fetch config value for " + key + " from " + parent);
|
|
||||||
safeValueFetch("boolean", parent);
|
|
||||||
if (!BOOLEAN.isEmpty()) {
|
|
||||||
if (BOOLEAN.containsKey(key)) {
|
|
||||||
//System.out.println("Successfully fetched value for " + key + " : " + BOOLEAN.get(key));
|
|
||||||
return BOOLEAN.get(key);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
System.out.println("Failed to fetch config value for " + key + ". Loading default value.\nIt is recommended that you restart your game.");
|
|
||||||
return defaultValue;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static float getFloat(String key, String parent, float defaultValue) {
|
|
||||||
//System.out.println("Trying to fetch config value for " + key + " from " + parent);
|
|
||||||
safeValueFetch("float", parent);
|
|
||||||
if (!FLOAT.isEmpty()) {
|
|
||||||
if (FLOAT.containsKey(key)) {
|
|
||||||
//System.out.println("Successfully fetched value for " + key + " : " + FLOAT.get(key));
|
|
||||||
return FLOAT.get(key);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
System.out.println("Failed to fetch config value for " + key + ". Loading default value.\nIt is recommended that you restart your game.");
|
|
||||||
//System.out.print(FLOAT);
|
|
||||||
return defaultValue;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static double getDouble(String key, String parent, double defaultValue) {
|
|
||||||
safeValueFetch("double", parent);
|
|
||||||
if (!DOUBLE.isEmpty()) {
|
|
||||||
if (DOUBLE.containsKey(key))
|
|
||||||
return DOUBLE.get(key);
|
|
||||||
}
|
|
||||||
System.out.println("Failed to fetch config value for " + key + ". Loading default value.\nIt is recommended that you restart your game.");
|
|
||||||
return defaultValue;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static int getInt(String key, String parent, int defaultValue) {
|
|
||||||
safeValueFetch("int", parent);
|
|
||||||
if (!INT.isEmpty()) {
|
|
||||||
if (INT.containsKey(key))
|
|
||||||
return INT.get(key);
|
|
||||||
}
|
|
||||||
System.out.println("Failed to fetch config value for " + key + ". Loading default value.\nIt is recommended that you restart your game.");
|
|
||||||
return defaultValue;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void safeValueFetch(String type, String parent) {
|
|
||||||
Path path = Paths.get("config/simplycompat_main/");
|
|
||||||
JsonObject json = null;
|
|
||||||
if (Files.exists(path)) {
|
|
||||||
json = switch (parent) {
|
|
||||||
// case "GemEffects" ->
|
|
||||||
// Config.getJsonObject(Config.readFile(new File("config/simplyswords_main/gem_effects.json5")));
|
|
||||||
// case "General" ->
|
|
||||||
// Config.getJsonObject(Config.readFile(new File("config/simplyswords_main/general.json5")));
|
|
||||||
// case "Loot" -> Config.getJsonObject(Config.readFile(new File("config/simplyswords_main/loot.json5")));
|
|
||||||
// case "RunicEffects" ->
|
|
||||||
//// Config.getJsonObject(Config.readFile(new File("config/simplyswords_main/runic_effects.json5")));
|
|
||||||
// case "StatusEffects" ->
|
|
||||||
// Config.getJsonObject(Config.readFile(new File("config/simplyswords_main/status_effects.json5")));
|
|
||||||
// case "UniqueEffects" ->
|
|
||||||
// Config.getJsonObject(Config.readFile(new File("config/simplyswords_main/unique_effects.json5")));
|
|
||||||
case "WeaponAttributes" ->
|
|
||||||
Config.getJsonObject(Config.readFile(new File("config/simplycompat_main/weapon_attributes.json5")));
|
|
||||||
default -> null;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
if (json != null) {
|
|
||||||
|
|
||||||
switch (type) {
|
|
||||||
case "boolean" -> {
|
|
||||||
for (Map.Entry<String, JsonElement> entry : json.entrySet()) {
|
|
||||||
try {
|
|
||||||
BOOLEAN.put(entry.getKey(), entry.getValue().getAsBoolean());
|
|
||||||
} catch (Exception e) {
|
|
||||||
//System.out.println(entry.getKey() + ": " + entry.getValue() + " is not a valid value. Skipping this entry.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
case "float" -> {
|
|
||||||
for (Map.Entry<String, JsonElement> entry : json.entrySet()) {
|
|
||||||
try {
|
|
||||||
FLOAT.put(entry.getKey(), entry.getValue().getAsFloat());
|
|
||||||
} catch (Exception e) {
|
|
||||||
//System.out.println(entry.getKey() + ": " + entry.getValue() + " is not a valid value. Skipping this entry.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
case "double" -> {
|
|
||||||
for (Map.Entry<String, JsonElement> entry : json.entrySet()) {
|
|
||||||
try {
|
|
||||||
DOUBLE.put(entry.getKey(), entry.getValue().getAsDouble());
|
|
||||||
} catch (Exception e) {
|
|
||||||
//System.out.println(entry.getKey() + ": " + entry.getValue() + " is not a valid value. Skipping this entry.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
case "int" -> {
|
|
||||||
for (Map.Entry<String, JsonElement> entry : json.entrySet()) {
|
|
||||||
try {
|
|
||||||
INT.put(entry.getKey(), entry.getValue().getAsInt());
|
|
||||||
} catch (Exception e) {
|
|
||||||
//System.out.println(entry.getKey() + ": " + entry.getValue() + " is not a valid value. Skipping this entry.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
package cc.toph.simplycompat.config;
|
|
||||||
|
|
||||||
public class ConfigDefaultValues {
|
|
||||||
|
|
||||||
// public static float bronze_damageModifier = 3.0f;
|
|
||||||
public static float copper_damageModifier = 3.0f;
|
|
||||||
// public static float steel_damageModifier = 3.0f;
|
|
||||||
|
|
||||||
// // -- LOOT CONFIG --
|
|
||||||
//
|
|
||||||
// public static boolean enableLootDrops = true;
|
|
||||||
//
|
|
||||||
// public static boolean enableLootInVillages = false;
|
|
||||||
// public static boolean enableTheWatcher = true;
|
|
||||||
//
|
|
||||||
// public static float standardLootTableWeight = 0.01f;
|
|
||||||
//
|
|
||||||
// public static float rareLootTableWeight = 0.004f;
|
|
||||||
//
|
|
||||||
// public static float runicLootTableWeight = 0.007f;
|
|
||||||
//
|
|
||||||
// public static float uniqueLootTableWeight = 0.001f;
|
|
||||||
// public static boolean enableWatchingWarglaive = true;
|
|
||||||
// public static boolean enableContainedRemnants = true;
|
|
||||||
// public static boolean enableLongswordOfThePlague = true;
|
|
||||||
// public static boolean enableSwordOnAStick = true;
|
|
||||||
// public static boolean enableBramblethorn = true;
|
|
||||||
// public static boolean enableStormsEdge = true;
|
|
||||||
// public static boolean enableStormbringer = true;
|
|
||||||
// public static boolean enableMjolnir = true;
|
|
||||||
// public static boolean enableEmberblade = true;
|
|
||||||
// public static boolean enableHearthflame = true;
|
|
||||||
// public static boolean enableTwistedBlade = true;
|
|
||||||
// public static boolean enableSoulrender = true;
|
|
||||||
// public static boolean enableSoulpyre = true;
|
|
||||||
// public static boolean enableSoulkeeper = true;
|
|
||||||
// public static boolean enableSoulstealer = true;
|
|
||||||
// public static boolean enableFrostfall = true;
|
|
||||||
// public static boolean enableMoltenEdge = true;
|
|
||||||
// public static boolean enableLivyatan = true;
|
|
||||||
// public static boolean enableIcewhisper = true;
|
|
||||||
// public static boolean enableArcanethyst = true;
|
|
||||||
// public static boolean enableThunderbrand = true;
|
|
||||||
// public static boolean enableBrimstone = true;
|
|
||||||
// public static boolean enableSlumberingLichblade = true;
|
|
||||||
// public static boolean enableShadowsting = true;
|
|
||||||
// public static boolean enableDormantRelic = true;
|
|
||||||
// public static boolean enableWhisperwind = true;
|
|
||||||
// public static boolean enableEmberlash = true;
|
|
||||||
// public static boolean enableWaxweaver = true;
|
|
||||||
// public static boolean enableHiveheart = true;
|
|
||||||
// public static boolean enableStarsEdge = true;
|
|
||||||
// public static boolean enableWickpiercer = true;
|
|
||||||
// public static boolean enableTempest = true;
|
|
||||||
// public static boolean enableFlamewind = true;
|
|
||||||
// public static boolean enableRibboncleaver = true;
|
|
||||||
// public static boolean enableCaelestis = true;
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,33 +0,0 @@
|
||||||
package cc.toph.simplycompat.config;
|
|
||||||
|
|
||||||
import cc.toph.simplycompat.SimplyCompat;
|
|
||||||
import me.shedaniel.autoconfig.annotation.Config;
|
|
||||||
import me.shedaniel.autoconfig.annotation.ConfigEntry;
|
|
||||||
import me.shedaniel.autoconfig.serializer.PartitioningSerializer;
|
|
||||||
|
|
||||||
@Config(name = SimplyCompat.MOD_ID + "_main")
|
|
||||||
@Config.Gui.Background("cloth-config2:transparent")
|
|
||||||
public class ConfigWrapper extends PartitioningSerializer.GlobalData {
|
|
||||||
|
|
||||||
// @ConfigEntry.Category("general")
|
|
||||||
// @ConfigEntry.Gui.TransitiveObject
|
|
||||||
// public GeneralConfig general = new GeneralConfig();
|
|
||||||
// @ConfigEntry.Category("loot")
|
|
||||||
// @ConfigEntry.Gui.TransitiveObject
|
|
||||||
// public LootConfig loot = new LootConfig();
|
|
||||||
// @ConfigEntry.Category("gem_effects")
|
|
||||||
// @ConfigEntry.Gui.TransitiveObject
|
|
||||||
// public GemEffectsConfig gem_effects = new GemEffectsConfig();
|
|
||||||
// @ConfigEntry.Category("runic_effects")
|
|
||||||
// @ConfigEntry.Gui.TransitiveObject
|
|
||||||
// public RunicEffectsConfig runic_effects = new RunicEffectsConfig();
|
|
||||||
// @ConfigEntry.Category("status_effects")
|
|
||||||
// @ConfigEntry.Gui.TransitiveObject
|
|
||||||
// public StatusEffectsConfig status_effects = new StatusEffectsConfig();
|
|
||||||
// @ConfigEntry.Category("unique_effects")
|
|
||||||
// @ConfigEntry.Gui.TransitiveObject
|
|
||||||
// public UniqueEffectsConfig unique_effects = new UniqueEffectsConfig();
|
|
||||||
@ConfigEntry.Category("weapon_attributes")
|
|
||||||
@ConfigEntry.Gui.TransitiveObject
|
|
||||||
public WeaponAttributesConfig weapon_attributes = new WeaponAttributesConfig();
|
|
||||||
}
|
|
|
@ -1,62 +0,0 @@
|
||||||
package cc.toph.simplycompat.config;
|
|
||||||
|
|
||||||
import me.shedaniel.autoconfig.ConfigData;
|
|
||||||
import me.shedaniel.autoconfig.annotation.Config;
|
|
||||||
import me.shedaniel.autoconfig.annotation.ConfigEntry;
|
|
||||||
|
|
||||||
@Config(name = "loot")
|
|
||||||
public class LootConfig implements ConfigData {
|
|
||||||
|
|
||||||
@ConfigEntry.Gui.PrefixText
|
|
||||||
@ConfigEntry.Gui.Tooltip
|
|
||||||
public boolean enableLootDrops = true;
|
|
||||||
@ConfigEntry.Gui.Tooltip
|
|
||||||
public boolean enableLootInVillages = false;
|
|
||||||
public boolean enableTheWatcher = true;
|
|
||||||
@ConfigEntry.Gui.Tooltip
|
|
||||||
public float standardLootTableWeight = 0.01f;
|
|
||||||
@ConfigEntry.Gui.Tooltip
|
|
||||||
public float rareLootTableWeight = 0.004f;
|
|
||||||
@ConfigEntry.Gui.Tooltip
|
|
||||||
public float runicLootTableWeight = 0.007f;
|
|
||||||
@ConfigEntry.Gui.Tooltip
|
|
||||||
public float uniqueLootTableWeight = 0.001f;
|
|
||||||
@ConfigEntry.Gui.Tooltip
|
|
||||||
public boolean enableContainedRemnants = true;
|
|
||||||
public boolean enableWatchingWarglaive = true;
|
|
||||||
public boolean enableLongswordOfThePlague = true;
|
|
||||||
public boolean enableSwordOnAStick = true;
|
|
||||||
public boolean enableBramblethorn = true;
|
|
||||||
public boolean enableStormsEdge = true;
|
|
||||||
public boolean enableStormbringer = true;
|
|
||||||
public boolean enableMjolnir = true;
|
|
||||||
public boolean enableEmberblade = true;
|
|
||||||
public boolean enableHearthflame = true;
|
|
||||||
public boolean enableTwistedBlade = true;
|
|
||||||
public boolean enableSoulrender = true;
|
|
||||||
public boolean enableSoulpyre = true;
|
|
||||||
public boolean enableSoulkeeper = true;
|
|
||||||
public boolean enableSoulstealer = true;
|
|
||||||
public boolean enableFrostfall = true;
|
|
||||||
public boolean enableMoltenEdge = true;
|
|
||||||
public boolean enableLivyatan = true;
|
|
||||||
public boolean enableIcewhisper = true;
|
|
||||||
public boolean enableArcanethyst = true;
|
|
||||||
public boolean enableThunderbrand = true;
|
|
||||||
public boolean enableBrimstone = true;
|
|
||||||
public boolean enableSlumberingLichblade = true;
|
|
||||||
public boolean enableShadowsting = true;
|
|
||||||
public boolean enableDormantRelic = true;
|
|
||||||
public boolean enableWhisperwind = true;
|
|
||||||
public boolean enableEmberlash = true;
|
|
||||||
public boolean enableWaxweaver = true;
|
|
||||||
public boolean enableHiveheart = true;
|
|
||||||
public boolean enableStarsEdge = true;
|
|
||||||
public boolean enableWickpiercer = true;
|
|
||||||
public boolean enableTempest = true;
|
|
||||||
public boolean enableFlamewind = true;
|
|
||||||
public boolean enableRibboncleaver = true;
|
|
||||||
public boolean enableCaelestis = true;
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,99 +0,0 @@
|
||||||
package cc.toph.simplycompat.config;
|
|
||||||
|
|
||||||
import com.google.gson.JsonElement;
|
|
||||||
import com.google.gson.JsonObject;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.LinkedHashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
public class SimplyCompatConfig {
|
|
||||||
private static final HashMap<String, Float> LOOT_OPTIONS = new LinkedHashMap<>();
|
|
||||||
|
|
||||||
public static float getLootModifiers(String key) {
|
|
||||||
if (!LOOT_OPTIONS.containsKey(key)) {
|
|
||||||
//System.out.println(key);
|
|
||||||
return 0f;
|
|
||||||
}
|
|
||||||
return LOOT_OPTIONS.get(key);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean getLootList(String id) {
|
|
||||||
if (!LOOT_OPTIONS.isEmpty()) {
|
|
||||||
//System.out.println(id);
|
|
||||||
return LOOT_OPTIONS.toString().contains(id);
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void init() {
|
|
||||||
|
|
||||||
LOOT_OPTIONS.put("minecraft:entities/wither", 0.05f);
|
|
||||||
LOOT_OPTIONS.put("minecraft:entities/ender_dragon", 0.5f);
|
|
||||||
LOOT_OPTIONS.put("minecraft:chests/ruined_portal", 0f);
|
|
||||||
LOOT_OPTIONS.put("minecraft:chests/village/village_armorer", 0f);
|
|
||||||
LOOT_OPTIONS.put("minecraft:chests/village/village_butcher", 0f);
|
|
||||||
LOOT_OPTIONS.put("minecraft:chests/village/village_cartographer", 0f);
|
|
||||||
LOOT_OPTIONS.put("minecraft:chests/village/village_desert_house", 0f);
|
|
||||||
LOOT_OPTIONS.put("minecraft:chests/village/village_fisher", 0f);
|
|
||||||
LOOT_OPTIONS.put("minecraft:chests/village/village_fletcher", 0f);
|
|
||||||
LOOT_OPTIONS.put("minecraft:chests/village/village_mason", 0f);
|
|
||||||
LOOT_OPTIONS.put("minecraft:chests/village/village_plains_house", 0f);
|
|
||||||
LOOT_OPTIONS.put("minecraft:chests/village/village_savanna_house", 0f);
|
|
||||||
LOOT_OPTIONS.put("minecraft:chests/village/village_shepard", 0f);
|
|
||||||
LOOT_OPTIONS.put("minecraft:chests/village/village_snowy_house", 0f);
|
|
||||||
LOOT_OPTIONS.put("minecraft:chests/village/village_taiga_house", 0f);
|
|
||||||
LOOT_OPTIONS.put("minecraft:chests/village/village_tannery", 0f);
|
|
||||||
LOOT_OPTIONS.put("minecraft:chests/village/village_temple", 0f);
|
|
||||||
LOOT_OPTIONS.put("minecraft:chests/village/village_toolsmith", 0f);
|
|
||||||
LOOT_OPTIONS.put("minecraft:chests/village/village_weaponsmith", 0f);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void loadConfig() {
|
|
||||||
//System.out.println("Loading common Simply Swords config");
|
|
||||||
JsonObject json;
|
|
||||||
json = Config.getJsonObject(Config.readFile(new File("config/simplyswords_extra/loot_config.json5")));
|
|
||||||
for (Map.Entry<String, JsonElement> entry : json.entrySet()) {
|
|
||||||
LOOT_OPTIONS.put(entry.getKey(), entry.getValue().getAsFloat());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public static void generateConfigs(boolean overwrite) {
|
|
||||||
//System.out.println("Generating common Simply Swords config");
|
|
||||||
StringBuilder config;
|
|
||||||
int i;
|
|
||||||
config = new StringBuilder("{\n");
|
|
||||||
i = 0;
|
|
||||||
for (String key : LOOT_OPTIONS.keySet()) {
|
|
||||||
if (i == 0) {
|
|
||||||
config.append("// --------------------------------------------- LOOT CONFIGURATION ----------------------------------------------------------------- \n");
|
|
||||||
config.append("// This config allows for the tweaking of loot injection for UNIQUE weapons. \n");
|
|
||||||
config.append("// Standard iron > diamond gear, and Runic Tablets, are controlled by the loot modifiers in the general_config, not here. \n");
|
|
||||||
config.append("// ---------------------------------------------------------------------------------------------------------------------------------- \n");
|
|
||||||
config.append("// --------------------------------------------- How does it work? ------------------------------------------------------------------ \n");
|
|
||||||
config.append("// If 'add_weapons_to_loot_tables' is enabled in the simplyswords_main config, Simply Swords will attempt to inject its loot into \n");
|
|
||||||
config.append("// any loot table that contains 'chests' in its filepath. This includes loot tables from other mods.\n");
|
|
||||||
config.append("// Any values provided in this config will override the aforementioned process, acting as both a whitelist, and a blacklist.\n");
|
|
||||||
config.append("\n");
|
|
||||||
config.append("// Each line must be made up of a string containing the namespace, path, and filename, in addition to a float value. \n");
|
|
||||||
config.append("// The float value provided will determine the chance of the loot appearing in the loot table. Where 0.0 is %0, and 1.0 is %100.\n");
|
|
||||||
config.append("// If the float value provided is 0.0 the items will be blacklisted from this loot table and skipped entirely by the loot injection.\n");
|
|
||||||
config.append("\n");
|
|
||||||
config.append("// Items can also be injected into entity loot tables, as seen in the Wither example below.\n");
|
|
||||||
config.append("// ---------------------------------------------------------------------------------------------------------------------------------- \n");
|
|
||||||
config.append("\n");
|
|
||||||
}
|
|
||||||
config.append(" \"").append(key).append("\": ").append(LOOT_OPTIONS.get(key));
|
|
||||||
++i;
|
|
||||||
if (i < LOOT_OPTIONS.size()) {
|
|
||||||
config.append(",");
|
|
||||||
}
|
|
||||||
config.append("\n");
|
|
||||||
}
|
|
||||||
config.append("}");
|
|
||||||
Config.createFile("config/simplyswords_extra/loot_config.json5", config.toString(), overwrite);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,15 +0,0 @@
|
||||||
package cc.toph.simplycompat.config;
|
|
||||||
|
|
||||||
import me.shedaniel.autoconfig.ConfigData;
|
|
||||||
import me.shedaniel.autoconfig.annotation.Config;
|
|
||||||
import me.shedaniel.autoconfig.annotation.ConfigEntry;
|
|
||||||
|
|
||||||
@Config(name = "weapon_attributes")
|
|
||||||
public class WeaponAttributesConfig implements ConfigData {
|
|
||||||
|
|
||||||
@ConfigEntry.Gui.PrefixText
|
|
||||||
public float bronze_damageModifier = 3.0f;
|
|
||||||
public float copper_damageModifier = 3.0f;
|
|
||||||
public float steel_damageModifier = 3.0f;
|
|
||||||
|
|
||||||
}
|
|
|
@ -2,70 +2,76 @@ package cc.toph.simplycompat.item;
|
||||||
|
|
||||||
import com.google.common.base.Suppliers;
|
import com.google.common.base.Suppliers;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.core.registries.BuiltInRegistries;
|
||||||
import net.minecraft.item.Items;
|
import net.minecraft.world.item.Item;
|
||||||
import net.minecraft.item.ToolMaterial;
|
import net.minecraft.world.item.Items;
|
||||||
import net.minecraft.recipe.Ingredient;
|
import net.minecraft.world.item.Tier;
|
||||||
|
import net.minecraft.world.item.crafting.Ingredient;
|
||||||
|
|
||||||
public enum SimplyCompatToolMaterials implements ToolMaterial {
|
public enum SimplyCompatToolMaterials implements Tier {
|
||||||
COPPER(1, 125, 4.5F, 1.0F, 8, Items.COPPER_INGOT),
|
COPPER(1, 125, 4.5F, 1.0F, 8, Items.COPPER_INGOT),
|
||||||
STEEL(2, 600, 6.5F, 2.5F, 12, Items.DIAMOND);
|
STEEL(2, 600, 6.5F, 2.5F, 12, Items.DIAMOND);
|
||||||
|
|
||||||
private final int miningLevel;
|
private final int level;
|
||||||
private final int itemDurability;
|
private final int uses;
|
||||||
private final float miningSpeed;
|
private final float speed;
|
||||||
private final float attackDamage;
|
private final float attackDamageBonus;
|
||||||
private final int enchantability;
|
private final int enchantmentValue;
|
||||||
private final Supplier<Ingredient> repairIngredient;
|
private final Supplier<Ingredient> repairIngredient;
|
||||||
|
|
||||||
SimplyCompatToolMaterials(
|
SimplyCompatToolMaterials(
|
||||||
int miningLevel,
|
int level,
|
||||||
int itemDurability,
|
int uses,
|
||||||
float miningSpeed,
|
float speed,
|
||||||
float attackDamage,
|
float attackDamageBonus,
|
||||||
int enchantability,
|
int enchantmentValue,
|
||||||
Item... repairIngredient
|
Item... repairIngredient
|
||||||
) {
|
) {
|
||||||
this.miningLevel = miningLevel;
|
this.level = level;
|
||||||
this.itemDurability = itemDurability;
|
this.uses = uses;
|
||||||
this.miningSpeed = miningSpeed;
|
this.speed = speed;
|
||||||
this.attackDamage = attackDamage;
|
this.attackDamageBonus = attackDamageBonus;
|
||||||
this.enchantability = enchantability;
|
this.enchantmentValue = enchantmentValue;
|
||||||
this.repairIngredient = Suppliers.memoize(() -> Ingredient.ofItems(repairIngredient));
|
this.repairIngredient = Suppliers.memoize(() -> Ingredient.of(repairIngredient));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns RepairIngredient ResourceLocation as a string
|
||||||
|
* @return String ResourceLocation Path (mod:item)
|
||||||
|
*/
|
||||||
|
public String getIdentifier() {
|
||||||
|
return BuiltInRegistries.ITEM.getKey(
|
||||||
|
this.repairIngredient.get().getItems()[0].getItem()
|
||||||
|
).toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getDurability() {
|
public int getUses() {
|
||||||
return this.itemDurability;
|
return uses;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public float getMiningSpeedMultiplier() {
|
public float getSpeed() {
|
||||||
return this.miningSpeed;
|
return speed;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public float getAttackDamage() {
|
public float getAttackDamageBonus() {
|
||||||
return this.attackDamage;
|
return attackDamageBonus;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getMiningLevel() {
|
public int getLevel() {
|
||||||
return this.miningLevel;
|
return level;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getEnchantability() {
|
public int getEnchantmentValue() {
|
||||||
return this.enchantability;
|
return enchantmentValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Ingredient getRepairIngredient() {
|
public Ingredient getRepairIngredient() {
|
||||||
repairIngredient.get().getMatchingItemIds();
|
|
||||||
return this.repairIngredient.get();
|
return this.repairIngredient.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void getIdenfier() {
|
|
||||||
System.out.println(this.repairIngredient.get().toJson().getAsString());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,15 +0,0 @@
|
||||||
package cc.toph.simplycompat.mixin;
|
|
||||||
|
|
||||||
import net.minecraft.client.gui.screen.TitleScreen;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|
||||||
|
|
||||||
@Mixin(TitleScreen.class)
|
|
||||||
public class MixinTitleScreen {
|
|
||||||
@Inject(at = @At("HEAD"), method = "init()V")
|
|
||||||
private void init(CallbackInfo info) {
|
|
||||||
System.out.println("Hello from example architectury common mixin!");
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -4,8 +4,8 @@ import cc.toph.simplycompat.SimplyCompat;
|
||||||
import cc.toph.simplycompat.item.SimplyCompatToolMaterials;
|
import cc.toph.simplycompat.item.SimplyCompatToolMaterials;
|
||||||
import dev.architectury.registry.registries.DeferredRegister;
|
import dev.architectury.registry.registries.DeferredRegister;
|
||||||
import dev.architectury.registry.registries.RegistrySupplier;
|
import dev.architectury.registry.registries.RegistrySupplier;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.core.registries.Registries;
|
||||||
import net.minecraft.registry.RegistryKeys;
|
import net.minecraft.world.item.Item;
|
||||||
import net.sweenus.simplyswords.config.ConfigDefaultValues;
|
import net.sweenus.simplyswords.config.ConfigDefaultValues;
|
||||||
import net.sweenus.simplyswords.item.SimplySwordsSwordItem;
|
import net.sweenus.simplyswords.item.SimplySwordsSwordItem;
|
||||||
|
|
||||||
|
@ -319,14 +319,13 @@ public class ItemsRegistry {
|
||||||
|
|
||||||
public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(
|
public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(
|
||||||
SimplyCompat.MOD_ID,
|
SimplyCompat.MOD_ID,
|
||||||
RegistryKeys.ITEM
|
Registries.ITEM
|
||||||
);
|
);
|
||||||
|
|
||||||
private static RegistrySupplier<SimplySwordsSwordItem> registerSword(
|
private static RegistrySupplier<SimplySwordsSwordItem> registerSword(
|
||||||
String materialPrefix,
|
String materialPrefix,
|
||||||
SimplyCompatToolMaterials material,
|
SimplyCompatToolMaterials material,
|
||||||
WeaponType type,
|
WeaponType type
|
||||||
String... materialTag
|
|
||||||
) {
|
) {
|
||||||
// Get the base modifier from config by constructing the key "<materialPrefix>_damageModifier"
|
// Get the base modifier from config by constructing the key "<materialPrefix>_damageModifier"
|
||||||
// float baseModifier = Config.getFloat(
|
// float baseModifier = Config.getFloat(
|
||||||
|
@ -335,7 +334,7 @@ public class ItemsRegistry {
|
||||||
// 1.0F // TODO: Change config to a data structure, or at least have one available for accessing here, Since we cant `ConfigDefaultValues.material_damageModifier` here
|
// 1.0F // TODO: Change config to a data structure, or at least have one available for accessing here, Since we cant `ConfigDefaultValues.material_damageModifier` here
|
||||||
// );
|
// );
|
||||||
|
|
||||||
material.getIdenfier(); // DELETE
|
var materialTag = material.getIdentifier();
|
||||||
|
|
||||||
float finalDamage = 2.0f + type.getPositiveModifier() - type.getNegativeModifier();
|
float finalDamage = 2.0f + type.getPositiveModifier() - type.getNegativeModifier();
|
||||||
// float finalDamage = baseModifier + type.getPositiveModifier() - type.getNegativeModifier();
|
// float finalDamage = baseModifier + type.getPositiveModifier() - type.getNegativeModifier();
|
||||||
|
@ -349,104 +348,89 @@ public class ItemsRegistry {
|
||||||
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_CHAKRAM = registerSword(
|
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_CHAKRAM = registerSword(
|
||||||
"copper",
|
"copper",
|
||||||
SimplyCompatToolMaterials.COPPER,
|
SimplyCompatToolMaterials.COPPER,
|
||||||
WeaponType.CHAKRAM,
|
WeaponType.CHAKRAM
|
||||||
"minecraft:copper_ingot"
|
|
||||||
);
|
);
|
||||||
|
|
||||||
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_CLAYMORE = registerSword(
|
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_CLAYMORE = registerSword(
|
||||||
"copper",
|
"copper",
|
||||||
SimplyCompatToolMaterials.COPPER,
|
SimplyCompatToolMaterials.COPPER,
|
||||||
WeaponType.CLAYMORE,
|
WeaponType.CLAYMORE
|
||||||
"minecraft:copper_ingot"
|
|
||||||
);
|
);
|
||||||
|
|
||||||
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_CUTLASS = registerSword(
|
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_CUTLASS = registerSword(
|
||||||
"copper",
|
"copper",
|
||||||
SimplyCompatToolMaterials.COPPER,
|
SimplyCompatToolMaterials.COPPER,
|
||||||
WeaponType.CUTLASS,
|
WeaponType.CUTLASS
|
||||||
"minecraft:copper_ingot"
|
|
||||||
);
|
);
|
||||||
|
|
||||||
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_GLAIVE = registerSword(
|
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_GLAIVE = registerSword(
|
||||||
"copper",
|
"copper",
|
||||||
SimplyCompatToolMaterials.COPPER,
|
SimplyCompatToolMaterials.COPPER,
|
||||||
WeaponType.GLAIVE,
|
WeaponType.GLAIVE
|
||||||
"minecraft:copper_ingot"
|
|
||||||
);
|
);
|
||||||
|
|
||||||
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_GREATAXE = registerSword(
|
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_GREATAXE = registerSword(
|
||||||
"copper",
|
"copper",
|
||||||
SimplyCompatToolMaterials.COPPER,
|
SimplyCompatToolMaterials.COPPER,
|
||||||
WeaponType.GREATAXE,
|
WeaponType.GREATAXE
|
||||||
"minecraft:copper_ingot"
|
|
||||||
);
|
);
|
||||||
|
|
||||||
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_GREATHAMMER = registerSword(
|
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_GREATHAMMER = registerSword(
|
||||||
"copper",
|
"copper",
|
||||||
SimplyCompatToolMaterials.COPPER,
|
SimplyCompatToolMaterials.COPPER,
|
||||||
WeaponType.GREATHAMMER,
|
WeaponType.GREATHAMMER
|
||||||
"minecraft:copper_ingot"
|
|
||||||
);
|
);
|
||||||
|
|
||||||
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_HALBERD = registerSword(
|
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_HALBERD = registerSword(
|
||||||
"copper",
|
"copper",
|
||||||
SimplyCompatToolMaterials.COPPER,
|
SimplyCompatToolMaterials.COPPER,
|
||||||
WeaponType.HALBERD,
|
WeaponType.HALBERD
|
||||||
"minecraft:copper_ingot"
|
|
||||||
);
|
);
|
||||||
|
|
||||||
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_KATANA = registerSword(
|
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_KATANA = registerSword(
|
||||||
"copper",
|
"copper",
|
||||||
SimplyCompatToolMaterials.COPPER,
|
SimplyCompatToolMaterials.COPPER,
|
||||||
WeaponType.KATANA,
|
WeaponType.KATANA
|
||||||
"minecraft:copper_ingot"
|
|
||||||
);
|
);
|
||||||
|
|
||||||
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_LONGSWORD = registerSword(
|
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_LONGSWORD = registerSword(
|
||||||
"copper",
|
"copper",
|
||||||
SimplyCompatToolMaterials.COPPER,
|
SimplyCompatToolMaterials.COPPER,
|
||||||
WeaponType.LONGSWORD,
|
WeaponType.LONGSWORD
|
||||||
"minecraft:copper_ingot"
|
|
||||||
);
|
);
|
||||||
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_RAPIER = registerSword(
|
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_RAPIER = registerSword(
|
||||||
"copper",
|
"copper",
|
||||||
SimplyCompatToolMaterials.COPPER,
|
SimplyCompatToolMaterials.COPPER,
|
||||||
WeaponType.RAPIER,
|
WeaponType.RAPIER
|
||||||
"minecraft:copper_ingot"
|
|
||||||
);
|
);
|
||||||
|
|
||||||
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_SAI = registerSword(
|
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_SAI = registerSword(
|
||||||
"copper",
|
"copper",
|
||||||
SimplyCompatToolMaterials.COPPER,
|
SimplyCompatToolMaterials.COPPER,
|
||||||
WeaponType.SAI,
|
WeaponType.SAI
|
||||||
"minecraft:copper_ingot"
|
|
||||||
);
|
);
|
||||||
|
|
||||||
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_SCYTHE = registerSword(
|
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_SCYTHE = registerSword(
|
||||||
"copper",
|
"copper",
|
||||||
SimplyCompatToolMaterials.COPPER,
|
SimplyCompatToolMaterials.COPPER,
|
||||||
WeaponType.SCYTHE,
|
WeaponType.SCYTHE
|
||||||
"minecraft:copper_ingot"
|
|
||||||
);
|
);
|
||||||
|
|
||||||
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_SPEAR = registerSword(
|
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_SPEAR = registerSword(
|
||||||
"copper",
|
"copper",
|
||||||
SimplyCompatToolMaterials.COPPER,
|
SimplyCompatToolMaterials.COPPER,
|
||||||
WeaponType.SPEAR,
|
WeaponType.SPEAR
|
||||||
"minecraft:copper_ingot"
|
|
||||||
);
|
);
|
||||||
|
|
||||||
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_TWINBLADE = registerSword(
|
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_TWINBLADE = registerSword(
|
||||||
"copper",
|
"copper",
|
||||||
SimplyCompatToolMaterials.COPPER,
|
SimplyCompatToolMaterials.COPPER,
|
||||||
WeaponType.TWINBLADE,
|
WeaponType.TWINBLADE
|
||||||
"minecraft:copper_ingot"
|
|
||||||
);
|
);
|
||||||
|
|
||||||
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_WARGLAIVE = registerSword(
|
public static final RegistrySupplier<SimplySwordsSwordItem> COPPER_WARGLAIVE = registerSword(
|
||||||
"copper",
|
"copper",
|
||||||
SimplyCompatToolMaterials.COPPER,
|
SimplyCompatToolMaterials.COPPER,
|
||||||
WeaponType.WARGLAIVE,
|
WeaponType.WARGLAIVE
|
||||||
"minecraft:copper_ingot"
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
{
|
|
||||||
"accessWidener": "simplycompat.accesswidener"
|
|
||||||
}
|
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"parent": "simplycompat:item/copper_longsword",
|
"parent": "simplyswords:item/template_longsword",
|
||||||
"textures": {
|
"textures": {
|
||||||
"layer0": "simplycompat:item/copper_longsword"
|
"layer0": "simplycompat:item/copper_longsword"
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"parent": "simplycompat:item/copper_scythe",
|
"parent": "simplyswords:item/big_handheld",
|
||||||
"textures": {
|
"textures": {
|
||||||
"layer0": "simplycompat:item/copper_scythe"
|
"layer0": "simplycompat:item/copper_scythe"
|
||||||
}
|
}
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
accessWidener v2 named
|
|
|
@ -4,7 +4,6 @@
|
||||||
"compatibilityLevel": "JAVA_17",
|
"compatibilityLevel": "JAVA_17",
|
||||||
"minVersion": "0.8",
|
"minVersion": "0.8",
|
||||||
"client": [
|
"client": [
|
||||||
"MixinTitleScreen"
|
|
||||||
],
|
],
|
||||||
"mixins": [
|
"mixins": [
|
||||||
],
|
],
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
plugins {
|
plugins {
|
||||||
id "com.github.johnrengelman.shadow" version "7.1.2"
|
id 'com.github.johnrengelman.shadow'
|
||||||
}
|
}
|
||||||
|
|
||||||
architectury {
|
architectury {
|
||||||
|
@ -7,71 +7,72 @@ architectury {
|
||||||
fabric()
|
fabric()
|
||||||
}
|
}
|
||||||
|
|
||||||
loom {
|
|
||||||
accessWidenerPath = project(":common").loom.accessWidenerPath
|
|
||||||
}
|
|
||||||
|
|
||||||
configurations {
|
configurations {
|
||||||
common
|
common {
|
||||||
shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files.
|
canBeResolved = true
|
||||||
|
canBeConsumed = false
|
||||||
|
}
|
||||||
compileClasspath.extendsFrom common
|
compileClasspath.extendsFrom common
|
||||||
runtimeClasspath.extendsFrom common
|
runtimeClasspath.extendsFrom common
|
||||||
developmentFabric.extendsFrom common
|
developmentFabric.extendsFrom common
|
||||||
|
|
||||||
|
// Files in this configuration will be bundled into your mod using the Shadow plugin.
|
||||||
|
// Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files.
|
||||||
|
shadowBundle {
|
||||||
|
canBeResolved = true
|
||||||
|
canBeConsumed = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
|
||||||
|
maven {
|
||||||
|
url "https://www.cursemaven.com"
|
||||||
|
content {
|
||||||
|
includeGroup "curse.maven"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
maven { url "https://maven.shedaniel.me/" }
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
|
modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version"
|
||||||
modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
|
|
||||||
// Remove the next line if you don't want to depend on the API
|
|
||||||
modApi "dev.architectury:architectury-fabric:${rootProject.architectury_version}"
|
|
||||||
|
|
||||||
common(project(path: ":common", configuration: "namedElements")) { transitive false }
|
// Fabric API. This is technically optional, but you probably want it anyway.
|
||||||
shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
|
modImplementation "net.fabricmc.fabric-api:fabric-api:$rootProject.fabric_api_version"
|
||||||
|
|
||||||
|
// Architectury API. This is optional, and you can comment it out if you don't need it.
|
||||||
|
modImplementation "dev.architectury:architectury-fabric:$rootProject.architectury_api_version"
|
||||||
|
|
||||||
|
modApi("me.shedaniel.cloth:cloth-config-fabric:${rootProject.cloth_config_version}") {
|
||||||
|
exclude(group: "net.fabricmc.fabric-api")
|
||||||
|
}
|
||||||
|
|
||||||
|
modImplementation "curse.maven:simplyswords-659887:5255981"
|
||||||
|
// runtimeOnly "curse.maven:better-combat-by-daedelus-639842:5625757"
|
||||||
|
// runtimeOnly "curse.maven:playeranimator-658587:4587214"
|
||||||
|
// implementation "curse.maven:additional-additions-forge-582387:5155724"
|
||||||
|
// implementation "curse.maven:create-328085:5838779"
|
||||||
|
// implementation "curse.maven:create-industry-693815:5811638"
|
||||||
|
|
||||||
|
common(project(path: ':common', configuration: 'namedElements')) { transitive false }
|
||||||
|
shadowBundle project(path: ':common', configuration: 'transformProductionFabric')
|
||||||
}
|
}
|
||||||
|
|
||||||
processResources {
|
processResources {
|
||||||
inputs.property "version", project.version
|
inputs.property 'version', project.version
|
||||||
|
|
||||||
filesMatching("fabric.mod.json") {
|
filesMatching('fabric.mod.json') {
|
||||||
expand "version": project.version
|
expand version: project.version
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
shadowJar {
|
shadowJar {
|
||||||
exclude "architectury.common.json"
|
configurations = [project.configurations.shadowBundle]
|
||||||
|
archiveClassifier = 'dev-shadow'
|
||||||
configurations = [project.configurations.shadowCommon]
|
|
||||||
archiveClassifier = "dev-shadow"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
remapJar {
|
remapJar {
|
||||||
injectAccessWidener = true
|
inputFile.set shadowJar.archiveFile
|
||||||
input.set shadowJar.archiveFile
|
|
||||||
dependsOn shadowJar
|
|
||||||
}
|
|
||||||
|
|
||||||
sourcesJar {
|
|
||||||
def commonSources = project(":common").sourcesJar
|
|
||||||
dependsOn commonSources
|
|
||||||
from commonSources.archiveFile.map { zipTree(it) }
|
|
||||||
}
|
|
||||||
|
|
||||||
components.java {
|
|
||||||
withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
|
|
||||||
skip()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
publishing {
|
|
||||||
publications {
|
|
||||||
mavenFabric(MavenPublication) {
|
|
||||||
artifactId = rootProject.archives_base_name + "-" + project.name
|
|
||||||
from components.java
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
|
|
||||||
repositories {
|
|
||||||
// Add repositories to publish to here.
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,15 +0,0 @@
|
||||||
package cc.toph.simplycompat.fabric;
|
|
||||||
|
|
||||||
import cc.toph.simplycompat.ExpectPlatform;
|
|
||||||
import java.nio.file.Path;
|
|
||||||
import net.fabricmc.loader.api.FabricLoader;
|
|
||||||
|
|
||||||
public class SimplyCompatExpectPlatformImpl {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This is our actual method to {@link ExpectPlatform#getConfigDirectory()}.
|
|
||||||
*/
|
|
||||||
public static Path getConfigDirectory() {
|
|
||||||
return FabricLoader.getInstance().getConfigDir();
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -0,0 +1,17 @@
|
||||||
|
package cc.toph.simplycompat.fabric;
|
||||||
|
|
||||||
|
import cc.toph.simplycompat.SimplyCompat;
|
||||||
|
import net.fabricmc.api.ModInitializer;
|
||||||
|
|
||||||
|
public final class SimplyCompatFabric implements ModInitializer {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onInitialize() {
|
||||||
|
// This code runs as soon as Minecraft is in a mod-load-ready state.
|
||||||
|
// However, some things (like resources) may still be uninitialized.
|
||||||
|
// Proceed with mild caution.
|
||||||
|
|
||||||
|
// Run our common setup.
|
||||||
|
SimplyCompat.init();
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,11 +0,0 @@
|
||||||
package cc.toph.simplycompat.fabric;
|
|
||||||
|
|
||||||
import cc.toph.simplycompat.SimplyCompat;
|
|
||||||
import net.fabricmc.api.ModInitializer;
|
|
||||||
|
|
||||||
public class SimplyCompatModFabric implements ModInitializer {
|
|
||||||
@Override
|
|
||||||
public void onInitialize() {
|
|
||||||
SimplyCompat.init();
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
package cc.toph.simplycompat.fabric.client;
|
||||||
|
|
||||||
|
import net.fabricmc.api.ClientModInitializer;
|
||||||
|
|
||||||
|
public final class SimplyCompatFabricClient implements ClientModInitializer {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onInitializeClient() {
|
||||||
|
// This entrypoint is suitable for setting up client-specific logic, such as rendering.
|
||||||
|
}
|
||||||
|
}
|
|
@ -2,29 +2,29 @@
|
||||||
"schemaVersion": 1,
|
"schemaVersion": 1,
|
||||||
"id": "simplycompat",
|
"id": "simplycompat",
|
||||||
"version": "${version}",
|
"version": "${version}",
|
||||||
"name": "Example Mod",
|
"name": "Simply Compat",
|
||||||
"description": "This is an example description! Tell everyone what your mod is about!",
|
"description": "This is an example description! Tell everyone what your mod is about!",
|
||||||
"authors": [
|
"authors": ["Me!"],
|
||||||
"Me!"
|
|
||||||
],
|
|
||||||
"contact": {
|
"contact": {
|
||||||
"homepage": "https://fabricmc.net/",
|
"homepage": "https://fabricmc.net/",
|
||||||
"sources": "https://github.com/FabricMC/fabric-example-mod"
|
"sources": "https://github.com/FabricMC/fabric-example-mod"
|
||||||
},
|
},
|
||||||
"license": "Insert License Here",
|
"license": "CC0-1.0",
|
||||||
"icon": "assets/simplycompat/icon.png",
|
"icon": "assets/simplycompat/icon.png",
|
||||||
"environment": "*",
|
"environment": "*",
|
||||||
"entrypoints": {
|
"entrypoints": {
|
||||||
"main": [
|
"main": ["cc.toph.simplycompat.fabric.SimplyCompatFabric"],
|
||||||
"cc.toph.simplycompat.fabric.SimplyCompatModFabric"
|
"client": ["cc.toph.simplycompat.fabric.client.SimplyCompatFabricClient"]
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"mixins": [
|
"mixins": ["simplycompat.mixins.json"],
|
||||||
"simplycompat.fabric.mixins.json"
|
|
||||||
],
|
|
||||||
"depends": {
|
"depends": {
|
||||||
"fabric": "*",
|
"fabricloader": ">=0.16.10",
|
||||||
"minecraft": ">=1.20.1",
|
"minecraft": "~1.20.1",
|
||||||
"architectury": ">=9.1.12"
|
"java": ">=17",
|
||||||
|
"architectury": ">=9.2.14",
|
||||||
|
"fabric-api": "*"
|
||||||
|
},
|
||||||
|
"suggests": {
|
||||||
|
"another-mod": "*"
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,13 +0,0 @@
|
||||||
{
|
|
||||||
"required": true,
|
|
||||||
"package": "cc.toph.simplycompat.fabric.mixin",
|
|
||||||
"compatibilityLevel": "JAVA_17",
|
|
||||||
"minVersion": "0.8",
|
|
||||||
"client": [
|
|
||||||
],
|
|
||||||
"mixins": [
|
|
||||||
],
|
|
||||||
"injectors": {
|
|
||||||
"defaultRequire": 1
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,5 +1,11 @@
|
||||||
plugins {
|
plugins {
|
||||||
id "com.github.johnrengelman.shadow" version "7.1.2"
|
id 'com.github.johnrengelman.shadow'
|
||||||
|
}
|
||||||
|
|
||||||
|
loom {
|
||||||
|
forge {
|
||||||
|
mixinConfig "simplycompat.mixins.json"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
architectury {
|
architectury {
|
||||||
|
@ -7,89 +13,79 @@ architectury {
|
||||||
forge()
|
forge()
|
||||||
}
|
}
|
||||||
|
|
||||||
loom {
|
// def localModsDir = project.rootProject.file('./run/mods/')
|
||||||
accessWidenerPath = project(":common").loom.accessWidenerPath
|
// if (localModsDir.exists() && localModsDir.isDirectory()) {
|
||||||
|
// def localMods = localModsDir
|
||||||
forge {
|
// .listFiles({ file -> file.isFile() && file.name.endsWith('.jar') } as FileFilter)
|
||||||
convertAccessWideners = true
|
// localMods.each { mod ->
|
||||||
extraAccessWideners.add loom.accessWidenerPath.get().asFile.name
|
// dependencies {
|
||||||
|
// modLocalRuntime files(mod)
|
||||||
mixinConfig "simplycompat.forge.mixins.json"
|
// }
|
||||||
mixinConfig "simplycompat.mixins.json"
|
// }
|
||||||
}
|
// }
|
||||||
}
|
|
||||||
|
|
||||||
def localModsDir = project.rootProject.file('./run/mods/')
|
|
||||||
if (localModsDir.exists() && localModsDir.isDirectory()) {
|
|
||||||
def localMods = localModsDir
|
|
||||||
.listFiles({ file -> file.isFile() && file.name.endsWith('.jar') } as FileFilter)
|
|
||||||
localMods.each { mod ->
|
|
||||||
dependencies {
|
|
||||||
modLocalRuntime files(mod)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
configurations {
|
configurations {
|
||||||
common
|
common {
|
||||||
shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files.
|
canBeResolved = true
|
||||||
|
canBeConsumed = false
|
||||||
|
}
|
||||||
compileClasspath.extendsFrom common
|
compileClasspath.extendsFrom common
|
||||||
runtimeClasspath.extendsFrom common
|
runtimeClasspath.extendsFrom common
|
||||||
developmentForge.extendsFrom common
|
developmentForge.extendsFrom common
|
||||||
|
|
||||||
|
// Files in this configuration will be bundled into your mod using the Shadow plugin.
|
||||||
|
// Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files.
|
||||||
|
shadowBundle {
|
||||||
|
canBeResolved = true
|
||||||
|
canBeConsumed = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
|
||||||
|
maven {
|
||||||
|
url "https://www.cursemaven.com"
|
||||||
|
content {
|
||||||
|
includeGroup "curse.maven"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
maven { url "https://maven.shedaniel.me/" }
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
forge "net.minecraftforge:forge:${rootProject.forge_version}"
|
forge "net.minecraftforge:forge:$rootProject.forge_version"
|
||||||
// Remove the next line if you don't want to depend on the API
|
|
||||||
modApi "dev.architectury:architectury-forge:${rootProject.architectury_version}"
|
|
||||||
|
|
||||||
common(project(path: ":common", configuration: "namedElements")) { transitive false }
|
// Architectury API. This is optional, and you can comment it out if you don't need it.
|
||||||
shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
|
modImplementation "dev.architectury:architectury-forge:$rootProject.architectury_api_version"
|
||||||
|
|
||||||
|
modApi("me.shedaniel.cloth:cloth-config-forge:${rootProject.cloth_config_version}")
|
||||||
|
modCompileOnly "curse.maven:simplyswords-659887:5255981"
|
||||||
|
// modImplementation "curse.maven:simplyswords-659887:5255981"
|
||||||
|
// runtimeOnly "curse.maven:better-combat-by-daedelus-639842:5625757"
|
||||||
|
// runtimeOnly "curse.maven:playeranimator-658587:4587214"
|
||||||
|
// implementation "curse.maven:additional-additions-forge-582387:5155724"
|
||||||
|
// implementation "curse.maven:create-328085:5838779"
|
||||||
|
// implementation "curse.maven:create-industry-693815:5811638"
|
||||||
|
|
||||||
|
|
||||||
|
common(project(path: ':common', configuration: 'namedElements')) { transitive false }
|
||||||
|
shadowBundle project(path: ':common', configuration: 'transformProductionForge')
|
||||||
}
|
}
|
||||||
|
|
||||||
processResources {
|
processResources {
|
||||||
inputs.property "version", project.version
|
inputs.property 'version', project.version
|
||||||
|
|
||||||
filesMatching("META-INF/mods.toml") {
|
filesMatching('META-INF/mods.toml') {
|
||||||
expand "version": project.version
|
expand version: project.version
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
shadowJar {
|
shadowJar {
|
||||||
exclude "fabric.mod.json"
|
configurations = [project.configurations.shadowBundle]
|
||||||
exclude "architectury.common.json"
|
archiveClassifier = 'dev-shadow'
|
||||||
|
|
||||||
configurations = [project.configurations.shadowCommon]
|
|
||||||
archiveClassifier = "dev-shadow"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
remapJar {
|
remapJar {
|
||||||
input.set shadowJar.archiveFile
|
inputFile.set shadowJar.archiveFile
|
||||||
dependsOn shadowJar
|
|
||||||
}
|
|
||||||
|
|
||||||
sourcesJar {
|
|
||||||
def commonSources = project(":common").sourcesJar
|
|
||||||
dependsOn commonSources
|
|
||||||
from commonSources.archiveFile.map { zipTree(it) }
|
|
||||||
}
|
|
||||||
|
|
||||||
components.java {
|
|
||||||
withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
|
|
||||||
skip()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
publishing {
|
|
||||||
publications {
|
|
||||||
mavenForge(MavenPublication) {
|
|
||||||
artifactId = rootProject.archives_base_name + "-" + project.name
|
|
||||||
from components.java
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
|
|
||||||
repositories {
|
|
||||||
// Add repositories to publish to here.
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,14 +6,17 @@ import net.minecraftforge.fml.common.Mod;
|
||||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||||
|
|
||||||
@Mod(SimplyCompat.MOD_ID)
|
@Mod(SimplyCompat.MOD_ID)
|
||||||
public class SimplyCompatForge {
|
public final class ExampleModForge {
|
||||||
|
|
||||||
public SimplyCompatForge() {
|
@SuppressWarnings("removal")
|
||||||
// Submit our event bus to let architectury register our content on the right time
|
public ExampleModForge() {
|
||||||
|
// Submit our event bus to let Architectury API register our content on the right time.
|
||||||
EventBuses.registerModEventBus(
|
EventBuses.registerModEventBus(
|
||||||
SimplyCompat.MOD_ID,
|
SimplyCompat.MOD_ID,
|
||||||
FMLJavaModLoadingContext.get().getModEventBus()
|
FMLJavaModLoadingContext.get().getModEventBus()
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Run our common setup.
|
||||||
SimplyCompat.init();
|
SimplyCompat.init();
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,24 +0,0 @@
|
||||||
package cc.toph.simplycompat.forge;
|
|
||||||
|
|
||||||
import cc.toph.simplycompat.ExpectPlatform;
|
|
||||||
import cc.toph.simplycompat.SimplyCompat;
|
|
||||||
import java.nio.file.Path;
|
|
||||||
import net.minecraftforge.fml.ModList;
|
|
||||||
import net.minecraftforge.fml.loading.FMLPaths;
|
|
||||||
|
|
||||||
public class SimplyCompatExpectPlatformImpl {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This is our actual method to {@link ExpectPlatform#getConfigDirectory()}.
|
|
||||||
*/
|
|
||||||
public static Path getConfigDirectory() {
|
|
||||||
return FMLPaths.CONFIGDIR.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String getVersion() {
|
|
||||||
return ModList.get()
|
|
||||||
.getModContainerById(SimplyCompat.MOD_ID)
|
|
||||||
.map(it -> it.getModInfo().getVersion().toString())
|
|
||||||
.orElseThrow();
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -13,8 +13,6 @@ This is an example description! Tell everyone what your mod is about!
|
||||||
'''
|
'''
|
||||||
#logoFile = ""
|
#logoFile = ""
|
||||||
|
|
||||||
# TODO: add simply swords here
|
|
||||||
|
|
||||||
[[dependencies.simplycompat]]
|
[[dependencies.simplycompat]]
|
||||||
modId = "forge"
|
modId = "forge"
|
||||||
mandatory = true
|
mandatory = true
|
||||||
|
@ -32,6 +30,6 @@ side = "BOTH"
|
||||||
[[dependencies.simplycompat]]
|
[[dependencies.simplycompat]]
|
||||||
modId = "architectury"
|
modId = "architectury"
|
||||||
mandatory = true
|
mandatory = true
|
||||||
versionRange = "[9.1.12,)"
|
versionRange = "[9.2.14,)"
|
||||||
ordering = "AFTER"
|
ordering = "AFTER"
|
||||||
side = "BOTH"
|
side = "BOTH"
|
|
@ -1,6 +1,7 @@
|
||||||
{
|
{
|
||||||
"pack": {
|
"pack": {
|
||||||
"description": "Simply Compat",
|
"description": "Simply Compat",
|
||||||
|
"forge:server_data_pack_format": 15,
|
||||||
"pack_format": 15
|
"pack_format": 15
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
{
|
|
||||||
"required": true,
|
|
||||||
"package": "cc.toph.simplycompat.forge.mixin",
|
|
||||||
"compatibilityLevel": "JAVA_17",
|
|
||||||
"minVersion": "0.8",
|
|
||||||
"client": [
|
|
||||||
],
|
|
||||||
"mixins": [
|
|
||||||
],
|
|
||||||
"injectors": {
|
|
||||||
"defaultRequire": 1
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,20 +1,20 @@
|
||||||
org.gradle.jvmargs=-Xmx6g
|
# Done to increase the memory available to Gradle.
|
||||||
|
org.gradle.jvmargs=-Xmx6G
|
||||||
|
org.gradle.parallel=true
|
||||||
|
|
||||||
minecraft_version=1.20.1
|
# Mod properties
|
||||||
|
mod_version = 1.0.0
|
||||||
|
maven_group = cc.toph.simplycompat
|
||||||
|
archives_name = simplycompat
|
||||||
enabled_platforms = fabric,forge
|
enabled_platforms = fabric,forge
|
||||||
|
|
||||||
archives_base_name=simplycompat
|
# Minecraft properties
|
||||||
mod_version=0.0.1
|
minecraft_version = 1.20.1
|
||||||
maven_group=cc.toph
|
|
||||||
|
|
||||||
architectury_version=9.2.14
|
|
||||||
|
|
||||||
fabric_loader_version=0.14.23
|
|
||||||
fabric_api_version=0.90.4+1.20.1
|
|
||||||
|
|
||||||
forge_version=1.20.1-47.3.22
|
|
||||||
|
|
||||||
|
# Dependencies
|
||||||
|
architectury_api_version = 9.2.14
|
||||||
cloth_config_version=11.1.106
|
cloth_config_version=11.1.106
|
||||||
yarn_mappings=1.20.1+build.10
|
fabric_loader_version = 0.16.10
|
||||||
|
fabric_api_version = 0.92.3+1.20.1
|
||||||
|
forge_version=1.20.1-47.1.1
|
||||||
|
parchment_version = 1.20.1:2023.09.03
|
|
@ -2,13 +2,13 @@ pluginManagement {
|
||||||
repositories {
|
repositories {
|
||||||
maven { url "https://maven.fabricmc.net/" }
|
maven { url "https://maven.fabricmc.net/" }
|
||||||
maven { url "https://maven.architectury.dev/" }
|
maven { url "https://maven.architectury.dev/" }
|
||||||
maven { url "https://maven.minecraftforge.net/" }
|
maven { url "https://files.minecraftforge.net/maven/" }
|
||||||
gradlePluginPortal()
|
gradlePluginPortal()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
include("common")
|
rootProject.name = 'simplycompat'
|
||||||
include("fabric")
|
|
||||||
include("forge")
|
|
||||||
|
|
||||||
rootProject.name = "SimplyCompat"
|
include 'common'
|
||||||
|
include 'fabric'
|
||||||
|
include 'forge'
|
||||||
|
|
Loading…
Add table
Reference in a new issue