diff --git a/.gitignore b/.gitignore index 64717e09..36361d12 100644 --- a/.gitignore +++ b/.gitignore @@ -28,10 +28,12 @@ crash-reports/ *.iws *.classpath *.project -*.launch # Specific files Thumbs.db usernamecache.json options.txt +BloodMagic_Client.launch +BloodMagic_Server.launch + usercache.json diff --git a/.settings/BloodMagic1.8IDEA.jar b/.settings/BloodMagic1.8IDEA.jar new file mode 100644 index 00000000..839031f4 Binary files /dev/null and b/.settings/BloodMagic1.8IDEA.jar differ diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index e8895216..00000000 --- a/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -connection.project.dir= -eclipse.preferences.version=1 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 52c66cdc..74e1c18e 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,392 +1,299 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes= -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.source=1.8 -org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false -org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false -org.eclipse.jdt.core.formatter.align_with_spaces=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=1 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=1 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=1 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=1 -org.eclipse.jdt.core.formatter.alignment_for_assertion_message=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=0 -org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=49 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=1 -org.eclipse.jdt.core.formatter.alignment_for_module_statements=16 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=1 -org.eclipse.jdt.core.formatter.alignment_for_record_components=16 -org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=1 -org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=0 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=17 -org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0 -org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch=0 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=next_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_record_constructor=next_line -org.eclipse.jdt.core.formatter.brace_position_for_record_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line -org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=true -org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false -org.eclipse.jdt.core.formatter.comment.indent_root_tags=false -org.eclipse.jdt.core.formatter.comment.indent_tag_description=false -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_not_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert -org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +# +#Tue Dec 13 20:41:11 EST 2016 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.brace_position_for_block=next_line +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=true -org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_if_empty -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_preserve -org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=true -org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=true -org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false -org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=true +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.lineSplit=120 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block=0 +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=1 +org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.text_block_indentation=0 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator=true -org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.join_lines_in_comments=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=1 +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true -org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=49 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.join_wrapped_lines=true +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.use_on_off_tags=true +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.comment.format_line_comments=false +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.alignment_for_compact_if=49 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.lineSplit=600 +org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +eclipse.preferences.version=1 +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=next_line +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs index 1994e3f7..3f2271a9 100644 --- a/.settings/org.eclipse.jdt.ui.prefs +++ b/.settings/org.eclipse.jdt.ui.prefs @@ -1,12 +1,11 @@ eclipse.preferences.version=1 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_WayofTime-Dev -formatter_settings_version=20 +formatter_profile=_BloodMagic +formatter_settings_version=12 org.eclipse.jdt.ui.exception.name=e org.eclipse.jdt.ui.gettersetter.use.is=true org.eclipse.jdt.ui.keywordthis=false org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.text.custom_code_templates= sp_cleanup.add_default_serial_version_id=true sp_cleanup.add_generated_serial_version_id=false sp_cleanup.add_missing_annotations=true @@ -22,39 +21,29 @@ sp_cleanup.always_use_this_for_non_static_field_access=false sp_cleanup.always_use_this_for_non_static_method_access=false sp_cleanup.convert_functional_interfaces=false sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false sp_cleanup.correct_indentation=false sp_cleanup.format_source_code=true sp_cleanup.format_source_code_changes_only=false sp_cleanup.insert_inferred_type_arguments=false -sp_cleanup.lazy_logical_operator=false sp_cleanup.make_local_variable_final=true sp_cleanup.make_parameters_final=false sp_cleanup.make_private_fields_final=true sp_cleanup.make_type_abstract_if_missing_method=false sp_cleanup.make_variable_declarations_final=false -sp_cleanup.merge_conditional_blocks=false sp_cleanup.never_use_blocks=false sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.number_suffix=false -sp_cleanup.objects_equals=false sp_cleanup.on_save_use_additional_actions=false -sp_cleanup.organize_imports=true -sp_cleanup.precompile_regex=false -sp_cleanup.push_down_negation=false +sp_cleanup.organize_imports=false sp_cleanup.qualify_static_field_accesses_with_declaring_class=false sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true sp_cleanup.qualify_static_member_accesses_with_declaring_class=false sp_cleanup.qualify_static_method_accesses_with_declaring_class=false sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_redundant_modifiers=false -sp_cleanup.remove_redundant_semicolons=false -sp_cleanup.remove_redundant_type_arguments=false +sp_cleanup.remove_redundant_type_arguments=true sp_cleanup.remove_trailing_whitespaces=false sp_cleanup.remove_trailing_whitespaces_all=true sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_array_creation=false sp_cleanup.remove_unnecessary_casts=true sp_cleanup.remove_unnecessary_nls_tags=false sp_cleanup.remove_unused_imports=false @@ -63,19 +52,15 @@ sp_cleanup.remove_unused_private_fields=true sp_cleanup.remove_unused_private_members=false sp_cleanup.remove_unused_private_methods=true sp_cleanup.remove_unused_private_types=true -sp_cleanup.simplify_lambda_expression_and_method_ref=false sp_cleanup.sort_members=false sp_cleanup.sort_members_all=false sp_cleanup.use_anonymous_class_creation=false -sp_cleanup.use_autoboxing=false sp_cleanup.use_blocks=false sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_directly_map_method=false sp_cleanup.use_lambda=true sp_cleanup.use_parentheses_in_expressions=false sp_cleanup.use_this_for_non_static_field_access=false sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true sp_cleanup.use_this_for_non_static_method_access=false sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true -sp_cleanup.use_unboxing=false -sp_cleanup.use_var=false +sp_cleanup.use_type_arguments=false diff --git a/BM3 Progression.drawio b/BM3 Progression.drawio deleted file mode 100644 index a37ad70e..00000000 --- a/BM3 Progression.drawio +++ /dev/null @@ -1,308 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/LICENSE b/LICENSE index 264519f7..dc6c92d2 100644 --- a/LICENSE +++ b/LICENSE @@ -1,87 +1,502 @@ -Creative Commons Attribution 4.0 International Public License + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 -By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions. + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. -Section 1 – Definitions. +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] -Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image. -Adapter's License means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License. -Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights. -Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements. -Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material. -Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License. -Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license. -Licensor means the individual(s) or entity(ies) granting rights under this Public License. -Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them. -Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world. -You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning. -Section 2 – Scope. + Preamble -License grant. -Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to: -reproduce and Share the Licensed Material, in whole or in part; and -produce, reproduce, and Share Adapted Material. -Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions. -Term. The term of this Public License is specified in Section 6(a). -Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material. -Downstream recipients. -Offer from the Licensor – Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License. -No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material. -No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i). -Other rights. + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. -Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise. -Patent and trademark rights are not licensed under this Public License. -To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties. -Section 3 – License Conditions. + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. -Your exercise of the Licensed Rights is expressly made subject to the following conditions. + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. -Attribution. + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. -If You Share the Licensed Material (including in modified form), You must: + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. -retain the following if it is supplied by the Licensor with the Licensed Material: -identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated); -a copyright notice; -a notice that refers to this Public License; -a notice that refers to the disclaimer of warranties; -a URI or hyperlink to the Licensed Material to the extent reasonably practicable; -indicate if You modified the Licensed Material and retain an indication of any previous modifications; and -indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License. -You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information. -If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable. -If You Share Adapted Material You produce, the Adapter's License You apply must not prevent recipients of the Adapted Material from complying with this Public License. -Section 4 – Sui Generis Database Rights. + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. -Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material: + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. -for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database; -if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and -You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database. -For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights. -Section 5 – Disclaimer of Warranties and Limitation of Liability. + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. -Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You. -To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You. -The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability. -Section 6 – Term and Termination. + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. -This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically. -Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates: + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. -automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or -upon express reinstatement by the Licensor. -For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License. -For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License. -Sections 1, 5, 6, 7, and 8 survive termination of this Public License. -Section 7 – Other Terms and Conditions. + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. -The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed. -Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License. -Section 8 – Interpretation. + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. -For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License. -To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions. -No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor. -Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority. \ No newline at end of file + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! \ No newline at end of file diff --git a/README.md b/README.md index c945030e..614881cf 100644 --- a/README.md +++ b/README.md @@ -1,120 +1,65 @@ -# Blood Magic: Alchemical Wizardry [![](http://cf.way2muchnoise.eu/full_blood-magic_downloads.svg)](https://minecraft.curseforge.com/projects/blood-magic) [![Discord](https://img.shields.io/discord/259683256348311552.svg?colorB=7289DA&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHYAAABWAgMAAABnZYq0AAAACVBMVEUAAB38%2FPz%2F%2F%2F%2Bm8P%2F9AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgAAAAHdElNRQfhBxwQJhxy2iqrAAABoElEQVRIx7WWzdGEIAyGgcMeKMESrMJ6rILZCiiBg4eYKr%2Fd1ZAfgXFm98sJfAyGNwno3G9sLucgYGpQ4OGVRxQTREMDZjF7ILSWjoiHo1n%2BE03Aw8p7CNY5IhkYd%2F%2F6MtO3f8BNhR1QWnarCH4tr6myl0cWgUVNcfMcXACP1hKrGMt8wcAyxide7Ymcgqale7hN6846uJCkQxw6GG7h2MH4Czz3cLqD1zHu0VOXMfZjHLoYvsdd0Q7ZvsOkafJ1P4QXxrWFd14wMc60h8JKCbyQvImzlFjyGoZTKzohwWR2UzSONHhYXBQOaKKsySsahwGGDnb%2FiYPJw22sCqzirSULYy1qtHhXGbtgrM0oagBV4XiTJok3GoLoDNH8ooTmBm7ZMsbpFzi2bgPGoXWXME6XT%2BRJ4GLddxJ4PpQy7tmfoU2HPN6cKg%2BledKHBKlF8oNSt5w5g5o8eXhu1IOlpl5kGerDxIVT%2BztzKepulD8utXqpChamkzzuo7xYGk%2FkpSYuviLXun5bzdRf0Krejzqyz7Z3p0I1v2d6HmA07dofmS48njAiuMgAAAAASUVORK5CYII%3D)](https://discord.gg/VtNrGrs) +# Blood Magic: Alchemical Wizardry [![](https://cf.way2muchnoise.eu/full_blood-magic_downloads.svg)](https://minecraft.curseforge.com/projects/blood-magic) [![Discord](https://img.shields.io/discord/259683256348311552.svg?colorB=7289DA&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHYAAABWAgMAAABnZYq0AAAACVBMVEUAAB38%2FPz%2F%2F%2F%2Bm8P%2F9AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgAAAAHdElNRQfhBxwQJhxy2iqrAAABoElEQVRIx7WWzdGEIAyGgcMeKMESrMJ6rILZCiiBg4eYKr%2Fd1ZAfgXFm98sJfAyGNwno3G9sLucgYGpQ4OGVRxQTREMDZjF7ILSWjoiHo1n%2BE03Aw8p7CNY5IhkYd%2F%2F6MtO3f8BNhR1QWnarCH4tr6myl0cWgUVNcfMcXACP1hKrGMt8wcAyxide7Ymcgqale7hN6846uJCkQxw6GG7h2MH4Czz3cLqD1zHu0VOXMfZjHLoYvsdd0Q7ZvsOkafJ1P4QXxrWFd14wMc60h8JKCbyQvImzlFjyGoZTKzohwWR2UzSONHhYXBQOaKKsySsahwGGDnb%2FiYPJw22sCqzirSULYy1qtHhXGbtgrM0oagBV4XiTJok3GoLoDNH8ooTmBm7ZMsbpFzi2bgPGoXWXME6XT%2BRJ4GLddxJ4PpQy7tmfoU2HPN6cKg%2BledKHBKlF8oNSt5w5g5o8eXhu1IOlpl5kGerDxIVT%2BztzKepulD8utXqpChamkzzuo7xYGk%2FkpSYuviLXun5bzdRf0Krejzqyz7Z3p0I1v2d6HmA07dofmS48njAiuMgAAAAASUVORK5CYII%3D)](https://discord.gg/VtNrGrs) -### Gruesome? Probably. Worth it? Definitely! -### [Downloads](http://minecraft.curseforge.com/projects/blood-magic/files) - -## Information +Gruesome? Probably. Worth it? Definitely! Have you ever picked up a magic mod for Minecraft, and thought that it was too tame? Was there not enough danger involved when creating your next high-tech gadget? Bored with all of those peaceful animals just staring at you without a care in the world? Well then, I am glad you came here! Blood Magic is an arcane art that is practiced by mages who attempt to gather a vast amount of power through utilizing a forbidden material: blood. Even though it does grant a huge amount of power, every single action that is performed with this volatile magic can prove deadly. You have been warned. ## Links + +* [Minecraft Forum Thread](https://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1290532-bm) + +### WayofTime: + * Twitter: [@WayofTime](https://twitter.com/WayofTime) -* Wiki: Found at [FTBWiki](http://ftbwiki.org/Blood_Magic) -* [Minecraft Forum Thread](http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1290532-bm) -* [Curseforge](http://minecraft.curseforge.com/projects/blood-magic) * [Donate](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=J7SNY7L82PQ82) * [Patreon](https://www.patreon.com/BloodMagic) -## Development Setup +### TehNut -1. Fork this project to your own Github repository and clone it to your desktop. -2. Navigate to the directory you cloned to. Follow the [Forge Documentation](http://mcforge.readthedocs.io/en/latest/gettingstarted/#from-zero-to-modding) (start at step 4) to setup your workspace. If you use IDEA, follow [this set](http://mcforge.readthedocs.io/en/latest/gettingstarted/#terminal-free-intellij-idea-configuration) of steps. +* Twitter: [@OfficialTehNut](https://twitter.com/OfficialTehNut) +* [Website](https://tehnut.info) -#### IntelliJ IDEA extra steps +## Building -1. Navigate to `File > Settings > Plugins > Browse repositories...`. Search for Lombok and install the plugin. -2. Navigate to `File > Settings > Build, Execution, Deployment > Compiler > Annotation Processors`. Check `Enable annotation processing`. - -[Setup video](https://www.youtube.com/watch?v=8VEdtQLuLO0&feature=youtu.be) by LexManos. For more information, refer to the [Forge Forums](http://www.minecraftforge.net/forum/index.php/topic,14048.0.html). - - -## Developing Addons - -Add to your build.gradle: - - repositories { - maven { - url "http://tehnut.info/maven/" - } - } - - dependencies { - deobfCompile "com.wayoftime.bloodmagic:BloodMagic:" - } - -`` can be found on CurseForge (or via the Maven itself), check the file name of the version you want. - -## Custom Builds - -**Custom builds are *unsupported*. If you have an issue while using an unofficial build, it is not guaranteed that you will get support.** - -#### How to make a custom build: - -1. Clone directly from this repository to your desktop. -2. Navigate to the directory you cloned to. Open a command window there and run `gradlew build` -3. Once it completes, your new build will be found at `../build/libs/BloodMagic-*.jar`. You can ignore the `deobf`, `sources`, and `javadoc` jars. +1. Clone this repository to your local file system. +2. Open a terminal in the directory you cloned to. +3. Run `gradlew build` (or `./gradlew build` if that doesn't work). +4. Navigate to `./build/libs`, you will find the compiled jars there. ## License -![CCA4.0](https://licensebuttons.net/l/by/4.0/88x31.png) - -Blood Magic: AlchemicalWizardry by WayofTime is licensed under a [Creative Commons Attribution 4.0 International License](http://creativecommons.org/licenses/by/4.0/). +Blood Magic: AlchemicalWizardry by WayofTime is licensed under the [GNU Lesser General Public License 2.1](https://tldrlegal.com/license/gnu-lesser-general-public-license-v2.1-(lgpl-2.1)). ## Installation Instructions This mod requires "Minecraft Forge" in order to operate. It is incredibly easy to download and set up, so might as well get to it! -1. Download [Forge](http://files.minecraftforge.net/). Usually "Recommended" is best - you want the "universal", not the source. Forge also has an "install" option now, so all you need to do is launch that program and it will make a lovely Forge profile. If you haven't, look up how to use the installer and the new 1.6.x launcher if you are confused! +1. Download [Forge](https://files.minecraftforge.net/). Usually "Recommended" is best - you want the "universal", not the source. Forge also has an "install" option now, so all you need to do is launch that program and it will make a lovely Forge profile. If you haven't, look up how to use the installer and the new 1.6.x launcher if you are confused! -2. Download the latest version of BloodMagic from [Curseforge](http://minecraft.curseforge.com/mc-mods/224791-blood-magic). +2. Download the latest version of BloodMagic from [Curseforge](https://minecraft.curseforge.com/projects/blood-magic). 3. Place the mod in the **mods** folder of your .minecraft. If you are unsure of where that is located, it is here: `../Users/you/AppData/roaming/.minecraft`. -## FAQ +## Development Setup -**Q**: My weak blood orb doesn't show my current LP! Fix it please. +First, clone this repository to your local file system, then follow the steps outlined on the [Minecraft Forge documentation site](https://mcforge.readthedocs.io/en/latest/gettingstarted/#from-zero-to-modding). -**A**: The mechanic for viewing the player's essence has changed due to some issues with mechanics. You now need a Divination Sigil to view a player's essence. It does other things, too, so it is worth it! +## Adding Compatibility -**Q**: Why am I dying so much? +Add to your build.gradle: -**A**: It might be a good idea to make sure that you have enough essence to do a task. If you don't have enough essence for, say, an imperfect ritual, it will take it out of your health. If your health reaches 0... Well, you don't have to be a genius to see what would happen. +```groovy +repositories { + maven { url "https://tehnut.info/maven/" } +} +``` -**Q**: Waffles? +```groovy +dependencies { + deobfCompile "com.wayoftime.bloodmagic:BloodMagic:${BLOODMAGIC_VERSION}:api" +} +``` -**A**: Waffles! - -**Q**: Where is x? When I watched spotlight "w," it had an item called x. Don't you need x to make y, before you can create z? - -**A**: It might be wise to look at an updated spotlight, or check the changelogs. I'm not evil, so I do document everything that I can. There was most likely some issues with balance with the item, so it may have been removed for those reasons. Or you just grabbed the item from NEI without seeing it was a test item, in which case: shame on you! - -**Q**: Isn't that armour ... - -**A**: Yes, the armour texture is from the mod EE2. Pahimar and I are good friends, and I decided to use it for the armour and tools. He has given me his express permission for it, so need not worry! -[Proof](https://twitter.com/Pahimar/status/453590600689139712). - -**Q**: My game is crashing with the latest TC4! - -**A**: To help stop this, remove the TC4 API from my Blood Magic zip file (if it is there). It should solve things. - -**Q**: But, my Thaumcraft aspects are messed up! - -**A**: Once again, remove the TC4 API from the Blood Magic zip file to solve this. Azanor changed some aspect combinations. - -**Q**: When will 1.7.2 be released? - -**A**: It's out! Go get it! - -**Q**: Way, I've just had an amazing idea! Why not add an in-game book just like the Thaumonomicon? - -**A**: This has been suggested several times. It I being worked on, and is proceeding quite well. Some framework needs to be completed, but it isn't a priority - ALL of the information you need is on this post, or online. - -**Q**: Why do I not have a Sacrificial Orb? It's only showing up as a knife! - -**A**: This is a config option. The person you saw with an orb had a config that changed the knife to an orb. The orb and knife function exactly the same way, but you can change it in the configs by looking for the "Idontlikefun" option. - -**Q**: When I respawn, I appear to only come back with 3 hearts. What's happening? - -**A**: This is due to another config option in the "WhimpySettings," which is due to my attempt to combat Zerg Rushing. You can disable this if you really want to, but it shouldn't hurt unduly. +`${BLOODMAGIC_VERSION}` can be found on CurseForge (or via the Maven itself), check the file name of the version you want. If making a full addon, remove the `:api` modifier to get the full project. \ No newline at end of file diff --git a/build.gradle b/build.gradle index b9e99859..f1ffc620 100644 --- a/build.gradle +++ b/build.gradle @@ -1,199 +1,177 @@ buildscript { repositories { - maven { url = 'https://files.minecraftforge.net/maven' } - jcenter() mavenCentral() + maven { url "http://files.minecraftforge.net/maven" } + maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } } dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true + classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' } } -apply plugin: 'net.minecraftforge.gradle' -// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. -apply plugin: 'eclipse' -apply plugin: 'maven-publish' -version = '1.16.4-3.1.0-15' -group = 'com.yourname.modid' // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = 'BloodMagic' +plugins { + id "net.minecraftforge.gradle.forge" version "2.0.2" + id 'com.matthewprenger.cursegradle' version '1.0.10' + id 'maven-publish' +} -sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly. +sourceSets { + compat { + compileClasspath += sourceSets.main.runtimeClasspath + sourceSets.main.output + } -println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch')) -minecraft { - // The mappings can be changed at any time, and must be in the following format. - // snapshot_YYYYMMDD Snapshot are built nightly. - // stable_# Stables are built at the discretion of the MCP team. - // Use non-default mappings at your own risk. they may not always work. - // Simply re-run your setup task after changing the mappings to update your workspace. - mappings channel: 'snapshot', version: '20200916-1.16.2' - // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. - - // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') - - // Default run configurations. - // These can be tweaked, removed, or duplicated as needed. - runs { - client { - workingDirectory project.file('run') - - properties 'mixin.env.disableRefMap': 'true' - - // Recommended logging data for a userdev environment - property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' - - // Recommended logging level for the console - property 'forge.logging.console.level', 'debug' - - mods { - bloodmagic { - source sourceSets.main - } - } - } - - server { - workingDirectory project.file('run') - - properties 'mixin.env.disableRefMap': 'true' - - // Recommended logging data for a userdev environment - property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' - - // Recommended logging level for the console - property 'forge.logging.console.level', 'debug' - - mods { - bloodmagic { - source sourceSets.main - } - } - } - - data { - workingDirectory project.file('run') - - properties 'mixin.env.disableRefMap': 'true' - - // Recommended logging data for a userdev environment - property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' - - // Recommended logging level for the console - property 'forge.logging.console.level', 'debug' - - args '--mod', 'bloodmagic', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') - - mods { - bloodmagic { - source sourceSets.main - } - } - } + main { + runtimeClasspath += sourceSets.compat.runtimeClasspath } } +def build_number = System.getenv('BUILD_NUMBER') != null ? System.getenv('BUILD_NUMBER') : 'CUSTOM' +def username = project.hasProperty('dev_username') ? "${dev_username}" : "${mod_name}" + +group = package_group +archivesBaseName = mod_name +version = "${mc_version}-${mod_version}-${build_number}" + repositories { - maven { - url "http://dvs1.progwml6.com/files/maven/" - } - maven { - name = "The Loader" - url = "https://maven.blamejared.com" - } + maven { url "http://dvs1.progwml6.com/files/maven" } + maven { url "http://tehnut.info/maven" } } dependencies { - // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed - // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied. - // The userdev artifact is a special name and will get all sorts of transformations applied to it. - minecraft 'net.minecraftforge:forge:1.16.4-35.1.37' - - // compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}:api") - // runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}") - - //deobfCompile "mezz.jei:jei_${minecraft_version}:${jei_version}" - - compileOnly fg.deobf("mezz.jei:jei-1.16.2:7.1.3.19:api") - runtimeOnly fg.deobf("mezz.jei:jei-1.16.2:7.1.3.19") - - compileOnly fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}:api") - runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}") - - compileOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-1.16.4:7.1.0.84") - - // You may put jars on which you depend on in ./libs or you may define them like so.. - // compile "some.group:artifact:version:classifier" - // compile "some.group:artifact:version" - - // Real examples - // compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env - // compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env - - // The 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime. - // provided 'com.mod-buildcraft:buildcraft:6.0.8:dev' - - // These dependencies get remapped to your current MCP mappings - // deobf 'com.mod-buildcraft:buildcraft:6.0.8:dev' - - // For more info... - // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html - // http://www.gradle.org/docs/current/userguide/dependency_management.html - + deobfCompile "mcp.mobius.waila:Hwyla:${hwyla_version}:api" + runtime "mcp.mobius.waila:Hwyla:${hwyla_version}" + deobfCompile "mezz.jei:jei_${mc_version}:${jei_version}:api" + runtime "mezz.jei:jei_${mc_version}:${jei_version}" } -// Example for how to get properties into the manifest for reading by the runtime.. -jar { - manifest { - attributes([ - "Specification-Title": "bloodmagic", - "Specification-Vendor": "bloodmagicsareus", - "Specification-Version": "1", // We are version 1 of ourselves - "Implementation-Title": project.name, - "Implementation-Version": "${version}", - "Implementation-Vendor" :"bloodmagicsareus", - "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") - ]) +minecraft { + version = "${mc_version}-${forge_version}" + runDir = "run" + + replace '${VERSION}', project.version + replaceIn "BloodMagic.java" + + clientRunArgs += "--username=${username}" + + if (project.hasProperty('mappings_version')) + mappings = project.mappings_version +} + +processResources { + inputs.property "version", project.version + inputs.property "mcversion", project.minecraft.version + + from(sourceSets.main.resources.srcDirs) { + include '**/*.info' + include '**/*.properties' + + expand 'version': project.version, 'mcversion': project.minecraft.version + } + + from(sourceSets.main.resources.srcDirs) { + exclude '**/*.info' + exclude '**/*.properties' } } -// Example configuration to allow publishing using the maven-publish task -// This is the preferred method to reobfuscate your jar file -jar.finalizedBy('reobfJar') -// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing -//publish.dependsOn('reobfJar') - -sourceSets.main.resources { - srcDir 'src/generated/resources' -} - -task srcJar(type: Jar) { - from(sourceSets.main.java) - classifier = 'sources' +jar { + classifier = '' + from sourceSets.main.output + from sourceSets.api.output + from sourceSets.compat.output + manifest.mainAttributes( + "Built-By": System.getProperty('user.name'), + "Created-By": "${System.getProperty('java.vm.version')} + (${System.getProperty('java.vm.vendor')})", + "Implementation-Title": project.name, + "Implementation-Version": project.version, + "Built-On": "${mc_version}-${forge_version}" + ) } task apiJar(type: Jar) { - from(sourceSets.main.allJava) - from(sourceSets.main.output) - include 'wayoftime/bloodmagic/api/**' - classifier = 'api' + from sourceSets.api.output + + // TODO: when FG bug is fixed, remove allJava from the api jar. + // https://github.com/MinecraftForge/ForgeGradle/issues/369 + // Gradle should be able to pull them from the -sources jar. + from sourceSets.api.allJava } -artifacts { - archives srcJar, apiJar +task sourcesJar(type: Jar) { + classifier = 'sources' + from sourceSets.main.allJava + from sourceSets.api.allJava + from sourceSets.compat.allJava +} + +tasks.build.dependsOn apiJar, sourcesJar + +tasks.withType(JavaCompile) { task -> + task.options.encoding = 'UTF-8' } publishing { + tasks.publish.dependsOn 'build' publications { mavenJava(MavenPublication) { artifact jar - artifact srcJar + artifact sourcesJar artifact apiJar } } repositories { - maven { - url "file:///${project.projectDir}/mcmodsrepo" + if (project.hasProperty('maven_repo')) { + maven { url maven_repo } + } else { + mavenLocal() } } -} \ No newline at end of file +} + +String getChangelogText() { + def changelogFile = new File('changelog.txt') + String str = '' + String separator = '---' + int lineCount = 0 + boolean done = false + changelogFile.eachLine { + if (done || it == null) { + return + } + if (lineCount < 3) { + lineCount++ + if (it.startsWith(separator)) { + return + } + } + if (!it.startsWith(separator)) { + str += "$it" + (lineCount < 3 ? ':\n\n' : '\n') + return + } + done = true // once we go past the first version block, parse no more + } + return str +} + +def curseRelations = { + optionalLibrary 'jei' + optionalLibrary 'hwyla' + requiredLibrary 'guide-api' +} + +curseforge { + if (project.hasProperty('curse_key_WayofTime')) + apiKey = project.curse_key_WayofTime + + project { + id = "${curse_id}" + changelog = getChangelogText() + releaseType = 'alpha' + + relations curseRelations + + addArtifact sourcesJar + addArtifact apiJar + } +} diff --git a/changelog.txt b/changelog.txt index e9b9c9ee..3d8a9a5d 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,321 +1,3 @@ ------------------------------------------------------- -Version 3.1.0 ------------------------------------------------------- -- Majorly refactored the progression of the mod. Instead of starting with a Snare, you instead start by crafting the Blood Altar. The changes are documented in the guide, and you can follow its "Getting Started" entry! - -- Changed the tooltips so that they are gray, more easily differentiating them from the name of the item. -- Added the Sigil of Holding -- Changed the crafting of Tartaric Gems so that you no longer need to use the previous tier gem in the gem slot. --> The Hellfire Forge will now syphon from the gem in the crafting table first, and all unused will from the consumed gem will be placed in the crafted gem. - -- Changed the GUI for the Alchemy Table --> You can now select which sides that an input/output slot is accessible from. Click on the slot you wish to change, then click on the directional toggle buttons. - -- Fixed Plunderer's Glint not properly applying the Looting level. -- Also fixed a NPE crash due to Iron Tip. Fixes some crashes due to mods using the ItemUsedFinish event. - -- Fixed the Blood Altar not being able to input fluids. About time, Way! -- Added new Explosive Charges --> Fungal Charge, which is very useful for giant mushrooms and nether mushrooms --> Controlled Charge, which will destroy only blocks that match the block it is placed on. -- Added the ability to apply a few select Anointments to the charges. Only one can be applied to a charge at a time. --> Soft Touch, Fortuna, and Smelting - -- Fixed the Living Armour so that you cannot use an upgrade tome to usurp the point cap. --> Fixed "Strong Legs" so that it no longer runs the program "CrunchyLegs.exe" - as a result, you no longer suffer fall damage from jumping on the same level. --> Removed the direct fall damage mitigation from "Strong Legs" - -- Added two types of Throwing Daggers to the Blood Mage's offensive kit. --> Iron Throwing Dagger --> Syringe Throwing Dagger - -- Refactored the guide so that it provides +2 to awesomeness. - - ------------------------------------------------------- -Version 3.0.6 ------------------------------------------------------- -- Reimplemented the Well of Suffering. -- Added several new items, called "Anointments"! These are items that provide temporary buffs to your tools and weapons, such as silk touch, higher damage, and more! Look them up in the Utility section of the book. These include: - - Honing Oil - - Soft Coating - - Fortuna Extract - - Holy Water - - Miner's Secrets - - Dexterity Alkahest - - Iron Tip - - Plunderer's Glint - - Slow-burning Oil - ------------------------------------------------------- -Version 3.0.5 ------------------------------------------------------- -- Fixed a crash with the Blood Altar because I am dumb. -- Also fixed the recipe for the Day array. Now you don't need to clean your clocks! - ------------------------------------------------------- -Version 3.0.4 ------------------------------------------------------- - -- Added two new explosives: - - The Shaped Charge, which will break a 5x5x5 volume when placed - - The Deforester Charge, which can chop down a tree up to a maximum of 128 logs. - - (Both explosives drop all blocks affected, and do not cause further environmental nor entity damage.) - -- Added new alchemy arrays: - - Two arrays, which changes the current daylight cycle to day and night. Recipes are temp. - -- Fixed the following Living Armour upgrades so that they are now obtainable: - - Experienced - - Body Builder - -- Fixed Living Armour not upgrading under certain conditions. - -- Fixed the two rituals involving Living Armour so that they are properly activatable using a Weak Activation Crystal. - -- Fixed NPE in Blood Altar when trying to interact with the contained Fluids -- Also fixed bug that prevented the Altar from accepting fluids piped in as inputs. -- Fixed a client-side crash when right clicking the ground with a Lava Crystal when on a server - now properly makes a fire without consuming the client. - -- Fixed the JEI so that it no longer ouputs an error when loading Alchemy Array recipes without a crafting output. -- Fixed crash with Actually Additions - - ------------------------------------------------------- -Version 3.0.3 ------------------------------------------------------- - -- Updated the Sanguine Scientiem - it's very well written! Special thanks to both VT-14 and Wrince for their long hours of effort to make this book better than I could have done! -- Fixed a crash with the Living Armour when crafted and worn right after enchanting. - - - ------------------------------------------------------- -Version 3.0.2 ------------------------------------------------------- - -Readded the Living Armour. Currently only with a few upgrades, and no downgrades. - - Pin Cushion - - Soft Fall - - Tough - - Strong Legs (Now can be temporarily deactivated when jumping by sneaking) - - Healthy - - Experienced - - Charging Strike - - Tough Palms - - Quick Feet - - Poison Resistance - - Gift of Ignis - - Dwarven Might - - Body Builder - -Reimplemented the following rituals: - - Resonance of the Faceted Crystal - - Crack of the Fractured Crystal - - Reap of the Harvest Moon - - Ritual of the Shepherd - - Ritual of the Green Grove - - Focus of the Ellipsoid - - Sound of the Cleansing Soul - - Ritual of Living Evolution - ------------------------------------------------------- -Version 3.0.1 ------------------------------------------------------- - -- Reimplemented the Incense Altar with all appropriate blocks. -- Added guide entries for the Incense Altar and Blood Altar. Other misc entries added, too. -- Fixed a server-related crash on the client on the Sigil of the Green Grove. -- Added ore processing to Ancient Debris. -- Readded the other Sentient Tool types (with one more on the way). -- Added a few WIP items that cannot be used yet - they're part of the D*$)@ D*#@(@* system that I'm adding for Tier 4. -- Added the API - It's still in flux, so expect it to change very soon! -- Probably forgot something important. -- Fixed a crash for the Lava Crystal that made it blow up the Client if used on a server. No, that was not the intended purpose! -- Added the Ritual Tinkerer for Rituals. -- Added the "Tome of Peritia" again - stores EXP. - - ------------------------------------------------------- -Version 2.4.3 ------------------------------------------------------- - -- Fixed Lava Crystals causing crash when used while not yet bound -- Fixed Teleposers sending entities at the destination position the wrong way -- Fixed Speed Runes not working on Tier 2 altars -- Fixed crash when checking tasks for some entities -- Fixed crash when checking some entities for potion effects -- Re-implemented the Boost potion - - The PR still had TODOs in the description when I merged so this may not be complete yet - ------------------------------------------------------- -Version 2.4.2 ------------------------------------------------------- -Now with no guarantees for working textures! - -Blood Altar: - - A Blood Altar with a Redstone Lamp below it will now emit a redstone signal upon finishing crafting (#1635) - - Fixed Blood Altar being able to obtain negative progress (#1649) - -Living Armor: - - Fixed Storm Trooper Level 4 costing 65 instead of -65 upgrade points (#1631) - -Rituals: - - Fixed Ritual of the Eternal Soul (Ritual Stone layout & didn't work) (#1633) - - Fixed Ritual Tinkerer (ritual area is now unique per ritual instance), added the ability to reset the ritual ranges to default (#1636) - -Misc: - - Lava Crystals can now set things on fire (#1652) - - Fixed parts of the German translation. Other translations still need to be reworked to accomodate changed translation keys (#1640) - - Fixed Guidebook showing wrong recipes (Rune of Self-Sacrifice instead of others) (#1641) - - Wooden Paths now behave like wood instead of stone (sound & efficient tool) (#1638) - - -Technical Stuff: - - Fixed Veil of Evil and Ward of Sacrosanctity console spam (which could eventually lead to an out of memory exception) (#1639) - - Fixed GLSL shader compilation errors (affected Mesa driver (AMD GPU) on Linux) (#1624) - - Fixed `/bloodmagic network` command permissions (#1613) - - Fixed a rare crash that could occur when summoning mobs (#1618) - ------------------------------------------------------- -Version 2.4.1 ------------------------------------------------------- - -Nut was too lazy to create a changelog, it's AEon's turn now! -Changes made from Feb 02 - now (Fill end date in later) - - -Living Armor: - - Fixed "Soft Fall" not preventing damage - - "Nocturnal Prowess" should not flash anymore - - "Trickshot" now ignores HurtResistanceTime - - "Trickshot" now works properly with sentient arrows - - "Step Assist" does not take effect while sneaking - -Sentient Bow: - - Fixed Destructive Will arrows exploding continuously - - Fixed Tipped Arrows getting improved even if no Will can be used - -Sigils: - - Buffed "Sigil of the Fast Miner" to be in accordance to the "Sanguine Scientium" - - Fixed a bug where "Sigil of the Fast Miner" would also cause the whirlwind effect - - Added "Whirlwind" to the potion registry - - Fixed broken Sigil tooltip formatting - - Fixed Sigil of Holding not updating some Sigil data, allowing for exploits - - Greatly improved "Sigil of Compression" performance - - Fixed "Sigil of Compression" bug that would eat leftover items (usually everything between 55 and 64 items for a 3x3 compression) - - -Rituals: - - Ported Veil of Evil & Ward of Sacrosanctity - - Fixed "Serenade of the Nether" replacing lava source blocks with lava (fixed underlying function to detect flowing liquids) - - Added configurability to Ritual of the High Jump by modifying a new ritual area with the Ritual Tinkerer - -Misc: - - Fixed routing node oredict filter (crashes) - - Fixed mimic vanishing in some cases - - Fixed "Blood Letter's Pack" and "Coat of Arms" always being used in the main hand slot (action bar/hotbar) - - Stop insertions into Demon Crucible if the inventory is not empty - - Fixed abnormal deaths at your own hands through the sacrificial dagger (hopefully) (Gravestone bugginess) - - Fixed "Unmending" mod incompatibility - - Fixed Teleposers crashing the game if someone force-fed it junk - - added Nut being angery at contributors for messing stuff up - - Added some Russian language strings for the guide book - - Added repair recipes for Sentient Tools & Living Armor to JEI - - Many translation keys have changed which makes affected translations fall back to english - -Technical Stuff no player cares about: - - Formatted Project code - - Fixed BlockState parsing (mimic vanishing) - - Fixed some and streamlined ritual block ranges - - Mystery drain still mysterious - - Use TextFormatting rather than color codes in block lang names - - Fixed world unload crash (may happen if a world is loaded by world generators or JEI Resource graphing) - - Fixed `/bloodmagic network get` command - - Added translation keys for tickethistory command help strings - ------------------------------------------------------- -Version 2.4.0 ------------------------------------------------------- - -It's been a while, eh? Some of you may be asking yourself "whats up with bloodmagic" like that damned recon on a certain -social media site. Well here's what's up: put something snarky here when done writing changelog - -There's so much here, I'm probably going to miss some. Here's a general overview from just skimming commit titles. - -Much of this was done via PR because I'm ~~lazy~~ too busy having fun with Fabric. - -- Fixed harvest moon not working with pumpkins -- [API] Added a way to unregister an altar component -- Moved anything related to Tier 6 behind an opt-in config. Please stop asking me how to get it. -- Fixed small demon stone bricks recipe so it returns 4 instead of 1 -- Ported some old rituals from 1.7 - - Cry of the Eternal Soul - - Reverence of the Condor - - Ritual of the Feathered Earth -- Added a new ritual, Ritual of Grounding -- Optimized bound tool harvesting -- Fixed render issues with demon crystals -- Fixed Hymn of Syphoning not updating some tanks visually -- Added very basic documentation for several rituals to the guide book -- Made meteor costs for Mark of the Falling Tower configurable in the meteor json -- Fluid related sigils should now work identically to buckets of the fluid -- Fixed ritual tinkerer area setting behaving wonkily -- Fixed Seer Sigil not working for incense altars -- Added the ability to buff movement and updraft arrays by providing more of their ingredient -- Ported the ritual dismantler from 1.7.10 -- Logic fix for the Solar Powered - - Now it requires a clear line of sight to the sky as well as it being day time -- Fixed Sigil of Magnetism AOE being offset from the player -- Rewrote commands - - They're different in some way, some how - - Don't ask me how -- Quality of life improvements for the ritual tinkerer -- Changed the activation crystal levels of some rituals to use the awakened crystal - - Mark of the Falling Tower - - All the living armor ones - - It's late and I'm tired don't hate me for being too lazy to look up their names -- Fixed up some bounding boxes for some blocks with fancier models -- Sentient Bow now properly handles modded and potion-ified arrows - -I can't wait for this to turn out to be very broken so I can yell at the contributor :> - ------------------------------------------------------- -Version 2.3.3 ------------------------------------------------------- - -- Fixed Altars not filling orbs of their own tier - ------------------------------------------------------- -Version 2.3.2 ------------------------------------------------------- - -looky bois, we beta now - -- Fixed Sentient Sword attacking mobs and players without being provoked -- Fixed weird Crystal Clusters being weird - - They are now less weird -- Fixed Ritual Reader and Tinkerer not being in the creative tab -- Fixed an NPE that would happen with some blocks in the Ritual of Magnetism's area of effect -- Fixed Mimics not being able to replace blocks during placement -- Fixed issues with inter-dimensional teleportation - - Teleposers and Teleposition Sigils are now fully functional -- Fixed custom arrows not having their effects when fired from the Sentient Bow -- Fixed Splash Potions being unthrowable while Living Armor had the quenched downgrade -- Fixed Ritual Stones being considered Iron instead of Rock -- Fixed the Lava, Water, and Void sigils so they now work properly with tanks -- Fixed an issue where the Teleposer would attempt to damage an offline player -- Fixed the Compression Sigil so it now functions -- Fixed low tier altars being able to fill high tier orbs -- Fixed Sentient Tools having the wrong material -- Fixed Sentient Tools not having a repair material - - It is now demon crystals -- Added a config to disable mob drops from mobs killed by the Well of Suffering -- Added an additional glow to the Dagger of Sacrifice when it has a full incense bonus -- Reworked the Phantom Bridge -- Updated german translation -- Updated chinese translation - ------------------------------------------------------ Version 2.3.1 ------------------------------------------------------ @@ -1343,4 +1025,4 @@ Changed - A graphical overhaul of everything has been implemented. These textures were provided by CyanideX's Unity texture pack. BBoldt and Yulife (Inap) from the Unity team are our new permanent texture artists. Bug Fixes -- +- \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 27da6a0e..d9286a61 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,13 @@ -# Sets default memory used for gradle commands. Can be overridden by user or command line properties. -# This is required to provide enough memory for the Minecraft decompilation process. -org.gradle.jvmargs=-Xmx3G -org.gradle.daemon=false +mod_name=BloodMagic +package_group=com.wayoftime.bloodmagic +mod_version=3.0.0 -minecraft_version=1.16.3 +mc_version=1.12.2 +forge_version=14.23.4.2759 +mappings_version=stable_39 -#Mod dependencies -jei_version=7.6.0.49 -patchouli_version=1.16.4-48-SNAPSHOT \ No newline at end of file +jei_version=4.11.0.206 +hwyla_version=1.8.26-B41_1.12.2 +guideapi_version=1.12-2.1.4-57 + +curse_id=224791 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7a3265ee..3d0dee6e 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1d5b29fb..9d7c377b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Fri Sep 26 11:20:52 CDT 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip diff --git a/gradlew b/gradlew index cccdd3d5..91a7e269 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash ############################################################################## ## @@ -6,6 +6,47 @@ ## ############################################################################## +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + # Attempt to set APP_HOME # Resolve links: $0 may be a link PRG="$0" @@ -20,49 +61,9 @@ while [ -h "$PRG" ] ; do fi done SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null +cd "`dirname \"$PRG\"`/" >&- APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac +cd "$SAVED" >&- CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -89,7 +90,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -113,7 +114,6 @@ fi if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` @@ -154,19 +154,11 @@ if $cygwin ; then esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") } -APP_ARGS=$(save "$@") +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - -exec "$JAVACMD" "$@" +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat index f9553162..8a0b282a 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -8,14 +8,14 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -46,9 +46,10 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windows variants +@rem Get command-line arguments, handling Windowz variants if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@ -59,6 +60,11 @@ set _SKIP=2 if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ :execute @rem Setup the command line diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..af2ab34f --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'BloodMagic' \ No newline at end of file diff --git a/src/api/java/com/wayoftime/bloodmagic/api/BloodMagicPlugin.java b/src/api/java/com/wayoftime/bloodmagic/api/BloodMagicPlugin.java new file mode 100644 index 00000000..c9687fe1 --- /dev/null +++ b/src/api/java/com/wayoftime/bloodmagic/api/BloodMagicPlugin.java @@ -0,0 +1,29 @@ +package com.wayoftime.bloodmagic.api; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * This annotation lets Blood Magic detect mod plugins. + * All {@link IBloodMagicPlugin} must have this annotation and a constructor with no arguments. + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface BloodMagicPlugin { + + /** + * This annotation will inject the active {@link IBloodMagicAPI} into a {@code static} field of the same + * type. Fields with invalid types will be ignored and an error will be logged. + *

+ * These fields are populated during {@link net.minecraftforge.fml.common.event.FMLPreInitializationEvent}. + *

+ * {@code public static @BloodMagicPlugin.Inject IBloodMagicAPI API_INSTANCE = null;} + */ + @Retention(RetentionPolicy.RUNTIME) + @Target(ElementType.FIELD) + @interface Inject { + + } +} diff --git a/src/api/java/com/wayoftime/bloodmagic/api/IBloodMagicAPI.java b/src/api/java/com/wayoftime/bloodmagic/api/IBloodMagicAPI.java new file mode 100644 index 00000000..bf003608 --- /dev/null +++ b/src/api/java/com/wayoftime/bloodmagic/api/IBloodMagicAPI.java @@ -0,0 +1,57 @@ +package com.wayoftime.bloodmagic.api; + +import net.minecraft.block.state.IBlockState; + +import javax.annotation.Nonnull; + +/** + * The main interface between a plugin and Blood Magic's internals. + *

+ * This API is intended for compatibility between other mods and Blood Magic. More advanced integration is out of the scope of this API and are considered "addons". + *

+ * To get an instance of this without actually creating an {@link IBloodMagicPlugin}, use {@link BloodMagicPlugin.Inject}. + */ +public interface IBloodMagicAPI { + + /** + * Retrieves the instance of the blacklist. + * + * @return the active {@link IBloodMagicBlacklist} instance + */ + @Nonnull + IBloodMagicBlacklist getBlacklist(); + + /** + * Retrieves the instance of the recipe registrar. + * + * @return the active {@link IBloodMagicRecipeRegistrar} instance + */ + @Nonnull + IBloodMagicRecipeRegistrar getRecipeRegistrar(); + + /** + * Retrieves the instance of the value manager. + * + * @return the active {@link IBloodMagicValueManager} instance + */ + @Nonnull + IBloodMagicValueManager getValueManager(); + + /** + * Registers an {@link IBlockState} as a given component for the Blood Altar. + *

+ * Valid component types: + *

    + *
  • GLOWSTONE
  • + *
  • BLOODSTONE
  • + *
  • BEACON
  • + *
  • BLOODRUNE
  • + *
  • CRYSTAL
  • + *
  • NOTAIR
  • + *
+ * + * @param state The state to register + * @param componentType The type of Blood Altar component to register as. + */ + void registerAltarComponent(@Nonnull IBlockState state, @Nonnull String componentType); +} diff --git a/src/api/java/com/wayoftime/bloodmagic/api/IBloodMagicBlacklist.java b/src/api/java/com/wayoftime/bloodmagic/api/IBloodMagicBlacklist.java new file mode 100644 index 00000000..329f98d7 --- /dev/null +++ b/src/api/java/com/wayoftime/bloodmagic/api/IBloodMagicBlacklist.java @@ -0,0 +1,47 @@ +package com.wayoftime.bloodmagic.api; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; + +import javax.annotation.Nonnull; + +/** + * Allows blacklisting of various objects from different Blood Magic systems. + */ +public interface IBloodMagicBlacklist { + + /** + * Blacklists a given {@link IBlockState} from being teleposed. + * + * @param state The {@link IBlockState} to blacklist. + */ + void addTeleposer(@Nonnull IBlockState state); + + /** + * Blacklists a {@link net.minecraft.entity.Entity} from being teleposed based on the given registry name. + * + * @param entityId The registry name to blacklist. + */ + void addTeleposer(@Nonnull ResourceLocation entityId); + + /** + * Blacklists a given {@link IBlockState} from being transposed. + * + * @param state The {@link IBlockState} to blacklist. + */ + void addTransposition(@Nonnull IBlockState state); + + /** + * Blacklists a given {@link IBlockState} from being accelerated by the growth enhancement ritual and sigil. + * + * @param state The {@link IBlockState} to blacklist. + */ + void addGreenGrove(@Nonnull IBlockState state); + + /** + * Blacklists a {@link net.minecraft.entity.Entity} from being sacrificed via the Well of Suffering ritual. + * + * @param entityId The registry name to blacklist. + */ + void addWellOfSuffering(@Nonnull ResourceLocation entityId); +} diff --git a/src/api/java/com/wayoftime/bloodmagic/api/IBloodMagicPlugin.java b/src/api/java/com/wayoftime/bloodmagic/api/IBloodMagicPlugin.java new file mode 100644 index 00000000..9cd2546f --- /dev/null +++ b/src/api/java/com/wayoftime/bloodmagic/api/IBloodMagicPlugin.java @@ -0,0 +1,26 @@ +package com.wayoftime.bloodmagic.api; + +/** + * The main class to implement to create a Blood Magic plugin. Everything communicated between a mod and Blood Magic is through this class. + * IBloodMagicPlugins must have the {@link BloodMagicPlugin} annotation to get loaded by Blood Magic. + */ +public interface IBloodMagicPlugin { + + /** + * Register mod content with the API. Called during {@link net.minecraftforge.fml.common.event.FMLInitializationEvent}. + * + * @param api The active instance of the {@link IBloodMagicAPI} + */ + default void register(IBloodMagicAPI api) { + // No-op + } + + /** + * Register recipes with the API. Called during {@link net.minecraftforge.event.RegistryEvent.Register}. + * + * @param recipeRegistrar The active instance of the {@link IBloodMagicRecipeRegistrar} + */ + default void registerRecipes(IBloodMagicRecipeRegistrar recipeRegistrar) { + // No-op + } +} diff --git a/src/api/java/com/wayoftime/bloodmagic/api/IBloodMagicRecipeRegistrar.java b/src/api/java/com/wayoftime/bloodmagic/api/IBloodMagicRecipeRegistrar.java new file mode 100644 index 00000000..544c16a3 --- /dev/null +++ b/src/api/java/com/wayoftime/bloodmagic/api/IBloodMagicRecipeRegistrar.java @@ -0,0 +1,95 @@ +package com.wayoftime.bloodmagic.api; + +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.ResourceLocation; + +import javax.annotation.Nonnegative; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +/** + * Allows recipe addition and removal. + */ +public interface IBloodMagicRecipeRegistrar { + + /** + * Adds a new recipe to the Blood Altar. + * + * @param input An input {@link Ingredient}. + * @param output An output {@link ItemStack}. + * @param minimumTier The minimum Blood Altar tier required for this recipe. + * @param syphon The amount of Life Essence to syphon from the Blood Altar over the course of the craft. + * @param consumeRate How quickly the Life Essence is syphoned. + * @param drainRate How quickly progress is lost if the Blood Altar runs out of Life Essence during the craft. + */ + void addBloodAltar(@Nonnull Ingredient input, @Nonnull ItemStack output, @Nonnegative int minimumTier, @Nonnegative int syphon, @Nonnegative int consumeRate, @Nonnegative int drainRate); + + /** + * Removes a Blood Altar recipe based on an input {@link ItemStack}. + * + * @param input The input item to remove the recipe of. + * @return Whether or not a recipe was removed. + */ + boolean removeBloodAltar(@Nonnull ItemStack input); + + /** + * Adds a new recipe to the Alchemy Table. + * + * @param output An output {@link ItemStack}. + * @param syphon The amount of Life Essence to syphon from the Blood Orb's bound network over the course of the craft. + * @param ticks The amount of ticks it takes to complete the craft. + * @param minimumTier The minimum Blood Orb tier required for this recipe. + * @param input An array of {@link Ingredient}s to accept as inputs. + */ + void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks, @Nonnegative int minimumTier, @Nonnull Ingredient... input); + + /** + * Removes an Alchemy Table recipe based on an input {@link ItemStack} array. + * + * @param input The input items to remove the recipe of. + * @return Whether or not a recipe was removed. + */ + boolean removeAlchemyTable(@Nonnull ItemStack... input); + + /** + * Adds a new recipe to the Soul/Tartaric Forge. + * + * @param output An output {@link ItemStack}. + * @param minimumSouls The minimum number of souls that must be contained in the Soul Gem. + * @param soulDrain The number of souls to drain from the Soul Gem. + * @param input An array of {@link Ingredient}s to accept as inputs. + */ + void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain, @Nonnull Ingredient... input); + + /** + * Removes a Soul/Tartaric Forge recipe based on an input {@link ItemStack} array. + * + * @param input The input items to remove the recipe of. + * @return Whether or not a recipe was removed. + */ + boolean removeTartaricForge(@Nonnull ItemStack... input); + + /** + * Adds a new recipe to the Alchemy Array. + * + * @param input An input {@link Ingredient}. First item put into the Alchemy Array. + * @param catalyst A catalyst {@link Ingredient}. Second item put into the Alchemy Array. + * @param output An output {@link ItemStack}. + * @param circleTexture The texture to render for the Alchemy Array circle. + */ + void addAlchemyArray(@Nonnull Ingredient input, @Nonnull Ingredient catalyst, @Nonnull ItemStack output, @Nullable ResourceLocation circleTexture); + + /** + * Removes an Alchemy Array recipe based on an input {@link ItemStack} and it's catalyst {@link ItemStack}. + * + * @param input The input item to remove the recipe of. + * @param catalyst The catalyst item to remove the recipe of. + * @return Whether or not a recipe was removed. + */ + boolean removeAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst); + + void addSacrificeCraft(@Nonnull ItemStack output, @Nonnegative double healthRequired, @Nonnull Ingredient... input); + + boolean removeSacrificeCraft(@Nonnull ItemStack... input); +} diff --git a/src/api/java/com/wayoftime/bloodmagic/api/IBloodMagicValueManager.java b/src/api/java/com/wayoftime/bloodmagic/api/IBloodMagicValueManager.java new file mode 100644 index 00000000..1a5389ff --- /dev/null +++ b/src/api/java/com/wayoftime/bloodmagic/api/IBloodMagicValueManager.java @@ -0,0 +1,42 @@ +package com.wayoftime.bloodmagic.api; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; + +import javax.annotation.Nonnegative; +import javax.annotation.Nonnull; + +/** + * Allows value modification for various features of Blood Magic such as Sacrificial values. + */ +public interface IBloodMagicValueManager { + + /** + * Sets the amount of LP received per health point from sacrificing the given entity. By default, this is 25. Setting + * the value to 0 effectively disables sacrificing. + * + * @param entityId The registry name of the entity. + * @param value The amount of LP per health point to receive upon sacrifice. + */ + void setSacrificialValue(@Nonnull ResourceLocation entityId, @Nonnegative int value); + + /** + * Sets the Tranquility value of a given {@link IBlockState}. + *

+ * Valid tranquility types: + *

    + *
  • PLANT
  • + *
  • CROP
  • + *
  • TREE
  • + *
  • EARTHEN
  • + *
  • WATER
  • + *
  • FIRE
  • + *
  • LAVA
  • + *
+ * + * @param state The {@link IBlockState} to set the value of. + * @param tranquilityType The type of Tranquility this block should provide. + * @param value The amount of tranquility this block should provide. + */ + void setTranquility(@Nonnull IBlockState state, @Nonnull String tranquilityType, double value); +} diff --git a/src/api/java/com/wayoftime/bloodmagic/api/event/BloodMagicCraftedEvent.java b/src/api/java/com/wayoftime/bloodmagic/api/event/BloodMagicCraftedEvent.java new file mode 100644 index 00000000..fe8125ac --- /dev/null +++ b/src/api/java/com/wayoftime/bloodmagic/api/event/BloodMagicCraftedEvent.java @@ -0,0 +1,71 @@ +package com.wayoftime.bloodmagic.api.event; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.eventhandler.Event; + +public class BloodMagicCraftedEvent extends Event { + + private final boolean modifiable; + private final ItemStack[] inputs; + private ItemStack output; + + public BloodMagicCraftedEvent(ItemStack output, ItemStack[] inputs, boolean modifiable) { + this.modifiable = modifiable; + this.inputs = inputs; + this.output = output; + } + + public boolean isModifiable() { + return modifiable; + } + + public ItemStack[] getInputs() { + return inputs; + } + + public ItemStack getOutput() { + return output; + } + + public void setOutput(ItemStack output) { + if (isModifiable()) + this.output = output; + } + + /** + * Fired whenever a craft is completed in a Blood Altar. + *

+ * It is not cancelable, however you can modify the output stack. + */ + public static class Altar extends BloodMagicCraftedEvent { + + public Altar(ItemStack output, ItemStack input) { + super(output, new ItemStack[]{input}, true); + } + } + + /** + * Fired whenever a craft is completed in a Soul Forge. + *

+ * It is not cancelable, however you can modify the output stack. + */ + public static class SoulForge extends BloodMagicCraftedEvent { + + public SoulForge(ItemStack output, ItemStack[] inputs) { + super(output, inputs, true); + } + } + + /** + * Fired whenever a craft is completed in an Alchemy Table. + *

+ * It is not cancelable, however you can modify the output stack. + */ + public static class AlchemyTable extends BloodMagicCraftedEvent { + + public AlchemyTable(ItemStack output, ItemStack[] inputs) { + super(output, inputs, true); + } + } + +} diff --git a/src/api/java/com/wayoftime/bloodmagic/api/package-info.java b/src/api/java/com/wayoftime/bloodmagic/api/package-info.java new file mode 100644 index 00000000..462725c6 --- /dev/null +++ b/src/api/java/com/wayoftime/bloodmagic/api/package-info.java @@ -0,0 +1,4 @@ +@API(owner = "bloodmagic", provides = "bloodmagic-api", apiVersion = "2.0.0") +package com.wayoftime.bloodmagic.api; + +import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/compat/java/com/wayoftime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java b/src/compat/java/com/wayoftime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java new file mode 100644 index 00000000..19f88ba3 --- /dev/null +++ b/src/compat/java/com/wayoftime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java @@ -0,0 +1,35 @@ +package com.wayoftime.bloodmagic.compat.jei; + +import com.wayoftime.bloodmagic.api.impl.BloodMagicAPI; +import com.wayoftime.bloodmagic.api.impl.recipe.RecipeBloodAltar; +import com.wayoftime.bloodmagic.compat.jei.altar.RecipeCategoryAltar; +import com.wayoftime.bloodmagic.compat.jei.altar.RecipeWrapperAltar; +import com.wayoftime.bloodmagic.core.RegistrarBloodMagicBlocks; +import mezz.jei.api.IJeiHelpers; +import mezz.jei.api.IModPlugin; +import mezz.jei.api.IModRegistry; +import mezz.jei.api.JEIPlugin; +import mezz.jei.api.recipe.IRecipeCategoryRegistration; +import net.minecraft.item.ItemStack; + +@JEIPlugin +public class BloodMagicJEIPlugin implements IModPlugin { + + public static IJeiHelpers helper; + + @Override + public void registerCategories(IRecipeCategoryRegistration registry) { + helper = registry.getJeiHelpers(); + + registry.addRecipeCategories( + new RecipeCategoryAltar() + ); + } + + @Override + public void register(IModRegistry registry) { + registry.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAltarRecipes(), RecipeCategoryAltar.CATEGORY_ID); + registry.handleRecipes(RecipeBloodAltar.class, RecipeWrapperAltar::new, RecipeCategoryAltar.CATEGORY_ID); + registry.addRecipeCatalyst(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_ALTAR), RecipeCategoryAltar.CATEGORY_ID); + } +} diff --git a/src/compat/java/com/wayoftime/bloodmagic/compat/jei/altar/RecipeCategoryAltar.java b/src/compat/java/com/wayoftime/bloodmagic/compat/jei/altar/RecipeCategoryAltar.java new file mode 100644 index 00000000..4bd8c397 --- /dev/null +++ b/src/compat/java/com/wayoftime/bloodmagic/compat/jei/altar/RecipeCategoryAltar.java @@ -0,0 +1,63 @@ +package com.wayoftime.bloodmagic.compat.jei.altar; + +import com.wayoftime.bloodmagic.BloodMagic; +import com.wayoftime.bloodmagic.compat.jei.BloodMagicJEIPlugin; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.ingredients.IIngredients; +import mezz.jei.api.recipe.IRecipeCategory; +import net.minecraft.client.resources.I18n; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +public class RecipeCategoryAltar implements IRecipeCategory { + + public static final String CATEGORY_ID = "bloodmagic:blood_altar"; + private static final int INPUT_SLOT = 0; + private static final int OUTPUT_SLOT = 1; + + @Nonnull + private final IDrawable background = BloodMagicJEIPlugin.helper.getGuiHelper().createDrawable(new ResourceLocation(BloodMagic.MODID, "textures/gui/jei/blood_altar.png"), 3, 4, 155, 65); + + @Nonnull + @Override + public String getUid() { + return CATEGORY_ID; + } + + @Nonnull + @Override + public String getTitle() { + return I18n.format("jei.bloodmagic:blood_altar"); + } + + @Nonnull + @Override + public IDrawable getBackground() { + return background; + } + + @Nullable + @Override + public IDrawable getIcon() { + return null; + } + + @Override + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull RecipeWrapperAltar recipeWrapper, @Nonnull IIngredients ingredients) { + recipeLayout.getItemStacks().init(INPUT_SLOT, true, 31, 0); + recipeLayout.getItemStacks().init(OUTPUT_SLOT, false, 125, 30); + + recipeLayout.getItemStacks().set(INPUT_SLOT, ingredients.getInputs(ItemStack.class).get(0)); + recipeLayout.getItemStacks().set(OUTPUT_SLOT, ingredients.getOutputs(ItemStack.class).get(0)); + } + + @Nonnull + @Override + public String getModName() { + return BloodMagic.NAME; + } +} \ No newline at end of file diff --git a/src/compat/java/com/wayoftime/bloodmagic/compat/jei/altar/RecipeWrapperAltar.java b/src/compat/java/com/wayoftime/bloodmagic/compat/jei/altar/RecipeWrapperAltar.java new file mode 100644 index 00000000..d36c4ad8 --- /dev/null +++ b/src/compat/java/com/wayoftime/bloodmagic/compat/jei/altar/RecipeWrapperAltar.java @@ -0,0 +1,49 @@ +package com.wayoftime.bloodmagic.compat.jei.altar; + +import com.google.common.collect.Lists; +import com.wayoftime.bloodmagic.api.impl.recipe.RecipeBloodAltar; +import mezz.jei.api.ingredients.IIngredients; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.I18n; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; + +import javax.annotation.Nonnull; +import java.awt.Color; +import java.util.List; + +public class RecipeWrapperAltar implements IRecipeWrapper { + + private final RecipeBloodAltar recipe; + + public RecipeWrapperAltar(RecipeBloodAltar recipe) { + this.recipe = recipe; + } + + @Override + public void getIngredients(@Nonnull IIngredients ingredients) { + ingredients.setInputs(ItemStack.class, NonNullList.from(ItemStack.EMPTY, recipe.getInput().getMatchingStacks())); + ingredients.setOutput(ItemStack.class, recipe.getOutput()); + } + + @Nonnull + @Override + public List getTooltipStrings(int mouseX, int mouseY) { + List tooltip = Lists.newArrayList(); + if (mouseX >= 13 && mouseX <= 64 && mouseY >= 27 && mouseY <= 58) { + tooltip.add(I18n.format("jei.bloodmagic:consumption_rate", recipe.getConsumeRate())); + tooltip.add(I18n.format("jei.bloodmagic:drain_rate", recipe.getDrainRate())); + } + return tooltip; + } + + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { + String line1 = I18n.format("jei.bloodmagic:required_tier", I18n.format("enchantment.level." + (recipe.getMinimumTier().ordinal() + 1))); + minecraft.fontRenderer.drawString(line1, 90 - minecraft.fontRenderer.getStringWidth(line1) / 2, 0, Color.GRAY.getRGB()); + + String line2 = I18n.format("jei.bloodmagic:required_lp", recipe.getSyphon()); + minecraft.fontRenderer.drawString(line2, 90 - minecraft.fontRenderer.getStringWidth(line2) / 2, 10, Color.GRAY.getRGB()); + } +} diff --git a/src/compat/java/com/wayoftime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java b/src/compat/java/com/wayoftime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java new file mode 100644 index 00000000..7e7ddeda --- /dev/null +++ b/src/compat/java/com/wayoftime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java @@ -0,0 +1,15 @@ +package com.wayoftime.bloodmagic.compat.waila; + +import com.wayoftime.bloodmagic.tile.TileBloodAltar; +import mcp.mobius.waila.api.IWailaPlugin; +import mcp.mobius.waila.api.IWailaRegistrar; +import mcp.mobius.waila.api.WailaPlugin; + +@WailaPlugin +public class BloodMagicHwylaPlugin implements IWailaPlugin { + @Override + public void register(IWailaRegistrar registrar) { + registrar.registerBodyProvider(DataProviderBloodAltar.INSTANCE, TileBloodAltar.class); + registrar.registerNBTProvider(DataProviderBloodAltar.INSTANCE, TileBloodAltar.class); + } +} diff --git a/src/compat/java/com/wayoftime/bloodmagic/compat/waila/DataProviderBloodAltar.java b/src/compat/java/com/wayoftime/bloodmagic/compat/waila/DataProviderBloodAltar.java new file mode 100644 index 00000000..57c560e8 --- /dev/null +++ b/src/compat/java/com/wayoftime/bloodmagic/compat/waila/DataProviderBloodAltar.java @@ -0,0 +1,40 @@ +package com.wayoftime.bloodmagic.compat.waila; + +import com.wayoftime.bloodmagic.tile.TileBloodAltar; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import net.minecraft.client.resources.I18n; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import javax.annotation.Nonnull; +import java.util.List; + +public class DataProviderBloodAltar implements IWailaDataProvider { + + static final IWailaDataProvider INSTANCE = new DataProviderBloodAltar(); + + @Nonnull + @Override + public List getWailaBody(ItemStack itemStack, List tooltip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + tooltip.add(I18n.format("tooltip.bloodmagic:tier", I18n.format("enchantment.level." + (accessor.getNBTData().getInteger("tier") + 1)))); + if (accessor.getNBTData().hasKey("progress")) + tooltip.add(I18n.format("tooltip.bloodmagic:progress", String.valueOf(accessor.getNBTData().getFloat("progress") * 100))); + return tooltip; + } + + @Nonnull + @Override + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos) { + TileBloodAltar altar = (TileBloodAltar) te; + tag.setInteger("tier", altar.getCurrentTier().ordinal()); + if (altar.isCrafting()) + tag.setFloat("progress", altar.getProgress()); + return tag; + } +} diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache deleted file mode 100644 index 6089bd47..00000000 --- a/src/generated/resources/.cache/cache +++ /dev/null @@ -1,757 +0,0 @@ -cb435652c27b4978d8db83af2fd531ccaa82ada7 assets/bloodmagic/blockstates/accelerationrune.json -43be0406da1c9f7cf734427bea235a65cda073d2 assets/bloodmagic/blockstates/airritualstone.json -5ba8e1b2a7ef85028044056cc971b8fe02ab7e7f assets/bloodmagic/blockstates/alchemicalreactionchamber.json -4a60c54def00d68368ed0a0d4783979aa63d5f60 assets/bloodmagic/blockstates/altarcapacityrune.json -950fff9f06033741091aa8a66a62857da673efb9 assets/bloodmagic/blockstates/bettercapacityrune.json -8a5edb859a6f4d0adfbe2f608bab6b8c8addf01a assets/bloodmagic/blockstates/blankrune.json -904d9baa649250571bce5f965cf48fbec69c2c1a assets/bloodmagic/blockstates/bloodlight.json -5f3898cc4891f85091fe6104800d6c88d9e85e29 assets/bloodmagic/blockstates/bloodstonebrick.json -631b579c38652efbcd9e5771d09ad6e476f3ba00 assets/bloodmagic/blockstates/chargingrune.json -a35188b0244bf9808098c7d49d0af9bd32cef297 assets/bloodmagic/blockstates/corrosivedemoncrystal.json -b943c6433f295c168841aec3c3f62e525c5c9cc9 assets/bloodmagic/blockstates/creeping_doubt.json -a54ab8dfd36a593829dc33644c5f9dbccaaadaf3 assets/bloodmagic/blockstates/deforester_charge.json -b696f680545dffa4d3fbcc83b4b81ab58ac69aef assets/bloodmagic/blockstates/destructivedemoncrystal.json -6bd58d1d02a40416cec29409dee7ef80038b26d5 assets/bloodmagic/blockstates/dislocationrune.json -0b7d0241c379d0b3a8a4fa2dae79d4f998800a1f assets/bloodmagic/blockstates/dungeon_brick1.json -19d1da41c8b836a88ea7164b32e5a8525e5155cf assets/bloodmagic/blockstates/dungeon_brick2.json -79853c0ffa8fd2eb9e2ddd0848c572de0cf49037 assets/bloodmagic/blockstates/dungeon_brick3.json -1117fb4dd4f110a7b7fabae92760e0a3b949c461 assets/bloodmagic/blockstates/dungeon_brick_assorted.json -c67498a81f8dd53770da51df45192b171cdd234c assets/bloodmagic/blockstates/dungeon_brick_gate.json -8b568926830785a5cb848fb36d4ae01e67590501 assets/bloodmagic/blockstates/dungeon_brick_stairs.json -6c10c79909e008b960f2d78543f55847eec7a226 assets/bloodmagic/blockstates/dungeon_brick_wall.json -8a04e502b6965d912793699d61071e44428fceb8 assets/bloodmagic/blockstates/dungeon_eye.json -40051ea4111a9c2fd2524d664d52f241eed5317e assets/bloodmagic/blockstates/dungeon_metal.json -fe31978b41dc50c21f413c81410221f657fd4d23 assets/bloodmagic/blockstates/dungeon_ore.json -388af5c6d34f62d66d987760871c64793df84a37 assets/bloodmagic/blockstates/dungeon_pillar_cap.json -8d8d58ad890f339b75dbdfc710b30dc00eed2ef3 assets/bloodmagic/blockstates/dungeon_pillar_center.json -48e7b0533fa722eb66956e01de661ebac6470da7 assets/bloodmagic/blockstates/dungeon_pillar_special.json -e3f31a23580bce835115483f5790cb08bac44fe2 assets/bloodmagic/blockstates/dungeon_polished.json -aa980029d03236ba34f53952fdadc06cf1cff245 assets/bloodmagic/blockstates/dungeon_polished_gate.json -30c3dc138436c2a25a7fcdd7edca7f70f1adb425 assets/bloodmagic/blockstates/dungeon_polished_stairs.json -512bd11d55934229cb464c720362949302309eba assets/bloodmagic/blockstates/dungeon_polished_wall.json -2015a403ca2bcc73afbb4768df99554a13b171b6 assets/bloodmagic/blockstates/dungeon_smallbrick.json -f5b4cda776f7aabe537ca843e41074c03429cdfb assets/bloodmagic/blockstates/dungeon_stone.json -167512323d506489adb4487d3da092ceec0bd17e assets/bloodmagic/blockstates/dungeon_tile.json -4806276351c534917c2e72f98c4618e6592b18a0 assets/bloodmagic/blockstates/dungeon_tilespecial.json -ba1cd8a9475212843e3b26232c8a9943fa0d2d20 assets/bloodmagic/blockstates/duskritualstone.json -bb3db171734f511fc0c259d86e869b49aa1d0c77 assets/bloodmagic/blockstates/earthritualstone.json -e780d6d9e891082dc6ce83fde1697ce36281a02a assets/bloodmagic/blockstates/fireritualstone.json -e2c9c08bab702938e1a861d096526f16f68f6691 assets/bloodmagic/blockstates/fungal_charge.json -f78ce2be09ab794bf5f5679414eee0dc85cf4fb1 assets/bloodmagic/blockstates/largebloodstonebrick.json -002795212cc7bf2cad2a91f873d85e2204c6367d assets/bloodmagic/blockstates/lightritualstone.json -e1a98bd53fca155e4bbb03c1e548341af0f84bd7 assets/bloodmagic/blockstates/masterritualstone.json -505e45be4a207e22433d853e5139c5b1d48c57d7 assets/bloodmagic/blockstates/nether_soil.json -95a0c9a84139cf92c2689e53408b51619db126a1 assets/bloodmagic/blockstates/obsidianbrickpath.json -8b0ea137c63cf3a658a03eee58ca4b2c3d996f87 assets/bloodmagic/blockstates/obsidiantilepath.json -372ecd737f7082a4c2c70e46745f893b1179f885 assets/bloodmagic/blockstates/orbcapacityrune.json -a2eaa9166258d7179d9e5099200f777bb9edf613 assets/bloodmagic/blockstates/rawdemoncrystal.json -90daa355e528ab8a6582f796951201882f3c56da assets/bloodmagic/blockstates/ritualstone.json -285618c1a8ec36e36d479f577190579ae7616529 assets/bloodmagic/blockstates/sacrificerune.json -b03040d7a168653bf8df3600033b8fde2383db30 assets/bloodmagic/blockstates/selfsacrificerune.json -d2e2e78bd859c321a72f40fbb17ca79292d58031 assets/bloodmagic/blockstates/shaped_charge.json -487ffdc02ab7b65aafcb932e3b5cf6ea0500b21d assets/bloodmagic/blockstates/speedrune.json -f1ca47098385a955155cab9c2a97219e02d390a0 assets/bloodmagic/blockstates/steadfastdemoncrystal.json -297bc2425f7b07b1a9dd3f7f6649c44f88dbac29 assets/bloodmagic/blockstates/stonebrickpath.json -e3256db10fc8a8ab540f6ac8d27e0f47861e817a assets/bloodmagic/blockstates/stonetilepath.json -6989c4e23e5405772a8601ea88f071a479ed3fa9 assets/bloodmagic/blockstates/veinmine_charge.json -48ed6b25a5d8d8074c38d772fdc27c1753d42c36 assets/bloodmagic/blockstates/vengefuldemoncrystal.json -e6d9cf699667aaa47efff37b2b033895dee29c15 assets/bloodmagic/blockstates/waterritualstone.json -74c889434f46e060e8f185e8ef674312eb2f1192 assets/bloodmagic/blockstates/woodbrickpath.json -42f26f715bddd16c069f9b51e3767b36477c8908 assets/bloodmagic/blockstates/woodtilepath.json -3c6ce233dae6c1307d9016406c324bbe844b4e1e assets/bloodmagic/blockstates/wornstonebrickpath.json -d59655f12d1724b73b77c373fb6864fcff69db12 assets/bloodmagic/blockstates/wornstonetilepath.json -0492479fed31666acdf2d5f3fb2dab3b6ebdf6b5 assets/bloodmagic/lang/en_us.json -34445195b9f2459475cde53454bc8e37d32865d7 assets/bloodmagic/models/block/accelerationrune.json -bcdbccc49d4509571be6988762ab87126275a4c8 assets/bloodmagic/models/block/airritualstone.json -adf6c0b1e25451609486dc8c8cfbd9cf0f8c67f4 assets/bloodmagic/models/block/alchemicalreactionchamber.json -3c98a88c2283ad54f0efb9d7194361bbc3e93c17 assets/bloodmagic/models/block/altarcapacityrune.json -7cd62092c6fb3109e016d42090cf89bfa3ab7fca assets/bloodmagic/models/block/bettercapacityrune.json -1fe0f89895addb7abcacf6ce7e39b6ddc87b0d85 assets/bloodmagic/models/block/blankrune.json -3c83e090a1cff00e2bb2c7eb475785954b6eb980 assets/bloodmagic/models/block/bloodlight.json -ae2ff1abd707f2193d04d235de8f0ce92ada1d0f assets/bloodmagic/models/block/bloodstonebrick.json -320827ad2feaa51a90ebb7064a70bdc6d3765203 assets/bloodmagic/models/block/chargingrune.json -d5d82916652aee95adb8c16c97788be0a0f9f9d6 assets/bloodmagic/models/block/creeping_doubt_1.json -3effbe56422e18a44138e13e33eb26ba33b9381f assets/bloodmagic/models/block/creeping_doubt_2.json -8a7e5bfc63d3de0987bd71c1237fb580a6317601 assets/bloodmagic/models/block/creeping_doubt_3.json -8c75a72923902d5000852728436313f5979e903a assets/bloodmagic/models/block/creeping_doubt_4.json -38d083dbe1852d6dc0995a46d63a8a6dbe2c31ac assets/bloodmagic/models/block/creeping_doubt_5.json -ec5fcd20fee4260f131c82ec0a6558cc4e70e781 assets/bloodmagic/models/block/creeping_doubt_6.json -f38c5b52e9215a3d819e0b35c590d8924ca84200 assets/bloodmagic/models/block/creeping_doubt_7.json -9b332dc0443cb28c08d3af52096b7dd4fb2b68cc assets/bloodmagic/models/block/creeping_doubt_8.json -17ed7bf0e4e0aba9fc6390c8fa46f02b63145b1c assets/bloodmagic/models/block/crystal/corrosivecrystal1.json -0ae47095829ba2218113131f29e0a870b7ac7c71 assets/bloodmagic/models/block/crystal/corrosivecrystal2.json -f2fa5d770d52b5888d4fcba9161bc6485938cc21 assets/bloodmagic/models/block/crystal/corrosivecrystal3.json -f3f58ce78925d6c5e9c3beaa325f75084b9fab7c assets/bloodmagic/models/block/crystal/corrosivecrystal4.json -ca4af4bd7d6bfefbdb925aafe9d7ea80b18eaa3a assets/bloodmagic/models/block/crystal/corrosivecrystal5.json -1e0d6dc84398a2e12d177578c6c798b2c22ca95c assets/bloodmagic/models/block/crystal/corrosivecrystal6.json -302703cfe171a5f5bca492eb781ab3f3fd1c5cc1 assets/bloodmagic/models/block/crystal/corrosivecrystal7.json -6e4a3ba1cbd063757f2781e61bfae1b6191f750f assets/bloodmagic/models/block/crystal/defaultcrystal1.json -c41eee3071f1c1b27548eed79d333ab40d18a993 assets/bloodmagic/models/block/crystal/defaultcrystal2.json -3cf921a7416da052e2879cf0daae21144a40fa98 assets/bloodmagic/models/block/crystal/defaultcrystal3.json -6019d4e18f271f67b970c4e9b140ff96dc2c26fb assets/bloodmagic/models/block/crystal/defaultcrystal4.json -a106985d414ba63680da8a6b1abe77a0406adcc7 assets/bloodmagic/models/block/crystal/defaultcrystal5.json -8c3307e3ef8f44eb95c70774e32989454da8b675 assets/bloodmagic/models/block/crystal/defaultcrystal6.json -592af0e2cf2849bd0581a43271d391a9ddbc6fb0 assets/bloodmagic/models/block/crystal/defaultcrystal7.json -f688ae826b9f42b092d8de2e419f67f8049a5d00 assets/bloodmagic/models/block/crystal/destructivecrystal1.json -e27df3ee62984fc10026e721b262c89db95f2b40 assets/bloodmagic/models/block/crystal/destructivecrystal2.json -df186d5bbcb608d7e91b2a67ab7fc347aa715a34 assets/bloodmagic/models/block/crystal/destructivecrystal3.json -c4839ceb06d5a22aa47c71e1a7d7dfd12a7af68c assets/bloodmagic/models/block/crystal/destructivecrystal4.json -091b5b1986e7542485c7d03419baf6f3f81fd8cb assets/bloodmagic/models/block/crystal/destructivecrystal5.json -cf05718711393bf322680bc24897ba82bafd1f53 assets/bloodmagic/models/block/crystal/destructivecrystal6.json -a66d5091e5241479e512a3a71aba67d93992f32b assets/bloodmagic/models/block/crystal/destructivecrystal7.json -47d8fa9891d7baad8a17df455fd6d9baf6da56de assets/bloodmagic/models/block/crystal/steadfastcrystal1.json -6bbd2e8584e783e07390b0f30d0f3fbb2782f663 assets/bloodmagic/models/block/crystal/steadfastcrystal2.json -0883e99e1d5fa81d2ea0212ab8e9f4d5313717f4 assets/bloodmagic/models/block/crystal/steadfastcrystal3.json -c0a2ec89a412ce6dc078697f6ab92944a8a65cd9 assets/bloodmagic/models/block/crystal/steadfastcrystal4.json -b8d576ca3daf0b597b222f9d0645526e1d8a65be assets/bloodmagic/models/block/crystal/steadfastcrystal5.json -1e6b6825d373b1532d2458e6122a9869153d3776 assets/bloodmagic/models/block/crystal/steadfastcrystal6.json -2478650854e8e82b46bfb58754004e89771636fc assets/bloodmagic/models/block/crystal/steadfastcrystal7.json -dc2fff8fbabd58db8c0f2fb83d3d68446e324389 assets/bloodmagic/models/block/crystal/vengefulcrystal1.json -623e226eb28df9d7e2311ed6c68fba0835c80785 assets/bloodmagic/models/block/crystal/vengefulcrystal2.json -fe8271e4e815de11cd617179dedface57bd8c696 assets/bloodmagic/models/block/crystal/vengefulcrystal3.json -658bcbf2eadb0e2b442668e47b8a3a0fc684a57f assets/bloodmagic/models/block/crystal/vengefulcrystal4.json -825352d6cdd314dd4cb775062757e2b8eb39f5d7 assets/bloodmagic/models/block/crystal/vengefulcrystal5.json -9603b46cb4ebc567878ca5f54fe96e1199f34d0c assets/bloodmagic/models/block/crystal/vengefulcrystal6.json -ecf64f8c06743f0c2752e32a67753c0d5f9f67a1 assets/bloodmagic/models/block/crystal/vengefulcrystal7.json -c75695cf399d96d66914ab7dcfe1fe6bf171d6b9 assets/bloodmagic/models/block/deforester_charge.json -6adbeedc17f649ef47419845a6da0d50cfc76742 assets/bloodmagic/models/block/dislocationrune.json -313607b36c7c30073bbc64d3130f15b5871c5cd3 assets/bloodmagic/models/block/dungeon_brick1.json -55a9c171872cf9fb40c06dc2e9e826223a9096e0 assets/bloodmagic/models/block/dungeon_brick2.json -ff6727ee9a149e89deef8d666f373bdb4e68a545 assets/bloodmagic/models/block/dungeon_brick3.json -5b95b5519b04dec4f87ad7d287e3e1fa344725d8 assets/bloodmagic/models/block/dungeon_brick_gate.json -3de5c424b0928c220bf2073ee6aca5dbf4f379bb assets/bloodmagic/models/block/dungeon_brick_gate_open.json -daaeb0a0adb39fb6df3c6e6d380b34efd14bf4ce assets/bloodmagic/models/block/dungeon_brick_gate_wall.json -62ecdb415d060bf8a815f57fcf4c56b1e788f8f2 assets/bloodmagic/models/block/dungeon_brick_gate_wall_open.json -d40eb07dfa8b700d08a7f4c3739f4b6eef0bc95f assets/bloodmagic/models/block/dungeon_brick_stairs.json -df27c2b4e3345199ba29e16cddffcb86efe457b5 assets/bloodmagic/models/block/dungeon_brick_stairs_inner.json -2fbb36a96684b4acc57e551ac1f971878685a2aa assets/bloodmagic/models/block/dungeon_brick_stairs_outer.json -ffb2021036b74d29fca5fc706885f3e1399c2950 assets/bloodmagic/models/block/dungeon_brick_wall_inventory.json -70508a960748a3f62a11b1a7277977f0256be58a assets/bloodmagic/models/block/dungeon_brick_wall_post.json -a7d371e5d0efefae2729131bda16120bfe477bb8 assets/bloodmagic/models/block/dungeon_brick_wall_side.json -bd152efd619489661cac86a80190bf9e88c86363 assets/bloodmagic/models/block/dungeon_brick_wall_side_tall.json -19ae530a34eb5cee35dc7b9cdd51c9c2d61fdc9e assets/bloodmagic/models/block/dungeon_eye.json -72d70f0acb18b765340167559c10b027bd98673a assets/bloodmagic/models/block/dungeon_metal.json -61eb4e5ede53a8278d2d95fbeb40dc01424f2895 assets/bloodmagic/models/block/dungeon_ore.json -a4449c1d14c46bcda58b542c3efdddadff15bedc assets/bloodmagic/models/block/dungeon_pillar_cap.json -1752cc99d0c334016bebd0e8027b8abe3ca5d7e8 assets/bloodmagic/models/block/dungeon_pillar_cap_down.json -f171162bb4b86e70f2b2f13f3393704d295a4d86 assets/bloodmagic/models/block/dungeon_pillar_cap_east.json -c340c5e6c593cec4d342b36097fe7cca85ad647b assets/bloodmagic/models/block/dungeon_pillar_cap_north.json -c8ee14fcf2f46c755b47cc407e3cd0dbe7a477f9 assets/bloodmagic/models/block/dungeon_pillar_cap_south.json -4ac68eafddb0c99ad884af596bc48cd63af5a021 assets/bloodmagic/models/block/dungeon_pillar_cap_west.json -e6f858e8aa3c4bf2189885400a76892e707f5403 assets/bloodmagic/models/block/dungeon_pillar_center.json -12209619fc1d437d9339402ce437e6c9b2f3c02b assets/bloodmagic/models/block/dungeon_pillar_center_x.json -a4223ff2570f04a4a5d068944e8964811a62e92a assets/bloodmagic/models/block/dungeon_pillar_center_z.json -5b884f4ad41e9f0ba94a1a91938af497d3dde49b assets/bloodmagic/models/block/dungeon_pillar_special.json -eb4237db6507002305969c55ba64c9e19fe90357 assets/bloodmagic/models/block/dungeon_pillar_special_x.json -29736a69c3d5eef5b11befa0be27ddd274abc29e assets/bloodmagic/models/block/dungeon_pillar_special_z.json -a0aabc2be78af27e620e82d9f9b877dc99ae2798 assets/bloodmagic/models/block/dungeon_polished.json -05b4a25735c96036005bea06e013651a8aac5641 assets/bloodmagic/models/block/dungeon_polished_gate.json -fd32ed9981b8164f88319b66811f8e6d41ec8470 assets/bloodmagic/models/block/dungeon_polished_gate_open.json -590dbd87da39d8dc0f03dd274e46e5fec55a6ab0 assets/bloodmagic/models/block/dungeon_polished_gate_wall.json -9b86f7cfcf9b539090a49fe213ca76eb4295a7cd assets/bloodmagic/models/block/dungeon_polished_gate_wall_open.json -a9871493a35453a0f0cf1f5ff3e54f646325c2cf assets/bloodmagic/models/block/dungeon_polished_stairs.json -b073d62667acc4d278b96efcfbb929e4c70afe22 assets/bloodmagic/models/block/dungeon_polished_stairs_inner.json -fc4b1f91035eab88ea3178713ff950dce2637e41 assets/bloodmagic/models/block/dungeon_polished_stairs_outer.json -f5176982c9143ec07275349178617102af40ebeb assets/bloodmagic/models/block/dungeon_polished_wall_inventory.json -eb1252284b87f352e5d7eeae48d57e189f25340f assets/bloodmagic/models/block/dungeon_polished_wall_post.json -3c060012163a8c95532b85010773326a28e6f30e assets/bloodmagic/models/block/dungeon_polished_wall_side.json -6b5d875b69643f9daa4302a317ef3863fcce1a91 assets/bloodmagic/models/block/dungeon_polished_wall_side_tall.json -ef2a677751c2ae6c3cec9b905c28aeb615ea03e7 assets/bloodmagic/models/block/dungeon_smallbrick.json -84555e144215de4477ab826420400747b11edf9a assets/bloodmagic/models/block/dungeon_stone.json -d4e4cbb3a24e069a8e6c8e60764f8bbb7b3adb2b assets/bloodmagic/models/block/dungeon_stone_mirrored.json -8a922c0105191857905467f048aa40221cb34853 assets/bloodmagic/models/block/dungeon_tile.json -3895234c0c49d936ad0ad420dedd3669999b8a81 assets/bloodmagic/models/block/dungeon_tilespecial.json -81313327125e6e7396df0408595228bf0f63e1c9 assets/bloodmagic/models/block/duskritualstone.json -c30064f4aa09c42d23e94d118ae5b148eadb3a6c assets/bloodmagic/models/block/earthritualstone.json -44c4d3178261b3756987643b62f263c91fa74198 assets/bloodmagic/models/block/etherealopaquemimic.json -4ff1cab1014cd8f655e5f032ecf60dd371f421c3 assets/bloodmagic/models/block/fireritualstone.json -0fb05dea521223c58619fd71ccc2bcdf82ba7563 assets/bloodmagic/models/block/fungal_charge.json -d6bf1482345199e7d056a60865024ea5d480b986 assets/bloodmagic/models/block/largebloodstonebrick.json -2e1a81c758bfeec2aee807b48239f23241302268 assets/bloodmagic/models/block/lightritualstone.json -eab1713a8879decb2ae05258a6bcfa9da78ec67b assets/bloodmagic/models/block/masterritualstone.json -c0e0f918b237d2f25718bae4774750b90a88de7b assets/bloodmagic/models/block/nether_soil.json -1e354903812e9cf8e2fea26b908430d7e1cf20a9 assets/bloodmagic/models/block/obsidianbrickpath.json -71893b8b185c2b0f64f21b7dc6c4f2850f936206 assets/bloodmagic/models/block/obsidiantilepath.json -c3a813b735cd229f8597e41d04465926b2e65fe1 assets/bloodmagic/models/block/orbcapacityrune.json -9b2bf2a44b788cbaecbe63a3e085e8de76672e1b assets/bloodmagic/models/block/ritualstone.json -a8a1d06fcc2f8395530c72d2846133fff37d5537 assets/bloodmagic/models/block/sacrificerune.json -791c9f2e27215ff0a45eed7efe385276bfc09aed assets/bloodmagic/models/block/selfsacrificerune.json -d6238c0661560abd991d534ef6c8836f4655a7e7 assets/bloodmagic/models/block/sentientmimic.json -04a1e67d1587be970310912849119903b99412ef assets/bloodmagic/models/block/shaped_charge.json -6556131b1aeb25dc67daf31a1ecdb3ce23e718d4 assets/bloodmagic/models/block/solidclearmimic.json -88b9f25444280d323fff11046d4d3a3af11265e8 assets/bloodmagic/models/block/solidlightmimic.json -23d937795efdb02507d301c459e52cd4b0cfa5cb assets/bloodmagic/models/block/solidopaquemimic.json -65fe5e01ed2660e45a5c329ff2389a87e4d791ec assets/bloodmagic/models/block/speedrune.json -c5d2b0e33500a5c51046cd606e0d1272ec0dddd6 assets/bloodmagic/models/block/stonebrickpath.json -359e28e79778961f57c6369b5d1b68218972fccb assets/bloodmagic/models/block/stonetilepath.json -d8c8cb24e0e8479ec620b4cd8d5a6f5abb1a2dcb assets/bloodmagic/models/block/veinmine_charge.json -6041f2e47f5437d90a58586e42d18dadc42df439 assets/bloodmagic/models/block/waterritualstone.json -d77cdb168a084aeb962be6ad7b4f41b181837be6 assets/bloodmagic/models/block/woodbrickpath.json -e54a4f2b3cd405c69782662b1b0d57e24f7c2524 assets/bloodmagic/models/block/woodtilepath.json -ee59117289640eaebf7a9d7f629dd584ac3ed50f assets/bloodmagic/models/block/wornstonebrickpath.json -bee51abed529a89ad088b2cb89a4c1d0de541bf1 assets/bloodmagic/models/block/wornstonetilepath.json -9462d62d9bc9408359d30728de8651dc104aacf1 assets/bloodmagic/models/item/accelerationrune.json -28dc926a434253f140a7c4eece1522a64a7cccae assets/bloodmagic/models/item/activationcrystalawakened.json -3f64f82051888db51f30a75c41e1d249d7899235 assets/bloodmagic/models/item/activationcrystalcreative.json -10fa1f758c52f639880607bfaac3ced18b8b91ae assets/bloodmagic/models/item/activationcrystalweak.json -fe8e3deb3ad0107ca3ebd70694c1fc55a987d912 assets/bloodmagic/models/item/airritualstone.json -33074d865864911fcaf65e6d56430e87d466a1b8 assets/bloodmagic/models/item/airscribetool.json -60487d07a2fc1af61993e6bbebf012cf20aa3edd assets/bloodmagic/models/item/airsigil.json -92cc51b70ce22796804d093e3fc21141658f85fd assets/bloodmagic/models/item/alchemicalreactionchamber.json -f150f178edf7d6d250bcfd84af1c28a21cff09c6 assets/bloodmagic/models/item/altarcapacityrune.json -cb96caeaa30f168d03a7763f06fdff9fe47d29c5 assets/bloodmagic/models/item/apprenticebloodorb.json -5ae6e2eedcbf4a58b2e437aae2304e8171e05689 assets/bloodmagic/models/item/arcaneashes.json -69dc96914b3f5c8f672bbaca16720ffef951c179 assets/bloodmagic/models/item/basemonstersoul.json -975b721b2a1b40b4d3b3bf20d17329476f4bfc98 assets/bloodmagic/models/item/basemonstersoul_corrosive.json -318e954cc662ea33e30dad9bdff5e73b1da3b129 assets/bloodmagic/models/item/basemonstersoul_destructive.json -366657ca2747a4c8f9521c5b0b8f439d7880fcce assets/bloodmagic/models/item/basemonstersoul_steadfast.json -af6319be25a2aeadf7366c6f4b83a6c8e9e07343 assets/bloodmagic/models/item/basemonstersoul_vengeful.json -f5a0419f239ff5079b60011adb903a126265942e assets/bloodmagic/models/item/basiccuttingfluid.json -d3c33ff908880e7abc8a2cd977304419ec48a23d assets/bloodmagic/models/item/bettercapacityrune.json -7a1c55d55fe59d8a70bc2a867d127cb303c1ba23 assets/bloodmagic/models/item/blankrune.json -db9d31cae77018833be0e4d38db84d75adeb30a1 assets/bloodmagic/models/item/blankslate.json -c801f34e88224f9fabd89245f9d2a0d9ef466b64 assets/bloodmagic/models/item/bloodlightsigil.json -c795d1b7aa99ce27da63868f81bac615cf199c66 assets/bloodmagic/models/item/bloodstonebrick.json -dd4a590f68820a04ca4a71df507e8a39ca6bd393 assets/bloodmagic/models/item/bow_power_anointment.json -7315e49149eca494e6b132d383082cb76fc9c0e4 assets/bloodmagic/models/item/chargingrune.json -8c84f53166f2fdf7eaac4b6dc45402e3fa5b18d9 assets/bloodmagic/models/item/coalsand.json -3636c40fafa385642db14ca5f09d68e547060c4d assets/bloodmagic/models/item/corrosivecrystal.json -e8bdf0e3f557bb09c665312df380672e676f4382 assets/bloodmagic/models/item/corrosivedemoncrystal.json -470406aa7191f99f8b8d144fa0b1c314bdc10f11 assets/bloodmagic/models/item/corrupted_dust.json -1136b546d2cf73fc0f419447f7c328b8e2083323 assets/bloodmagic/models/item/corrupted_tinydust.json -9b332dc0443cb28c08d3af52096b7dd4fb2b68cc assets/bloodmagic/models/item/creeping_doubt.json -7b4471ae902c8e96a3730a86e1b15fb5c13aeec7 assets/bloodmagic/models/item/crystalline_resonator.json -5414b42d1246ff780f15ebd42212f19e90891daa assets/bloodmagic/models/item/daggerofsacrifice.json -08e573e533ecbfed2a734691608abe0119f3f3e3 assets/bloodmagic/models/item/defaultcrystal.json -cad1aef333d131d77b7960f5dc295694baeead1c assets/bloodmagic/models/item/deforester_charge.json -6353ff212d21942d3fcbf7ea0cedd027e831059f assets/bloodmagic/models/item/demonslate.json -fd9ec2b5fe4436363ae5058b6ff9d77bd81ce85d assets/bloodmagic/models/item/demonwillgauge.json -51f65b07ce2ff59d740e28a27a039bd0022c367f assets/bloodmagic/models/item/destructivecrystal.json -3e952fc5e87bd7883dadd761ef708ddfac29638c assets/bloodmagic/models/item/destructivedemoncrystal.json -7af07ab578bbd20e2f834b26d9cafb5fe23bc7d4 assets/bloodmagic/models/item/dislocationrune.json -d57d9bcecc2580bdc009e1cd2b4a87cc39b4bca9 assets/bloodmagic/models/item/divinationsigil.json -f866879eed9f1bd7eebac14495de599ca3ad855d assets/bloodmagic/models/item/dungeon_brick1.json -78f206d696acf10f082a34c7ec2fdbddc321231a assets/bloodmagic/models/item/dungeon_brick2.json -52f18a291e92fe5218dd4abacdabdc106dc2d380 assets/bloodmagic/models/item/dungeon_brick3.json -f866879eed9f1bd7eebac14495de599ca3ad855d assets/bloodmagic/models/item/dungeon_brick_assorted.json -1a1ab86e948d6f2a7e928750d5442fff1edb4c19 assets/bloodmagic/models/item/dungeon_brick_gate.json -2ec6a2c66e88981ff54e74035bb3adb1ec4f6396 assets/bloodmagic/models/item/dungeon_brick_stairs.json -098a26f4e9222c801f9a17a6db1b266ad4085003 assets/bloodmagic/models/item/dungeon_brick_wall.json -0a48c4fd74036702ae2d72a9b2333c2bdf5ab31b assets/bloodmagic/models/item/dungeon_eye.json -e5b467f756ccc4d3ab42a1249864d47f2b9c4587 assets/bloodmagic/models/item/dungeon_metal.json -95a45fae0890e626aa5e5ff85b9884bd30087244 assets/bloodmagic/models/item/dungeon_ore.json -ba5c610437b7d3a84820109c32d204310ff41fd7 assets/bloodmagic/models/item/dungeon_pillar_cap.json -d098a544e7b9918a45106c2cbc5e10baea66502a assets/bloodmagic/models/item/dungeon_pillar_center.json -5284f1cc7508546c66669564182fe5056053333d assets/bloodmagic/models/item/dungeon_pillar_special.json -9e876e438fa9bac067f6b3af4904e6bbd24044c8 assets/bloodmagic/models/item/dungeon_polished.json -9a7bf4c6c15f2a6e39588b1b8aed7988a7713a02 assets/bloodmagic/models/item/dungeon_polished_gate.json -477cd98babad0a71ccfcc9e541169fe9bc31d8d1 assets/bloodmagic/models/item/dungeon_polished_stairs.json -f3b763d6edc3c75655797481f05e02d409f481d9 assets/bloodmagic/models/item/dungeon_polished_wall.json -2ecba4811bd02698f6a34b5cdd9160426f7bda63 assets/bloodmagic/models/item/dungeon_smallbrick.json -2d7a8a3ed9f91a5bf5c277c6342c69e97692d347 assets/bloodmagic/models/item/dungeon_stone.json -717a9dcc833d1fbea4e5f989f45f46268d4ffe37 assets/bloodmagic/models/item/dungeon_tester.json -6186d2045f87b1e6cc7006226993a93b63d650ff assets/bloodmagic/models/item/dungeon_tile.json -21e8a4fa93ba249684e0624a10a6f0f00ff6d194 assets/bloodmagic/models/item/dungeon_tilespecial.json -10aceefca3ad3f0da773cb317c4effc6c06051ea assets/bloodmagic/models/item/duskritualstone.json -1f8ce936602a2e55ecf05b926734099c057733e5 assets/bloodmagic/models/item/duskscribetool.json -4d56efd7fdbf430f49903ce201577047687c3804 assets/bloodmagic/models/item/earthritualstone.json -b29b6d11b54e98dbfbeb9d677298e6ca95bf2ca2 assets/bloodmagic/models/item/earthscribetool.json -cdbaaf8662f2e855a34a66f28e49403c4ea9a45e assets/bloodmagic/models/item/ethereal_mimic.json -c5a3b58c52f75650ae38391841b21ad1cb0855f9 assets/bloodmagic/models/item/etherealslate.json -64529fc174f49c6eabca127ebdd287ff77a7ed63 assets/bloodmagic/models/item/experiencebook.json -dbd20c2ac822262cc368fd7d649de67c754e693d assets/bloodmagic/models/item/explosivepowder.json -c36bde4f98c0aeb3bf0f369ad3bc067e5f0dc916 assets/bloodmagic/models/item/fireritualstone.json -0a3dcea188a3e5cf5f7c9a2cc4ad62667ac5821b assets/bloodmagic/models/item/firescribetool.json -dd4a590f68820a04ca4a71df507e8a39ca6bd393 assets/bloodmagic/models/item/fortune_anointment.json -0392d220dc92ab8abad335e620b011e000b61ef9 assets/bloodmagic/models/item/fragment_netherite_scrap.json -4228d831053597cbb7d7e5fb68b7a6dbf1dbf977 assets/bloodmagic/models/item/fungal_charge.json -27ce75b6179a4620fd23aa07568c47fad36a14eb assets/bloodmagic/models/item/furnacecell_primitive.json -72386afa0dcb2444a8072d1618425038c73106c7 assets/bloodmagic/models/item/goldfragment.json -2bf9f4f4901425531903ace1cebee594bc37e55a assets/bloodmagic/models/item/goldgravel.json -bad504721d3bfd106869df9902bac0aa4001a1a7 assets/bloodmagic/models/item/goldsand.json -ebb91dfd0f28c439478b5f041b127aefa00ae583 assets/bloodmagic/models/item/gravel_netherite_scrap.json -44663089f348642bcca1c5020b5081c3ab172f92 assets/bloodmagic/models/item/growthsigil.json -dd4a590f68820a04ca4a71df507e8a39ca6bd393 assets/bloodmagic/models/item/hidden_knowledge_anointment.json -dd4a590f68820a04ca4a71df507e8a39ca6bd393 assets/bloodmagic/models/item/holy_water_anointment.json -f68825f667ca73b4373fd5068a47f0d1ca9b2aad assets/bloodmagic/models/item/icesigil.json -5d151f9d9007fb7459dde9f2d5c182b9b6aa06e0 assets/bloodmagic/models/item/infusedslate.json -59940408324c0379fa791a58f4a81781d06d1257 assets/bloodmagic/models/item/ingot_hellforged.json -80c575c613c1696069284224fe2c711c343bb0be assets/bloodmagic/models/item/ironfragment.json -4b803c1c838284d78474bab0f8ced938985dd958 assets/bloodmagic/models/item/irongravel.json -d83040a473f44ff2fd9d290f3fd6ef0d8b9f3114 assets/bloodmagic/models/item/ironsand.json -9b9fc4a11a187257d30334cd3faa949790b6ca29 assets/bloodmagic/models/item/largebloodstonebrick.json -ffc3da1cbb86adc5aec7dfd503d23af319aec529 assets/bloodmagic/models/item/lavacrystal.json -12360580230f4eab90dbe7de3d5bbf79e2338b03 assets/bloodmagic/models/item/lavasigil.json -5a76914a87fc9b99079bb6afed1d4cfe3e4a532e assets/bloodmagic/models/item/lightritualstone.json -0d6c9d3b2ec30835ef74b6d6e8184074ac0861b8 assets/bloodmagic/models/item/livingboots.json -dd50db84188025895693164736f4799e75b8c7a9 assets/bloodmagic/models/item/livinghelmet.json -e39cf255d5c8873e02d1f2df2c829d0858df25e3 assets/bloodmagic/models/item/livingleggings.json -45756697d2f012fcc2de5fead120768a87655662 assets/bloodmagic/models/item/livingplate.json -dd4a590f68820a04ca4a71df507e8a39ca6bd393 assets/bloodmagic/models/item/looting_anointment.json -7211624c82431d12dd21b3de262f4f332a69e0e1 assets/bloodmagic/models/item/magicianbloodorb.json -2b760616f7dad714accf1249b85eec4761f69706 assets/bloodmagic/models/item/masterbloodorb.json -9e377ab2c131993f96ab6fb544bda4dbba0ab87e assets/bloodmagic/models/item/masterritualstone.json -dd4a590f68820a04ca4a71df507e8a39ca6bd393 assets/bloodmagic/models/item/melee_anointment.json -3d5c71d1f24ebcc65db48765b56db60d64673a0d assets/bloodmagic/models/item/mimic.json -7596826c5b40c2809eb0a42eb5f5f2089290e3e5 assets/bloodmagic/models/item/miningsigil.json -9010fdcefb80ed0db271b41263412a1673c6c311 assets/bloodmagic/models/item/nether_soil.json -eaa0548775c3d5839b46d333af33f815dc6dd0fe assets/bloodmagic/models/item/obsidianbrickpath.json -cf066d15baae650a383240a91240abd335bbb0e3 assets/bloodmagic/models/item/obsidiantilepath.json -ff9b802098659824626dc90dbb5a0d8960234228 assets/bloodmagic/models/item/orbcapacityrune.json -d5fd516b1cf94ab01d5b1fbe554705215f21ff66 assets/bloodmagic/models/item/plantoil.json -abdd58730704a0936783c6752098a9fec1e3f18d assets/bloodmagic/models/item/primitive_crystalline_resonator.json -f3dd3ad67c86895983e3cf0f21e44d0f4046962e assets/bloodmagic/models/item/primitive_explosive_cell.json -0a88f03b48e0032f7ed7878212b0b01a930186d0 assets/bloodmagic/models/item/primitive_hydration_cell.json -dd4a590f68820a04ca4a71df507e8a39ca6bd393 assets/bloodmagic/models/item/quick_draw_anointment.json -63fe86d0faf9aa03a513221a6a12828a886b1301 assets/bloodmagic/models/item/rawdemoncrystal.json -6f5418ed5739381e95b4d3b33f3e2924a6233941 assets/bloodmagic/models/item/reagentair.json -0f3fbea424448d41cac91bc479d9235def615af7 assets/bloodmagic/models/item/reagentbinding.json -df9beacb97275ffaa7f186778d94ad11138dffe3 assets/bloodmagic/models/item/reagentbloodlight.json -ba57b2a11a0920e7a4df894c6fbae38bf2a6e0ce assets/bloodmagic/models/item/reagentfastminer.json -f9a2fbb703e22dee4ae74daff99249e5f22caa0f assets/bloodmagic/models/item/reagentgrowth.json -a0e2480efd5433e9ead1ef87c2b31b0dbbc7ecb6 assets/bloodmagic/models/item/reagentholding.json -2f8cfb7f2c9cb3dd62a007c2ec56f585414149d8 assets/bloodmagic/models/item/reagentlava.json -2a07dc18d2d8166815c29aa989ccd0093d5d112b assets/bloodmagic/models/item/reagentmagnetism.json -7ce18ad9b0de94a3fc5abf03c6726c8cc4cf5524 assets/bloodmagic/models/item/reagentsight.json -7aa180a374f6a60f0525659c90f386a9df7bedcd assets/bloodmagic/models/item/reagentvoid.json -d6fefc8d0d11bcc40ec6c9fa41e8e9402274251a assets/bloodmagic/models/item/reagentwater.json -98783464efdcbcaf2f457dfafc4a126f57454f8c assets/bloodmagic/models/item/reinforcedslate.json -8c473f375d7e45adb82f615a6d9e6dea312f57bd assets/bloodmagic/models/item/ritualdiviner.json -152682fd87d660cb06931b65d7a402ccd332a21a assets/bloodmagic/models/item/ritualdivinerdusk.json -2722891c9c40b124d85bf9ff8eb885e175f5e6ff assets/bloodmagic/models/item/ritualstone.json -7f7c3f406430ca088c3993c1347c2219b287498e assets/bloodmagic/models/item/ritualtinkerer.json -db73abb3bcb1731b6fc389e3577910b6aab87b10 assets/bloodmagic/models/item/sacrificerune.json -7d0c46410e4e256bd88f9220cd3eaf948a4b715f assets/bloodmagic/models/item/sacrificialdagger.json -9a67ae7be820dca31446758377677cc2c906ab80 assets/bloodmagic/models/item/saltpeter.json -db66835b16edd296fe71a63a2f195ffdc9e97519 assets/bloodmagic/models/item/sand_hellforged.json -1e7fca5638c09e4c46f9e65854bc0316d8142361 assets/bloodmagic/models/item/sand_netherite.json -eb098783e91a17d07429d9006fb09bf056350e57 assets/bloodmagic/models/item/sanguinereverter.json -b6e98c7b1789654fe7ff559e95011c0a28c58bc1 assets/bloodmagic/models/item/seersigil.json -cc71421e98ee7ee047a4cfbb6cb69529c2b02d4e assets/bloodmagic/models/item/selfsacrificerune.json -7f0256ef2f219d92882e759677399050b0776d64 assets/bloodmagic/models/item/shaped_charge.json -6cc73920a09d4d6925154732f4064d8d03590f25 assets/bloodmagic/models/item/sigilofholding.json -ea5747638d0b5dcc03f008b202cc60a11e0827bb assets/bloodmagic/models/item/sigilofmagnetism.json -dd4a590f68820a04ca4a71df507e8a39ca6bd393 assets/bloodmagic/models/item/silk_touch_anointment.json -96eca80edd26a325bd65f325f4c3d651b1080912 assets/bloodmagic/models/item/slate_ampoule.json -08bee690d5092e3c9e6c04c43f50af668fdb3b7e assets/bloodmagic/models/item/slate_vial.json -dd4a590f68820a04ca4a71df507e8a39ca6bd393 assets/bloodmagic/models/item/smelting_anointment.json -db0f63198089161b8d4ecfb1ec8a45f7dc5ba83d assets/bloodmagic/models/item/soulaxe.json -9ec68a2dcf04b987c3c5d5c6c52195e3deccacbb assets/bloodmagic/models/item/soulgemcommon.json -6501bb4b72457e8107bec818f26de6178b655203 assets/bloodmagic/models/item/soulgemgreater.json -ad010d9680cd748bd04c8fc36262c236f7d90105 assets/bloodmagic/models/item/soulgemlesser.json -b49e7f34913e32ccb68eeb6f6c196ff6b209f482 assets/bloodmagic/models/item/soulgempetty.json -c873e91c70eef9ad4c39aeb2fe8b9aa16a26cccd assets/bloodmagic/models/item/soulpickaxe.json -5682770badd4dbc1ae533de0ce0f9a7cd0b2aeea assets/bloodmagic/models/item/soulscythe.json -bde2befafc97fd89a428dfa3f39fc970e9a3ae29 assets/bloodmagic/models/item/soulshovel.json -7b375670d1fa52a3585907d3e880863dbcc04b32 assets/bloodmagic/models/item/soulsnare.json -fe2b201007c974229509f6900c6eb8b03d158b0a assets/bloodmagic/models/item/soulsword.json -52d21027ac6fed000e77b5e8ad9102319b25cb33 assets/bloodmagic/models/item/speedrune.json -36e0914768c8b3eb3b80702280ca74bbd8546623 assets/bloodmagic/models/item/steadfastcrystal.json -6968a3d0c3bbeac8ea4cb2c050e28506e8938851 assets/bloodmagic/models/item/steadfastdemoncrystal.json -29009ca92dc30e1ec4ae1d454cd3f8726d8edc3c assets/bloodmagic/models/item/stonebrickpath.json -2dc28b0e2b7ae7bb0bcf8c8e74b9ba7c800446ff assets/bloodmagic/models/item/stonetilepath.json -1992b3655f7bbca8b7aac7c53f1a0e7b1ab3124d assets/bloodmagic/models/item/sulfur.json -451fa4812d23a207882eb95d89673b1e4c2dd257 assets/bloodmagic/models/item/throwing_dagger.json -4f4e6c72a160eb635bdf78ed0a6ba5765fbf51ea assets/bloodmagic/models/item/throwing_dagger_syringe.json -d13731c45f6dd23b8e70d2a75d4068bdae88ef5c assets/bloodmagic/models/item/upgradetome.json -e8fe01c5cddc268538681889f3161472a8f1c8ad assets/bloodmagic/models/item/variants/growthsigil_activated.json -20c802279de4df496057795c2e891fa54a21376f assets/bloodmagic/models/item/variants/growthsigil_deactivated.json -2778ea3a62ce6dd718a557beee7b5329bb185ff9 assets/bloodmagic/models/item/variants/icesigil_activated.json -11f5516cea8ac65bbb0f5958d6492170482ae8d8 assets/bloodmagic/models/item/variants/icesigil_deactivated.json -be3772fd711ccf4a2adfad122a8b39e8a36e874a assets/bloodmagic/models/item/variants/miningsigil_activated.json -7dec45f3167426d975564692a80196cdb3f4bdb4 assets/bloodmagic/models/item/variants/miningsigil_deactivated.json -9403d6195d4d38d5876c2a42f4edfb9bdcd05210 assets/bloodmagic/models/item/variants/sacrificialdagger.json -89ea1f760bac680b1baa98536d6bc407e347676e assets/bloodmagic/models/item/variants/sacrificialdagger_ceremonial.json -79c61e61656a934397c92626809c1869b0617fc3 assets/bloodmagic/models/item/variants/sigilofmagnetism_activated.json -129ace1f4a25f22bd09215603248a25adcf234e0 assets/bloodmagic/models/item/variants/sigilofmagnetism_deactivated.json -81e1cb0664f53f30ad195fc4330786b71db9e20c assets/bloodmagic/models/item/variants/soulaxe.json -2254b45194021cdd3fbc7d384d958b031a8e7cea assets/bloodmagic/models/item/variants/soulaxe_corrosive.json -c11750d01a720a1b0eca0610ec12cba0fef4d5da assets/bloodmagic/models/item/variants/soulaxe_destructive.json -368e428410c7c6d6bf444970221bb5ebe5f6bacd assets/bloodmagic/models/item/variants/soulaxe_steadfast.json -267875926ed261400a10371e044e9f54aafa637a assets/bloodmagic/models/item/variants/soulaxe_vengeful.json -cddaa2be8db3aff90933fb772b92cab735ebf11e assets/bloodmagic/models/item/variants/soulgemcommon.json -874aa708d02de2315e29033b2f67fd313edc8aff assets/bloodmagic/models/item/variants/soulgemcommon_corrosive.json -3ca3c4251a8907c1c47caf49e53a711265e0e92c assets/bloodmagic/models/item/variants/soulgemcommon_destructive.json -3ad2785d3e893943ea769c7e39d69cedd71e556a assets/bloodmagic/models/item/variants/soulgemcommon_steadfast.json -016ccdfb8a6e0101975e64f9f548e6a93d32f53c assets/bloodmagic/models/item/variants/soulgemcommon_vengeful.json -daef17113abd2003f745e069c1ccecc911445919 assets/bloodmagic/models/item/variants/soulgemgreater.json -73926de465b378adad07303f02a01c41c2f3656e assets/bloodmagic/models/item/variants/soulgemgreater_corrosive.json -1807f9b243e98c9ea43ac230ae211a324c82db79 assets/bloodmagic/models/item/variants/soulgemgreater_destructive.json -07c68e7574ef7d4db2e011e23c3bc20ad258daea assets/bloodmagic/models/item/variants/soulgemgreater_steadfast.json -3691ec7d9fedd3694feb1d6d387a9420e87ff8ce assets/bloodmagic/models/item/variants/soulgemgreater_vengeful.json -2b2322dfd3f7e28ea5d0ad2d9df2223d7ee47f00 assets/bloodmagic/models/item/variants/soulgemlesser.json -8eaab2fddfe201dc83d2d2ffd65e1537a3e5a388 assets/bloodmagic/models/item/variants/soulgemlesser_corrosive.json -24608fc7a19e41d71ec84a80c18ceccbc869cd79 assets/bloodmagic/models/item/variants/soulgemlesser_destructive.json -1ef6dd3ceed7f6ffd3e91283146fbe3f6db46d10 assets/bloodmagic/models/item/variants/soulgemlesser_steadfast.json -7801bda9366c21aad10137d30151ac4154acbea1 assets/bloodmagic/models/item/variants/soulgemlesser_vengeful.json -0b37376d07ecf8ff91df345435abd5d94d28714e assets/bloodmagic/models/item/variants/soulgempetty.json -fb9e51a933316daa4a99b6e6c9a2606dc354f0dc assets/bloodmagic/models/item/variants/soulgempetty_corrosive.json -0a15d2c90a8d139c1689579460379e5feefaddec assets/bloodmagic/models/item/variants/soulgempetty_destructive.json -a94516c3019969baa379f4a32d68736010cb473a assets/bloodmagic/models/item/variants/soulgempetty_steadfast.json -eabd2e88451ef42250e86c6675868b322aa0db92 assets/bloodmagic/models/item/variants/soulgempetty_vengeful.json -cebb0537b96480ac99314840a45107108b1bbc3a assets/bloodmagic/models/item/variants/soulpickaxe.json -2045e6593e80a11da9c60d0bdcef456503141232 assets/bloodmagic/models/item/variants/soulpickaxe_corrosive.json -37144adb7eb312c66a3567faeb3ece5aeef76e70 assets/bloodmagic/models/item/variants/soulpickaxe_destructive.json -e09d7927fdb84c372d36b290e3c69f728c922675 assets/bloodmagic/models/item/variants/soulpickaxe_steadfast.json -bec6cecf74db6a32fb5890b0596ddb7e2bf2daef assets/bloodmagic/models/item/variants/soulpickaxe_vengeful.json -a1fa69851bf9bb7022a25c0bef26fd44633616e2 assets/bloodmagic/models/item/variants/soulscythe.json -7c97bf4b12fc39cbe100d0e54e6b1b53a592c771 assets/bloodmagic/models/item/variants/soulscythe_corrosive.json -ad9c84341af3f0e90cdb206f39fbf4c2e589c52a assets/bloodmagic/models/item/variants/soulscythe_destructive.json -00b631dc41ee04264a91fe9a9e0b5660daf9fbc5 assets/bloodmagic/models/item/variants/soulscythe_steadfast.json -379922deb3b4e352763b335c01d4d66bfc531218 assets/bloodmagic/models/item/variants/soulscythe_vengeful.json -501142d1ff49eaf663e9a2044da17b8b5a25e361 assets/bloodmagic/models/item/variants/soulshovel.json -f65e2a2d4f0cae6c3dc986274c2dee0f1773cfb2 assets/bloodmagic/models/item/variants/soulshovel_corrosive.json -6c6b04b81358bb82b4d127fc621190dc2804fd45 assets/bloodmagic/models/item/variants/soulshovel_destructive.json -0e193ee2b27783f3d10461977c7d719be96af203 assets/bloodmagic/models/item/variants/soulshovel_steadfast.json -a8a7f03cc24f0d796e8868ace72f50ec4343dd5b assets/bloodmagic/models/item/variants/soulshovel_vengeful.json -0cd32e8e693d85b8a81e96ea305ffafb4a72e861 assets/bloodmagic/models/item/variants/soulsword_activated.json -60831276c8b0a5ecfa8e1a7beee6c5a4838cae69 assets/bloodmagic/models/item/variants/soulsword_corrosive_activated.json -792bb3a3e613808890cf0c31585318dc8e16891d assets/bloodmagic/models/item/variants/soulsword_corrosive_deactivated.json -ba7a7366b1471dd58b27b523bde130e39220fe01 assets/bloodmagic/models/item/variants/soulsword_deactivated.json -ef838be270d9d87651aec70c6b59197b01e48a6c assets/bloodmagic/models/item/variants/soulsword_destructive_activated.json -ec6f6bf7f520182b2044f3cc5a10f1d4c7a8d7ab assets/bloodmagic/models/item/variants/soulsword_destructive_deactivated.json -149f3e3049bd4f4ed559e56db79027bda9e8478e assets/bloodmagic/models/item/variants/soulsword_steadfast_activated.json -7d22fdba9bb8593c247a0b33df11f3b26a16c254 assets/bloodmagic/models/item/variants/soulsword_steadfast_deactivated.json -2029220112f89a3f4d432ab4749dff6143846659 assets/bloodmagic/models/item/variants/soulsword_vengeful_activated.json -0f5a3e1e5993a03ccda156eed855b71fbd0be0a2 assets/bloodmagic/models/item/variants/soulsword_vengeful_deactivated.json -81776d7be5f2d13e44622a6d38929821bc78ae7d assets/bloodmagic/models/item/veinmine_charge.json -16bde91467016c6012fe2b618c898d0340043492 assets/bloodmagic/models/item/vengefulcrystal.json -11e3347147e079093c4fa12018412071db22a4f5 assets/bloodmagic/models/item/vengefuldemoncrystal.json -9019dcd2f21b03e703ceeee1ea3199de72110268 assets/bloodmagic/models/item/voidsigil.json -a31019db55828cb937a071ac2f74b125a2d0c955 assets/bloodmagic/models/item/waterritualstone.json -23d5a97cb44909c470ea76833138cd187f13ba80 assets/bloodmagic/models/item/waterscribetool.json -bfa6dec13cc193bbe634c2c68b641f3897ccb342 assets/bloodmagic/models/item/watersigil.json -cb4eaa9292890e172b0f36a63605db0c973f735e assets/bloodmagic/models/item/weakbloodorb.json -46423c1325542ab0efad772e1aab52082d9ef636 assets/bloodmagic/models/item/weakbloodshard.json -6b16a94dcb06f31b7a92f250449ec42dbc3568aa assets/bloodmagic/models/item/will_power_anointment.json -c0907e611e09ccc924452070519006add21f3d12 assets/bloodmagic/models/item/woodbrickpath.json -1de444baa270a146dcd33c784b08f75a3d745421 assets/bloodmagic/models/item/woodtilepath.json -c8ea88c439c91d0eeee3e6204a3c50f8cfd36758 assets/bloodmagic/models/item/wornstonebrickpath.json -2d9dab8ebc036473d82eb044eb7a7bba0d0937a4 assets/bloodmagic/models/item/wornstonetilepath.json -273f8363ef906c87c67ae8aeb21a7d9d2834bbc6 data/bloodmagic/advancements/recipes/bloodmagictab/alchemy_table.json -e6a3ac3998653b10ee09780be9099a9d0c5b3917 data/bloodmagic/advancements/recipes/bloodmagictab/arc.json -08af21340e8457f43f7e5235790f58c2a67b9b3a data/bloodmagic/advancements/recipes/bloodmagictab/blood_altar.json -80cf1e0f026565be99279c46306b92be06bda65c data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_acceleration.json -f77e3947a24a252c04a80d1eb26547a3fbf868e7 data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_aug_capacity.json -f8b66411c96c6a7a409fb10f6888d078f1f8fa14 data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_blank.json -ab5612f33028487c08e51de4b91bb786df1b1b95 data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_capacity.json -e59e508cdbd51f62f83559edeb5f2a89226d7694 data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_charging.json -d707d48cc670ae65f224487a5012d5464c0a9760 data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_displacement.json -e897d6f91e2a0bd12b0da0a50e5c897294989e7c data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_orb.json -4a53004c651901cd1245de452810161736d9b067 data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_sacrifice.json -263f7c251d2f163db5bd229f2ab8a222f23ae03a data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_self_sacrifice.json -7ca400d1141ff4be1b529cd060950b42cf3b9bfb data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_speed.json -764e54fdaa24f87cceb815990bbbd2e2cd87f205 data/bloodmagic/advancements/recipes/bloodmagictab/bloodstonebrick.json -2e7ec285e758b06c2bd7d9fd93eedd96f511fa49 data/bloodmagic/advancements/recipes/bloodmagictab/corrupted_dust.json -f92c8a88a2c0ca63510d170c33f5eb2d1aee25ec data/bloodmagic/advancements/recipes/bloodmagictab/experience_tome.json -1b1dab3143eae33e25c4a14c011adec72768c9b5 data/bloodmagic/advancements/recipes/bloodmagictab/hellforged_block.json -a6f012d0584d36d9b7dd0ec4f9e4cbd2a3ff1146 data/bloodmagic/advancements/recipes/bloodmagictab/incense_altar.json -4c24af93a64071aadc0308b27bcbc44572e5ccfc data/bloodmagic/advancements/recipes/bloodmagictab/largebloodstonebrick.json -344567e6f5671131addcfebbd92d18e5cbd66ef5 data/bloodmagic/advancements/recipes/bloodmagictab/lava_crystal.json -d8ca7255f72a2ab6915552cdeb682ecc6efde03a data/bloodmagic/advancements/recipes/bloodmagictab/path/path_stone.json -1b85f9d2b823aef941158276b6f46bd8279cd693 data/bloodmagic/advancements/recipes/bloodmagictab/path/path_stonetile.json -f17f721149daf9246788be3235e5a6472155215a data/bloodmagic/advancements/recipes/bloodmagictab/path/path_wood.json -147ba38e68ca50e503ecf1ea96e85ce62c2dd86d data/bloodmagic/advancements/recipes/bloodmagictab/path/path_woodtile.json -ea0b32b5595661f0d09f68a8a596577cc62ba0b1 data/bloodmagic/advancements/recipes/bloodmagictab/path/path_wornstone.json -0dc717f46c2c6f36b58114df2bf5c82aadb104d2 data/bloodmagic/advancements/recipes/bloodmagictab/path/path_wornstonetile.json -091fbd276c5ad173716e9e7474fa278e742a662f data/bloodmagic/advancements/recipes/bloodmagictab/primitive_furnace_cell.json -7cf09fef1a5bfc1401ecc34857bdf78c7282c12a data/bloodmagic/advancements/recipes/bloodmagictab/primitive_hydration_cell.json -01e90bb9c59d44a52777ecc0cf28754295fda675 data/bloodmagic/advancements/recipes/bloodmagictab/ritual_diviner_0.json -836e1fc171dba197e02d6a9e3e61a3718cb5a482 data/bloodmagic/advancements/recipes/bloodmagictab/ritual_diviner_1.json -5deb91599f19a4f28e5b03c9fcb428d3f00a3644 data/bloodmagic/advancements/recipes/bloodmagictab/ritual_reader.json -c8e5cdac0e7328640ab1cb0eab0a46f0733b59b3 data/bloodmagic/advancements/recipes/bloodmagictab/ritual_stone_blank.json -1578416eb302aecb3fd61e481634c5c021541f51 data/bloodmagic/advancements/recipes/bloodmagictab/ritual_stone_master.json -832301a424345b7ca70b43cb214faa104179f0fb data/bloodmagic/advancements/recipes/bloodmagictab/sacrificial_dagger.json -b76943e5606d3cd4ec9933b533e0925499af5c65 data/bloodmagic/advancements/recipes/bloodmagictab/smelting/ingot_hellforged.json -766cf6a61f198a8426debb6f0c9f43e36193fc76 data/bloodmagic/advancements/recipes/bloodmagictab/soul_forge.json -1c751b044e5ce4d05746857d6cf5e812e94a4026 data/bloodmagic/advancements/recipes/misc/smelting/ingot_gold.json -af036dd1bd5193c2d36e7cb96c0a2b73a37b76ab data/bloodmagic/advancements/recipes/misc/smelting/ingot_iron.json -ab358377c93ecbdd790722d5e796df59095e79e1 data/bloodmagic/advancements/recipes/misc/smelting/ingot_netherite_scrap.json -639ebb2ccabb2eaece59be96c2e6f28c31f4d2f4 data/bloodmagic/loot_tables/blocks/accelerationrune.json -26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/airritualstone.json -1ed1f3cebe68450b6d5ca3ce69e4728a7d250b1c data/bloodmagic/loot_tables/blocks/alchemicalreactionchamber.json -443550be9eaf1021b11fd2bbe6afcfe2cee6f7ad data/bloodmagic/loot_tables/blocks/alchemyarray.json -c92a9f2a90f2c17933f89832899c295cde1f194d data/bloodmagic/loot_tables/blocks/alchemytable.json -17d8dcc62320d5d2eeb781e925963d9b9d5eec54 data/bloodmagic/loot_tables/blocks/altar.json -05bb6268d7e884c962061a632e162d5baf73271e data/bloodmagic/loot_tables/blocks/altarcapacityrune.json -87d44fa5143733864c12608443d11744b91e0496 data/bloodmagic/loot_tables/blocks/bettercapacityrune.json -867d0fa555de94140215d9edb7cd7ae533bbc619 data/bloodmagic/loot_tables/blocks/blankrune.json -f1a8e3131d85077665563372cad868534a72fb31 data/bloodmagic/loot_tables/blocks/bloodlight.json -f0827ad5bf71c06a71f50aeb0298c04d0cb1a1d9 data/bloodmagic/loot_tables/blocks/bloodstonebrick.json -779b809a2a51e6dab46f9e6799249f2f14653ebb data/bloodmagic/loot_tables/blocks/chargingrune.json -0d501e4eb447e84b38250ab1c396abe1218d129c data/bloodmagic/loot_tables/blocks/corrosivedemoncrystal.json -e59c93dcc8d42b3ddb71dad1695573b1c284213f data/bloodmagic/loot_tables/blocks/creeping_doubt.json -794eab6d989fe113f797835fa6a2f7ead5bfbd38 data/bloodmagic/loot_tables/blocks/deforester_charge.json -4c9ed83e7e7215f995df35054e96d2f4e5027016 data/bloodmagic/loot_tables/blocks/demoncrucible.json -c590b923d28b3d7916932dfcb05091df815f71dd data/bloodmagic/loot_tables/blocks/demoncrystallizer.json -b0ce964c69f63aa13350259279e5fe831ae18e2c data/bloodmagic/loot_tables/blocks/destructivedemoncrystal.json -a9fcfc656fab957328c10ee1d9d33807e697b7f7 data/bloodmagic/loot_tables/blocks/dislocationrune.json -e39c50638d466bf706327f52fd42c915e2990d7e data/bloodmagic/loot_tables/blocks/dungeon_brick1.json -be050ff812ae62793e3c51d7c2ab343294ede7f0 data/bloodmagic/loot_tables/blocks/dungeon_brick2.json -75252b630d7e0cf77db12125844283949ee94226 data/bloodmagic/loot_tables/blocks/dungeon_brick3.json -607d6e286ff2280686f258a931341aeed5334781 data/bloodmagic/loot_tables/blocks/dungeon_brick_assorted.json -03410080009911badbf6458a54b596bee464cbe4 data/bloodmagic/loot_tables/blocks/dungeon_brick_gate.json -0d30aeb91425e2419abf555e9baab34475f45afc data/bloodmagic/loot_tables/blocks/dungeon_brick_stairs.json -fa335aded871280065ca02db79d6de59ced7f6c9 data/bloodmagic/loot_tables/blocks/dungeon_brick_wall.json -47baa958866616d96eb39e2671a4cf488e0abae2 data/bloodmagic/loot_tables/blocks/dungeon_eye.json -055aa396cd80393d84ed340692be62f74ecb6ffc data/bloodmagic/loot_tables/blocks/dungeon_metal.json -234675dab5d5ff7e1fec0e13cede1f141811fc92 data/bloodmagic/loot_tables/blocks/dungeon_ore.json -53864c213b973e67006cda4596877bcdd3474396 data/bloodmagic/loot_tables/blocks/dungeon_pillar_cap.json -db8be3b67639ab451d0a28e0674240094ceea046 data/bloodmagic/loot_tables/blocks/dungeon_pillar_center.json -c3deab4dd4ef8c1cf6f217d660ea07e5d7bd8555 data/bloodmagic/loot_tables/blocks/dungeon_pillar_special.json -32d9f0674d7d416a5d668af187b89caede4188a3 data/bloodmagic/loot_tables/blocks/dungeon_polished.json -dc0822572a66634163dd630797b1b90d98d47c22 data/bloodmagic/loot_tables/blocks/dungeon_polished_gate.json -a44e605af1925a17a806c751f9f4279dbffa417f data/bloodmagic/loot_tables/blocks/dungeon_polished_stairs.json -d6f0610c923131dee1c8723231ffafd7a75eb689 data/bloodmagic/loot_tables/blocks/dungeon_polished_wall.json -e936d89fc5a75a786a455a32e9bce2f7b1bdcb34 data/bloodmagic/loot_tables/blocks/dungeon_smallbrick.json -b6732b30df9e946739a1913671a60f56090679f8 data/bloodmagic/loot_tables/blocks/dungeon_stone.json -69eb25424b97782eb86d9667581ada8d03e3b220 data/bloodmagic/loot_tables/blocks/dungeon_tile.json -6381473b6e0bc7c16b8214eb083f5069622b4dd1 data/bloodmagic/loot_tables/blocks/dungeon_tilespecial.json -26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/duskritualstone.json -26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/earthritualstone.json -2f27b244e5b3459408e9519dde05dc70cbb03998 data/bloodmagic/loot_tables/blocks/ethereal_mimic.json -26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/fireritualstone.json -70ecedd4cea1655ce9fe5b1d3f72796a5c0ff133 data/bloodmagic/loot_tables/blocks/fungal_charge.json -59dd54a876b7ccd0b6c90f409753c2af2d687f03 data/bloodmagic/loot_tables/blocks/incensealtar.json -462a82b07e7fe3e479a2c072c73507686c339346 data/bloodmagic/loot_tables/blocks/largebloodstonebrick.json -26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/lightritualstone.json -72610188b4538d98ffcd015c2813d63d19889d5f data/bloodmagic/loot_tables/blocks/masterritualstone.json -ce5bf03f0ee03205ef6a1b6f512cb5da23addc57 data/bloodmagic/loot_tables/blocks/mimic.json -842c4dce4e47561fe29d7b5c03d3953808ada929 data/bloodmagic/loot_tables/blocks/nether_soil.json -3892d33bbef90db50034b1358d4a9ee8b731bc8d data/bloodmagic/loot_tables/blocks/obsidianbrickpath.json -3576b2f9d92ab5bdc456cb904905fb5c969e55f3 data/bloodmagic/loot_tables/blocks/obsidiantilepath.json -95442c1bb740fab2eb8ee051f7184813f6023afa data/bloodmagic/loot_tables/blocks/orbcapacityrune.json -6c59e846922061c0f2249b0c73c3be89ec73ea31 data/bloodmagic/loot_tables/blocks/rawdemoncrystal.json -26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/ritualstone.json -e0239eff7762a414a4e4faa0158d844dffb8c1f6 data/bloodmagic/loot_tables/blocks/sacrificerune.json -9b697e37046b6238b3a19eae9113b88010ccff32 data/bloodmagic/loot_tables/blocks/selfsacrificerune.json -fce757b3f3b79758be0fba70e016b3bdb373814e data/bloodmagic/loot_tables/blocks/shaped_charge.json -f748a5ba8838b50de0502f132fe2a65f4726dae6 data/bloodmagic/loot_tables/blocks/soulforge.json -015e07226fd90935f7ec663f4bcf3873a57a82d1 data/bloodmagic/loot_tables/blocks/speedrune.json -128ec3ee93e927d457beeb8161e80706e9239760 data/bloodmagic/loot_tables/blocks/steadfastdemoncrystal.json -8849e41b699c2eb7c3712a8e862bd9dd309a5c31 data/bloodmagic/loot_tables/blocks/stonebrickpath.json -6149fd464bafaabf35ca431202680c84cf5441b1 data/bloodmagic/loot_tables/blocks/stonetilepath.json -10b636d364f9ff72eb6db34f6f5e6aca704fc621 data/bloodmagic/loot_tables/blocks/veinmine_charge.json -33a22d9b198c93ed07ac69b7a594bb08db64b239 data/bloodmagic/loot_tables/blocks/vengefuldemoncrystal.json -26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/waterritualstone.json -04c5bc02383ddff04588af3a048ee3973e69666f data/bloodmagic/loot_tables/blocks/woodbrickpath.json -2c471cedf5e3e39610821766609646698d2b47e3 data/bloodmagic/loot_tables/blocks/woodtilepath.json -9ab0aac56f75e7811f9641a6a20ff8d9dd78876a data/bloodmagic/loot_tables/blocks/wornstonebrickpath.json -4a7395079f874ae08af94f64a8a00211a56e906a data/bloodmagic/loot_tables/blocks/wornstonetilepath.json -c95cd70b7ca320e18618c07827add555984b0e45 data/bloodmagic/loot_tables/test.json -966981b01944985f1fe5cfa72b21c9ceeebd9cc4 data/bloodmagic/recipes/alchemy_table.json -6e508e442b24c2a0e3f85026277c199cc0deada0 data/bloodmagic/recipes/alchemytable/arcane_ash.json -a343604b5a75e1b3810df97d024813fb041cffb6 data/bloodmagic/recipes/alchemytable/basic_cutting_fluid.json -cc28a48ec4b21be99c4ec13f6e560c322012192c data/bloodmagic/recipes/alchemytable/bow_power_anointment.json -6a93bcd65cf2636fc684276777f56630f82d710c data/bloodmagic/recipes/alchemytable/bread.json -e50009fa724173c2dcb4fab49b4f029039f69bf8 data/bloodmagic/recipes/alchemytable/clay_from_sand.json -72f8d4afe57970d3969a9373b18f8eac86b245bc data/bloodmagic/recipes/alchemytable/cobweb.json -96cc66cdb9c5f786eaa899e1fbdd38144e44a0fe data/bloodmagic/recipes/alchemytable/explosive_powder.json -1fa964af556af521d8eaf1a686befdd9d69c63af data/bloodmagic/recipes/alchemytable/flint_from_gravel.json -90b9431139014864558e96916eb835105f3b5a2f data/bloodmagic/recipes/alchemytable/fortune_anointment.json -7b4b20c316a4c2e533d8a123025a4424ea808142 data/bloodmagic/recipes/alchemytable/gold_ore_from_gilded.json -aff95e4322f9e8daaffc2337964f95ab6f9d631c data/bloodmagic/recipes/alchemytable/grass_block.json -540edca1f507d366e55887b4429a9952c00f4060 data/bloodmagic/recipes/alchemytable/gunpowder.json -9f1b37b59f8abbe419306b3eb8af59317a54483a data/bloodmagic/recipes/alchemytable/hidden_knowledge_anointment.json -566352daaa6e6803df68475d964108b3f89cebd2 data/bloodmagic/recipes/alchemytable/holy_water_anointment.json -0657a60976678fdfbdf0b8ee2c178502520d194a data/bloodmagic/recipes/alchemytable/leather_from_flesh.json -c42ae24ad8955d8cf0a1f1096b0bca37d55621cf data/bloodmagic/recipes/alchemytable/looting_anointment.json -93620eaad39a46a97f3381ff5c645e59d7dddd16 data/bloodmagic/recipes/alchemytable/melee_damage_anointment.json -b18dde32d8a428f44437c0e53e5fdb990597498d data/bloodmagic/recipes/alchemytable/nether_wart_from_block.json -0a5ce0f2d09a596fb47b27a60e66eceeb04e0b0d data/bloodmagic/recipes/alchemytable/plantoil_from_beets.json -f1fd76dab242882e327b4677b95328cb3a52deee data/bloodmagic/recipes/alchemytable/plantoil_from_carrots.json -e9f5a06e4800cb03cc13480db9fdb7b9fa47f487 data/bloodmagic/recipes/alchemytable/plantoil_from_taters.json -f41e9bf8376ffcad07752b5657e27e06e500be0a data/bloodmagic/recipes/alchemytable/plantoil_from_wheat.json -6230b36712a5b6d239ec35b85e7fda0917ca7bc2 data/bloodmagic/recipes/alchemytable/quick_draw_anointment.json -eb8f2ef0c592ba022190d727eec69d73b7437bac data/bloodmagic/recipes/alchemytable/reagent_air.json -755960529025fecd187cae962dc76988c1d52c8e data/bloodmagic/recipes/alchemytable/reagent_binding.json -47a4511054bd10454302a6b41eecfac942d27864 data/bloodmagic/recipes/alchemytable/reagent_blood_light.json -e50bf64f33ac29e704f553ef465c2631c1857777 data/bloodmagic/recipes/alchemytable/reagent_fastminer.json -00d41617bb2e67cdfcfcd87c3bb931726bd37e13 data/bloodmagic/recipes/alchemytable/reagent_growth.json -2c613ba6d23fb3a133963e48134893ac7e404042 data/bloodmagic/recipes/alchemytable/reagent_holding.json -e06d24e618d3f2f17cb34a79ac630bd81c85dc45 data/bloodmagic/recipes/alchemytable/reagent_lava.json -41969af0a92baece82c53a779f2e71aec71fe0cb data/bloodmagic/recipes/alchemytable/reagent_magnetism.json -cb5b17173d9f6b7dad40a59aa920f47601e1304e data/bloodmagic/recipes/alchemytable/reagent_sight.json -1f19c4b4070c9e519c83fc624cb401503d8178cb data/bloodmagic/recipes/alchemytable/reagent_void.json -ef693cd04a08d89990ec8bb2620ff5e7efc353fc data/bloodmagic/recipes/alchemytable/reagent_water.json -842713a090b5abf3ce967dbee90d7582f7414949 data/bloodmagic/recipes/alchemytable/sand_coal.json -9292733697eca52de2c2ac7325ba45ab0354bfa3 data/bloodmagic/recipes/alchemytable/sand_gold.json -06f00cce47e0d5e5d25a2587796494340f8a3278 data/bloodmagic/recipes/alchemytable/sand_iron.json -3e3359b89a8c38c0fdeb2b4ca2920bce053082f8 data/bloodmagic/recipes/alchemytable/silk_touch_anointment.json -f7e91d164ea5c782420ff3507a98da16c5915b73 data/bloodmagic/recipes/alchemytable/slate_vial.json -4158f21d795aeeec52cfdec718ba9f82b0f2d10d data/bloodmagic/recipes/alchemytable/smelting_anointment.json -a91e81c79959b522bcd1bac901bca646184015de data/bloodmagic/recipes/alchemytable/string.json -3c9d829f7bff8a4d607c46fc3ff4f86dffa28fd5 data/bloodmagic/recipes/altar/air_tool.json -f41b0e9dfab608c42a85c3c5c5bbc050b03f02a1 data/bloodmagic/recipes/altar/apprenticebloodorb.json -2269c03d8ba4b790fb6a30c32bdb0169c283e5e2 data/bloodmagic/recipes/altar/bucket_life.json -2a67e37497a571b5ee944375d315fddccea87697 data/bloodmagic/recipes/altar/daggerofsacrifice.json -c5a4a256a7437f2e13c574a6f0c4d75fc2e718cb data/bloodmagic/recipes/altar/demonicslate.json -d79a96eb3eed597f1c18a8983764a6362a24748c data/bloodmagic/recipes/altar/dusk_tool.json -7272cdd4e1469cf83849e5444b4b93a7563a6bf2 data/bloodmagic/recipes/altar/earth_tool.json -37913b1babf9b8159332db09b114c919b1b49473 data/bloodmagic/recipes/altar/fire_tool.json -9aeb0d2d33d839eedb2d9bbdaf76fc73e0b39941 data/bloodmagic/recipes/altar/imbuedslate.json -2643d1516f6dae79128fdc8c48c4cfe23453f171 data/bloodmagic/recipes/altar/magicianbloodorb.json -5996888ae6e4ae9afc86a5d629a729d624fc4372 data/bloodmagic/recipes/altar/masterbloodorb.json -30d84c946ad9235f6e59f1046edbe8d44acc799e data/bloodmagic/recipes/altar/reinforcedslate.json -584d01dff4d64bb88bd3783751a29723700f1728 data/bloodmagic/recipes/altar/slate.json -5e6289a1c8deb414202bba0f16fc09f9fdf7add0 data/bloodmagic/recipes/altar/soul_snare.json -926d4a0e165c87a15a609744d832d2f5f04a40d0 data/bloodmagic/recipes/altar/water_tool.json -dd59da50b674ec8f680e01a91261bf34091075cf data/bloodmagic/recipes/altar/weakbloodorb.json -5807b2515f4a2dc9855327940e6055f6947f0749 data/bloodmagic/recipes/arc.json -f35bb47d609201f6568b598307ae9d157792fe3e data/bloodmagic/recipes/arc/clay_from_sand.json -6b8ba1822bac8a1af426a14f87d613dc89e3fca0 data/bloodmagic/recipes/arc/clay_from_terracotta.json -5206a65f02d3bea5c23164325eb23ce8e928102f data/bloodmagic/recipes/arc/dustsfrom_gravel_gold.json -5af6c601a7be4c0fc4811befa59324c1a2cdb758 data/bloodmagic/recipes/arc/dustsfrom_gravel_iron.json -6f3f5d2f3054d61a3965b10bcebc8cefe107cf5f data/bloodmagic/recipes/arc/dustsfrom_gravel_netherite_scrap.json -b5d3a7ee94494665a9e69519da43a0d4056deb76 data/bloodmagic/recipes/arc/dustsfrom_ingot_gold.json -a31e17fb2da1259fb186cfd07c9cd500e6354518 data/bloodmagic/recipes/arc/dustsfrom_ingot_iron.json -b9dc41ad0d9ee6035084a8e9a8eb920223817d33 data/bloodmagic/recipes/arc/dustsfrom_ingot_netherite_scrap.json -e0846e670dc94334ba695d2a1182527a5016cd31 data/bloodmagic/recipes/arc/dustsfrom_ore_gold.json -855c963531471cedd2f5f067801b96c0bd6a0c56 data/bloodmagic/recipes/arc/dustsfrom_ore_iron.json -e410be937d52aea0f186aa14fa9b2929a98ffaf3 data/bloodmagic/recipes/arc/dustsfrom_ore_netherite_scrap.json -517a3b7a6bbfc486777f509c2d9af6490ff722c9 data/bloodmagic/recipes/arc/fragmentsgold.json -d8b9e64d14e67299aa08888246cdead76ebd91ce data/bloodmagic/recipes/arc/fragmentsiron.json -ec54b6d447bf5709b15d7bccb9c7d0790661f621 data/bloodmagic/recipes/arc/fragmentsnetherite_scrap.json -0275b4a539ccac64818c19bcb5351408eea9d193 data/bloodmagic/recipes/arc/gravelsgold.json -32b0aeab82c1d98b86b162e98036b2591ccf649c data/bloodmagic/recipes/arc/gravelsiron.json -f83ad96ea74fd51f1fd78ee40ff0fbeb08755b12 data/bloodmagic/recipes/arc/gravelsnetherite_scrap.json -2eb26a1af68ed7a5fdb6ac9d4bbc7557729c56cd data/bloodmagic/recipes/arc/netherrack_to_sulfer.json -0a6a8034c55d093fed458759bbc85e5893712d35 data/bloodmagic/recipes/arc/ore/dustgold.json -b2760564e300976d88a3938bc0e9e2d2defa0841 data/bloodmagic/recipes/arc/ore/dustiron.json -249229687c1b41a4191c455278624b642b501b4e data/bloodmagic/recipes/arc/reversion/apprentice_blood_orb.json -a2b7d868ac099dd6fb29fa54892aad90e29d028d data/bloodmagic/recipes/arc/reversion/magician_blood_orb.json -a7f51456052d0fd317164d400cdd595ae2687df8 data/bloodmagic/recipes/arc/reversion/master_blood_orb.json -8d9d66d63e21cc8a6f02fac2111f5d169c8542ff data/bloodmagic/recipes/arc/reversion/weak_blood_orb.json -1e5814caf63714b8e1ff2b2f413a86ba8c840ebb data/bloodmagic/recipes/arc/weakbloodshard.json -e1285ec51100f2336c1ea1a1a3057e74a0dd84d1 data/bloodmagic/recipes/array/airsigil.json -d1ac23080f72f21adb5908befefe965ffb4efd4f data/bloodmagic/recipes/array/bloodlightsigil.json -f6b6c72c0a2d6b3e602976f0dd2dfa778be41777 data/bloodmagic/recipes/array/bounce.json -7110895fe75e65404bc66d6c09087d9e58220a11 data/bloodmagic/recipes/array/day.json -1890706e5b93cd6df764b0419483c348e0d7f277 data/bloodmagic/recipes/array/divinationsigil.json -4bd220ced486f1d8fc4468ebd61dac755670d716 data/bloodmagic/recipes/array/fastminersigil.json -d9ae32c70d4bd872f22229006ad3c8e0cf7e3721 data/bloodmagic/recipes/array/grove.json -f191a3c9982b827b0b2ba93164a81fc4f8cb0959 data/bloodmagic/recipes/array/growthsigil.json -4452b681c328ed01ec680b6b68cb2a0aee11ed3d data/bloodmagic/recipes/array/holdingsigil.json -78c880321f0bfad14239d4b9d2edae170a7fa86e data/bloodmagic/recipes/array/lavasigil.json -165f8f8ba7ae094cdd1367716a0797a0f8d4d605 data/bloodmagic/recipes/array/living_boots.json -1de17e8a769d471c934835955184d0c8782fb619 data/bloodmagic/recipes/array/living_helmet.json -4a48885f110a87505381c7e2f2607d30612a3604 data/bloodmagic/recipes/array/living_leggings.json -5e3c6dd7bfcd16e79f17e963d8c1b59c0d1aebe9 data/bloodmagic/recipes/array/living_plate.json -8b1007de1b7fca5d27b54d7c9839cde9e47ab1c0 data/bloodmagic/recipes/array/magnetismsigil.json -7a674784e0d8d4f6f071a72d26ba677087976970 data/bloodmagic/recipes/array/movement.json -5c208259e33c3a56c5d6f6ab951ac0c4d5b60e26 data/bloodmagic/recipes/array/night.json -6fd91801759c6a7a018b9d18601fc3db4d3ee3b4 data/bloodmagic/recipes/array/seersigil.json -1921cc1cba3bcc36a6be6edd377dd44eb9b884a0 data/bloodmagic/recipes/array/spike.json -085bf564ec74060e5c0224155cefc6ba0635c2c8 data/bloodmagic/recipes/array/updraft.json -cabe693e7c714203ad708a1068f302b3ee3120b0 data/bloodmagic/recipes/array/voidsigil.json -5e68d933fff631142a8dd819aee235d343d43cff data/bloodmagic/recipes/array/watersigil.json -ac895b8c95ca10d61ae6efedfe5815b980588433 data/bloodmagic/recipes/blood_altar.json -f4de3cfc4616f762b4a87b08510153ae06733528 data/bloodmagic/recipes/blood_rune_acceleration.json -78e3f4666bc13897821abec9fa41e8b72accd007 data/bloodmagic/recipes/blood_rune_aug_capacity.json -2f31d0108cdb0cca056405023bd0ac64b6c02524 data/bloodmagic/recipes/blood_rune_blank.json -5c4e4af372250a3f967666f0f97198547cfbd5e1 data/bloodmagic/recipes/blood_rune_capacity.json -f905c1a8ca4d3a9f841ca6c44caa91de327fc29d data/bloodmagic/recipes/blood_rune_charging.json -ac0ee73ab691edd09be24453bd3fe3dc1a8f1ecb data/bloodmagic/recipes/blood_rune_displacement.json -89563d5c176d465632a45005cbe5e570791fd8dd data/bloodmagic/recipes/blood_rune_orb.json -b63d77c3762f86d4a91f62e192c3e9b26e3b52ca data/bloodmagic/recipes/blood_rune_sacrifice.json -7c4e247c1df6ef594bbb2fc2196afb102f45982b data/bloodmagic/recipes/blood_rune_self_sacrifice.json -e2bcf2a6f951fbcef45554ec90ba28d14e261d18 data/bloodmagic/recipes/blood_rune_speed.json -eeb5e64b8bc90adc2554dde88b8792b92ad7c8cc data/bloodmagic/recipes/bloodstonebrick.json -68e9201ef0d0051618a73434b35791a208bacde1 data/bloodmagic/recipes/corrupted_dust.json -ab11cf6806dab2a2d1cda2f7fde9cd2ecd9cdf9f data/bloodmagic/recipes/experience_tome.json -84aeee900c15d94f1940e72c8f331755d0a97b11 data/bloodmagic/recipes/hellforged_block.json -9a5749465020b32b0147b3367784ce31a0d3b54b data/bloodmagic/recipes/incense_altar.json -63bca28ba5eebb9c488c819bcb117595eadb877d data/bloodmagic/recipes/largebloodstonebrick.json -9dedad36e9d2ab6688e069c2e6df3851c395b583 data/bloodmagic/recipes/lava_crystal.json -50d84717ac673875e4b52522b583f564a8a75e8e data/bloodmagic/recipes/path/path_stone.json -2756ff3f29e1231795671c94fdaf9e5abc65bbee data/bloodmagic/recipes/path/path_stonetile.json -dcb702aeb768bc0ff5d1f05c5ac95066c4082193 data/bloodmagic/recipes/path/path_wood.json -7491b9f62c29d2fde6ff1dbff09f16f458b9afe8 data/bloodmagic/recipes/path/path_woodtile.json -d85f637e3c87ba050c24581b8f4bef4176e1ba14 data/bloodmagic/recipes/path/path_wornstone.json -2ee3e7f073df764289939b8df814cc8f056eced0 data/bloodmagic/recipes/path/path_wornstonetile.json -0b1a11f0e1b6bc317e2dbf04560a81581623f41e data/bloodmagic/recipes/primitive_furnace_cell.json -7e1a70935e9b5ba6b345af6a7077287896ec6cfe data/bloodmagic/recipes/primitive_hydration_cell.json -bfd7925ad30534463d7daf0f7dce03cf1502cbcf data/bloodmagic/recipes/ritual_diviner_0.json -2ec436681cdd169bae99d090bb889c2a45420b6c data/bloodmagic/recipes/ritual_diviner_1.json -18accae45d6c592b108c227c629caf15e430bf2b data/bloodmagic/recipes/ritual_reader.json -7757e5fd52f71b0d21595e072593fc592210dd64 data/bloodmagic/recipes/ritual_stone_blank.json -8608f828f997b1a8015287bd9cd436e9d7dff2ff data/bloodmagic/recipes/ritual_stone_master.json -aefbf1fd258f1cda8d04db7e0794b9612993e6bf data/bloodmagic/recipes/sacrificial_dagger.json -1eab0535b38c4a8a021a72244b9e6a75353970f0 data/bloodmagic/recipes/smelting/ingot_gold.json -b644726cea2da0626f33b60fbc64701f26d48561 data/bloodmagic/recipes/smelting/ingot_hellforged.json -477f968ee84a5b9cd3e9c2a9864be32b5e7d3a32 data/bloodmagic/recipes/smelting/ingot_iron.json -06855bcd8951355604ab1e63b5db717382430967 data/bloodmagic/recipes/smelting/ingot_netherite_scrap.json -d4ee90b52934c7c530fb031dcf81d4f1ccb27a9b data/bloodmagic/recipes/soul_forge.json -8b64af8453c60b6b1ae55bd0dd1a68fe95e8ba19 data/bloodmagic/recipes/soulforge/commontartaricgem.json -659db62f8fb71c792b00d6409b1c9a2f1ca96048 data/bloodmagic/recipes/soulforge/corrosive_crystal_block.json -5ad148899ed46134ae0572b220736b9d38004980 data/bloodmagic/recipes/soulforge/deforester_charge.json -26d7fb7f868bcc96ce268adccead7207d5559afb data/bloodmagic/recipes/soulforge/deforester_charge_fortune_1.json -40ae097cd8b3c0dcd38f7032d928acdb71da13da data/bloodmagic/recipes/soulforge/deforester_charge_silk_touch.json -bd63ccb772c829a4a50df17f06a641353dc3b98e data/bloodmagic/recipes/soulforge/deforester_charge_smelting.json -2c90f1da43a79e61d2b6b09c012d08f53b133264 data/bloodmagic/recipes/soulforge/demon_crucible.json -bc4ad3b44720a3f7363ef53027b4aae35622e7c1 data/bloodmagic/recipes/soulforge/demon_crystallizer.json -759279a190f3bc74e162dedf0f5d311267e06fbc data/bloodmagic/recipes/soulforge/destructive_crystal_block.json -78f0e3dc5fa61d8f9c182a3608184f21925f79db data/bloodmagic/recipes/soulforge/fungal_charge.json -61003f9b47ae96e5bccd518d514ef2532ce6e028 data/bloodmagic/recipes/soulforge/fungal_charge_fortune_1.json -9f7efc88c863110e6253b8877eee93c2e6533090 data/bloodmagic/recipes/soulforge/fungal_charge_silk_touch.json -a625c60e99970a93cb188e17579bcb958890d7a9 data/bloodmagic/recipes/soulforge/fungal_charge_smelting.json -0b82d2354aaa635b4fe5514e4815298ee0dedf80 data/bloodmagic/recipes/soulforge/greatertartaricgem.json -d46b61779b3c8382862d4e66c3909a1241ecca18 data/bloodmagic/recipes/soulforge/lessertartaricgem.json -d6e06747c75fc06e708a15358911f1c63eee86b1 data/bloodmagic/recipes/soulforge/pettytartaricgem.json -2468dd785e301732b1be8108caa468bdd5008e46 data/bloodmagic/recipes/soulforge/primitive_crystalline_resonator.json -535a9ec33a425bde205dffc3254635741d1c82d6 data/bloodmagic/recipes/soulforge/raw_crystal_block.json -4a4340f334c51beaacb77fd201298ad94b71e79c data/bloodmagic/recipes/soulforge/sanguine_reverter.json -799c9b83373966f70bbd6777cdae0ff2ff89fd84 data/bloodmagic/recipes/soulforge/sentientaxe.json -6d94372ffffbe36ca91ed2a5e46991bff896726c data/bloodmagic/recipes/soulforge/sentientpickaxe.json -6b47831e5c2f3033b6706706d810fa96d8abebd6 data/bloodmagic/recipes/soulforge/sentientscythe.json -6dcced40126f950b85f868aa04c77e90b71b69f2 data/bloodmagic/recipes/soulforge/sentientshovel.json -7e281841a2953c1284d332c2bbf75097f8128241 data/bloodmagic/recipes/soulforge/sentientsword.json -dc977e9d98fcba66fbcce3f6c31a746db5ed60f5 data/bloodmagic/recipes/soulforge/shaped_charge.json -865cac49dd9604f35577aa6cfd2756946b49b8b1 data/bloodmagic/recipes/soulforge/shaped_charge_fortune_1.json -83b9b038785f449e4948cf17f8fa35457c24a3cb data/bloodmagic/recipes/soulforge/shaped_charge_silk_touch.json -7417c0ad20f4c23a7fed958f658e6dc96720ec60 data/bloodmagic/recipes/soulforge/shaped_charge_smelting.json -c4102a1573e632d0b9f894353b0d522a51a7c65e data/bloodmagic/recipes/soulforge/steadfast_crystal_block.json -ed0875aaba76e013684b8ea2f8275d5563e90e98 data/bloodmagic/recipes/soulforge/throwing_dagger.json -b081dbc0865421df6a591366393ffdbceb205907 data/bloodmagic/recipes/soulforge/throwing_dagger_syringe.json -978033adf58e34fa317bcea448ac1ddf3f0cd69e data/bloodmagic/recipes/soulforge/vein_charge.json -a06bb2d29cfa5d9c38092e93196bed7f331bcc97 data/bloodmagic/recipes/soulforge/vein_charge_fortune_1.json -29a712f5e12e1702f6221c4c8918ba37299edd7c data/bloodmagic/recipes/soulforge/vein_charge_silk_touch.json -911023ba84eed7836875793a21c32a83755760d3 data/bloodmagic/recipes/soulforge/vein_charge_smelting.json -3aa852edda803a2225ebe53d2daa55bd46b0a1b9 data/bloodmagic/recipes/soulforge/vengeful_crystal_block.json -d7d993bb729284a5201c164ea81fbe1d8e4e4750 data/bloodmagic/recipes/weak_activation_crystal.json -cf63fdccec992f2cb36c72843791623463cecc44 data/bloodmagic/tags/items/arc/cuttingfluid.json -54a0fcc973590c80a4d3cd6b82f5602ba7208438 data/bloodmagic/tags/items/arc/explosive.json -331b978ba851ae3c48390c5d992bcd5f28ac644d data/bloodmagic/tags/items/arc/furnace.json -a62b82e1f59284d230b4b983ffa4a4cecb288c0e data/bloodmagic/tags/items/arc/hydrate.json -9689738644fcfa3a80effc6ee150b67c67e8b8f4 data/bloodmagic/tags/items/arc/resonator.json -65326040c8974fcfcc8711d29040b4297ff55ec1 data/bloodmagic/tags/items/arc/reverter.json -14fb88c612622be110e273818eee9512cd285d56 data/bloodmagic/tags/items/arc/sieve.json -bcd2befe59cbb4931c8c9bed183d19b2a469e506 data/bloodmagic/tags/items/arc/tool.json -2bdc1397bd092d373f785f08a2befdce8c1c1e2e data/bloodmagic/tags/items/crystals/demon.json -dab44ece8bcdf079b349fc4f49da67aafe9c4cf7 data/bloodmagic/tags/items/dusts/corrupted.json -dc8d6f8f8d128499f3d2632ef1bc353cc49d1ddb data/bloodmagic/tags/items/fragments/gold.json -a60c7b779168689387a03f00002bfd8380d919e5 data/bloodmagic/tags/items/fragments/iron.json -590aab8d5f5a4ed18dd211865e917674dcabfea0 data/bloodmagic/tags/items/fragments/netherite_scrap.json -af9b1a9ba1b16a85e3e1cf84b99e4cc9e12f9886 data/bloodmagic/tags/items/gravels/gold.json -19547e1b8859f1e2f1ae858e74b4456fc20be53f data/bloodmagic/tags/items/gravels/iron.json -3597daeddb742612d0b7fe2d0f711251a2781ac2 data/bloodmagic/tags/items/gravels/netherite_scrap.json -04fdfff381183672d6d7b3e55ded42a0a5b89f16 data/bloodmagic/tags/items/tiny_dusts/corrupted.json -b7b3ffae086763317f5ed70a4f857e9634932972 data/forge/tags/fluids/life.json -4f8f46a7e30fe81d36790d3ffed37efef7c87d06 data/forge/tags/items/dusts/coal.json -82f2679934e550a1188658350e52cfac7c450c4d data/forge/tags/items/dusts/gold.json -205d57b4f622a13fceda5e8062d9bba80d619e92 data/forge/tags/items/dusts/hellforged.json -625a1e6a3b635b2ac5176a49afbae9b476de4f71 data/forge/tags/items/dusts/iron.json -05fbe38ee5bdb3d912a5980254886ad64399e062 data/forge/tags/items/dusts/netherite_scrap.json -9380fe45b06787ba776af4a7d542a047c1441031 data/forge/tags/items/dusts/saltpeter.json -5c709b6444acb94ca784c33618547ba535e15db2 data/forge/tags/items/dusts/sulfur.json -ca758f49ba878f8e498fe156d4916c1e332d552c data/forge/tags/items/ingots/hellforged.json -74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/forge/tags/items/ores/copper.json -74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/forge/tags/items/ores/lead.json -74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/forge/tags/items/ores/osmium.json -74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/forge/tags/items/ores/silver.json -74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/forge/tags/items/ores/tin.json -d348e6ef5f30db7c6c6ef2aac89c45e9c4c6fef7 data/minecraft/tags/blocks/mushroom_hyphae.json -95fd3a7b178a92c5aecdd097fec5359f14a06c13 data/minecraft/tags/blocks/mushroom_stem.json -2ba6f93ee0567360afa3ae9999027b839ed06532 data/minecraft/tags/blocks/walls.json -d348e6ef5f30db7c6c6ef2aac89c45e9c4c6fef7 data/minecraft/tags/items/mushroom_hyphae.json -95fd3a7b178a92c5aecdd097fec5359f14a06c13 data/minecraft/tags/items/mushroom_stem.json diff --git a/src/generated/resources/assets/bloodmagic/blockstates/accelerationrune.json b/src/generated/resources/assets/bloodmagic/blockstates/accelerationrune.json deleted file mode 100644 index dc97d5de..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/accelerationrune.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/accelerationrune" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/airritualstone.json b/src/generated/resources/assets/bloodmagic/blockstates/airritualstone.json deleted file mode 100644 index a64ce156..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/airritualstone.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/airritualstone" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/alchemicalreactionchamber.json b/src/generated/resources/assets/bloodmagic/blockstates/alchemicalreactionchamber.json deleted file mode 100644 index 05658c8b..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/alchemicalreactionchamber.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "variants": { - "facing=north,lit=false": { - "model": "bloodmagic:block/alchemicalreactionchamber" - }, - "facing=south,lit=false": { - "model": "bloodmagic:block/alchemicalreactionchamber", - "y": 180 - }, - "facing=west,lit=false": { - "model": "bloodmagic:block/alchemicalreactionchamber", - "y": 270 - }, - "facing=east,lit=false": { - "model": "bloodmagic:block/alchemicalreactionchamber", - "y": 90 - }, - "facing=north,lit=true": { - "model": "bloodmagic:block/alchemicalreactionchamber" - }, - "facing=south,lit=true": { - "model": "bloodmagic:block/alchemicalreactionchamber", - "y": 180 - }, - "facing=west,lit=true": { - "model": "bloodmagic:block/alchemicalreactionchamber", - "y": 270 - }, - "facing=east,lit=true": { - "model": "bloodmagic:block/alchemicalreactionchamber", - "y": 90 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/altarcapacityrune.json b/src/generated/resources/assets/bloodmagic/blockstates/altarcapacityrune.json deleted file mode 100644 index f5a088ea..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/altarcapacityrune.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/altarcapacityrune" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/bettercapacityrune.json b/src/generated/resources/assets/bloodmagic/blockstates/bettercapacityrune.json deleted file mode 100644 index ead6c945..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/bettercapacityrune.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/bettercapacityrune" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/blankrune.json b/src/generated/resources/assets/bloodmagic/blockstates/blankrune.json deleted file mode 100644 index d211f0a6..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/blankrune.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/blankrune" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/bloodlight.json b/src/generated/resources/assets/bloodmagic/blockstates/bloodlight.json deleted file mode 100644 index dfa612f0..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/bloodlight.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/bloodlight" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/bloodstonebrick.json b/src/generated/resources/assets/bloodmagic/blockstates/bloodstonebrick.json deleted file mode 100644 index 4bf17916..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/bloodstonebrick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/bloodstonebrick" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/chargingrune.json b/src/generated/resources/assets/bloodmagic/blockstates/chargingrune.json deleted file mode 100644 index 5c238290..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/chargingrune.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/chargingrune" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/corrosivedemoncrystal.json b/src/generated/resources/assets/bloodmagic/blockstates/corrosivedemoncrystal.json deleted file mode 100644 index fb67a253..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/corrosivedemoncrystal.json +++ /dev/null @@ -1,431 +0,0 @@ -{ - "multipart": [ - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal1", - "x": 180 - } - }, - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal1" - } - }, - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal1", - "x": 90 - } - }, - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal1", - "x": 270 - } - }, - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal1", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal1", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal2", - "x": 180 - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal2" - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal2", - "x": 90 - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal2", - "x": 270 - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal2", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal2", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal3", - "x": 180 - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal3" - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal3", - "x": 90 - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal3", - "x": 270 - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal3", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal3", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal4", - "x": 180 - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal4" - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal4", - "x": 90 - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal4", - "x": 270 - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal4", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal4", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "4|5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal5", - "x": 180 - } - }, - { - "when": { - "age": "4|5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal5" - } - }, - { - "when": { - "age": "4|5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal5", - "x": 90 - } - }, - { - "when": { - "age": "4|5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal5", - "x": 270 - } - }, - { - "when": { - "age": "4|5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal5", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "4|5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal5", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal6", - "x": 180 - } - }, - { - "when": { - "age": "5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal6" - } - }, - { - "when": { - "age": "5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal6", - "x": 90 - } - }, - { - "when": { - "age": "5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal6", - "x": 270 - } - }, - { - "when": { - "age": "5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal6", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal6", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal7", - "x": 180 - } - }, - { - "when": { - "age": "6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal7" - } - }, - { - "when": { - "age": "6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal7", - "x": 90 - } - }, - { - "when": { - "age": "6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal7", - "x": 270 - } - }, - { - "when": { - "age": "6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal7", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/corrosivecrystal7", - "x": 90, - "y": 90 - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/creeping_doubt.json b/src/generated/resources/assets/bloodmagic/blockstates/creeping_doubt.json deleted file mode 100644 index d7e819a0..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/creeping_doubt.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "variants": { - "age=0": { - "model": "bloodmagic:block/creeping_doubt_1" - }, - "age=1": { - "model": "bloodmagic:block/creeping_doubt_2" - }, - "age=2": { - "model": "bloodmagic:block/creeping_doubt_3" - }, - "age=3": { - "model": "bloodmagic:block/creeping_doubt_4" - }, - "age=4": { - "model": "bloodmagic:block/creeping_doubt_5" - }, - "age=5": { - "model": "bloodmagic:block/creeping_doubt_6" - }, - "age=6": { - "model": "bloodmagic:block/creeping_doubt_7" - }, - "age=7": { - "model": "bloodmagic:block/creeping_doubt_8" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/deforester_charge.json b/src/generated/resources/assets/bloodmagic/blockstates/deforester_charge.json deleted file mode 100644 index bac5692f..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/deforester_charge.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "variants": { - "attached=down": { - "model": "bloodmagic:block/deforester_charge", - "x": 180 - }, - "attached=up": { - "model": "bloodmagic:block/deforester_charge" - }, - "attached=north": { - "model": "bloodmagic:block/deforester_charge", - "x": 90 - }, - "attached=south": { - "model": "bloodmagic:block/deforester_charge", - "x": 270 - }, - "attached=west": { - "model": "bloodmagic:block/deforester_charge", - "x": 90, - "y": 270 - }, - "attached=east": { - "model": "bloodmagic:block/deforester_charge", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/destructivedemoncrystal.json b/src/generated/resources/assets/bloodmagic/blockstates/destructivedemoncrystal.json deleted file mode 100644 index b99a263f..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/destructivedemoncrystal.json +++ /dev/null @@ -1,431 +0,0 @@ -{ - "multipart": [ - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal1", - "x": 180 - } - }, - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal1" - } - }, - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal1", - "x": 90 - } - }, - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal1", - "x": 270 - } - }, - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal1", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal1", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal2", - "x": 180 - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal2" - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal2", - "x": 90 - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal2", - "x": 270 - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal2", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal2", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal3", - "x": 180 - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal3" - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal3", - "x": 90 - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal3", - "x": 270 - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal3", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal3", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal4", - "x": 180 - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal4" - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal4", - "x": 90 - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal4", - "x": 270 - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal4", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal4", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "4|5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal5", - "x": 180 - } - }, - { - "when": { - "age": "4|5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal5" - } - }, - { - "when": { - "age": "4|5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal5", - "x": 90 - } - }, - { - "when": { - "age": "4|5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal5", - "x": 270 - } - }, - { - "when": { - "age": "4|5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal5", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "4|5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal5", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal6", - "x": 180 - } - }, - { - "when": { - "age": "5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal6" - } - }, - { - "when": { - "age": "5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal6", - "x": 90 - } - }, - { - "when": { - "age": "5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal6", - "x": 270 - } - }, - { - "when": { - "age": "5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal6", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal6", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal7", - "x": 180 - } - }, - { - "when": { - "age": "6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal7" - } - }, - { - "when": { - "age": "6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal7", - "x": 90 - } - }, - { - "when": { - "age": "6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal7", - "x": 270 - } - }, - { - "when": { - "age": "6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal7", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/destructivecrystal7", - "x": 90, - "y": 90 - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dislocationrune.json b/src/generated/resources/assets/bloodmagic/blockstates/dislocationrune.json deleted file mode 100644 index e788f3d5..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/dislocationrune.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/dislocationrune" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick1.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick1.json deleted file mode 100644 index 149337cf..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick1.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/dungeon_brick1" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick2.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick2.json deleted file mode 100644 index 2be23091..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick2.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/dungeon_brick2" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick3.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick3.json deleted file mode 100644 index b5c84c5c..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick3.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/dungeon_brick3" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_assorted.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_assorted.json deleted file mode 100644 index 81dc572a..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_assorted.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "bloodmagic:block/dungeon_brick1" - }, - { - "model": "bloodmagic:block/dungeon_brick2" - }, - { - "model": "bloodmagic:block/dungeon_brick3" - } - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_gate.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_gate.json deleted file mode 100644 index 4dae3f78..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=north,in_wall=false,open=false": { - "model": "bloodmagic:block/dungeon_brick_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "bloodmagic:block/dungeon_brick_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "bloodmagic:block/dungeon_brick_gate", - "y": 90, - "uvlock": true - }, - "facing=east,in_wall=false,open=false": { - "model": "bloodmagic:block/dungeon_brick_gate", - "y": 270, - "uvlock": true - }, - "facing=north,in_wall=true,open=false": { - "model": "bloodmagic:block/dungeon_brick_gate_wall", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=true,open=false": { - "model": "bloodmagic:block/dungeon_brick_gate_wall", - "uvlock": true - }, - "facing=west,in_wall=true,open=false": { - "model": "bloodmagic:block/dungeon_brick_gate_wall", - "y": 90, - "uvlock": true - }, - "facing=east,in_wall=true,open=false": { - "model": "bloodmagic:block/dungeon_brick_gate_wall", - "y": 270, - "uvlock": true - }, - "facing=north,in_wall=false,open=true": { - "model": "bloodmagic:block/dungeon_brick_gate_open", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=true": { - "model": "bloodmagic:block/dungeon_brick_gate_open", - "uvlock": true - }, - "facing=west,in_wall=false,open=true": { - "model": "bloodmagic:block/dungeon_brick_gate_open", - "y": 90, - "uvlock": true - }, - "facing=east,in_wall=false,open=true": { - "model": "bloodmagic:block/dungeon_brick_gate_open", - "y": 270, - "uvlock": true - }, - "facing=north,in_wall=true,open=true": { - "model": "bloodmagic:block/dungeon_brick_gate_wall_open", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=true,open=true": { - "model": "bloodmagic:block/dungeon_brick_gate_wall_open", - "uvlock": true - }, - "facing=west,in_wall=true,open=true": { - "model": "bloodmagic:block/dungeon_brick_gate_wall_open", - "y": 90, - "uvlock": true - }, - "facing=east,in_wall=true,open=true": { - "model": "bloodmagic:block/dungeon_brick_gate_wall_open", - "y": 270, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_wall.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_wall.json deleted file mode 100644 index 9ffbb2d4..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_wall.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "multipart": [ - { - "when": { - "up": "true" - }, - "apply": { - "model": "bloodmagic:block/dungeon_brick_wall_post" - } - }, - { - "when": { - "east": "low" - }, - "apply": { - "model": "bloodmagic:block/dungeon_brick_wall_side", - "y": 90, - "uvlock": true - } - }, - { - "when": { - "east": "tall" - }, - "apply": { - "model": "bloodmagic:block/dungeon_brick_wall_side_tall", - "y": 90, - "uvlock": true - } - }, - { - "when": { - "north": "low" - }, - "apply": { - "model": "bloodmagic:block/dungeon_brick_wall_side", - "uvlock": true - } - }, - { - "when": { - "north": "tall" - }, - "apply": { - "model": "bloodmagic:block/dungeon_brick_wall_side_tall", - "uvlock": true - } - }, - { - "when": { - "south": "low" - }, - "apply": { - "model": "bloodmagic:block/dungeon_brick_wall_side", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "south": "tall" - }, - "apply": { - "model": "bloodmagic:block/dungeon_brick_wall_side_tall", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "low" - }, - "apply": { - "model": "bloodmagic:block/dungeon_brick_wall_side", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "west": "tall" - }, - "apply": { - "model": "bloodmagic:block/dungeon_brick_wall_side_tall", - "y": 270, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_eye.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_eye.json deleted file mode 100644 index baa1f6ce..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_eye.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/dungeon_eye" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_metal.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_metal.json deleted file mode 100644 index bef6c3bf..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_metal.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/dungeon_metal" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_ore.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_ore.json deleted file mode 100644 index a44ddeae..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_ore.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/dungeon_ore" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_pillar_cap.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_pillar_cap.json deleted file mode 100644 index cc2654a2..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_pillar_cap.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "variants": { - "facing=down": { - "model": "bloodmagic:block/dungeon_pillar_cap_down" - }, - "facing=up": { - "model": "bloodmagic:block/dungeon_pillar_cap" - }, - "facing=north": { - "model": "bloodmagic:block/dungeon_pillar_cap_north" - }, - "facing=south": { - "model": "bloodmagic:block/dungeon_pillar_cap_south" - }, - "facing=west": { - "model": "bloodmagic:block/dungeon_pillar_cap_west" - }, - "facing=east": { - "model": "bloodmagic:block/dungeon_pillar_cap_east" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_pillar_center.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_pillar_center.json deleted file mode 100644 index 56d64ff0..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_pillar_center.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "bloodmagic:block/dungeon_pillar_center_x" - }, - "axis=y": { - "model": "bloodmagic:block/dungeon_pillar_center" - }, - "axis=z": { - "model": "bloodmagic:block/dungeon_pillar_center_z" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_pillar_special.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_pillar_special.json deleted file mode 100644 index 6b7e479d..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_pillar_special.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "bloodmagic:block/dungeon_pillar_special_x" - }, - "axis=y": { - "model": "bloodmagic:block/dungeon_pillar_special" - }, - "axis=z": { - "model": "bloodmagic:block/dungeon_pillar_special_z" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_polished.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_polished.json deleted file mode 100644 index 0a334ab3..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_polished.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/dungeon_polished" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_polished_gate.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_polished_gate.json deleted file mode 100644 index 467dc35d..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_polished_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=north,in_wall=false,open=false": { - "model": "bloodmagic:block/dungeon_polished_gate", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=false": { - "model": "bloodmagic:block/dungeon_polished_gate", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "bloodmagic:block/dungeon_polished_gate", - "y": 90, - "uvlock": true - }, - "facing=east,in_wall=false,open=false": { - "model": "bloodmagic:block/dungeon_polished_gate", - "y": 270, - "uvlock": true - }, - "facing=north,in_wall=true,open=false": { - "model": "bloodmagic:block/dungeon_polished_gate_wall", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=true,open=false": { - "model": "bloodmagic:block/dungeon_polished_gate_wall", - "uvlock": true - }, - "facing=west,in_wall=true,open=false": { - "model": "bloodmagic:block/dungeon_polished_gate_wall", - "y": 90, - "uvlock": true - }, - "facing=east,in_wall=true,open=false": { - "model": "bloodmagic:block/dungeon_polished_gate_wall", - "y": 270, - "uvlock": true - }, - "facing=north,in_wall=false,open=true": { - "model": "bloodmagic:block/dungeon_polished_gate_open", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=false,open=true": { - "model": "bloodmagic:block/dungeon_polished_gate_open", - "uvlock": true - }, - "facing=west,in_wall=false,open=true": { - "model": "bloodmagic:block/dungeon_polished_gate_open", - "y": 90, - "uvlock": true - }, - "facing=east,in_wall=false,open=true": { - "model": "bloodmagic:block/dungeon_polished_gate_open", - "y": 270, - "uvlock": true - }, - "facing=north,in_wall=true,open=true": { - "model": "bloodmagic:block/dungeon_polished_gate_wall_open", - "y": 180, - "uvlock": true - }, - "facing=south,in_wall=true,open=true": { - "model": "bloodmagic:block/dungeon_polished_gate_wall_open", - "uvlock": true - }, - "facing=west,in_wall=true,open=true": { - "model": "bloodmagic:block/dungeon_polished_gate_wall_open", - "y": 90, - "uvlock": true - }, - "facing=east,in_wall=true,open=true": { - "model": "bloodmagic:block/dungeon_polished_gate_wall_open", - "y": 270, - "uvlock": true - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_polished_wall.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_polished_wall.json deleted file mode 100644 index 228f6735..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_polished_wall.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "multipart": [ - { - "when": { - "up": "true" - }, - "apply": { - "model": "bloodmagic:block/dungeon_polished_wall_post" - } - }, - { - "when": { - "east": "low" - }, - "apply": { - "model": "bloodmagic:block/dungeon_polished_wall_side", - "y": 90, - "uvlock": true - } - }, - { - "when": { - "east": "tall" - }, - "apply": { - "model": "bloodmagic:block/dungeon_polished_wall_side_tall", - "y": 90, - "uvlock": true - } - }, - { - "when": { - "north": "low" - }, - "apply": { - "model": "bloodmagic:block/dungeon_polished_wall_side", - "uvlock": true - } - }, - { - "when": { - "north": "tall" - }, - "apply": { - "model": "bloodmagic:block/dungeon_polished_wall_side_tall", - "uvlock": true - } - }, - { - "when": { - "south": "low" - }, - "apply": { - "model": "bloodmagic:block/dungeon_polished_wall_side", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "south": "tall" - }, - "apply": { - "model": "bloodmagic:block/dungeon_polished_wall_side_tall", - "y": 180, - "uvlock": true - } - }, - { - "when": { - "west": "low" - }, - "apply": { - "model": "bloodmagic:block/dungeon_polished_wall_side", - "y": 270, - "uvlock": true - } - }, - { - "when": { - "west": "tall" - }, - "apply": { - "model": "bloodmagic:block/dungeon_polished_wall_side_tall", - "y": 270, - "uvlock": true - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_smallbrick.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_smallbrick.json deleted file mode 100644 index c9950639..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_smallbrick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/dungeon_smallbrick" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_stone.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_stone.json deleted file mode 100644 index 7e4a6bec..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_stone.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "bloodmagic:block/dungeon_stone" - }, - { - "model": "bloodmagic:block/dungeon_stone_mirrored" - }, - { - "model": "bloodmagic:block/dungeon_stone", - "y": 180 - }, - { - "model": "bloodmagic:block/dungeon_stone_mirrored", - "y": 180 - } - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_tile.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_tile.json deleted file mode 100644 index c34e5e71..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_tile.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/dungeon_tile" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_tilespecial.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_tilespecial.json deleted file mode 100644 index 1204cd1d..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_tilespecial.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/dungeon_tilespecial" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/duskritualstone.json b/src/generated/resources/assets/bloodmagic/blockstates/duskritualstone.json deleted file mode 100644 index 474324b4..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/duskritualstone.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/duskritualstone" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/earthritualstone.json b/src/generated/resources/assets/bloodmagic/blockstates/earthritualstone.json deleted file mode 100644 index 75d2c5eb..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/earthritualstone.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/earthritualstone" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/fireritualstone.json b/src/generated/resources/assets/bloodmagic/blockstates/fireritualstone.json deleted file mode 100644 index 33e7f1b2..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/fireritualstone.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/fireritualstone" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/fungal_charge.json b/src/generated/resources/assets/bloodmagic/blockstates/fungal_charge.json deleted file mode 100644 index 88c95e60..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/fungal_charge.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "variants": { - "attached=down": { - "model": "bloodmagic:block/fungal_charge", - "x": 180 - }, - "attached=up": { - "model": "bloodmagic:block/fungal_charge" - }, - "attached=north": { - "model": "bloodmagic:block/fungal_charge", - "x": 90 - }, - "attached=south": { - "model": "bloodmagic:block/fungal_charge", - "x": 270 - }, - "attached=west": { - "model": "bloodmagic:block/fungal_charge", - "x": 90, - "y": 270 - }, - "attached=east": { - "model": "bloodmagic:block/fungal_charge", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/largebloodstonebrick.json b/src/generated/resources/assets/bloodmagic/blockstates/largebloodstonebrick.json deleted file mode 100644 index e7f7e853..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/largebloodstonebrick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/largebloodstonebrick" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/lightritualstone.json b/src/generated/resources/assets/bloodmagic/blockstates/lightritualstone.json deleted file mode 100644 index d198280b..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/lightritualstone.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/lightritualstone" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/masterritualstone.json b/src/generated/resources/assets/bloodmagic/blockstates/masterritualstone.json deleted file mode 100644 index c6276d28..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/masterritualstone.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/masterritualstone" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/nether_soil.json b/src/generated/resources/assets/bloodmagic/blockstates/nether_soil.json deleted file mode 100644 index de25c31e..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/nether_soil.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "variants": { - "moisture=0": { - "model": "bloodmagic:block/nether_soil" - }, - "moisture=1": { - "model": "bloodmagic:block/nether_soil" - }, - "moisture=2": { - "model": "bloodmagic:block/nether_soil" - }, - "moisture=3": { - "model": "bloodmagic:block/nether_soil" - }, - "moisture=4": { - "model": "bloodmagic:block/nether_soil" - }, - "moisture=5": { - "model": "bloodmagic:block/nether_soil" - }, - "moisture=6": { - "model": "bloodmagic:block/nether_soil" - }, - "moisture=7": { - "model": "bloodmagic:block/nether_soil" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/obsidianbrickpath.json b/src/generated/resources/assets/bloodmagic/blockstates/obsidianbrickpath.json deleted file mode 100644 index 38e7c85f..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/obsidianbrickpath.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/obsidianbrickpath" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/obsidiantilepath.json b/src/generated/resources/assets/bloodmagic/blockstates/obsidiantilepath.json deleted file mode 100644 index 185a1d06..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/obsidiantilepath.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/obsidiantilepath" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/orbcapacityrune.json b/src/generated/resources/assets/bloodmagic/blockstates/orbcapacityrune.json deleted file mode 100644 index afa6fb84..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/orbcapacityrune.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/orbcapacityrune" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/rawdemoncrystal.json b/src/generated/resources/assets/bloodmagic/blockstates/rawdemoncrystal.json deleted file mode 100644 index be9a5c2a..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/rawdemoncrystal.json +++ /dev/null @@ -1,431 +0,0 @@ -{ - "multipart": [ - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal1", - "x": 180 - } - }, - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal1" - } - }, - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal1", - "x": 90 - } - }, - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal1", - "x": 270 - } - }, - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal1", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal1", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal2", - "x": 180 - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal2" - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal2", - "x": 90 - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal2", - "x": 270 - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal2", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal2", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal3", - "x": 180 - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal3" - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal3", - "x": 90 - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal3", - "x": 270 - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal3", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal3", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal4", - "x": 180 - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal4" - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal4", - "x": 90 - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal4", - "x": 270 - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal4", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal4", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "4|5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal5", - "x": 180 - } - }, - { - "when": { - "age": "4|5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal5" - } - }, - { - "when": { - "age": "4|5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal5", - "x": 90 - } - }, - { - "when": { - "age": "4|5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal5", - "x": 270 - } - }, - { - "when": { - "age": "4|5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal5", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "4|5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal5", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal6", - "x": 180 - } - }, - { - "when": { - "age": "5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal6" - } - }, - { - "when": { - "age": "5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal6", - "x": 90 - } - }, - { - "when": { - "age": "5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal6", - "x": 270 - } - }, - { - "when": { - "age": "5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal6", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal6", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal7", - "x": 180 - } - }, - { - "when": { - "age": "6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal7" - } - }, - { - "when": { - "age": "6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal7", - "x": 90 - } - }, - { - "when": { - "age": "6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal7", - "x": 270 - } - }, - { - "when": { - "age": "6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal7", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/defaultcrystal7", - "x": 90, - "y": 90 - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/ritualstone.json b/src/generated/resources/assets/bloodmagic/blockstates/ritualstone.json deleted file mode 100644 index 8f09bcba..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/ritualstone.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/ritualstone" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/sacrificerune.json b/src/generated/resources/assets/bloodmagic/blockstates/sacrificerune.json deleted file mode 100644 index 1564fd64..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/sacrificerune.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/sacrificerune" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/selfsacrificerune.json b/src/generated/resources/assets/bloodmagic/blockstates/selfsacrificerune.json deleted file mode 100644 index 05620681..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/selfsacrificerune.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/selfsacrificerune" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/shaped_charge.json b/src/generated/resources/assets/bloodmagic/blockstates/shaped_charge.json deleted file mode 100644 index 8b918ec1..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/shaped_charge.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "variants": { - "attached=down": { - "model": "bloodmagic:block/shaped_charge", - "x": 180 - }, - "attached=up": { - "model": "bloodmagic:block/shaped_charge" - }, - "attached=north": { - "model": "bloodmagic:block/shaped_charge", - "x": 90 - }, - "attached=south": { - "model": "bloodmagic:block/shaped_charge", - "x": 270 - }, - "attached=west": { - "model": "bloodmagic:block/shaped_charge", - "x": 90, - "y": 270 - }, - "attached=east": { - "model": "bloodmagic:block/shaped_charge", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/speedrune.json b/src/generated/resources/assets/bloodmagic/blockstates/speedrune.json deleted file mode 100644 index 9ebf2703..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/speedrune.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/speedrune" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/steadfastdemoncrystal.json b/src/generated/resources/assets/bloodmagic/blockstates/steadfastdemoncrystal.json deleted file mode 100644 index f886422f..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/steadfastdemoncrystal.json +++ /dev/null @@ -1,431 +0,0 @@ -{ - "multipart": [ - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal1", - "x": 180 - } - }, - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal1" - } - }, - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal1", - "x": 90 - } - }, - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal1", - "x": 270 - } - }, - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal1", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal1", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal2", - "x": 180 - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal2" - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal2", - "x": 90 - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal2", - "x": 270 - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal2", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal2", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal3", - "x": 180 - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal3" - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal3", - "x": 90 - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal3", - "x": 270 - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal3", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal3", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal4", - "x": 180 - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal4" - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal4", - "x": 90 - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal4", - "x": 270 - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal4", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal4", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "4|5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal5", - "x": 180 - } - }, - { - "when": { - "age": "4|5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal5" - } - }, - { - "when": { - "age": "4|5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal5", - "x": 90 - } - }, - { - "when": { - "age": "4|5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal5", - "x": 270 - } - }, - { - "when": { - "age": "4|5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal5", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "4|5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal5", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal6", - "x": 180 - } - }, - { - "when": { - "age": "5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal6" - } - }, - { - "when": { - "age": "5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal6", - "x": 90 - } - }, - { - "when": { - "age": "5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal6", - "x": 270 - } - }, - { - "when": { - "age": "5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal6", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal6", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal7", - "x": 180 - } - }, - { - "when": { - "age": "6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal7" - } - }, - { - "when": { - "age": "6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal7", - "x": 90 - } - }, - { - "when": { - "age": "6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal7", - "x": 270 - } - }, - { - "when": { - "age": "6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal7", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/steadfastcrystal7", - "x": 90, - "y": 90 - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/stonebrickpath.json b/src/generated/resources/assets/bloodmagic/blockstates/stonebrickpath.json deleted file mode 100644 index dd693c22..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/stonebrickpath.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/stonebrickpath" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/stonetilepath.json b/src/generated/resources/assets/bloodmagic/blockstates/stonetilepath.json deleted file mode 100644 index e3f65a05..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/stonetilepath.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/stonetilepath" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/veinmine_charge.json b/src/generated/resources/assets/bloodmagic/blockstates/veinmine_charge.json deleted file mode 100644 index beb5ad11..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/veinmine_charge.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "variants": { - "attached=down": { - "model": "bloodmagic:block/veinmine_charge", - "x": 180 - }, - "attached=up": { - "model": "bloodmagic:block/veinmine_charge" - }, - "attached=north": { - "model": "bloodmagic:block/veinmine_charge", - "x": 90 - }, - "attached=south": { - "model": "bloodmagic:block/veinmine_charge", - "x": 270 - }, - "attached=west": { - "model": "bloodmagic:block/veinmine_charge", - "x": 90, - "y": 270 - }, - "attached=east": { - "model": "bloodmagic:block/veinmine_charge", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/vengefuldemoncrystal.json b/src/generated/resources/assets/bloodmagic/blockstates/vengefuldemoncrystal.json deleted file mode 100644 index c4f8f825..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/vengefuldemoncrystal.json +++ /dev/null @@ -1,431 +0,0 @@ -{ - "multipart": [ - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal1", - "x": 180 - } - }, - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal1" - } - }, - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal1", - "x": 90 - } - }, - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal1", - "x": 270 - } - }, - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal1", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "0|1|2|3|4|5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal1", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal2", - "x": 180 - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal2" - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal2", - "x": 90 - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal2", - "x": 270 - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal2", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "1|2|3|4|5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal2", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal3", - "x": 180 - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal3" - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal3", - "x": 90 - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal3", - "x": 270 - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal3", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "2|3|4|5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal3", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal4", - "x": 180 - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal4" - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal4", - "x": 90 - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal4", - "x": 270 - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal4", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "3|4|5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal4", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "4|5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal5", - "x": 180 - } - }, - { - "when": { - "age": "4|5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal5" - } - }, - { - "when": { - "age": "4|5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal5", - "x": 90 - } - }, - { - "when": { - "age": "4|5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal5", - "x": 270 - } - }, - { - "when": { - "age": "4|5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal5", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "4|5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal5", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "5|6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal6", - "x": 180 - } - }, - { - "when": { - "age": "5|6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal6" - } - }, - { - "when": { - "age": "5|6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal6", - "x": 90 - } - }, - { - "when": { - "age": "5|6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal6", - "x": 270 - } - }, - { - "when": { - "age": "5|6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal6", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "5|6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal6", - "x": 90, - "y": 90 - } - }, - { - "when": { - "age": "6", - "attached": "down" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal7", - "x": 180 - } - }, - { - "when": { - "age": "6", - "attached": "up" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal7" - } - }, - { - "when": { - "age": "6", - "attached": "north" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal7", - "x": 90 - } - }, - { - "when": { - "age": "6", - "attached": "south" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal7", - "x": 270 - } - }, - { - "when": { - "age": "6", - "attached": "west" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal7", - "x": 90, - "y": 270 - } - }, - { - "when": { - "age": "6", - "attached": "east" - }, - "apply": { - "model": "bloodmagic:block/crystal/vengefulcrystal7", - "x": 90, - "y": 90 - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/waterritualstone.json b/src/generated/resources/assets/bloodmagic/blockstates/waterritualstone.json deleted file mode 100644 index 35b1d3aa..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/waterritualstone.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/waterritualstone" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/woodbrickpath.json b/src/generated/resources/assets/bloodmagic/blockstates/woodbrickpath.json deleted file mode 100644 index 5b1d7ce2..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/woodbrickpath.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/woodbrickpath" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/woodtilepath.json b/src/generated/resources/assets/bloodmagic/blockstates/woodtilepath.json deleted file mode 100644 index 6439e3bc..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/woodtilepath.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/woodtilepath" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/wornstonebrickpath.json b/src/generated/resources/assets/bloodmagic/blockstates/wornstonebrickpath.json deleted file mode 100644 index 4c9539bf..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/wornstonebrickpath.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/wornstonebrickpath" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/wornstonetilepath.json b/src/generated/resources/assets/bloodmagic/blockstates/wornstonetilepath.json deleted file mode 100644 index db7e680a..00000000 --- a/src/generated/resources/assets/bloodmagic/blockstates/wornstonetilepath.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/wornstonetilepath" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/lang/en_us.json b/src/generated/resources/assets/bloodmagic/lang/en_us.json deleted file mode 100644 index 32f01ab1..00000000 --- a/src/generated/resources/assets/bloodmagic/lang/en_us.json +++ /dev/null @@ -1,503 +0,0 @@ -{ - "anointment.bloodmagic.bow_power": "Heavy Shot", - "anointment.bloodmagic.fortune": "Fortunate", - "anointment.bloodmagic.hidden_knowledge": "Miner's Secrets", - "anointment.bloodmagic.holy_water": "Holy Light", - "anointment.bloodmagic.looting": "Plundering", - "anointment.bloodmagic.melee_damage": "Whetstone", - "anointment.bloodmagic.quick_draw": "Deft Hands", - "anointment.bloodmagic.silk_touch": "Soft Touch", - "anointment.bloodmagic.smelting": "Heated Tool", - "block.bloodmagic.accelerationrune": "Acceleration Rune", - "block.bloodmagic.airritualstone": "Air Ritual Stone", - "block.bloodmagic.alchemicalreactionchamber": "Alchemical Reaction Chamber", - "block.bloodmagic.alchemytable": "Alchemy Table", - "block.bloodmagic.altar": "Blood Altar", - "block.bloodmagic.altarcapacityrune": "Rune of Capacity", - "block.bloodmagic.bettercapacityrune": "Rune of Augmented Capacity", - "block.bloodmagic.blankrune": "Blank Rune", - "block.bloodmagic.bloodstonebrick": "Bloodstone Brick", - "block.bloodmagic.chargingrune": "Charging Rune", - "block.bloodmagic.corrosivedemoncrystal": "Corrosive Crystal Cluster", - "block.bloodmagic.deforester_charge": "Deforester Charge", - "block.bloodmagic.demoncrucible": "Demon Crucible", - "block.bloodmagic.demoncrystallizer": "Demon Crystallizer", - "block.bloodmagic.destructivedemoncrystal": "Destructive Crystal Cluster", - "block.bloodmagic.dislocationrune": "Displacement Rune", - "block.bloodmagic.dungeon_brick1": "Demon Bricks", - "block.bloodmagic.dungeon_brick2": "Offset Demon Bricks", - "block.bloodmagic.dungeon_brick3": "Long Demon Bricks", - "block.bloodmagic.dungeon_brick_assorted": "Assorted Demon Bricks", - "block.bloodmagic.dungeon_brick_gate": "Demon Brick Gate", - "block.bloodmagic.dungeon_brick_stairs": "Demon Brick Stairs", - "block.bloodmagic.dungeon_brick_wall": "Demon Brick Wall", - "block.bloodmagic.dungeon_eye": "Demon Eye", - "block.bloodmagic.dungeon_ore": "Demonite", - "block.bloodmagic.dungeon_pillar_cap": "Demon Stone Pillar Cap", - "block.bloodmagic.dungeon_pillar_center": "Demon Stone Pillar", - "block.bloodmagic.dungeon_pillar_special": "Accented Demon Stone Pillar", - "block.bloodmagic.dungeon_polished": "Polished Demon Stone", - "block.bloodmagic.dungeon_polished_gate": "Demon Stone Gate", - "block.bloodmagic.dungeon_polished_stairs": "Demon Stone Stairs", - "block.bloodmagic.dungeon_polished_wall": "Demon Stone Wall", - "block.bloodmagic.dungeon_smallbrick": "Small Demon Bricks", - "block.bloodmagic.dungeon_stone": "Demon Stone", - "block.bloodmagic.dungeon_tile": "Demon Stone Tiles", - "block.bloodmagic.dungeon_tilespecial": "Accented Demon Stone Tiles", - "block.bloodmagic.duskritualstone": "Dusk Ritual Stone", - "block.bloodmagic.earthritualstone": "Earth Ritual Stone", - "block.bloodmagic.fireritualstone": "Fire Ritual Stone", - "block.bloodmagic.fungal_charge": "Fungal Charge", - "block.bloodmagic.incensealtar": "Incense Altar", - "block.bloodmagic.largebloodstonebrick": "Large Bloodstone Brick", - "block.bloodmagic.lightritualstone": "Dawn Ritual Stone", - "block.bloodmagic.masterritualstone": "Master Ritual Stone", - "block.bloodmagic.obsidianbrickpath": "Obsidian Path", - "block.bloodmagic.obsidiantilepath": "Tiled Obsidian Path", - "block.bloodmagic.orbcapacityrune": "Rune of the Orb", - "block.bloodmagic.rawdemoncrystal": "Raw Crystal Cluster", - "block.bloodmagic.ritualstone": "Ritual Stone", - "block.bloodmagic.sacrificerune": "Rune of Sacrifice", - "block.bloodmagic.selfsacrificerune": "Rune of Self Sacrifice", - "block.bloodmagic.shaped_charge": "Shaped Charge", - "block.bloodmagic.soulforge": "Hellfire Forge", - "block.bloodmagic.speedrune": "Speed Rune", - "block.bloodmagic.steadfastdemoncrystal": "Steadfast Crystal Cluster", - "block.bloodmagic.stonebrickpath": "Stone Path", - "block.bloodmagic.stonetilepath": "Tiled Stone Path", - "block.bloodmagic.veinmine_charge": "Controlled Charge", - "block.bloodmagic.vengefuldemoncrystal": "Vengeful Crystal Cluster", - "block.bloodmagic.waterritualstone": "Water Ritual Stone", - "block.bloodmagic.woodbrickpath": "Wooden Path", - "block.bloodmagic.woodtilepath": "Tiled Wooden Path", - "block.bloodmagic.wornstonebrickpath": "Worn Stone Path", - "block.bloodmagic.wornstonetilepath": "Tiled Worn Stone Path", - "bloodmagic.keybind.cycle_holding_neg": "Cycle Sigil (-)", - "bloodmagic.keybind.cycle_holding_pos": "Cycle Sigil (+)", - "bloodmagic.keybind.open_holding": "Open Sigil of Holding", - "chat.bloodmagic.damageSource": "%s's soul became too weak", - "chat.bloodmagic.living_upgrade_level_increase": "%s has leveled up to %d", - "chat.bloodmagic.ritual.activate": "A rush of energy flows through the ritual!", - "chat.bloodmagic.ritual.notValid": "You feel that these runes are not configured correctly...", - "chat.bloodmagic.ritual.prevent": "The ritual is actively resisting you!", - "chat.bloodmagic.ritual.weak": "You feel a push, but are too weak to perform this ritual.", - "gui.bloodmagic.empty": "Empty", - "guide.bloodmagic.landing_text": "\"It is my dear hope that by holding this tome in your hands, I may impart the knowledge of the lost art that is Blood Magic\"$(br)$(o)- Magus Arcana$()", - "guide.bloodmagic.name": "Sanguine Scientiem", - "hud.bloodmagic.inactive": "Inactive", - "item.bloodmagic.activationcrystalawakened": "Awakened Activation Crystal", - "item.bloodmagic.activationcrystalcreative": "Creative Activation Crystal", - "item.bloodmagic.activationcrystalweak": "Weak Activation Crystal", - "item.bloodmagic.airscribetool": "Inscription Tool: Air", - "item.bloodmagic.airsigil": "Air Sigil", - "item.bloodmagic.apprenticebloodorb": "Apprentice Blood Orb", - "item.bloodmagic.arcaneashes": "Arcane Ashes", - "item.bloodmagic.basemonstersoul": "Demon Will", - "item.bloodmagic.basemonstersoul_corrosive": "Demon Will", - "item.bloodmagic.basemonstersoul_destructive": "Demon Will", - "item.bloodmagic.basemonstersoul_steadfast": "Demon Will", - "item.bloodmagic.basemonstersoul_vengeful": "Demon Will", - "item.bloodmagic.basiccuttingfluid": "Basic Cutting Fluid", - "item.bloodmagic.blankslate": "Blank Slate", - "item.bloodmagic.bloodlightsigil": "Sigil of the Blood Lamp", - "item.bloodmagic.bow_power_anointment": "Iron Tip", - "item.bloodmagic.coalsand": "Coal Sand", - "item.bloodmagic.corrosivecrystal": "Corrosive Will Crystal", - "item.bloodmagic.crystalline_resonator": "Crystalline Resonator", - "item.bloodmagic.daggerofsacrifice": "Dagger of Sacrifice", - "item.bloodmagic.defaultcrystal": "Demon Will Crystal", - "item.bloodmagic.demonslate": "Demonic Slate", - "item.bloodmagic.destructivecrystal": "Destructive Will Crystal", - "item.bloodmagic.divinationsigil": "Divination Sigil", - "item.bloodmagic.duskscribetool": "Inscription Tool: Dusk", - "item.bloodmagic.earthscribetool": "Inscription Tool: Earth", - "item.bloodmagic.etherealslate": "Ethereal Slate", - "item.bloodmagic.experiencebook": "Tome of Peritia", - "item.bloodmagic.explosivepowder": "Explosive Powder", - "item.bloodmagic.firescribetool": "Inscription Tool: Fire", - "item.bloodmagic.fortune_anointment": "Fortuna Extract", - "item.bloodmagic.fragment_netherite_scrap": "Ancient Debris Fragment", - "item.bloodmagic.furnacecell_primitive": "Primitive Fuel Cell", - "item.bloodmagic.goldfragment": "Gold Ore Fragment", - "item.bloodmagic.goldgravel": "Gold Gravel", - "item.bloodmagic.goldsand": "Gold Sand", - "item.bloodmagic.gravel_netherite_scrap": "Ancient Debris Gravel", - "item.bloodmagic.growthsigil": "Sigil of the Green Grove", - "item.bloodmagic.hidden_knowledge_anointment": "Miner's Secrets", - "item.bloodmagic.holy_water_anointment": "Holy Water", - "item.bloodmagic.icesigil": "Sigil of the Frozen Lake", - "item.bloodmagic.infusedslate": "Imbued Slate", - "item.bloodmagic.ironfragment": "Iron Ore Fragment", - "item.bloodmagic.irongravel": "Iron Gravel", - "item.bloodmagic.ironsand": "Iron Sand", - "item.bloodmagic.lavacrystal": "Lava Crystal", - "item.bloodmagic.lavasigil": "Lava Sigil", - "item.bloodmagic.life_essence_bucket": "Bucket of Life", - "item.bloodmagic.livingboots": "Living Boots", - "item.bloodmagic.livinghelmet": "Living Helmet", - "item.bloodmagic.livingleggings": "Living Leggings", - "item.bloodmagic.livingplate": "Living Chestplate", - "item.bloodmagic.looting_anointment": "Plunderer's Glint", - "item.bloodmagic.magicianbloodorb": "Magician Blood Orb", - "item.bloodmagic.masterbloodorb": "Master Blood Orb", - "item.bloodmagic.melee_anointment": "Honing Oil", - "item.bloodmagic.miningsigil": "Sigil of the Fast Miner", - "item.bloodmagic.plantoil": "Plant Oil", - "item.bloodmagic.primitive_crystalline_resonator": "Primitive Resonator", - "item.bloodmagic.primitive_explosive_cell": "Primitive Explosive Cell", - "item.bloodmagic.primitive_hydration_cell": "Primitive Hydration Cell", - "item.bloodmagic.quick_draw_anointment": "Dexterity Alkahest", - "item.bloodmagic.reagentair": "Air Reagent", - "item.bloodmagic.reagentbinding": "Binding Reagent", - "item.bloodmagic.reagentbloodlight": "Blood Lamp Reagent", - "item.bloodmagic.reagentfastminer": "Mining Reagent", - "item.bloodmagic.reagentgrowth": "Growth Reagent", - "item.bloodmagic.reagentholding": "Holding Reagent", - "item.bloodmagic.reagentlava": "Lava Reagent", - "item.bloodmagic.reagentmagnetism": "Magnetism Reagent", - "item.bloodmagic.reagentsight": "Sight Reagent", - "item.bloodmagic.reagentvoid": "Void Reagent", - "item.bloodmagic.reagentwater": "Water Reagent", - "item.bloodmagic.reinforcedslate": "Reinforced Slate", - "item.bloodmagic.ritualdiviner": "Ritual Diviner", - "item.bloodmagic.ritualdivinerdusk": "Ritual Diviner [Dusk]", - "item.bloodmagic.ritualtinkerer": "Ritual Tinkerer", - "item.bloodmagic.sacrificialdagger": "Sacrificial Knife", - "item.bloodmagic.saltpeter": "Saltpeter", - "item.bloodmagic.sand_netherite": "Netherite Scrap Sand", - "item.bloodmagic.sanguinereverter": "Sanguine Reverter", - "item.bloodmagic.seersigil": "Seer's Sigil", - "item.bloodmagic.sigilofholding": "Sigil of Holding", - "item.bloodmagic.sigilofmagnetism": "Sigil of Magnetism", - "item.bloodmagic.silk_touch_anointment": "Soft Coating", - "item.bloodmagic.slate_ampoule": "Slate Ampoule", - "item.bloodmagic.slate_vial": "Slate-infused Vial", - "item.bloodmagic.smelting_anointment": "Slow-burning Oil", - "item.bloodmagic.soulaxe": "Sentient Axe", - "item.bloodmagic.soulgemcommon": "Common Tartaric Gem", - "item.bloodmagic.soulgemgreater": "Greater Tartaric Gem", - "item.bloodmagic.soulgemlesser": "Lesser Tartaric Gem", - "item.bloodmagic.soulgempetty": "Petty Tartaric Gem", - "item.bloodmagic.soulpickaxe": "Sentient Pickaxe", - "item.bloodmagic.soulscythe": "Sentient Scythe", - "item.bloodmagic.soulshovel": "Sentient Shovel", - "item.bloodmagic.soulsnare": "Soul Snare", - "item.bloodmagic.soulsword": "Sentient Sword", - "item.bloodmagic.steadfastcrystal": "Steadfast Will Crystal", - "item.bloodmagic.sulfur": "Sulfur", - "item.bloodmagic.throwing_dagger": "Iron Throwing Dagger", - "item.bloodmagic.throwing_dagger_syringe": "Syringe Throwing Dagger", - "item.bloodmagic.upgradetome": "Living Armour Upgrade Tome", - "item.bloodmagic.vengefulcrystal": "Vengeful Will Crystal", - "item.bloodmagic.voidsigil": "Void Sigil", - "item.bloodmagic.waterscribetool": "Inscription Tool: Water", - "item.bloodmagic.watersigil": "Water Sigil", - "item.bloodmagic.weakbloodorb": "Weak Blood Orb", - "item.bloodmagic.weakbloodshard": "Weak Blood Shard", - "itemGroup.bloodmagic.creativeTab": "Blood Magic", - "itemGroup.bloodmagictab": "Blood Magic", - "jei.bloodmagic.recipe.alchemyarraycrafting": "Alchemy Array", - "jei.bloodmagic.recipe.alchemytable": "Alchemy Table", - "jei.bloodmagic.recipe.altar": "Blood Altar", - "jei.bloodmagic.recipe.arc": "ARC Recipe", - "jei.bloodmagic.recipe.arcfurnace": "ARC Furnace Recipe", - "jei.bloodmagic.recipe.consumptionrate": "Consumption: %s LP/t", - "jei.bloodmagic.recipe.drainrate": "Drain: %s LP/t", - "jei.bloodmagic.recipe.lpDrained": "Drained: %s LP", - "jei.bloodmagic.recipe.minimumsouls": "Minimum: %s Will", - "jei.bloodmagic.recipe.requiredlp": "LP: %d", - "jei.bloodmagic.recipe.requiredtier": "Tier: %d", - "jei.bloodmagic.recipe.soulforge": "Hellfire Forge", - "jei.bloodmagic.recipe.soulsdrained": "Drained: %s Will", - "jei.bloodmagic.recipe.ticksRequired": "Time: %sTicks", - "key.bloodmagic.category": "Blood Magic", - "living_upgrade.bloodmagic.arrow_protect": "Pin Cushion", - "living_upgrade.bloodmagic.arrow_shot": "Trick Shot", - "living_upgrade.bloodmagic.battleHunger": "Battle Hungry", - "living_upgrade.bloodmagic.crippledArm": "Crippled Arm", - "living_upgrade.bloodmagic.critical_strike": "True Strike", - "living_upgrade.bloodmagic.digSlowdown": "Weakened Pick", - "living_upgrade.bloodmagic.digging": "Dwarven Might", - "living_upgrade.bloodmagic.disoriented": "Disoriented", - "living_upgrade.bloodmagic.elytra": "Elytra", - "living_upgrade.bloodmagic.experienced": "Experienced", - "living_upgrade.bloodmagic.fall_protect": "Soft Fall", - "living_upgrade.bloodmagic.fire_resist": "Gift of Ignis", - "living_upgrade.bloodmagic.grave_digger": "Grave Digger", - "living_upgrade.bloodmagic.grim_reaper": "Grim Reaper's Sprint", - "living_upgrade.bloodmagic.health": "Healthy", - "living_upgrade.bloodmagic.jump": "Strong Legs", - "living_upgrade.bloodmagic.knockback_resist": "Body Builder", - "living_upgrade.bloodmagic.meleeDecrease": "Dulled Blade", - "living_upgrade.bloodmagic.melee_damage": "Fierce Strike", - "living_upgrade.bloodmagic.night_sight": "Nocturnal Prowess", - "living_upgrade.bloodmagic.physical_protect": "Tough", - "living_upgrade.bloodmagic.poison_resist": "Poison Resistance", - "living_upgrade.bloodmagic.quenched": "Quenched", - "living_upgrade.bloodmagic.repair": "Repairing", - "living_upgrade.bloodmagic.revealing": "Revealing", - "living_upgrade.bloodmagic.self_sacrifice": "Tough Palms", - "living_upgrade.bloodmagic.slippery": "Loose Traction", - "living_upgrade.bloodmagic.slowHeal": "Diseased", - "living_upgrade.bloodmagic.slowness": "Limp Leg", - "living_upgrade.bloodmagic.solar_powered": "Solar Powered", - "living_upgrade.bloodmagic.speed": "Quick Feet", - "living_upgrade.bloodmagic.sprint_attack": "Charging Strike", - "living_upgrade.bloodmagic.step_assist": "Step Assist", - "living_upgrade.bloodmagic.stormTrooper": "Storm Trooper", - "living_upgrade.bloodmagic.thaumRunicShielding": "Runic Shielding", - "ritual.bloodmagic.altarBuilderRitual": "The Assembly of the High Altar", - "ritual.bloodmagic.altarBuilderRitual.info": "Builds an altar out of the components inside of the connected inventory.", - "ritual.bloodmagic.animalGrowthRitual": "Ritual of the Shepherd", - "ritual.bloodmagic.animalGrowthRitual.chest.info": "(Chest) Chest for breeding items if properly augmented.", - "ritual.bloodmagic.animalGrowthRitual.corrosive.info": "(Corrosive) Unimplemented.", - "ritual.bloodmagic.animalGrowthRitual.default.info": "(Raw) Increases the speed of the ritual based on the total Will in the Aura.", - "ritual.bloodmagic.animalGrowthRitual.destructive.info": "(Destructive) Causes adults that have not bred lately to run at mobs and explode.", - "ritual.bloodmagic.animalGrowthRitual.growing.info": "(Growth) Animals within this range will grow much faster.", - "ritual.bloodmagic.animalGrowthRitual.info": "Increases the maturity rate of baby animals within its range.", - "ritual.bloodmagic.animalGrowthRitual.steadfast.info": "(Steadfast) Automatically breeds adults within its area using items in the connected chest.", - "ritual.bloodmagic.animalGrowthRitual.vengeful.info": "(Vengeful) Decreases the time it takes for adults to breed again.", - "ritual.bloodmagic.armourEvolveRitual": "Ritual of Living Evolution", - "ritual.bloodmagic.armourEvolveRitual.info": "Increases the amount of maximum Upgrade Points on your Living Armor to 300.", - "ritual.bloodmagic.blockRange.firstBlock": "First block for new range stored.", - "ritual.bloodmagic.blockRange.inactive": "The ritual stone is currently inactive, and cannot have its range modified.", - "ritual.bloodmagic.blockRange.noRange": "The range was not properly chosen.", - "ritual.bloodmagic.blockRange.success": "New range successfully set!", - "ritual.bloodmagic.blockRange.tooBig": "The block range given is too big! Needs to be at most %s blocks.", - "ritual.bloodmagic.blockRange.tooFar": "The block range given is too far! Needs to be within a vertical range of %s blocks and a horizontal range of %s blocks.", - "ritual.bloodmagic.cobblestoneRitual": "Le Vulcanos Frigius", - "ritual.bloodmagic.condorRitual.info": "Provides flight in an area around the ritual.", - "ritual.bloodmagic.containmentRitual": "Ritual of Containment", - "ritual.bloodmagic.containmentRitual.containmentRange.info": "(Containment) The area of the ritual where mobs will be pulled. All mobs are pulled towards the master ritual stone, regardless of where this area is.", - "ritual.bloodmagic.containmentRitual.info": "Pulls all mobs within its area towards the master ritual stone.", - "ritual.bloodmagic.crushingRitual": "Ritual of the Crusher", - "ritual.bloodmagic.crushingRitual.chest.info": "(Chest) The location of the inventory that the ritual will place the broken blocks into.", - "ritual.bloodmagic.crushingRitual.corrosive.info": "(Corrosive) All blocks are broken to be processed with a form of cutting fluid. Overrides Silk Touch where applicable.", - "ritual.bloodmagic.crushingRitual.crushingRange.info": "(Crushing) The blocks that the ritual will break.", - "ritual.bloodmagic.crushingRitual.default.info": "(Raw) Increases the speed of the ritual based on total Will.", - "ritual.bloodmagic.crushingRitual.destructive.info": "(Destructive) Blocks are broken down forcefully: all blocks broken are affected by Fortune III.", - "ritual.bloodmagic.crushingRitual.info": "Breaks blocks within its crushing range and places the items into the linked chest.", - "ritual.bloodmagic.crushingRitual.steadfast.info": "(Steadfast) Causes all blocks that are broken to be picked up with silk touch. Overrides Fortune where applicable.", - "ritual.bloodmagic.crushingRitual.vengeful.info": "(Vengeful) Compresses the inventory on successful operation. Currently only does one compression per operation.", - "ritual.bloodmagic.crystalHarvestRitual": "Crack of the Fractured Crystal", - "ritual.bloodmagic.crystalHarvestRitual.crystal.info": "(Crystal) All Demon Will crystal clusters have a single crystal broken off, spawning the crystal into the world. If there is only one crystal on the cluster, it will not break it.", - "ritual.bloodmagic.crystalHarvestRitual.info": "Breaks Demon Will crystal clusters within its range, dropping the results on top of the crystals.", - "ritual.bloodmagic.crystalSplitRitual": "Resonance of the Faceted Crystal", - "ritual.bloodmagic.crystalSplitRitual.info": "Splits apart a well-grown Raw crystal cluster into seperal aspected crystal clusters.", - "ritual.bloodmagic.ellipseRitual": "Focus of the Ellipsoid", - "ritual.bloodmagic.ellipseRitual.chest.info": "(Chest) The location of the inventory that the ritual will grab blocks from to place in the world.", - "ritual.bloodmagic.ellipseRitual.info": "Creates a hollow spheroid around the ritual using the blocks in the attached chest.", - "ritual.bloodmagic.ellipseRitual.spheroidRange.info": "(Placement) The range that the ritual will place its blocks in. Spheroid is centered on the ritual - if one side is shorter than the side opposite the spheroid is truncated.", - "ritual.bloodmagic.eternalSoulRitual.info": "Capable of transferring Life Essence from a Network back into an Altar at a cost.", - "ritual.bloodmagic.expulsionRitual": "Aura of Expulsion", - "ritual.bloodmagic.expulsionRitual.expulsionRange.info": "(Expulsion) The area from which players that are not owner or have an orb in the chest will be teleported away from.", - "ritual.bloodmagic.expulsionRitual.info": "Expels players from its range that are neither the owner nor have a bound blood orb in the chest on top of the master ritual stone.", - "ritual.bloodmagic.featheredKnifeRitual": "Ritual of the Feathered Knife", - "ritual.bloodmagic.featheredKnifeRitual.altar.info": "(Altar) This range defines the area that the ritual searches for the blood altar. Changing this will either expand or limit the range to a certain region.", - "ritual.bloodmagic.featheredKnifeRitual.corrosive.info": "(Corrosive) Uses the player's Incense to increase the yield.", - "ritual.bloodmagic.featheredKnifeRitual.damage.info": "(Damage) This defines where the ritual will damage a player. Players inside of this range will receive damage over time up to the specified limit.", - "ritual.bloodmagic.featheredKnifeRitual.default.info": "(Raw) Increases the speed of the ritual based on the total Will in the Aura.", - "ritual.bloodmagic.featheredKnifeRitual.destructive.info": "(Destructive) Increases the yield of the ritual based on total Will.", - "ritual.bloodmagic.featheredKnifeRitual.info": "Drains health from players in its area and puts the LP into a nearby blood altar.", - "ritual.bloodmagic.featheredKnifeRitual.steadfast.info": "(Steadfast) Sets the minimum health for sacrificing from 30%% to 70%%.", - "ritual.bloodmagic.featheredKnifeRitual.vengeful.info": "(Vengeful) Sets the minimum health for sacrificing to 10%%. Overridden by Steadfast for the Owner if active.", - "ritual.bloodmagic.fellingRitual": "The Timberman", - "ritual.bloodmagic.fellingRitual.chest.info": "(Chest) The location of the inventory that the ritual will place the results into.", - "ritual.bloodmagic.fellingRitual.fellingRange.info": "(Cutting) The range that the ritual will search out logs and leaves in order to cut down.", - "ritual.bloodmagic.fellingRitual.info": "A standard tree-cutting machine, this ritual will cut down all trees and leaves within its area and collect the drops.", - "ritual.bloodmagic.forsakenSoulRitual": "Gathering of the Forsaken Souls", - "ritual.bloodmagic.forsakenSoulRitual.crystal.info": "(Crystal) Demon Crystals in this range receive an increase in growth speed when a mob is killed by the ritual.", - "ritual.bloodmagic.forsakenSoulRitual.damage.info": "(Damage) Mobs within this range will be slowly damaged, and when killed will grow the crystals.", - "ritual.bloodmagic.forsakenSoulRitual.info": "Damages mobs within its damage range and when the mob dies a demon crystal within its crystal range will be grown.", - "ritual.bloodmagic.fullStomachRitual": "Ritual of the Satiated Stomach", - "ritual.bloodmagic.fullStomachRitual.chest.info": "(Chest) The location of the inventory that the ritual will grab food from to feed players in range.", - "ritual.bloodmagic.fullStomachRitual.fillRange.info": "(Feeding) The range that the ritual will look at to feed players.", - "ritual.bloodmagic.fullStomachRitual.info": "Takes food from the linked chest and fills the player's saturation with it.", - "ritual.bloodmagic.greenGroveRitual": "Ritual of the Green Grove", - "ritual.bloodmagic.greenGroveRitual.corrosive.info": "(Corrosive) Entities within range are attacked by nearby plants, leeching away their life.", - "ritual.bloodmagic.greenGroveRitual.default.info": "(Raw) Increases the speed of all of the ritual operations depending on the total Will in the Aura.", - "ritual.bloodmagic.greenGroveRitual.destructive.info": "(Destructive) Growing range is increased based on total Will.", - "ritual.bloodmagic.greenGroveRitual.growing.info": "(Growth) The area that the ritual will grow plants in.", - "ritual.bloodmagic.greenGroveRitual.hydrate.info": "(Steadfast) Blocks within this range are rehydrated into farmland, and seeds within the area are planted nearby.", - "ritual.bloodmagic.greenGroveRitual.info": "Grows crops within its area.", - "ritual.bloodmagic.greenGroveRitual.leech.info": "(Corrosive) Entities in this area have their life drained to grow nearby crops.", - "ritual.bloodmagic.greenGroveRitual.steadfast.info": "(Steadfast) Seeds are replanted and blocks are hydrated within the Hydration range.", - "ritual.bloodmagic.greenGroveRitual.vengeful.info": "(Vengeful) Increases the rate that a growth tick is successful.", - "ritual.bloodmagic.groundingRitual.corrosive.info": "(Corrosive) Disables gravity (+Vengeful) Applies Levitation.", - "ritual.bloodmagic.groundingRitual.default.info": "(Raw) Affects players.", - "ritual.bloodmagic.groundingRitual.destructive.info": "(Destructive) Applies Heavy Heart (increases fall damage) (+Vengeful) Stronger effect.", - "ritual.bloodmagic.groundingRitual.info": "Forces entities on the ground and prevents jumping.", - "ritual.bloodmagic.groundingRitual.steadfast.info": "(Steadfast) Affects Bosses. Doesn't affect bosses that are immune against motion change or immune against potions (except Wither and Ender Dragon).", - "ritual.bloodmagic.groundingRitual.vengeful.info": "(Vengeful) Makes effects stronger. (+Corrosive) Applies Levitation. (+Destructive) Higher Heavy Heart amplifier.", - "ritual.bloodmagic.harvestRitual": "Reap of the Harvest Moon", - "ritual.bloodmagic.harvestRitual.harvestRange.info": "(Harvesting) Plants within this range will be harvested.", - "ritual.bloodmagic.harvestRitual.info": "Harvests plants within its range, dropping the results on the ground.", - "ritual.bloodmagic.interdictionRitual": "Ritual of Interdiction", - "ritual.bloodmagic.interdictionRitual.info": "Pushes all mobs within its area away from the master ritual stone.", - "ritual.bloodmagic.interdictionRitual.interdictionRange.info": "(Push) The area of the ritual where mobs will be pushed. All mobs are pushed away from the master ritual stone, regardless of where this area is.", - "ritual.bloodmagic.jumpRitual": "Ritual of the High Jump", - "ritual.bloodmagic.jumpRitual.info": "Causes entities to leap up into the air.", - "ritual.bloodmagic.jumpRitual.jumpRange.info": "(Jumping) Entities in this range will be launched in the air.", - "ritual.bloodmagic.lavaRitual": "Serenade of the Nether", - "ritual.bloodmagic.lavaRitual.corrosive.info": "(Corrosive) Entities within range that are immune to fire are damaged severely.", - "ritual.bloodmagic.lavaRitual.default.info": "(Raw) Decreases the LP cost of placing lava and allows lava to be placed insided of a linked container.", - "ritual.bloodmagic.lavaRitual.destructive.info": "(Destructive) Lava placement range is increased based on total Will.", - "ritual.bloodmagic.lavaRitual.fireDamage.info": "(Corrosive) Entities within this range that are immune to fire damage are hurt proportional to the Will.", - "ritual.bloodmagic.lavaRitual.fireFuse.info": "(Vengeful) Entities in this range are afflicted by Fire Fuse.", - "ritual.bloodmagic.lavaRitual.fireResist.info": "(Steadfast) Players in this range have Fire Resist applied.", - "ritual.bloodmagic.lavaRitual.info": "Generates a source of lava from the master ritual stone.", - "ritual.bloodmagic.lavaRitual.lavaRange.info": "(Lava) The area that the ritual will place lava source blocks.", - "ritual.bloodmagic.lavaRitual.lavaTank.info": "(Raw) The tank that the ritual will place lava into.", - "ritual.bloodmagic.lavaRitual.steadfast.info": "(Steadfast) Players within a designated range have Fire Resistance applied to them.", - "ritual.bloodmagic.lavaRitual.vengeful.info": "(Vengeful) Entities within range have Fire Fuse applied to them.", - "ritual.bloodmagic.magneticRitual": "Ritual of Magnetism", - "ritual.bloodmagic.magneticRitual.info": "Pulls up ores from the ground and puts them into its placement range.", - "ritual.bloodmagic.magneticRitual.placementRange.info": "(Placement) The range that the ritual will place the grabbed ores into.", - "ritual.bloodmagic.meteorRitual.info": "Consumes an item inside of its item range to summon a meteor full of resources from the sky, aimed directly at the ritual.", - "ritual.bloodmagic.placerRitual": "The Filler", - "ritual.bloodmagic.placerRitual.chest.info": "(Chest) The location of the inventory that the ritual will grab blocks from to place in the world.", - "ritual.bloodmagic.placerRitual.info": "Grabs blocks that are inside of the connected inventory and places them into the world.", - "ritual.bloodmagic.placerRitual.placerRange.info": "(Placement) The range that the ritual will place its blocks in.", - "ritual.bloodmagic.portalRitual": "The Gate of the Fold", - "ritual.bloodmagic.portalRitual.info": "Creates a portal network based on the activator and the immediately surrounding blocks. Blocks can be changed after activation without changing the network of portals, and portals with the same \"key\" will link together.", - "ritual.bloodmagic.pumpRitual": "Hymn of Siphoning", - "ritual.bloodmagic.pumpRitual.info": "Looks around the world and grabs fluids from the defined area. Will only remove and put the fluid into the connected tank if the tank has at least a bucket's worth of the same fluid.", - "ritual.bloodmagic.pumpRitual.pumpRange.info": "(Pump) The region that the ritual will look for fluids to grab from the world.", - "ritual.bloodmagic.regenerationRitual": "Ritual of Regeneration", - "ritual.bloodmagic.regenerationRitual.corrosive.info": "(Corrosive) Steals health from non-players inside of its Vampirism range and directly heals players.", - "ritual.bloodmagic.regenerationRitual.default.info": "(Raw)", - "ritual.bloodmagic.regenerationRitual.destructive.info": "(Destructive)", - "ritual.bloodmagic.regenerationRitual.heal.info": "(Healing) Entities within this range will receive a regeneration buff.", - "ritual.bloodmagic.regenerationRitual.info": "Casts regeneration on entities within its range if they are missing health.", - "ritual.bloodmagic.regenerationRitual.steadfast.info": "(Steadfast)", - "ritual.bloodmagic.regenerationRitual.vampire.info": "(Vampirism) Mobs within this range have their health syphoned to heal players in the Healing range.", - "ritual.bloodmagic.regenerationRitual.vengeful.info": "(Vengeful)", - "ritual.bloodmagic.speedRitual": "Ritual of Speed", - "ritual.bloodmagic.speedRitual.default.info": "(Raw) Increases the velocity caused by the ritual based on total Will.", - "ritual.bloodmagic.speedRitual.destructive.info": "(Destructive) Prevents child mobs and players from being transported. Players are transported if paired with Vengeful.", - "ritual.bloodmagic.speedRitual.info": "Launches players within its range in the direction of the ritual.", - "ritual.bloodmagic.speedRitual.sanicRange.info": "(Speed) All entities within this area are launched in the direction of the arrow formed by the ritual.", - "ritual.bloodmagic.speedRitual.vengeful.info": "(Vengeful) Prevents adult mobs and players from being transported. Players are transported if paired with Destructive.", - "ritual.bloodmagic.suppressionRitual": "Ritual of Suppression", - "ritual.bloodmagic.suppressionRitual.info": "Suppresses fluids within its range - deactivating the ritual returns the fluids back to the world.", - "ritual.bloodmagic.suppressionRitual.suppressionRange.info": "(Suppress) All liquids within the range are suppressed.", - "ritual.bloodmagic.testRitual": "Test Ritual", - "ritual.bloodmagic.upgradeRemoveRitual": "Sound of the Cleansing Soul", - "ritual.bloodmagic.upgradeRemoveRitual.info": "Removes all upgrades (and downgrades) from your Living Armor and gives you the corresponding Upgrade (and Downgrade) Tomes. These Tomes can be used to be applied to your Living Armor again.", - "ritual.bloodmagic.waterRitual": "Ritual of the Full Spring", - "ritual.bloodmagic.waterRitual.info": "Generates a source of water from the master ritual stone.", - "ritual.bloodmagic.waterRitual.waterRange.info": "(Water) The area that the ritual will place water source blocks.", - "ritual.bloodmagic.waterRitual.waterTank.info": "(Raw) The tank that the ritual will place water into.", - "ritual.bloodmagic.wellOfSufferingRitual": "Well of Suffering", - "ritual.bloodmagic.wellOfSufferingRitual.altar.info": "(Altar) This range defines the area that the ritual searches for the blood altar. Changing this will either expand or limit the range to a certain region.", - "ritual.bloodmagic.wellOfSufferingRitual.damage.info": "(Damage) This defines where the ritual will damage a mob. All mobs inside of this range (except for players) will receive damage over time.", - "ritual.bloodmagic.wellOfSufferingRitual.info": "Attacks mobs within its damage zone and puts the LP into a nearby blood altar.", - "ritual.bloodmagic.willConfig.set": "The ritual will use these Demon Will types: %s", - "ritual.bloodmagic.willConfig.void": "The ritual no longer uses Demon Will", - "ritual.bloodmagic.zephyrRitual": "Call of the Zephyr", - "ritual.bloodmagic.zephyrRitual.chest.info": "(Chest) The location of the inventory that the ritual will place the picked up items into.", - "ritual.bloodmagic.zephyrRitual.info": "Picks up items within its range and places them into the linked chest.", - "ritual.bloodmagic.zephyrRitual.zephyrRange.info": "(Suction) Items within this range will be sucked into the linked chest.", - "tile.bloodmagic.alchemytable.name": "Alchemy Table", - "tile.bloodmagic.arc.name": "Alchemical Reaction Chamber", - "tile.bloodmagic.soulforge.name": "Hellfire Forge", - "tooltip.bloodmagic.activated": "Activated", - "tooltip.bloodmagic.activationcrystal.awakened": "Activates more powerful rituals", - "tooltip.bloodmagic.activationcrystal.creative": "Creative Only - Activates any ritual", - "tooltip.bloodmagic.activationcrystal.weak": "Activates low-level rituals", - "tooltip.bloodmagic.arcaneAshes": "Ashes used to draw an alchemy circle", - "tooltip.bloodmagic.arctool.additionaldrops": "Increases chance of additional outputs by: x%s", - "tooltip.bloodmagic.arctool.uses": "Uses remaining: %s", - "tooltip.bloodmagic.blood_provider.slate.desc": "A simple ampoule containing 500LP", - "tooltip.bloodmagic.config.disabled": "Currently disabled in the Config", - "tooltip.bloodmagic.currentBaseType.corrosive": "Corrosive", - "tooltip.bloodmagic.currentBaseType.default": "Raw", - "tooltip.bloodmagic.currentBaseType.destructive": "Destructive", - "tooltip.bloodmagic.currentBaseType.steadfast": "Steadfast", - "tooltip.bloodmagic.currentBaseType.vengeful": "Vengeful", - "tooltip.bloodmagic.currentOwner": "Current owner: %s", - "tooltip.bloodmagic.currentTier": "Current tier: %d", - "tooltip.bloodmagic.currentType.corrosive": "Contains: Corrosive Will", - "tooltip.bloodmagic.currentType.default": "Contains: Raw Will", - "tooltip.bloodmagic.currentType.destructive": "Contains: Destructive Will", - "tooltip.bloodmagic.currentType.steadfast": "Contains: Steadfast Will", - "tooltip.bloodmagic.currentType.vengeful": "Contains: Vengeful Will", - "tooltip.bloodmagic.deactivated": "Deactivated", - "tooltip.bloodmagic.decoration.notSafe": "Dangerous for decoration", - "tooltip.bloodmagic.decoration.safe": "Safe for decoration", - "tooltip.bloodmagic.diviner.airRune": "Air Runes: %d", - "tooltip.bloodmagic.diviner.blankRune": "Blank Runes: %d", - "tooltip.bloodmagic.diviner.currentDirection": "Current Direction: %s", - "tooltip.bloodmagic.diviner.currentRitual": "Current Ritual: %s", - "tooltip.bloodmagic.diviner.dawnRune": "Dawn Runes: %d", - "tooltip.bloodmagic.diviner.duskRune": "Dusk Runes: %d", - "tooltip.bloodmagic.diviner.earthRune": "Earth Runes: %d", - "tooltip.bloodmagic.diviner.extraExtraInfo": "-Hold shift + alt for augmentation info-", - "tooltip.bloodmagic.diviner.extraInfo": "Press shift for extra info", - "tooltip.bloodmagic.diviner.fireRune": "Fire Runes: %d", - "tooltip.bloodmagic.diviner.totalRune": "Total Runes: %d", - "tooltip.bloodmagic.diviner.waterRune": "Water Runes: %d", - "tooltip.bloodmagic.experienceTome": "A book used to store experience", - "tooltip.bloodmagic.experienceTome.exp": "Exp: %0.3f", - "tooltip.bloodmagic.experienceTome.expLevel": "Level: %d", - "tooltip.bloodmagic.extraInfo": "&9-Hold shift for more info-", - "tooltip.bloodmagic.holdShiftForInfo": "Press shift for extra info", - "tooltip.bloodmagic.inscriber.desc": "The writing is on the wall...", - "tooltip.bloodmagic.livingarmour.extraExtraInfo": "&9-Hold shift + M for progress info-", - "tooltip.bloodmagic.livingarmour.upgrade.level": "%s (Level %d)", - "tooltip.bloodmagic.livingarmour.upgrade.points": "Upgrade points: %s / %s", - "tooltip.bloodmagic.livingarmour.upgrade.progress": "%s (%d/100)", - "tooltip.bloodmagic.orb.desc": "Stores raw Life Essence", - "tooltip.bloodmagic.orb.owner": "Added by: %s", - "tooltip.bloodmagic.ritualReader.currentState": "Current mode: %s", - "tooltip.bloodmagic.ritualReader.desc.information": "Right click on an active Master Ritual Stone to gather basic information about the ritual.", - "tooltip.bloodmagic.ritualReader.desc.set_area": "Right click on an active Master Ritual stone to cycle what area of the ritual you want to modify. Then click on the two corners of the new range you want to set the range.", - "tooltip.bloodmagic.ritualReader.desc.set_will_types": "Set the types of demon will that the ritual will consume from the aura by right clicking on the MRS with the same types of crystals on your hotbar.", - "tooltip.bloodmagic.ritualReader.information": "Information", - "tooltip.bloodmagic.ritualReader.set_area": "Define Area", - "tooltip.bloodmagic.ritualReader.set_will_types": "Set Will Consumed", - "tooltip.bloodmagic.sacrificialdagger.desc": "Just a prick of the finger will suffice...", - "tooltip.bloodmagic.sentientAxe.desc": "Uses demon will to unleash its full potential.", - "tooltip.bloodmagic.sentientPickaxe.desc": "Uses demon will to unleash its full potential.", - "tooltip.bloodmagic.sentientShovel.desc": "Uses demon will to unleash its full potential.", - "tooltip.bloodmagic.sentientSword.desc": "Uses demon will to unleash its full potential.", - "tooltip.bloodmagic.sigil.air.desc": "I feel lighter already...", - "tooltip.bloodmagic.sigil.bloodlight.desc": "I see a light!", - "tooltip.bloodmagic.sigil.divination.currentAltarCapacity": "Current Capacity: %d LP", - "tooltip.bloodmagic.sigil.divination.currentAltarTier": "Current Tier: %d", - "tooltip.bloodmagic.sigil.divination.currentBonus": "Current Bonus: +%d%%", - "tooltip.bloodmagic.sigil.divination.currentEssence": "Current Essence: %d LP", - "tooltip.bloodmagic.sigil.divination.currentTranquility": "Current Tranquility: %d", - "tooltip.bloodmagic.sigil.divination.desc": "Peer into the soul", - "tooltip.bloodmagic.sigil.divination.otherNetwork": "Peering into the soul of %s", - "tooltip.bloodmagic.sigil.fastminer.desc": "Keep mining, and mining...", - "tooltip.bloodmagic.sigil.greengrove.desc": "Environmentally friendly", - "tooltip.bloodmagic.sigil.holding.desc": "Sigil-ception", - "tooltip.bloodmagic.sigil.holding.press": "Press %s to modify", - "tooltip.bloodmagic.sigil.holding.sigilInSlot": "Slot %d: %s", - "tooltip.bloodmagic.sigil.lava.desc": "HOT! DO NOT EAT", - "tooltip.bloodmagic.sigil.magnetism.desc": "I have a very magnetic personality", - "tooltip.bloodmagic.sigil.seer.currentAltarCapacity": "Current Capacity: %d LP", - "tooltip.bloodmagic.sigil.seer.currentAltarConsumptionRate": "Consumption Rate: %d LP", - "tooltip.bloodmagic.sigil.seer.currentAltarProgress": "Current Progress: %d LP/ %s LP", - "tooltip.bloodmagic.sigil.seer.currentAltarProgress.percent": "Current Progress: %s", - "tooltip.bloodmagic.sigil.seer.currentAltarTier": "Current Tier: %d", - "tooltip.bloodmagic.sigil.seer.currentBonus": "Current Bonus: +%d%%", - "tooltip.bloodmagic.sigil.seer.currentCharge": "Current Charge: %d", - "tooltip.bloodmagic.sigil.seer.currentEssence": "Current Essence: %d LP", - "tooltip.bloodmagic.sigil.seer.currentTranquility": "Current Tranquility: %d", - "tooltip.bloodmagic.sigil.seer.desc": "When seeing all is not enough", - "tooltip.bloodmagic.sigil.void.desc": "Better than a Swiffer\u00AE!", - "tooltip.bloodmagic.sigil.water.desc": "Infinite water, anyone?", - "tooltip.bloodmagic.slate.desc": "Infused stone inside of a Blood Altar", - "tooltip.bloodmagic.slate_vial": "A glass vial infused with a simple slate", - "tooltip.bloodmagic.soulGem.common": "A gem used to contain more will", - "tooltip.bloodmagic.soulGem.grand": "A gem used to contain a large amount of will", - "tooltip.bloodmagic.soulGem.greater": "A gem used to contain a greater amount of will", - "tooltip.bloodmagic.soulGem.lesser": "A gem used to contain some will", - "tooltip.bloodmagic.soulGem.petty": "A gem used to contain a little will", - "tooltip.bloodmagic.soulSnare.desc": "Throw at a monster and then kill them to obtain their demonic will", - "tooltip.bloodmagic.throwing_dagger.desc": "Not to be used in the kitchen", - "tooltip.bloodmagic.tier": "Tier %d", - "tooltip.bloodmagic.will": "Will Quality: %s" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/accelerationrune.json b/src/generated/resources/assets/bloodmagic/models/block/accelerationrune.json deleted file mode 100644 index fd09a780..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/accelerationrune.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/accelerationrune" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/airritualstone.json b/src/generated/resources/assets/bloodmagic/models/block/airritualstone.json deleted file mode 100644 index 428b9552..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/airritualstone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/airritualstone" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/alchemicalreactionchamber.json b/src/generated/resources/assets/bloodmagic/models/block/alchemicalreactionchamber.json deleted file mode 100644 index 84690dfc..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/alchemicalreactionchamber.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "minecraft:block/orientable_with_bottom", - "textures": { - "side": "bloodmagic:block/arc_side", - "front": "bloodmagic:block/arc_front", - "bottom": "bloodmagic:block/arc_bottom", - "top": "bloodmagic:block/arc_top" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/altarcapacityrune.json b/src/generated/resources/assets/bloodmagic/models/block/altarcapacityrune.json deleted file mode 100644 index c8a6d830..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/altarcapacityrune.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/altarcapacityrune" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/bettercapacityrune.json b/src/generated/resources/assets/bloodmagic/models/block/bettercapacityrune.json deleted file mode 100644 index 3ffccb3a..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/bettercapacityrune.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/bettercapacityrune" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/blankrune.json b/src/generated/resources/assets/bloodmagic/models/block/blankrune.json deleted file mode 100644 index ab6f65ac..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/blankrune.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/blankrune" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/bloodlight.json b/src/generated/resources/assets/bloodmagic/models/block/bloodlight.json deleted file mode 100644 index 1a06cf8d..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/bloodlight.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/bloodlight" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/bloodstonebrick.json b/src/generated/resources/assets/bloodmagic/models/block/bloodstonebrick.json deleted file mode 100644 index b0eccad9..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/bloodstonebrick.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/bloodstonebrick" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/chargingrune.json b/src/generated/resources/assets/bloodmagic/models/block/chargingrune.json deleted file mode 100644 index 8a0996cf..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/chargingrune.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/chargingrune" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/creeping_doubt_1.json b/src/generated/resources/assets/bloodmagic/models/block/creeping_doubt_1.json deleted file mode 100644 index 2f9e67a5..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/creeping_doubt_1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/crop", - "textures": { - "crop": "bloodmagic:block/creeping_doubt_1" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/creeping_doubt_2.json b/src/generated/resources/assets/bloodmagic/models/block/creeping_doubt_2.json deleted file mode 100644 index 614b4b22..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/creeping_doubt_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/crop", - "textures": { - "crop": "bloodmagic:block/creeping_doubt_2" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/creeping_doubt_3.json b/src/generated/resources/assets/bloodmagic/models/block/creeping_doubt_3.json deleted file mode 100644 index b8c6af48..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/creeping_doubt_3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/crop", - "textures": { - "crop": "bloodmagic:block/creeping_doubt_3" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/creeping_doubt_4.json b/src/generated/resources/assets/bloodmagic/models/block/creeping_doubt_4.json deleted file mode 100644 index a9f300dd..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/creeping_doubt_4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/crop", - "textures": { - "crop": "bloodmagic:block/creeping_doubt_4" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/creeping_doubt_5.json b/src/generated/resources/assets/bloodmagic/models/block/creeping_doubt_5.json deleted file mode 100644 index cba7434f..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/creeping_doubt_5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/crop", - "textures": { - "crop": "bloodmagic:block/creeping_doubt_5" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/creeping_doubt_6.json b/src/generated/resources/assets/bloodmagic/models/block/creeping_doubt_6.json deleted file mode 100644 index ebe9679d..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/creeping_doubt_6.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/crop", - "textures": { - "crop": "bloodmagic:block/creeping_doubt_6" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/creeping_doubt_7.json b/src/generated/resources/assets/bloodmagic/models/block/creeping_doubt_7.json deleted file mode 100644 index d0b2d010..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/creeping_doubt_7.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/crop", - "textures": { - "crop": "bloodmagic:block/creeping_doubt_7" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/creeping_doubt_8.json b/src/generated/resources/assets/bloodmagic/models/block/creeping_doubt_8.json deleted file mode 100644 index 9763321c..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/creeping_doubt_8.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/crop", - "textures": { - "crop": "bloodmagic:block/creeping_doubt_8" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/corrosivecrystal1.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/corrosivecrystal1.json deleted file mode 100644 index 2b4aebed..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/corrosivecrystal1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal1", - "textures": { - "crystal": "bloodmagic:models/corrosivecrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/corrosivecrystal2.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/corrosivecrystal2.json deleted file mode 100644 index 24b1ec69..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/corrosivecrystal2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal2", - "textures": { - "crystal": "bloodmagic:models/corrosivecrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/corrosivecrystal3.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/corrosivecrystal3.json deleted file mode 100644 index fc658c68..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/corrosivecrystal3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal3", - "textures": { - "crystal": "bloodmagic:models/corrosivecrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/corrosivecrystal4.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/corrosivecrystal4.json deleted file mode 100644 index 5fc95052..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/corrosivecrystal4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal4", - "textures": { - "crystal": "bloodmagic:models/corrosivecrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/corrosivecrystal5.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/corrosivecrystal5.json deleted file mode 100644 index a39edf1b..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/corrosivecrystal5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal5", - "textures": { - "crystal": "bloodmagic:models/corrosivecrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/corrosivecrystal6.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/corrosivecrystal6.json deleted file mode 100644 index 40221914..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/corrosivecrystal6.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal6", - "textures": { - "crystal": "bloodmagic:models/corrosivecrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/corrosivecrystal7.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/corrosivecrystal7.json deleted file mode 100644 index bb114d6c..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/corrosivecrystal7.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal7", - "textures": { - "crystal": "bloodmagic:models/corrosivecrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/defaultcrystal1.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/defaultcrystal1.json deleted file mode 100644 index d6f96ee5..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/defaultcrystal1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal1", - "textures": { - "crystal": "bloodmagic:models/defaultcrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/defaultcrystal2.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/defaultcrystal2.json deleted file mode 100644 index 64eb34d7..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/defaultcrystal2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal2", - "textures": { - "crystal": "bloodmagic:models/defaultcrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/defaultcrystal3.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/defaultcrystal3.json deleted file mode 100644 index 985aa46e..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/defaultcrystal3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal3", - "textures": { - "crystal": "bloodmagic:models/defaultcrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/defaultcrystal4.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/defaultcrystal4.json deleted file mode 100644 index 6832216d..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/defaultcrystal4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal4", - "textures": { - "crystal": "bloodmagic:models/defaultcrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/defaultcrystal5.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/defaultcrystal5.json deleted file mode 100644 index 516a689d..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/defaultcrystal5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal5", - "textures": { - "crystal": "bloodmagic:models/defaultcrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/defaultcrystal6.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/defaultcrystal6.json deleted file mode 100644 index b1fd517f..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/defaultcrystal6.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal6", - "textures": { - "crystal": "bloodmagic:models/defaultcrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/defaultcrystal7.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/defaultcrystal7.json deleted file mode 100644 index 058eca74..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/defaultcrystal7.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal7", - "textures": { - "crystal": "bloodmagic:models/defaultcrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/destructivecrystal1.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/destructivecrystal1.json deleted file mode 100644 index a94ae6dc..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/destructivecrystal1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal1", - "textures": { - "crystal": "bloodmagic:models/destructivecrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/destructivecrystal2.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/destructivecrystal2.json deleted file mode 100644 index 4f35bb55..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/destructivecrystal2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal2", - "textures": { - "crystal": "bloodmagic:models/destructivecrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/destructivecrystal3.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/destructivecrystal3.json deleted file mode 100644 index a01fcd89..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/destructivecrystal3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal3", - "textures": { - "crystal": "bloodmagic:models/destructivecrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/destructivecrystal4.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/destructivecrystal4.json deleted file mode 100644 index 94865f70..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/destructivecrystal4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal4", - "textures": { - "crystal": "bloodmagic:models/destructivecrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/destructivecrystal5.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/destructivecrystal5.json deleted file mode 100644 index 94c1c39c..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/destructivecrystal5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal5", - "textures": { - "crystal": "bloodmagic:models/destructivecrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/destructivecrystal6.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/destructivecrystal6.json deleted file mode 100644 index 5d63f3ba..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/destructivecrystal6.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal6", - "textures": { - "crystal": "bloodmagic:models/destructivecrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/destructivecrystal7.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/destructivecrystal7.json deleted file mode 100644 index 81eb3805..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/destructivecrystal7.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal7", - "textures": { - "crystal": "bloodmagic:models/destructivecrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/steadfastcrystal1.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/steadfastcrystal1.json deleted file mode 100644 index ba1d5669..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/steadfastcrystal1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal1", - "textures": { - "crystal": "bloodmagic:models/steadfastcrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/steadfastcrystal2.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/steadfastcrystal2.json deleted file mode 100644 index cce291fc..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/steadfastcrystal2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal2", - "textures": { - "crystal": "bloodmagic:models/steadfastcrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/steadfastcrystal3.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/steadfastcrystal3.json deleted file mode 100644 index 046018b9..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/steadfastcrystal3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal3", - "textures": { - "crystal": "bloodmagic:models/steadfastcrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/steadfastcrystal4.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/steadfastcrystal4.json deleted file mode 100644 index 1dc6165a..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/steadfastcrystal4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal4", - "textures": { - "crystal": "bloodmagic:models/steadfastcrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/steadfastcrystal5.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/steadfastcrystal5.json deleted file mode 100644 index 3ea44bc5..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/steadfastcrystal5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal5", - "textures": { - "crystal": "bloodmagic:models/steadfastcrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/steadfastcrystal6.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/steadfastcrystal6.json deleted file mode 100644 index 6de624be..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/steadfastcrystal6.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal6", - "textures": { - "crystal": "bloodmagic:models/steadfastcrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/steadfastcrystal7.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/steadfastcrystal7.json deleted file mode 100644 index d66e329b..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/steadfastcrystal7.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal7", - "textures": { - "crystal": "bloodmagic:models/steadfastcrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/vengefulcrystal1.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/vengefulcrystal1.json deleted file mode 100644 index 9fa509cf..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/vengefulcrystal1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal1", - "textures": { - "crystal": "bloodmagic:models/vengefulcrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/vengefulcrystal2.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/vengefulcrystal2.json deleted file mode 100644 index c6a89b2b..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/vengefulcrystal2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal2", - "textures": { - "crystal": "bloodmagic:models/vengefulcrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/vengefulcrystal3.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/vengefulcrystal3.json deleted file mode 100644 index 83b5dd09..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/vengefulcrystal3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal3", - "textures": { - "crystal": "bloodmagic:models/vengefulcrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/vengefulcrystal4.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/vengefulcrystal4.json deleted file mode 100644 index 16322807..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/vengefulcrystal4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal4", - "textures": { - "crystal": "bloodmagic:models/vengefulcrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/vengefulcrystal5.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/vengefulcrystal5.json deleted file mode 100644 index 13d761b5..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/vengefulcrystal5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal5", - "textures": { - "crystal": "bloodmagic:models/vengefulcrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/vengefulcrystal6.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/vengefulcrystal6.json deleted file mode 100644 index 6c25cecf..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/vengefulcrystal6.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal6", - "textures": { - "crystal": "bloodmagic:models/vengefulcrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/crystal/vengefulcrystal7.json b/src/generated/resources/assets/bloodmagic/models/block/crystal/vengefulcrystal7.json deleted file mode 100644 index d3a5b678..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/crystal/vengefulcrystal7.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal7", - "textures": { - "crystal": "bloodmagic:models/vengefulcrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/deforester_charge.json b/src/generated/resources/assets/bloodmagic/models/block/deforester_charge.json deleted file mode 100644 index f441dc4e..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/deforester_charge.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "bloodmagic:block/sub/shaped_charge", - "textures": { - "1": "minecraft:block/oak_log_top", - "3": "minecraft:block/oak_log_top", - "4": "bloodmagic:block/blankrune", - "5": "minecraft:block/oak_planks", - "6": "bloodmagic:models/defaultcrystal", - "particle": "bloodmagic:models/defaultcrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dislocationrune.json b/src/generated/resources/assets/bloodmagic/models/block/dislocationrune.json deleted file mode 100644 index a4b7b5f3..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dislocationrune.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/dislocationrune" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick1.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick1.json deleted file mode 100644 index 67fd1fd3..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/dungeon/dungeon_brick1" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick2.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick2.json deleted file mode 100644 index f928def2..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/dungeon/dungeon_brick2" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick3.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick3.json deleted file mode 100644 index cde0ff61..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/dungeon/dungeon_brick3" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_gate.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_gate.json deleted file mode 100644 index e31759c0..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate", - "textures": { - "texture": "bloodmagic:block/dungeon/dungeon_brick1" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_gate_open.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_gate_open.json deleted file mode 100644 index d4a81aaa..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate_open", - "textures": { - "texture": "bloodmagic:block/dungeon/dungeon_brick1" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_gate_wall.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_gate_wall.json deleted file mode 100644 index 19ef409e..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate_wall", - "textures": { - "texture": "bloodmagic:block/dungeon/dungeon_brick1" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_gate_wall_open.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_gate_wall_open.json deleted file mode 100644 index 1d63b5c3..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate_wall_open", - "textures": { - "texture": "bloodmagic:block/dungeon/dungeon_brick1" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_stairs.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_stairs.json deleted file mode 100644 index 97ec435b..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "side": "bloodmagic:block/dungeon/dungeon_brick1", - "bottom": "bloodmagic:block/dungeon/dungeon_brick1", - "top": "bloodmagic:block/dungeon/dungeon_brick1" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_stairs_inner.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_stairs_inner.json deleted file mode 100644 index ab8c305f..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "side": "bloodmagic:block/dungeon/dungeon_brick1", - "bottom": "bloodmagic:block/dungeon/dungeon_brick1", - "top": "bloodmagic:block/dungeon/dungeon_brick1" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_stairs_outer.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_stairs_outer.json deleted file mode 100644 index 54284cbc..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "side": "bloodmagic:block/dungeon/dungeon_brick1", - "bottom": "bloodmagic:block/dungeon/dungeon_brick1", - "top": "bloodmagic:block/dungeon/dungeon_brick1" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_wall_inventory.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_wall_inventory.json deleted file mode 100644 index c90f1034..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_wall_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/wall_inventory", - "textures": { - "wall": "bloodmagic:block/dungeon/dungeon_brick1" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_wall_post.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_wall_post.json deleted file mode 100644 index 1e2aa564..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_wall_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_post", - "textures": { - "wall": "bloodmagic:block/dungeon/dungeon_brick1" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_wall_side.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_wall_side.json deleted file mode 100644 index d68f15be..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_wall_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_side", - "textures": { - "wall": "bloodmagic:block/dungeon/dungeon_brick1" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_wall_side_tall.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_wall_side_tall.json deleted file mode 100644 index 88c3bc4a..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_wall_side_tall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_side_tall", - "textures": { - "wall": "bloodmagic:block/dungeon/dungeon_brick1" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_eye.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_eye.json deleted file mode 100644 index 050b373a..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_eye.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/dungeon/dungeon_eye" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_metal.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_metal.json deleted file mode 100644 index bad4f014..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_metal.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/dungeon/dungeon_metal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_ore.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_ore.json deleted file mode 100644 index 93254ada..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/dungeon/dungeon_ore" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap.json deleted file mode 100644 index 80da11c8..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "side": "bloodmagic:block/dungeon/dungeon_pillartop", - "bottom": "bloodmagic:block/dungeon/dungeon_pillarheart", - "top": "bloodmagic:block/dungeon/dungeon_pillarheart" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_down.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_down.json deleted file mode 100644 index 1c9c81fa..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_down.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "side": "bloodmagic:block/dungeon/dungeon_pillarbottom", - "bottom": "bloodmagic:block/dungeon/dungeon_pillarheart", - "top": "bloodmagic:block/dungeon/dungeon_pillarheart" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_east.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_east.json deleted file mode 100644 index ddca684f..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_east.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "parent": "minecraft:block/cube", - "textures": { - "particle": "bloodmagic:block/dungeon/dungeon_pillarheart", - "sideBottom": "bloodmagic:block/dungeon/dungeon_pillarbottom", - "end": "bloodmagic:block/dungeon/dungeon_pillarheart", - "sideTop": "bloodmagic:block/dungeon/dungeon_pillartop" - }, - "elements": [ - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "down": { - "texture": "#sideBottom", - "rotation": 270 - }, - "up": { - "texture": "#sideBottom", - "rotation": 270 - }, - "north": { - "texture": "#sideTop", - "rotation": 270 - }, - "south": { - "texture": "#sideBottom", - "rotation": 270 - }, - "west": { - "texture": "#end", - "uv": [ - 16.0, - 0.0, - 0.0, - 16.0 - ] - }, - "east": { - "texture": "#end", - "uv": [ - 16.0, - 0.0, - 0.0, - 16.0 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_north.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_north.json deleted file mode 100644 index ba59597e..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_north.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "parent": "minecraft:block/cube", - "textures": { - "particle": "bloodmagic:block/dungeon/dungeon_pillarheart", - "sideBottom": "bloodmagic:block/dungeon/dungeon_pillarbottom", - "end": "bloodmagic:block/dungeon/dungeon_pillarheart", - "sideTop": "bloodmagic:block/dungeon/dungeon_pillartop" - }, - "elements": [ - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "down": { - "texture": "#sideBottom" - }, - "up": { - "texture": "#sideTop" - }, - "north": { - "texture": "#end" - }, - "south": { - "texture": "#end" - }, - "west": { - "texture": "#sideTop", - "uv": [ - 16.0, - 0.0, - 0.0, - 16.0 - ], - "rotation": 270 - }, - "east": { - "texture": "#sideBottom", - "uv": [ - 16.0, - 0.0, - 0.0, - 16.0 - ], - "rotation": 270 - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_south.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_south.json deleted file mode 100644 index 643f943d..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_south.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "parent": "minecraft:block/cube", - "textures": { - "particle": "bloodmagic:block/dungeon/dungeon_pillarheart", - "sideBottom": "bloodmagic:block/dungeon/dungeon_pillarbottom", - "end": "bloodmagic:block/dungeon/dungeon_pillarheart", - "sideTop": "bloodmagic:block/dungeon/dungeon_pillartop" - }, - "elements": [ - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "down": { - "texture": "#sideTop" - }, - "up": { - "texture": "#sideBottom" - }, - "north": { - "texture": "#end" - }, - "south": { - "texture": "#end" - }, - "west": { - "texture": "#sideBottom", - "uv": [ - 16.0, - 0.0, - 0.0, - 16.0 - ], - "rotation": 270 - }, - "east": { - "texture": "#sideTop", - "uv": [ - 16.0, - 0.0, - 0.0, - 16.0 - ], - "rotation": 270 - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_west.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_west.json deleted file mode 100644 index d871f337..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_west.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "parent": "minecraft:block/cube", - "textures": { - "particle": "bloodmagic:block/dungeon/dungeon_pillarheart", - "sideBottom": "bloodmagic:block/dungeon/dungeon_pillarbottom", - "end": "bloodmagic:block/dungeon/dungeon_pillarheart", - "sideTop": "bloodmagic:block/dungeon/dungeon_pillartop" - }, - "elements": [ - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "down": { - "texture": "#sideTop", - "rotation": 270 - }, - "up": { - "texture": "#sideTop", - "rotation": 270 - }, - "north": { - "texture": "#sideBottom", - "rotation": 270 - }, - "south": { - "texture": "#sideTop", - "rotation": 270 - }, - "west": { - "texture": "#end", - "uv": [ - 16.0, - 0.0, - 0.0, - 16.0 - ] - }, - "east": { - "texture": "#end", - "uv": [ - 16.0, - 0.0, - 0.0, - 16.0 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_center.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_center.json deleted file mode 100644 index 0ee75aa8..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_center.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "side": "bloodmagic:block/dungeon/dungeon_pillar", - "end": "bloodmagic:block/dungeon/dungeon_pillarheart" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_center_x.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_center_x.json deleted file mode 100644 index dc0d116a..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_center_x.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "parent": "minecraft:block/cube", - "textures": { - "particle": "bloodmagic:block/dungeon/dungeon_pillar", - "end": "bloodmagic:block/dungeon/dungeon_pillarheart", - "side": "bloodmagic:block/dungeon/dungeon_pillar" - }, - "elements": [ - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "down": { - "texture": "#side", - "rotation": 270 - }, - "up": { - "texture": "#side", - "rotation": 270 - }, - "north": { - "texture": "#side", - "rotation": 270 - }, - "south": { - "texture": "#side", - "rotation": 270 - }, - "west": { - "texture": "#end", - "uv": [ - 16.0, - 0.0, - 0.0, - 16.0 - ] - }, - "east": { - "texture": "#end", - "uv": [ - 16.0, - 0.0, - 0.0, - 16.0 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_center_z.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_center_z.json deleted file mode 100644 index 8cf66442..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_center_z.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "parent": "minecraft:block/cube", - "textures": { - "particle": "bloodmagic:block/dungeon/dungeon_pillar", - "end": "bloodmagic:block/dungeon/dungeon_pillarheart", - "side": "bloodmagic:block/dungeon/dungeon_pillar" - }, - "elements": [ - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "down": { - "texture": "#side" - }, - "up": { - "texture": "#side" - }, - "north": { - "texture": "#end" - }, - "south": { - "texture": "#end" - }, - "west": { - "texture": "#side", - "uv": [ - 16.0, - 0.0, - 0.0, - 16.0 - ], - "rotation": 270 - }, - "east": { - "texture": "#side", - "uv": [ - 16.0, - 0.0, - 0.0, - 16.0 - ], - "rotation": 270 - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_special.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_special.json deleted file mode 100644 index 3ad64eb6..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_special.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "side": "bloodmagic:block/dungeon/dungeon_pillarspecial", - "end": "bloodmagic:block/dungeon/dungeon_pillarheart" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_special_x.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_special_x.json deleted file mode 100644 index 4c04aa89..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_special_x.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "parent": "minecraft:block/cube", - "textures": { - "particle": "bloodmagic:block/dungeon/dungeon_pillarspecial", - "end": "bloodmagic:block/dungeon/dungeon_pillarheart", - "side": "bloodmagic:block/dungeon/dungeon_pillarspecial" - }, - "elements": [ - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "down": { - "texture": "#side", - "rotation": 270 - }, - "up": { - "texture": "#side", - "rotation": 270 - }, - "north": { - "texture": "#side", - "rotation": 270 - }, - "south": { - "texture": "#side", - "rotation": 270 - }, - "west": { - "texture": "#end", - "uv": [ - 16.0, - 0.0, - 0.0, - 16.0 - ] - }, - "east": { - "texture": "#end", - "uv": [ - 16.0, - 0.0, - 0.0, - 16.0 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_special_z.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_special_z.json deleted file mode 100644 index 5c198826..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_special_z.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "parent": "minecraft:block/cube", - "textures": { - "particle": "bloodmagic:block/dungeon/dungeon_pillarspecial", - "end": "bloodmagic:block/dungeon/dungeon_pillarheart", - "side": "bloodmagic:block/dungeon/dungeon_pillarspecial" - }, - "elements": [ - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "down": { - "texture": "#side" - }, - "up": { - "texture": "#side" - }, - "north": { - "texture": "#end" - }, - "south": { - "texture": "#end" - }, - "west": { - "texture": "#side", - "uv": [ - 16.0, - 0.0, - 0.0, - 16.0 - ], - "rotation": 270 - }, - "east": { - "texture": "#side", - "uv": [ - 16.0, - 0.0, - 0.0, - 16.0 - ], - "rotation": 270 - } - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished.json deleted file mode 100644 index 0cfce680..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/dungeon/dungeon_polished" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_gate.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_gate.json deleted file mode 100644 index 00d14be8..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate", - "textures": { - "texture": "bloodmagic:block/dungeon/dungeon_polished" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_gate_open.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_gate_open.json deleted file mode 100644 index eeeb11e3..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate_open", - "textures": { - "texture": "bloodmagic:block/dungeon/dungeon_polished" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_gate_wall.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_gate_wall.json deleted file mode 100644 index 5a753921..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate_wall", - "textures": { - "texture": "bloodmagic:block/dungeon/dungeon_polished" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_gate_wall_open.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_gate_wall_open.json deleted file mode 100644 index 94f199d1..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate_wall_open", - "textures": { - "texture": "bloodmagic:block/dungeon/dungeon_polished" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_stairs.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_stairs.json deleted file mode 100644 index 291e9cff..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "side": "bloodmagic:block/dungeon/dungeon_polished", - "bottom": "bloodmagic:block/dungeon/dungeon_polished", - "top": "bloodmagic:block/dungeon/dungeon_polished" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_stairs_inner.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_stairs_inner.json deleted file mode 100644 index f74477bd..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "side": "bloodmagic:block/dungeon/dungeon_polished", - "bottom": "bloodmagic:block/dungeon/dungeon_polished", - "top": "bloodmagic:block/dungeon/dungeon_polished" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_stairs_outer.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_stairs_outer.json deleted file mode 100644 index 7df9f548..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "side": "bloodmagic:block/dungeon/dungeon_polished", - "bottom": "bloodmagic:block/dungeon/dungeon_polished", - "top": "bloodmagic:block/dungeon/dungeon_polished" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_wall_inventory.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_wall_inventory.json deleted file mode 100644 index 1b6724a7..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_wall_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/wall_inventory", - "textures": { - "wall": "bloodmagic:block/dungeon/dungeon_polished" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_wall_post.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_wall_post.json deleted file mode 100644 index a65da079..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_wall_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_post", - "textures": { - "wall": "bloodmagic:block/dungeon/dungeon_polished" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_wall_side.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_wall_side.json deleted file mode 100644 index c2da5f14..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_wall_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_side", - "textures": { - "wall": "bloodmagic:block/dungeon/dungeon_polished" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_wall_side_tall.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_wall_side_tall.json deleted file mode 100644 index 2d55b1bc..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_wall_side_tall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_side_tall", - "textures": { - "wall": "bloodmagic:block/dungeon/dungeon_polished" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_smallbrick.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_smallbrick.json deleted file mode 100644 index dd5793ed..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_smallbrick.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/dungeon/dungeon_smallbrick" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_stone.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_stone.json deleted file mode 100644 index e76740d6..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_stone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/dungeon/dungeon_stone" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_stone_mirrored.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_stone_mirrored.json deleted file mode 100644 index 3b579c73..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_stone_mirrored.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_mirrored_all", - "textures": { - "all": "bloodmagic:block/dungeon/dungeon_stone" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_tile.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_tile.json deleted file mode 100644 index 8f93a06d..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_tile.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/dungeon/dungeon_tile" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_tilespecial.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_tilespecial.json deleted file mode 100644 index 2fb38846..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/dungeon_tilespecial.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/dungeon/dungeon_tilespecial" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/duskritualstone.json b/src/generated/resources/assets/bloodmagic/models/block/duskritualstone.json deleted file mode 100644 index ecfcfa10..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/duskritualstone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/duskritualstone" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/earthritualstone.json b/src/generated/resources/assets/bloodmagic/models/block/earthritualstone.json deleted file mode 100644 index e0949faa..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/earthritualstone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/earthritualstone" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/etherealopaquemimic.json b/src/generated/resources/assets/bloodmagic/models/block/etherealopaquemimic.json deleted file mode 100644 index 71983d4a..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/etherealopaquemimic.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/etherealopaquemimic" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/fireritualstone.json b/src/generated/resources/assets/bloodmagic/models/block/fireritualstone.json deleted file mode 100644 index 1661fe87..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/fireritualstone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/fireritualstone" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/fungal_charge.json b/src/generated/resources/assets/bloodmagic/models/block/fungal_charge.json deleted file mode 100644 index 49b4c667..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/fungal_charge.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "bloodmagic:block/sub/shaped_charge", - "textures": { - "1": "minecraft:block/crimson_planks", - "3": "minecraft:block/nether_wart_block", - "4": "bloodmagic:block/blankrune", - "5": "minecraft:block/crimson_stem", - "6": "bloodmagic:models/defaultcrystal", - "particle": "bloodmagic:models/defaultcrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/largebloodstonebrick.json b/src/generated/resources/assets/bloodmagic/models/block/largebloodstonebrick.json deleted file mode 100644 index 25aaa1a4..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/largebloodstonebrick.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/largebloodstonebrick" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/lightritualstone.json b/src/generated/resources/assets/bloodmagic/models/block/lightritualstone.json deleted file mode 100644 index 89bce579..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/lightritualstone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/lightritualstone" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/masterritualstone.json b/src/generated/resources/assets/bloodmagic/models/block/masterritualstone.json deleted file mode 100644 index cbb503be..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/masterritualstone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/masterritualstone" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/nether_soil.json b/src/generated/resources/assets/bloodmagic/models/block/nether_soil.json deleted file mode 100644 index 9014e226..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/nether_soil.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/template_farmland", - "textures": { - "top": "bloodmagic:block/nether_soil", - "dirt": "minecraft:block/netherrack" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/obsidianbrickpath.json b/src/generated/resources/assets/bloodmagic/models/block/obsidianbrickpath.json deleted file mode 100644 index 77f2ba8e..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/obsidianbrickpath.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/obsidianbrickpath" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/obsidiantilepath.json b/src/generated/resources/assets/bloodmagic/models/block/obsidiantilepath.json deleted file mode 100644 index 40a85379..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/obsidiantilepath.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/obsidiantilepath" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/orbcapacityrune.json b/src/generated/resources/assets/bloodmagic/models/block/orbcapacityrune.json deleted file mode 100644 index db85074a..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/orbcapacityrune.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/orbcapacityrune" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/ritualstone.json b/src/generated/resources/assets/bloodmagic/models/block/ritualstone.json deleted file mode 100644 index ca5b7b23..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/ritualstone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/ritualstone" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/sacrificerune.json b/src/generated/resources/assets/bloodmagic/models/block/sacrificerune.json deleted file mode 100644 index 9f99851f..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/sacrificerune.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/sacrificerune" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/selfsacrificerune.json b/src/generated/resources/assets/bloodmagic/models/block/selfsacrificerune.json deleted file mode 100644 index bad7ca8e..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/selfsacrificerune.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/selfsacrificerune" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/sentientmimic.json b/src/generated/resources/assets/bloodmagic/models/block/sentientmimic.json deleted file mode 100644 index 09592433..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/sentientmimic.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/sentientmimic" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/shaped_charge.json b/src/generated/resources/assets/bloodmagic/models/block/shaped_charge.json deleted file mode 100644 index 75078a95..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/shaped_charge.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "bloodmagic:block/sub/shaped_charge", - "textures": { - "1": "bloodmagic:block/dungeon/dungeon_tile", - "3": "bloodmagic:block/dungeon/dungeon_stone", - "4": "bloodmagic:block/blankrune", - "5": "bloodmagic:block/largebloodstonebrick", - "6": "bloodmagic:models/defaultcrystal", - "particle": "bloodmagic:models/defaultcrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/solidclearmimic.json b/src/generated/resources/assets/bloodmagic/models/block/solidclearmimic.json deleted file mode 100644 index bed0be1c..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/solidclearmimic.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/solidclearmimic" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/solidlightmimic.json b/src/generated/resources/assets/bloodmagic/models/block/solidlightmimic.json deleted file mode 100644 index 7dbf0fc7..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/solidlightmimic.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/solidlightmimic" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/solidopaquemimic.json b/src/generated/resources/assets/bloodmagic/models/block/solidopaquemimic.json deleted file mode 100644 index 0028f9e4..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/solidopaquemimic.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/solidopaquemimic" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/speedrune.json b/src/generated/resources/assets/bloodmagic/models/block/speedrune.json deleted file mode 100644 index d33d1f07..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/speedrune.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/speedrune" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/stonebrickpath.json b/src/generated/resources/assets/bloodmagic/models/block/stonebrickpath.json deleted file mode 100644 index 59ad054f..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/stonebrickpath.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/stonebrickpath" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/stonetilepath.json b/src/generated/resources/assets/bloodmagic/models/block/stonetilepath.json deleted file mode 100644 index 380149f4..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/stonetilepath.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/stonetilepath" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/veinmine_charge.json b/src/generated/resources/assets/bloodmagic/models/block/veinmine_charge.json deleted file mode 100644 index 1c50bf82..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/veinmine_charge.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "bloodmagic:block/sub/shaped_charge", - "textures": { - "1": "minecraft:block/sandstone_bottom", - "3": "minecraft:block/sandstone_bottom", - "4": "bloodmagic:block/blankrune", - "5": "minecraft:block/sand", - "6": "bloodmagic:models/defaultcrystal", - "particle": "bloodmagic:models/defaultcrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/waterritualstone.json b/src/generated/resources/assets/bloodmagic/models/block/waterritualstone.json deleted file mode 100644 index 1222a06c..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/waterritualstone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/waterritualstone" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/woodbrickpath.json b/src/generated/resources/assets/bloodmagic/models/block/woodbrickpath.json deleted file mode 100644 index 32aa5bb7..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/woodbrickpath.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/woodbrickpath" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/woodtilepath.json b/src/generated/resources/assets/bloodmagic/models/block/woodtilepath.json deleted file mode 100644 index b2a8fbe6..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/woodtilepath.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/woodtilepath" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/wornstonebrickpath.json b/src/generated/resources/assets/bloodmagic/models/block/wornstonebrickpath.json deleted file mode 100644 index b4a3da7b..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/wornstonebrickpath.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/wornstonebrickpath" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/wornstonetilepath.json b/src/generated/resources/assets/bloodmagic/models/block/wornstonetilepath.json deleted file mode 100644 index b1e91317..00000000 --- a/src/generated/resources/assets/bloodmagic/models/block/wornstonetilepath.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "bloodmagic:block/wornstonetilepath" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/accelerationrune.json b/src/generated/resources/assets/bloodmagic/models/item/accelerationrune.json deleted file mode 100644 index 4551c1a8..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/accelerationrune.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/accelerationrune" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/activationcrystalawakened.json b/src/generated/resources/assets/bloodmagic/models/item/activationcrystalawakened.json deleted file mode 100644 index 25f235a5..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/activationcrystalawakened.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/activationcrystalawakened" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/activationcrystalcreative.json b/src/generated/resources/assets/bloodmagic/models/item/activationcrystalcreative.json deleted file mode 100644 index 3b5983f3..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/activationcrystalcreative.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/activationcrystalcreative" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/activationcrystalweak.json b/src/generated/resources/assets/bloodmagic/models/item/activationcrystalweak.json deleted file mode 100644 index fddc803a..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/activationcrystalweak.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/activationcrystalweak" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/airritualstone.json b/src/generated/resources/assets/bloodmagic/models/item/airritualstone.json deleted file mode 100644 index a32ef885..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/airritualstone.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/airritualstone" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/airscribetool.json b/src/generated/resources/assets/bloodmagic/models/item/airscribetool.json deleted file mode 100644 index 000892ca..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/airscribetool.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/airscribetool" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/airsigil.json b/src/generated/resources/assets/bloodmagic/models/item/airsigil.json deleted file mode 100644 index b90cce51..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/airsigil.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/airsigil" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/alchemicalreactionchamber.json b/src/generated/resources/assets/bloodmagic/models/item/alchemicalreactionchamber.json deleted file mode 100644 index bb6ed1e2..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/alchemicalreactionchamber.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/alchemicalreactionchamber" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/altarcapacityrune.json b/src/generated/resources/assets/bloodmagic/models/item/altarcapacityrune.json deleted file mode 100644 index 819ef814..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/altarcapacityrune.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/altarcapacityrune" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/apprenticebloodorb.json b/src/generated/resources/assets/bloodmagic/models/item/apprenticebloodorb.json deleted file mode 100644 index e010d2b7..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/apprenticebloodorb.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/apprenticebloodorb" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/arcaneashes.json b/src/generated/resources/assets/bloodmagic/models/item/arcaneashes.json deleted file mode 100644 index 19120a51..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/arcaneashes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/arcaneashes" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul.json b/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul.json deleted file mode 100644 index 5455472a..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/basemonstersoul" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul_corrosive.json b/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul_corrosive.json deleted file mode 100644 index bd22eb5f..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul_corrosive.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/basemonstersoul_corrosive" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul_destructive.json b/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul_destructive.json deleted file mode 100644 index 3fcd9fd7..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul_destructive.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/basemonstersoul_destructive" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul_steadfast.json b/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul_steadfast.json deleted file mode 100644 index db32c775..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul_steadfast.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/basemonstersoul_steadfast" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul_vengeful.json b/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul_vengeful.json deleted file mode 100644 index 966c0f17..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/basemonstersoul_vengeful.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/basemonstersoul_vengeful" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/basiccuttingfluid.json b/src/generated/resources/assets/bloodmagic/models/item/basiccuttingfluid.json deleted file mode 100644 index 0d5d0cdc..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/basiccuttingfluid.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/basiccuttingfluid" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/bettercapacityrune.json b/src/generated/resources/assets/bloodmagic/models/item/bettercapacityrune.json deleted file mode 100644 index f8b79342..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/bettercapacityrune.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/bettercapacityrune" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/blankrune.json b/src/generated/resources/assets/bloodmagic/models/item/blankrune.json deleted file mode 100644 index 7bf5795e..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/blankrune.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/blankrune" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/blankslate.json b/src/generated/resources/assets/bloodmagic/models/item/blankslate.json deleted file mode 100644 index d3094597..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/blankslate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/blankslate" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/bloodlightsigil.json b/src/generated/resources/assets/bloodmagic/models/item/bloodlightsigil.json deleted file mode 100644 index 4ae506f9..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/bloodlightsigil.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/bloodlightsigil" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/bloodstonebrick.json b/src/generated/resources/assets/bloodmagic/models/item/bloodstonebrick.json deleted file mode 100644 index 533f926a..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/bloodstonebrick.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/bloodstonebrick" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/bow_power_anointment.json b/src/generated/resources/assets/bloodmagic/models/item/bow_power_anointment.json deleted file mode 100644 index 5d52447b..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/bow_power_anointment.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/alchemic_vial", - "layer1": "bloodmagic:item/alchemic_liquid", - "layer2": "bloodmagic:item/alchemic_ribbon" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/chargingrune.json b/src/generated/resources/assets/bloodmagic/models/item/chargingrune.json deleted file mode 100644 index ccd29652..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/chargingrune.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/chargingrune" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/coalsand.json b/src/generated/resources/assets/bloodmagic/models/item/coalsand.json deleted file mode 100644 index 12aaa0cc..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/coalsand.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/coalsand" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/corrosivecrystal.json b/src/generated/resources/assets/bloodmagic/models/item/corrosivecrystal.json deleted file mode 100644 index d99e15f4..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/corrosivecrystal.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/corrosivecrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/corrosivedemoncrystal.json b/src/generated/resources/assets/bloodmagic/models/item/corrosivedemoncrystal.json deleted file mode 100644 index 5e739ff2..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/corrosivedemoncrystal.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal/corrosivecrystal1" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/corrupted_dust.json b/src/generated/resources/assets/bloodmagic/models/item/corrupted_dust.json deleted file mode 100644 index a5f430a4..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/corrupted_dust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/corrupted_dust" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/corrupted_tinydust.json b/src/generated/resources/assets/bloodmagic/models/item/corrupted_tinydust.json deleted file mode 100644 index a9ecf66f..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/corrupted_tinydust.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/corrupted_tinydust" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/creeping_doubt.json b/src/generated/resources/assets/bloodmagic/models/item/creeping_doubt.json deleted file mode 100644 index 9763321c..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/creeping_doubt.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/crop", - "textures": { - "crop": "bloodmagic:block/creeping_doubt_8" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/crystalline_resonator.json b/src/generated/resources/assets/bloodmagic/models/item/crystalline_resonator.json deleted file mode 100644 index 44408cd6..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/crystalline_resonator.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/crystalline_resonator" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/daggerofsacrifice.json b/src/generated/resources/assets/bloodmagic/models/item/daggerofsacrifice.json deleted file mode 100644 index 762c92a7..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/daggerofsacrifice.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/daggerofsacrifice" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/defaultcrystal.json b/src/generated/resources/assets/bloodmagic/models/item/defaultcrystal.json deleted file mode 100644 index 630e05a5..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/defaultcrystal.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/defaultcrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/deforester_charge.json b/src/generated/resources/assets/bloodmagic/models/item/deforester_charge.json deleted file mode 100644 index 64187a41..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/deforester_charge.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/deforester_charge" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/demonslate.json b/src/generated/resources/assets/bloodmagic/models/item/demonslate.json deleted file mode 100644 index 97d3e2f5..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/demonslate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/demonslate" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/demonwillgauge.json b/src/generated/resources/assets/bloodmagic/models/item/demonwillgauge.json deleted file mode 100644 index db062669..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/demonwillgauge.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/demonwillgauge" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/destructivecrystal.json b/src/generated/resources/assets/bloodmagic/models/item/destructivecrystal.json deleted file mode 100644 index 728b4dc5..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/destructivecrystal.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/destructivecrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/destructivedemoncrystal.json b/src/generated/resources/assets/bloodmagic/models/item/destructivedemoncrystal.json deleted file mode 100644 index 132afed7..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/destructivedemoncrystal.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal/destructivecrystal1" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dislocationrune.json b/src/generated/resources/assets/bloodmagic/models/item/dislocationrune.json deleted file mode 100644 index 1ddb2946..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/dislocationrune.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/dislocationrune" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/divinationsigil.json b/src/generated/resources/assets/bloodmagic/models/item/divinationsigil.json deleted file mode 100644 index 364fb1ec..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/divinationsigil.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/divinationsigil" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick1.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick1.json deleted file mode 100644 index 11d3536b..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick1.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/dungeon_brick1" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick2.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick2.json deleted file mode 100644 index 5f9095c0..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick2.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/dungeon_brick2" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick3.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick3.json deleted file mode 100644 index fc97a2a2..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick3.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/dungeon_brick3" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_assorted.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_assorted.json deleted file mode 100644 index 11d3536b..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_assorted.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/dungeon_brick1" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_gate.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_gate.json deleted file mode 100644 index 818f37f8..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_gate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/dungeon_brick_gate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_stairs.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_stairs.json deleted file mode 100644 index f4f7c835..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/dungeon_brick_stairs" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_wall.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_wall.json deleted file mode 100644 index ee594c7e..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_wall.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/dungeon_brick_wall_inventory" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_eye.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_eye.json deleted file mode 100644 index b306aa4e..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/dungeon_eye.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/dungeon_eye" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_metal.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_metal.json deleted file mode 100644 index b4412870..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/dungeon_metal.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/dungeon_metal" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_ore.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_ore.json deleted file mode 100644 index 64362081..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/dungeon_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/dungeon_ore" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_pillar_cap.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_pillar_cap.json deleted file mode 100644 index 03211bec..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/dungeon_pillar_cap.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/dungeon_pillar_cap" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_pillar_center.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_pillar_center.json deleted file mode 100644 index 7a965604..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/dungeon_pillar_center.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/dungeon_pillar_center" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_pillar_special.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_pillar_special.json deleted file mode 100644 index dcbe8148..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/dungeon_pillar_special.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/dungeon_pillar_special" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_polished.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_polished.json deleted file mode 100644 index 334777b9..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/dungeon_polished.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/dungeon_polished" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_polished_gate.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_polished_gate.json deleted file mode 100644 index ec9c6b87..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/dungeon_polished_gate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/dungeon_polished_gate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_polished_stairs.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_polished_stairs.json deleted file mode 100644 index cb02affc..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/dungeon_polished_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/dungeon_polished_stairs" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_polished_wall.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_polished_wall.json deleted file mode 100644 index f02221cf..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/dungeon_polished_wall.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/dungeon_polished_wall_inventory" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_smallbrick.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_smallbrick.json deleted file mode 100644 index 2ccf3f92..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/dungeon_smallbrick.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/dungeon_smallbrick" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_stone.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_stone.json deleted file mode 100644 index 4c9c2b6a..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/dungeon_stone.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/dungeon_stone" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_tester.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_tester.json deleted file mode 100644 index f408e84c..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/dungeon_tester.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/dungeon_tester" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_tile.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_tile.json deleted file mode 100644 index 4c80f99b..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/dungeon_tile.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/dungeon_tile" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_tilespecial.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_tilespecial.json deleted file mode 100644 index 98d6dc5a..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/dungeon_tilespecial.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/dungeon_tilespecial" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/duskritualstone.json b/src/generated/resources/assets/bloodmagic/models/item/duskritualstone.json deleted file mode 100644 index 289ff1ee..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/duskritualstone.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/duskritualstone" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/duskscribetool.json b/src/generated/resources/assets/bloodmagic/models/item/duskscribetool.json deleted file mode 100644 index c95b2d43..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/duskscribetool.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/duskscribetool" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/earthritualstone.json b/src/generated/resources/assets/bloodmagic/models/item/earthritualstone.json deleted file mode 100644 index 3758ede0..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/earthritualstone.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/earthritualstone" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/earthscribetool.json b/src/generated/resources/assets/bloodmagic/models/item/earthscribetool.json deleted file mode 100644 index 4eb734a9..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/earthscribetool.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/earthscribetool" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/ethereal_mimic.json b/src/generated/resources/assets/bloodmagic/models/item/ethereal_mimic.json deleted file mode 100644 index caeb3a85..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/ethereal_mimic.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/etherealopaquemimic" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/etherealslate.json b/src/generated/resources/assets/bloodmagic/models/item/etherealslate.json deleted file mode 100644 index c0f0f8a0..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/etherealslate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/etherealslate" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/experiencebook.json b/src/generated/resources/assets/bloodmagic/models/item/experiencebook.json deleted file mode 100644 index 693287c2..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/experiencebook.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/experiencebook" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/explosivepowder.json b/src/generated/resources/assets/bloodmagic/models/item/explosivepowder.json deleted file mode 100644 index 25c7aa64..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/explosivepowder.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/explosivepowder" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/fireritualstone.json b/src/generated/resources/assets/bloodmagic/models/item/fireritualstone.json deleted file mode 100644 index 6eef57c2..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/fireritualstone.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/fireritualstone" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/firescribetool.json b/src/generated/resources/assets/bloodmagic/models/item/firescribetool.json deleted file mode 100644 index 9eb63402..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/firescribetool.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/firescribetool" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/fortune_anointment.json b/src/generated/resources/assets/bloodmagic/models/item/fortune_anointment.json deleted file mode 100644 index 5d52447b..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/fortune_anointment.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/alchemic_vial", - "layer1": "bloodmagic:item/alchemic_liquid", - "layer2": "bloodmagic:item/alchemic_ribbon" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/fragment_netherite_scrap.json b/src/generated/resources/assets/bloodmagic/models/item/fragment_netherite_scrap.json deleted file mode 100644 index 791fa55c..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/fragment_netherite_scrap.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/fragment_netherite_scrap" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/fungal_charge.json b/src/generated/resources/assets/bloodmagic/models/item/fungal_charge.json deleted file mode 100644 index 59b1be87..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/fungal_charge.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/fungal_charge" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/furnacecell_primitive.json b/src/generated/resources/assets/bloodmagic/models/item/furnacecell_primitive.json deleted file mode 100644 index cefb8192..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/furnacecell_primitive.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/furnacecell_primitive" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/goldfragment.json b/src/generated/resources/assets/bloodmagic/models/item/goldfragment.json deleted file mode 100644 index d8024eaf..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/goldfragment.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/goldfragment" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/goldgravel.json b/src/generated/resources/assets/bloodmagic/models/item/goldgravel.json deleted file mode 100644 index c104e0f5..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/goldgravel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/goldgravel" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/goldsand.json b/src/generated/resources/assets/bloodmagic/models/item/goldsand.json deleted file mode 100644 index 29106249..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/goldsand.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/goldsand" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/gravel_netherite_scrap.json b/src/generated/resources/assets/bloodmagic/models/item/gravel_netherite_scrap.json deleted file mode 100644 index 79f99443..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/gravel_netherite_scrap.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/gravel_netherite_scrap" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/growthsigil.json b/src/generated/resources/assets/bloodmagic/models/item/growthsigil.json deleted file mode 100644 index 545030bf..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/growthsigil.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "overrides": [ - { - "predicate": { - "bloodmagic:active": 0.0 - }, - "model": "bloodmagic:item/variants/growthsigil_deactivated" - }, - { - "predicate": { - "bloodmagic:active": 1.0 - }, - "model": "bloodmagic:item/variants/growthsigil_activated" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/hidden_knowledge_anointment.json b/src/generated/resources/assets/bloodmagic/models/item/hidden_knowledge_anointment.json deleted file mode 100644 index 5d52447b..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/hidden_knowledge_anointment.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/alchemic_vial", - "layer1": "bloodmagic:item/alchemic_liquid", - "layer2": "bloodmagic:item/alchemic_ribbon" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/holy_water_anointment.json b/src/generated/resources/assets/bloodmagic/models/item/holy_water_anointment.json deleted file mode 100644 index 5d52447b..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/holy_water_anointment.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/alchemic_vial", - "layer1": "bloodmagic:item/alchemic_liquid", - "layer2": "bloodmagic:item/alchemic_ribbon" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/icesigil.json b/src/generated/resources/assets/bloodmagic/models/item/icesigil.json deleted file mode 100644 index 67d4348e..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/icesigil.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "overrides": [ - { - "predicate": { - "bloodmagic:active": 0.0 - }, - "model": "bloodmagic:item/variants/icesigil_deactivated" - }, - { - "predicate": { - "bloodmagic:active": 1.0 - }, - "model": "bloodmagic:item/variants/icesigil_activated" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/infusedslate.json b/src/generated/resources/assets/bloodmagic/models/item/infusedslate.json deleted file mode 100644 index 057c0fc7..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/infusedslate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/infusedslate" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/ingot_hellforged.json b/src/generated/resources/assets/bloodmagic/models/item/ingot_hellforged.json deleted file mode 100644 index 6f2132df..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/ingot_hellforged.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/ingot_hellforged" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/ironfragment.json b/src/generated/resources/assets/bloodmagic/models/item/ironfragment.json deleted file mode 100644 index acd23d13..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/ironfragment.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/ironfragment" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/irongravel.json b/src/generated/resources/assets/bloodmagic/models/item/irongravel.json deleted file mode 100644 index cd5e0c4d..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/irongravel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/irongravel" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/ironsand.json b/src/generated/resources/assets/bloodmagic/models/item/ironsand.json deleted file mode 100644 index 9ad179b8..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/ironsand.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/ironsand" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/largebloodstonebrick.json b/src/generated/resources/assets/bloodmagic/models/item/largebloodstonebrick.json deleted file mode 100644 index c048956c..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/largebloodstonebrick.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/largebloodstonebrick" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/lavacrystal.json b/src/generated/resources/assets/bloodmagic/models/item/lavacrystal.json deleted file mode 100644 index 663eee3d..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/lavacrystal.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/lavacrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/lavasigil.json b/src/generated/resources/assets/bloodmagic/models/item/lavasigil.json deleted file mode 100644 index 78803529..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/lavasigil.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/lavasigil" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/lightritualstone.json b/src/generated/resources/assets/bloodmagic/models/item/lightritualstone.json deleted file mode 100644 index 96ca64a5..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/lightritualstone.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/lightritualstone" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/livingboots.json b/src/generated/resources/assets/bloodmagic/models/item/livingboots.json deleted file mode 100644 index 6fc62fe4..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/livingboots.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/livingboots" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/livinghelmet.json b/src/generated/resources/assets/bloodmagic/models/item/livinghelmet.json deleted file mode 100644 index 26231b72..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/livinghelmet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/livinghelmet" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/livingleggings.json b/src/generated/resources/assets/bloodmagic/models/item/livingleggings.json deleted file mode 100644 index 9f9e8220..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/livingleggings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/livingleggings" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/livingplate.json b/src/generated/resources/assets/bloodmagic/models/item/livingplate.json deleted file mode 100644 index ffcf6a31..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/livingplate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/livingplate" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/looting_anointment.json b/src/generated/resources/assets/bloodmagic/models/item/looting_anointment.json deleted file mode 100644 index 5d52447b..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/looting_anointment.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/alchemic_vial", - "layer1": "bloodmagic:item/alchemic_liquid", - "layer2": "bloodmagic:item/alchemic_ribbon" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/magicianbloodorb.json b/src/generated/resources/assets/bloodmagic/models/item/magicianbloodorb.json deleted file mode 100644 index 218986d2..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/magicianbloodorb.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/magicianbloodorb" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/masterbloodorb.json b/src/generated/resources/assets/bloodmagic/models/item/masterbloodorb.json deleted file mode 100644 index 63d243a6..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/masterbloodorb.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/masterbloodorb" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/masterritualstone.json b/src/generated/resources/assets/bloodmagic/models/item/masterritualstone.json deleted file mode 100644 index 84e36366..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/masterritualstone.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/masterritualstone" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/melee_anointment.json b/src/generated/resources/assets/bloodmagic/models/item/melee_anointment.json deleted file mode 100644 index 5d52447b..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/melee_anointment.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/alchemic_vial", - "layer1": "bloodmagic:item/alchemic_liquid", - "layer2": "bloodmagic:item/alchemic_ribbon" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/mimic.json b/src/generated/resources/assets/bloodmagic/models/item/mimic.json deleted file mode 100644 index 82d7c08b..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/mimic.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/solidopaquemimic" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/miningsigil.json b/src/generated/resources/assets/bloodmagic/models/item/miningsigil.json deleted file mode 100644 index f2f8923a..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/miningsigil.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "overrides": [ - { - "predicate": { - "bloodmagic:active": 0.0 - }, - "model": "bloodmagic:item/variants/miningsigil_deactivated" - }, - { - "predicate": { - "bloodmagic:active": 1.0 - }, - "model": "bloodmagic:item/variants/miningsigil_activated" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/nether_soil.json b/src/generated/resources/assets/bloodmagic/models/item/nether_soil.json deleted file mode 100644 index e26c6db7..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/nether_soil.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/nether_soil" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/obsidianbrickpath.json b/src/generated/resources/assets/bloodmagic/models/item/obsidianbrickpath.json deleted file mode 100644 index 03c76b69..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/obsidianbrickpath.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/obsidianbrickpath" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/obsidiantilepath.json b/src/generated/resources/assets/bloodmagic/models/item/obsidiantilepath.json deleted file mode 100644 index 3db5658a..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/obsidiantilepath.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/obsidiantilepath" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/orbcapacityrune.json b/src/generated/resources/assets/bloodmagic/models/item/orbcapacityrune.json deleted file mode 100644 index c851584c..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/orbcapacityrune.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/orbcapacityrune" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/plantoil.json b/src/generated/resources/assets/bloodmagic/models/item/plantoil.json deleted file mode 100644 index f61b1551..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/plantoil.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/plantoil" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/primitive_crystalline_resonator.json b/src/generated/resources/assets/bloodmagic/models/item/primitive_crystalline_resonator.json deleted file mode 100644 index 71d561ab..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/primitive_crystalline_resonator.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/primitive_crystalline_resonator" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/primitive_explosive_cell.json b/src/generated/resources/assets/bloodmagic/models/item/primitive_explosive_cell.json deleted file mode 100644 index 29f8d0f1..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/primitive_explosive_cell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/primitive_explosive_cell" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/primitive_hydration_cell.json b/src/generated/resources/assets/bloodmagic/models/item/primitive_hydration_cell.json deleted file mode 100644 index 73f64a0c..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/primitive_hydration_cell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/primitive_hydration_cell" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/quick_draw_anointment.json b/src/generated/resources/assets/bloodmagic/models/item/quick_draw_anointment.json deleted file mode 100644 index 5d52447b..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/quick_draw_anointment.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/alchemic_vial", - "layer1": "bloodmagic:item/alchemic_liquid", - "layer2": "bloodmagic:item/alchemic_ribbon" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/rawdemoncrystal.json b/src/generated/resources/assets/bloodmagic/models/item/rawdemoncrystal.json deleted file mode 100644 index d1f4da91..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/rawdemoncrystal.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal/defaultcrystal1" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/reagentair.json b/src/generated/resources/assets/bloodmagic/models/item/reagentair.json deleted file mode 100644 index 3cdc9d64..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/reagentair.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/reagentair" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/reagentbinding.json b/src/generated/resources/assets/bloodmagic/models/item/reagentbinding.json deleted file mode 100644 index e8409a07..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/reagentbinding.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/reagentbinding" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/reagentbloodlight.json b/src/generated/resources/assets/bloodmagic/models/item/reagentbloodlight.json deleted file mode 100644 index 54d4afa2..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/reagentbloodlight.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/reagentbloodlight" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/reagentfastminer.json b/src/generated/resources/assets/bloodmagic/models/item/reagentfastminer.json deleted file mode 100644 index 3c4434b7..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/reagentfastminer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/reagentfastminer" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/reagentgrowth.json b/src/generated/resources/assets/bloodmagic/models/item/reagentgrowth.json deleted file mode 100644 index 3d4ee45c..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/reagentgrowth.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/reagentgrowth" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/reagentholding.json b/src/generated/resources/assets/bloodmagic/models/item/reagentholding.json deleted file mode 100644 index b84ea6fb..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/reagentholding.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/reagentholding" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/reagentlava.json b/src/generated/resources/assets/bloodmagic/models/item/reagentlava.json deleted file mode 100644 index d6139efe..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/reagentlava.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/reagentlava" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/reagentmagnetism.json b/src/generated/resources/assets/bloodmagic/models/item/reagentmagnetism.json deleted file mode 100644 index 121d0018..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/reagentmagnetism.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/reagentmagnetism" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/reagentsight.json b/src/generated/resources/assets/bloodmagic/models/item/reagentsight.json deleted file mode 100644 index 37f60639..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/reagentsight.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/reagentsight" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/reagentvoid.json b/src/generated/resources/assets/bloodmagic/models/item/reagentvoid.json deleted file mode 100644 index 4f6564c8..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/reagentvoid.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/reagentvoid" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/reagentwater.json b/src/generated/resources/assets/bloodmagic/models/item/reagentwater.json deleted file mode 100644 index b5730d1a..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/reagentwater.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/reagentwater" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/reinforcedslate.json b/src/generated/resources/assets/bloodmagic/models/item/reinforcedslate.json deleted file mode 100644 index 3299a6a5..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/reinforcedslate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/reinforcedslate" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/ritualdiviner.json b/src/generated/resources/assets/bloodmagic/models/item/ritualdiviner.json deleted file mode 100644 index 39b88d5c..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/ritualdiviner.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/ritualdiviner" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/ritualdivinerdusk.json b/src/generated/resources/assets/bloodmagic/models/item/ritualdivinerdusk.json deleted file mode 100644 index 48ee296e..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/ritualdivinerdusk.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/ritualdivinerdusk" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/ritualstone.json b/src/generated/resources/assets/bloodmagic/models/item/ritualstone.json deleted file mode 100644 index 4dea1d50..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/ritualstone.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/ritualstone" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/ritualtinkerer.json b/src/generated/resources/assets/bloodmagic/models/item/ritualtinkerer.json deleted file mode 100644 index 31fcff20..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/ritualtinkerer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/ritualtinkerer" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/sacrificerune.json b/src/generated/resources/assets/bloodmagic/models/item/sacrificerune.json deleted file mode 100644 index dcbe6138..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/sacrificerune.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/sacrificerune" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/sacrificialdagger.json b/src/generated/resources/assets/bloodmagic/models/item/sacrificialdagger.json deleted file mode 100644 index 08eefb43..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/sacrificialdagger.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/sacrificialdagger" - }, - "overrides": [ - { - "predicate": { - "bloodmagic:incense": 0.0 - }, - "model": "bloodmagic:item/variants/sacrificialdagger" - }, - { - "predicate": { - "bloodmagic:incense": 1.0 - }, - "model": "bloodmagic:item/variants/sacrificialdagger_ceremonial" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/saltpeter.json b/src/generated/resources/assets/bloodmagic/models/item/saltpeter.json deleted file mode 100644 index b9ba71f1..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/saltpeter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/saltpeter" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/sand_hellforged.json b/src/generated/resources/assets/bloodmagic/models/item/sand_hellforged.json deleted file mode 100644 index 03c5f26d..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/sand_hellforged.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/sand_hellforged" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/sand_netherite.json b/src/generated/resources/assets/bloodmagic/models/item/sand_netherite.json deleted file mode 100644 index 99d41148..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/sand_netherite.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/sand_netherite" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/sanguinereverter.json b/src/generated/resources/assets/bloodmagic/models/item/sanguinereverter.json deleted file mode 100644 index 2e6c6de6..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/sanguinereverter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/sanguinereverter" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/seersigil.json b/src/generated/resources/assets/bloodmagic/models/item/seersigil.json deleted file mode 100644 index f513120b..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/seersigil.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/seersigil" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/selfsacrificerune.json b/src/generated/resources/assets/bloodmagic/models/item/selfsacrificerune.json deleted file mode 100644 index ab853e7b..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/selfsacrificerune.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/selfsacrificerune" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/shaped_charge.json b/src/generated/resources/assets/bloodmagic/models/item/shaped_charge.json deleted file mode 100644 index de035a33..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/shaped_charge.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/shaped_charge" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/sigilofholding.json b/src/generated/resources/assets/bloodmagic/models/item/sigilofholding.json deleted file mode 100644 index 32760a59..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/sigilofholding.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/sigilofholding" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/sigilofmagnetism.json b/src/generated/resources/assets/bloodmagic/models/item/sigilofmagnetism.json deleted file mode 100644 index 8a5253db..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/sigilofmagnetism.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "overrides": [ - { - "predicate": { - "bloodmagic:active": 0.0 - }, - "model": "bloodmagic:item/variants/sigilofmagnetism_deactivated" - }, - { - "predicate": { - "bloodmagic:active": 1.0 - }, - "model": "bloodmagic:item/variants/sigilofmagnetism_activated" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/silk_touch_anointment.json b/src/generated/resources/assets/bloodmagic/models/item/silk_touch_anointment.json deleted file mode 100644 index 5d52447b..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/silk_touch_anointment.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/alchemic_vial", - "layer1": "bloodmagic:item/alchemic_liquid", - "layer2": "bloodmagic:item/alchemic_ribbon" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/slate_ampoule.json b/src/generated/resources/assets/bloodmagic/models/item/slate_ampoule.json deleted file mode 100644 index bfabb3e6..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/slate_ampoule.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/slate_ampoule" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/slate_vial.json b/src/generated/resources/assets/bloodmagic/models/item/slate_vial.json deleted file mode 100644 index 1dfb1022..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/slate_vial.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/alchemic_vial", - "layer1": "bloodmagic:item/alchemic_ribbon" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/smelting_anointment.json b/src/generated/resources/assets/bloodmagic/models/item/smelting_anointment.json deleted file mode 100644 index 5d52447b..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/smelting_anointment.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/alchemic_vial", - "layer1": "bloodmagic:item/alchemic_liquid", - "layer2": "bloodmagic:item/alchemic_ribbon" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/soulaxe.json b/src/generated/resources/assets/bloodmagic/models/item/soulaxe.json deleted file mode 100644 index 7a752a51..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/soulaxe.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "overrides": [ - { - "predicate": { - "bloodmagic:type": 0.0 - }, - "model": "bloodmagic:item/variants/soulaxe" - }, - { - "predicate": { - "bloodmagic:type": 1.0 - }, - "model": "bloodmagic:item/variants/soulaxe_corrosive" - }, - { - "predicate": { - "bloodmagic:type": 2.0 - }, - "model": "bloodmagic:item/variants/soulaxe_destructive" - }, - { - "predicate": { - "bloodmagic:type": 3.0 - }, - "model": "bloodmagic:item/variants/soulaxe_vengeful" - }, - { - "predicate": { - "bloodmagic:type": 4.0 - }, - "model": "bloodmagic:item/variants/soulaxe_steadfast" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/soulgemcommon.json b/src/generated/resources/assets/bloodmagic/models/item/soulgemcommon.json deleted file mode 100644 index 7629117a..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/soulgemcommon.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "overrides": [ - { - "predicate": { - "bloodmagic:type": 0.0 - }, - "model": "bloodmagic:item/variants/soulgemcommon" - }, - { - "predicate": { - "bloodmagic:type": 1.0 - }, - "model": "bloodmagic:item/variants/soulgemcommon_corrosive" - }, - { - "predicate": { - "bloodmagic:type": 2.0 - }, - "model": "bloodmagic:item/variants/soulgemcommon_destructive" - }, - { - "predicate": { - "bloodmagic:type": 3.0 - }, - "model": "bloodmagic:item/variants/soulgemcommon_vengeful" - }, - { - "predicate": { - "bloodmagic:type": 4.0 - }, - "model": "bloodmagic:item/variants/soulgemcommon_steadfast" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/soulgemgreater.json b/src/generated/resources/assets/bloodmagic/models/item/soulgemgreater.json deleted file mode 100644 index 8c237764..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/soulgemgreater.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "overrides": [ - { - "predicate": { - "bloodmagic:type": 0.0 - }, - "model": "bloodmagic:item/variants/soulgemgreater" - }, - { - "predicate": { - "bloodmagic:type": 1.0 - }, - "model": "bloodmagic:item/variants/soulgemgreater_corrosive" - }, - { - "predicate": { - "bloodmagic:type": 2.0 - }, - "model": "bloodmagic:item/variants/soulgemgreater_destructive" - }, - { - "predicate": { - "bloodmagic:type": 3.0 - }, - "model": "bloodmagic:item/variants/soulgemgreater_vengeful" - }, - { - "predicate": { - "bloodmagic:type": 4.0 - }, - "model": "bloodmagic:item/variants/soulgemgreater_steadfast" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/soulgemlesser.json b/src/generated/resources/assets/bloodmagic/models/item/soulgemlesser.json deleted file mode 100644 index 3489ce2f..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/soulgemlesser.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "overrides": [ - { - "predicate": { - "bloodmagic:type": 0.0 - }, - "model": "bloodmagic:item/variants/soulgemlesser" - }, - { - "predicate": { - "bloodmagic:type": 1.0 - }, - "model": "bloodmagic:item/variants/soulgemlesser_corrosive" - }, - { - "predicate": { - "bloodmagic:type": 2.0 - }, - "model": "bloodmagic:item/variants/soulgemlesser_destructive" - }, - { - "predicate": { - "bloodmagic:type": 3.0 - }, - "model": "bloodmagic:item/variants/soulgemlesser_vengeful" - }, - { - "predicate": { - "bloodmagic:type": 4.0 - }, - "model": "bloodmagic:item/variants/soulgemlesser_steadfast" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/soulgempetty.json b/src/generated/resources/assets/bloodmagic/models/item/soulgempetty.json deleted file mode 100644 index b8c2358c..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/soulgempetty.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "overrides": [ - { - "predicate": { - "bloodmagic:type": 0.0 - }, - "model": "bloodmagic:item/variants/soulgempetty" - }, - { - "predicate": { - "bloodmagic:type": 1.0 - }, - "model": "bloodmagic:item/variants/soulgempetty_corrosive" - }, - { - "predicate": { - "bloodmagic:type": 2.0 - }, - "model": "bloodmagic:item/variants/soulgempetty_destructive" - }, - { - "predicate": { - "bloodmagic:type": 3.0 - }, - "model": "bloodmagic:item/variants/soulgempetty_vengeful" - }, - { - "predicate": { - "bloodmagic:type": 4.0 - }, - "model": "bloodmagic:item/variants/soulgempetty_steadfast" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/soulpickaxe.json b/src/generated/resources/assets/bloodmagic/models/item/soulpickaxe.json deleted file mode 100644 index 14619409..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/soulpickaxe.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "overrides": [ - { - "predicate": { - "bloodmagic:type": 0.0 - }, - "model": "bloodmagic:item/variants/soulpickaxe" - }, - { - "predicate": { - "bloodmagic:type": 1.0 - }, - "model": "bloodmagic:item/variants/soulpickaxe_corrosive" - }, - { - "predicate": { - "bloodmagic:type": 2.0 - }, - "model": "bloodmagic:item/variants/soulpickaxe_destructive" - }, - { - "predicate": { - "bloodmagic:type": 3.0 - }, - "model": "bloodmagic:item/variants/soulpickaxe_vengeful" - }, - { - "predicate": { - "bloodmagic:type": 4.0 - }, - "model": "bloodmagic:item/variants/soulpickaxe_steadfast" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/soulscythe.json b/src/generated/resources/assets/bloodmagic/models/item/soulscythe.json deleted file mode 100644 index 54c81982..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/soulscythe.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "overrides": [ - { - "predicate": { - "bloodmagic:type": 0.0 - }, - "model": "bloodmagic:item/variants/soulscythe" - }, - { - "predicate": { - "bloodmagic:type": 1.0 - }, - "model": "bloodmagic:item/variants/soulscythe_corrosive" - }, - { - "predicate": { - "bloodmagic:type": 2.0 - }, - "model": "bloodmagic:item/variants/soulscythe_destructive" - }, - { - "predicate": { - "bloodmagic:type": 3.0 - }, - "model": "bloodmagic:item/variants/soulscythe_vengeful" - }, - { - "predicate": { - "bloodmagic:type": 4.0 - }, - "model": "bloodmagic:item/variants/soulscythe_steadfast" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/soulshovel.json b/src/generated/resources/assets/bloodmagic/models/item/soulshovel.json deleted file mode 100644 index b6d3c67e..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/soulshovel.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "overrides": [ - { - "predicate": { - "bloodmagic:type": 0.0 - }, - "model": "bloodmagic:item/variants/soulshovel" - }, - { - "predicate": { - "bloodmagic:type": 1.0 - }, - "model": "bloodmagic:item/variants/soulshovel_corrosive" - }, - { - "predicate": { - "bloodmagic:type": 2.0 - }, - "model": "bloodmagic:item/variants/soulshovel_destructive" - }, - { - "predicate": { - "bloodmagic:type": 3.0 - }, - "model": "bloodmagic:item/variants/soulshovel_vengeful" - }, - { - "predicate": { - "bloodmagic:type": 4.0 - }, - "model": "bloodmagic:item/variants/soulshovel_steadfast" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/soulsnare.json b/src/generated/resources/assets/bloodmagic/models/item/soulsnare.json deleted file mode 100644 index 91fa098e..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/soulsnare.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/soulsnare" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/soulsword.json b/src/generated/resources/assets/bloodmagic/models/item/soulsword.json deleted file mode 100644 index 47e58c18..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/soulsword.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "overrides": [ - { - "predicate": { - "bloodmagic:type": 0.0, - "bloodmagic:active": 0.0 - }, - "model": "bloodmagic:item/variants/soulsword_deactivated" - }, - { - "predicate": { - "bloodmagic:type": 1.0, - "bloodmagic:active": 0.0 - }, - "model": "bloodmagic:item/variants/soulsword_corrosive_deactivated" - }, - { - "predicate": { - "bloodmagic:type": 2.0, - "bloodmagic:active": 0.0 - }, - "model": "bloodmagic:item/variants/soulsword_destructive_deactivated" - }, - { - "predicate": { - "bloodmagic:type": 3.0, - "bloodmagic:active": 0.0 - }, - "model": "bloodmagic:item/variants/soulsword_vengeful_deactivated" - }, - { - "predicate": { - "bloodmagic:type": 4.0, - "bloodmagic:active": 0.0 - }, - "model": "bloodmagic:item/variants/soulsword_steadfast_deactivated" - }, - { - "predicate": { - "bloodmagic:type": 0.0, - "bloodmagic:active": 1.0 - }, - "model": "bloodmagic:item/variants/soulsword_activated" - }, - { - "predicate": { - "bloodmagic:type": 1.0, - "bloodmagic:active": 1.0 - }, - "model": "bloodmagic:item/variants/soulsword_corrosive_activated" - }, - { - "predicate": { - "bloodmagic:type": 2.0, - "bloodmagic:active": 1.0 - }, - "model": "bloodmagic:item/variants/soulsword_destructive_activated" - }, - { - "predicate": { - "bloodmagic:type": 3.0, - "bloodmagic:active": 1.0 - }, - "model": "bloodmagic:item/variants/soulsword_vengeful_activated" - }, - { - "predicate": { - "bloodmagic:type": 4.0, - "bloodmagic:active": 1.0 - }, - "model": "bloodmagic:item/variants/soulsword_steadfast_activated" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/speedrune.json b/src/generated/resources/assets/bloodmagic/models/item/speedrune.json deleted file mode 100644 index d2bec661..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/speedrune.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/speedrune" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/steadfastcrystal.json b/src/generated/resources/assets/bloodmagic/models/item/steadfastcrystal.json deleted file mode 100644 index 5a4fee55..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/steadfastcrystal.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/steadfastcrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/steadfastdemoncrystal.json b/src/generated/resources/assets/bloodmagic/models/item/steadfastdemoncrystal.json deleted file mode 100644 index d874984d..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/steadfastdemoncrystal.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal/steadfastcrystal1" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/stonebrickpath.json b/src/generated/resources/assets/bloodmagic/models/item/stonebrickpath.json deleted file mode 100644 index f7f36e89..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/stonebrickpath.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/stonebrickpath" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/stonetilepath.json b/src/generated/resources/assets/bloodmagic/models/item/stonetilepath.json deleted file mode 100644 index 42594e88..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/stonetilepath.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/stonetilepath" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/sulfur.json b/src/generated/resources/assets/bloodmagic/models/item/sulfur.json deleted file mode 100644 index c52f67e0..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/sulfur.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/sulfur" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/throwing_dagger.json b/src/generated/resources/assets/bloodmagic/models/item/throwing_dagger.json deleted file mode 100644 index 59297614..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/throwing_dagger.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/throwing_dagger" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/throwing_dagger_syringe.json b/src/generated/resources/assets/bloodmagic/models/item/throwing_dagger_syringe.json deleted file mode 100644 index 2e98d782..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/throwing_dagger_syringe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/throwing_dagger_syringe" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/upgradetome.json b/src/generated/resources/assets/bloodmagic/models/item/upgradetome.json deleted file mode 100644 index 674756d4..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/upgradetome.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/upgradetome" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/growthsigil_activated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/growthsigil_activated.json deleted file mode 100644 index 0f5b60bd..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/growthsigil_activated.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/growthsigil_activated" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/growthsigil_deactivated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/growthsigil_deactivated.json deleted file mode 100644 index 5d14ea40..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/growthsigil_deactivated.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/growthsigil_deactivated" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/icesigil_activated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/icesigil_activated.json deleted file mode 100644 index 9f6e940a..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/icesigil_activated.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/icesigil_activated" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/icesigil_deactivated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/icesigil_deactivated.json deleted file mode 100644 index 5a461a5d..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/icesigil_deactivated.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/icesigil_deactivated" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/miningsigil_activated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/miningsigil_activated.json deleted file mode 100644 index 12877c52..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/miningsigil_activated.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/miningsigil_activated" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/miningsigil_deactivated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/miningsigil_deactivated.json deleted file mode 100644 index 858e701f..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/miningsigil_deactivated.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/miningsigil_deactivated" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/sacrificialdagger.json b/src/generated/resources/assets/bloodmagic/models/item/variants/sacrificialdagger.json deleted file mode 100644 index 20e1c9f1..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/sacrificialdagger.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/sacrificialdagger" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/sacrificialdagger_ceremonial.json b/src/generated/resources/assets/bloodmagic/models/item/variants/sacrificialdagger_ceremonial.json deleted file mode 100644 index ba8ea9db..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/sacrificialdagger_ceremonial.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/sacrificialdagger_ceremonial" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/sigilofmagnetism_activated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/sigilofmagnetism_activated.json deleted file mode 100644 index b49d9096..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/sigilofmagnetism_activated.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/sigilofmagnetism_activated" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/sigilofmagnetism_deactivated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/sigilofmagnetism_deactivated.json deleted file mode 100644 index f0b2fa42..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/sigilofmagnetism_deactivated.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/sigilofmagnetism_deactivated" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulaxe.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulaxe.json deleted file mode 100644 index 30fdc78b..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulaxe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulaxe" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulaxe_corrosive.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulaxe_corrosive.json deleted file mode 100644 index a55f906f..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulaxe_corrosive.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulaxe_corrosive" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulaxe_destructive.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulaxe_destructive.json deleted file mode 100644 index 8df2b5f9..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulaxe_destructive.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulaxe_destructive" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulaxe_steadfast.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulaxe_steadfast.json deleted file mode 100644 index d67ffdc2..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulaxe_steadfast.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulaxe_steadfast" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulaxe_vengeful.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulaxe_vengeful.json deleted file mode 100644 index 57f65f4c..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulaxe_vengeful.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulaxe_vengeful" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon.json deleted file mode 100644 index 460ba68b..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulgemcommon" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon_corrosive.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon_corrosive.json deleted file mode 100644 index 0fa3a377..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon_corrosive.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulgemcommon_corrosive" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon_destructive.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon_destructive.json deleted file mode 100644 index 2e30b739..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon_destructive.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulgemcommon_destructive" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon_steadfast.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon_steadfast.json deleted file mode 100644 index 56b5b375..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon_steadfast.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulgemcommon_steadfast" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon_vengeful.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon_vengeful.json deleted file mode 100644 index fc3b3fd5..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemcommon_vengeful.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulgemcommon_vengeful" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemgreater.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemgreater.json deleted file mode 100644 index 00ffd7ea..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemgreater.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulgemgreater" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemgreater_corrosive.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemgreater_corrosive.json deleted file mode 100644 index bdbcf609..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemgreater_corrosive.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulgemgreater_corrosive" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemgreater_destructive.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemgreater_destructive.json deleted file mode 100644 index 285cff8e..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemgreater_destructive.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulgemgreater_destructive" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemgreater_steadfast.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemgreater_steadfast.json deleted file mode 100644 index beb0d2a7..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemgreater_steadfast.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulgemgreater_steadfast" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemgreater_vengeful.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemgreater_vengeful.json deleted file mode 100644 index 2808693f..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemgreater_vengeful.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulgemgreater_vengeful" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser.json deleted file mode 100644 index 7a253c28..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulgemlesser" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser_corrosive.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser_corrosive.json deleted file mode 100644 index a191b1f6..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser_corrosive.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulgemlesser_corrosive" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser_destructive.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser_destructive.json deleted file mode 100644 index 241d5b93..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser_destructive.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulgemlesser_destructive" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser_steadfast.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser_steadfast.json deleted file mode 100644 index 9ea458c2..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser_steadfast.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulgemlesser_steadfast" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser_vengeful.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser_vengeful.json deleted file mode 100644 index dbc3cc32..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgemlesser_vengeful.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulgemlesser_vengeful" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty.json deleted file mode 100644 index 3085ac3b..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulgempetty" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty_corrosive.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty_corrosive.json deleted file mode 100644 index b5c185ea..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty_corrosive.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulgempetty_corrosive" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty_destructive.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty_destructive.json deleted file mode 100644 index 955e2c62..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty_destructive.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulgempetty_destructive" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty_steadfast.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty_steadfast.json deleted file mode 100644 index 5031e33f..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty_steadfast.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulgempetty_steadfast" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty_vengeful.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty_vengeful.json deleted file mode 100644 index e7ae0df4..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulgempetty_vengeful.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulgempetty_vengeful" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulpickaxe.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulpickaxe.json deleted file mode 100644 index fe117924..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulpickaxe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulpickaxe" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulpickaxe_corrosive.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulpickaxe_corrosive.json deleted file mode 100644 index 1e88cff5..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulpickaxe_corrosive.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulpickaxe_corrosive" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulpickaxe_destructive.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulpickaxe_destructive.json deleted file mode 100644 index 2aaac132..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulpickaxe_destructive.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulpickaxe_destructive" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulpickaxe_steadfast.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulpickaxe_steadfast.json deleted file mode 100644 index 8f6ed094..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulpickaxe_steadfast.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulpickaxe_steadfast" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulpickaxe_vengeful.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulpickaxe_vengeful.json deleted file mode 100644 index bd938ace..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulpickaxe_vengeful.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulpickaxe_vengeful" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulscythe.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulscythe.json deleted file mode 100644 index c6ada5af..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulscythe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulscythe" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulscythe_corrosive.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulscythe_corrosive.json deleted file mode 100644 index 9da5186f..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulscythe_corrosive.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulscythe_corrosive" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulscythe_destructive.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulscythe_destructive.json deleted file mode 100644 index a9e5999b..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulscythe_destructive.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulscythe_destructive" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulscythe_steadfast.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulscythe_steadfast.json deleted file mode 100644 index 9a8e1765..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulscythe_steadfast.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulscythe_steadfast" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulscythe_vengeful.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulscythe_vengeful.json deleted file mode 100644 index e0a42699..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulscythe_vengeful.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulscythe_vengeful" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulshovel.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulshovel.json deleted file mode 100644 index ad3f0972..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulshovel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulshovel" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulshovel_corrosive.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulshovel_corrosive.json deleted file mode 100644 index 93b102a0..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulshovel_corrosive.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulshovel_corrosive" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulshovel_destructive.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulshovel_destructive.json deleted file mode 100644 index 34bbd132..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulshovel_destructive.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulshovel_destructive" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulshovel_steadfast.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulshovel_steadfast.json deleted file mode 100644 index 3da6185d..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulshovel_steadfast.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulshovel_steadfast" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulshovel_vengeful.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulshovel_vengeful.json deleted file mode 100644 index 2a9bbdf2..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulshovel_vengeful.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulshovel_vengeful" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_activated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_activated.json deleted file mode 100644 index 9ade5a1a..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_activated.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulsword_activated" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_corrosive_activated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_corrosive_activated.json deleted file mode 100644 index 55c0bb87..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_corrosive_activated.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulsword_corrosive_activated" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_corrosive_deactivated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_corrosive_deactivated.json deleted file mode 100644 index 610f36ce..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_corrosive_deactivated.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulsword_corrosive_deactivated" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_deactivated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_deactivated.json deleted file mode 100644 index c87c8ee7..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_deactivated.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulsword_deactivated" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_destructive_activated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_destructive_activated.json deleted file mode 100644 index e34becaa..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_destructive_activated.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulsword_destructive_activated" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_destructive_deactivated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_destructive_deactivated.json deleted file mode 100644 index 78ddb49b..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_destructive_deactivated.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulsword_destructive_deactivated" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_steadfast_activated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_steadfast_activated.json deleted file mode 100644 index 40313e52..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_steadfast_activated.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulsword_steadfast_activated" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_steadfast_deactivated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_steadfast_deactivated.json deleted file mode 100644 index 13aa70f1..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_steadfast_deactivated.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulsword_steadfast_deactivated" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_vengeful_activated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_vengeful_activated.json deleted file mode 100644 index 1547ea7e..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_vengeful_activated.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulsword_vengeful_activated" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_vengeful_deactivated.json b/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_vengeful_deactivated.json deleted file mode 100644 index 64c72e95..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/variants/soulsword_vengeful_deactivated.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/soulsword_vengeful_deactivated" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/veinmine_charge.json b/src/generated/resources/assets/bloodmagic/models/item/veinmine_charge.json deleted file mode 100644 index d4e412ca..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/veinmine_charge.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/veinmine_charge" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/vengefulcrystal.json b/src/generated/resources/assets/bloodmagic/models/item/vengefulcrystal.json deleted file mode 100644 index 1256032a..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/vengefulcrystal.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/vengefulcrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/vengefuldemoncrystal.json b/src/generated/resources/assets/bloodmagic/models/item/vengefuldemoncrystal.json deleted file mode 100644 index b116d448..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/vengefuldemoncrystal.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/crystal/vengefulcrystal1" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/voidsigil.json b/src/generated/resources/assets/bloodmagic/models/item/voidsigil.json deleted file mode 100644 index 41dac6e2..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/voidsigil.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/voidsigil" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/waterritualstone.json b/src/generated/resources/assets/bloodmagic/models/item/waterritualstone.json deleted file mode 100644 index 4c02099f..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/waterritualstone.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/waterritualstone" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/waterscribetool.json b/src/generated/resources/assets/bloodmagic/models/item/waterscribetool.json deleted file mode 100644 index 658f9c03..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/waterscribetool.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/waterscribetool" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/watersigil.json b/src/generated/resources/assets/bloodmagic/models/item/watersigil.json deleted file mode 100644 index 12a3f053..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/watersigil.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/watersigil" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/weakbloodorb.json b/src/generated/resources/assets/bloodmagic/models/item/weakbloodorb.json deleted file mode 100644 index 93800f41..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/weakbloodorb.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/weakbloodorb" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/weakbloodshard.json b/src/generated/resources/assets/bloodmagic/models/item/weakbloodshard.json deleted file mode 100644 index 8cc8378f..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/weakbloodshard.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/weakbloodshard" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/will_power_anointment.json b/src/generated/resources/assets/bloodmagic/models/item/will_power_anointment.json deleted file mode 100644 index 057dedef..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/will_power_anointment.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "bloodmagic:item/alchemic_vial_will", - "layer1": "bloodmagic:item/alchemic_liquid", - "layer2": "bloodmagic:item/alchemic_ribbon_will" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/woodbrickpath.json b/src/generated/resources/assets/bloodmagic/models/item/woodbrickpath.json deleted file mode 100644 index d598f8f7..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/woodbrickpath.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/woodbrickpath" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/woodtilepath.json b/src/generated/resources/assets/bloodmagic/models/item/woodtilepath.json deleted file mode 100644 index fd20da53..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/woodtilepath.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/woodtilepath" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/wornstonebrickpath.json b/src/generated/resources/assets/bloodmagic/models/item/wornstonebrickpath.json deleted file mode 100644 index 78f2ee16..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/wornstonebrickpath.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/wornstonebrickpath" -} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/wornstonetilepath.json b/src/generated/resources/assets/bloodmagic/models/item/wornstonetilepath.json deleted file mode 100644 index 7394723f..00000000 --- a/src/generated/resources/assets/bloodmagic/models/item/wornstonetilepath.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/wornstonetilepath" -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/alchemy_table.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/alchemy_table.json deleted file mode 100644 index 6f38ef77..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/alchemy_table.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:alchemy_table" - ] - }, - "criteria": { - "has_blank_slate": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:blankslate" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:alchemy_table" - } - } - }, - "requirements": [ - [ - "has_blank_slate", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/arc.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/arc.json deleted file mode 100644 index 8fdd602b..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/arc.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:arc" - ] - }, - "criteria": { - "has_magician_orb": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:magicianbloodorb" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:arc" - } - } - }, - "requirements": [ - [ - "has_magician_orb", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_altar.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_altar.json deleted file mode 100644 index 7eff31d1..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_altar.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:blood_altar" - ] - }, - "criteria": { - "has_gold": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:gold_ingot" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:blood_altar" - } - } - }, - "requirements": [ - [ - "has_gold", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_acceleration.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_acceleration.json deleted file mode 100644 index e0555e28..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_acceleration.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:blood_rune_acceleration" - ] - }, - "criteria": { - "has_master_orb": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:masterbloodorb" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:blood_rune_acceleration" - } - } - }, - "requirements": [ - [ - "has_master_orb", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_aug_capacity.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_aug_capacity.json deleted file mode 100644 index 4de0eed5..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_aug_capacity.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:blood_rune_aug_capacity" - ] - }, - "criteria": { - "has_master_orb": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:masterbloodorb" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:blood_rune_aug_capacity" - } - } - }, - "requirements": [ - [ - "has_master_orb", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_blank.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_blank.json deleted file mode 100644 index 3de3b9d5..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_blank.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:blood_rune_blank" - ] - }, - "criteria": { - "has_weak_orb": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:weakbloodorb" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:blood_rune_blank" - } - } - }, - "requirements": [ - [ - "has_weak_orb", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_capacity.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_capacity.json deleted file mode 100644 index 85b29fb4..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_capacity.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:blood_rune_capacity" - ] - }, - "criteria": { - "has_imbued_slate": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:infusedslate" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:blood_rune_capacity" - } - } - }, - "requirements": [ - [ - "has_imbued_slate", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_charging.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_charging.json deleted file mode 100644 index c2add425..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_charging.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:blood_rune_charging" - ] - }, - "criteria": { - "has_master_orb": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:masterbloodorb" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:blood_rune_charging" - } - } - }, - "requirements": [ - [ - "has_master_orb", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_displacement.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_displacement.json deleted file mode 100644 index 6e77a0e8..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_displacement.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:blood_rune_displacement" - ] - }, - "criteria": { - "has_imbued_slate": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:infusedslate" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:blood_rune_displacement" - } - } - }, - "requirements": [ - [ - "has_imbued_slate", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_orb.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_orb.json deleted file mode 100644 index 46aaf95c..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_orb.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:blood_rune_orb" - ] - }, - "criteria": { - "has_master_orb": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:masterbloodorb" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:blood_rune_orb" - } - } - }, - "requirements": [ - [ - "has_master_orb", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_sacrifice.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_sacrifice.json deleted file mode 100644 index 2b7ee148..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_sacrifice.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:blood_rune_sacrifice" - ] - }, - "criteria": { - "has_apprentice_orb": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:apprenticebloodorb" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:blood_rune_sacrifice" - } - } - }, - "requirements": [ - [ - "has_apprentice_orb", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_self_sacrifice.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_self_sacrifice.json deleted file mode 100644 index 076daaee..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_self_sacrifice.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:blood_rune_self_sacrifice" - ] - }, - "criteria": { - "has_apprentice_orb": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:apprenticebloodorb" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:blood_rune_self_sacrifice" - } - } - }, - "requirements": [ - [ - "has_apprentice_orb", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_speed.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_speed.json deleted file mode 100644 index 7a866e04..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/blood_rune_speed.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:blood_rune_speed" - ] - }, - "criteria": { - "has_blank_rune": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:blankrune" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:blood_rune_speed" - } - } - }, - "requirements": [ - [ - "has_blank_rune", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/bloodstonebrick.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/bloodstonebrick.json deleted file mode 100644 index 37f650c6..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/bloodstonebrick.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:bloodstonebrick" - ] - }, - "criteria": { - "has_weak_shard": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:weakbloodshard" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:bloodstonebrick" - } - } - }, - "requirements": [ - [ - "has_weak_shard", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/corrupted_dust.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/corrupted_dust.json deleted file mode 100644 index 885b1b2f..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/corrupted_dust.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:corrupted_dust" - ] - }, - "criteria": { - "has_tiny": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:corrupted_tinydust" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:corrupted_dust" - } - } - }, - "requirements": [ - [ - "has_tiny", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/experience_tome.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/experience_tome.json deleted file mode 100644 index 16e94029..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/experience_tome.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:experience_tome" - ] - }, - "criteria": { - "has_magician_orb": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:magicianbloodorb" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:experience_tome" - } - } - }, - "requirements": [ - [ - "has_magician_orb", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/hellforged_block.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/hellforged_block.json deleted file mode 100644 index cf79dc99..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/hellforged_block.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:hellforged_block" - ] - }, - "criteria": { - "has_hellforged": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:ingot_hellforged" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:hellforged_block" - } - } - }, - "requirements": [ - [ - "has_hellforged", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/incense_altar.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/incense_altar.json deleted file mode 100644 index cc469b58..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/incense_altar.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:incense_altar" - ] - }, - "criteria": { - "has_weak_orb": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:weakbloodorb" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:incense_altar" - } - } - }, - "requirements": [ - [ - "has_weak_orb", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/largebloodstonebrick.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/largebloodstonebrick.json deleted file mode 100644 index cef9ce21..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/largebloodstonebrick.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:largebloodstonebrick" - ] - }, - "criteria": { - "has_weak_shard": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:weakbloodshard" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:largebloodstonebrick" - } - } - }, - "requirements": [ - [ - "has_weak_shard", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/lava_crystal.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/lava_crystal.json deleted file mode 100644 index 84bc8f36..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/lava_crystal.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:lava_crystal" - ] - }, - "criteria": { - "has_weak_orb": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:weakbloodorb" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:lava_crystal" - } - } - }, - "requirements": [ - [ - "has_weak_orb", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/path/path_stone.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/path/path_stone.json deleted file mode 100644 index c4388608..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/path/path_stone.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:path/path_stone" - ] - }, - "criteria": { - "has_magician_orb": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:magicianbloodorb" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:path/path_stone" - } - } - }, - "requirements": [ - [ - "has_magician_orb", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/path/path_stonetile.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/path/path_stonetile.json deleted file mode 100644 index e89a4e06..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/path/path_stonetile.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:path/path_stonetile" - ] - }, - "criteria": { - "has_magician_orb": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:magicianbloodorb" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:path/path_stonetile" - } - } - }, - "requirements": [ - [ - "has_magician_orb", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/path/path_wood.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/path/path_wood.json deleted file mode 100644 index dd6dc1ec..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/path/path_wood.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:path/path_wood" - ] - }, - "criteria": { - "has_apprentice_orb": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:apprenticebloodorb" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:path/path_wood" - } - } - }, - "requirements": [ - [ - "has_apprentice_orb", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/path/path_woodtile.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/path/path_woodtile.json deleted file mode 100644 index 1e7d7d71..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/path/path_woodtile.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:path/path_woodtile" - ] - }, - "criteria": { - "has_apprentice_orb": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:apprenticebloodorb" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:path/path_woodtile" - } - } - }, - "requirements": [ - [ - "has_apprentice_orb", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/path/path_wornstone.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/path/path_wornstone.json deleted file mode 100644 index cde914c3..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/path/path_wornstone.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:path/path_wornstone" - ] - }, - "criteria": { - "has_master_orb": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:masterbloodorb" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:path/path_wornstone" - } - } - }, - "requirements": [ - [ - "has_master_orb", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/path/path_wornstonetile.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/path/path_wornstonetile.json deleted file mode 100644 index 658edfb7..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/path/path_wornstonetile.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:path/path_wornstonetile" - ] - }, - "criteria": { - "has_master_orb": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:masterbloodorb" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:path/path_wornstonetile" - } - } - }, - "requirements": [ - [ - "has_master_orb", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/primitive_furnace_cell.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/primitive_furnace_cell.json deleted file mode 100644 index 801f59f1..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/primitive_furnace_cell.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:primitive_furnace_cell" - ] - }, - "criteria": { - "has_magician_orb": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:magicianbloodorb" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:primitive_furnace_cell" - } - } - }, - "requirements": [ - [ - "has_magician_orb", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/primitive_hydration_cell.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/primitive_hydration_cell.json deleted file mode 100644 index 69a0f6b6..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/primitive_hydration_cell.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:primitive_hydration_cell" - ] - }, - "criteria": { - "has_magician_orb": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:magicianbloodorb" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:primitive_hydration_cell" - } - } - }, - "requirements": [ - [ - "has_magician_orb", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_diviner_0.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_diviner_0.json deleted file mode 100644 index ac4dd373..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_diviner_0.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:ritual_diviner_0" - ] - }, - "criteria": { - "has_scribe": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:airscribetool" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:ritual_diviner_0" - } - } - }, - "requirements": [ - [ - "has_scribe", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_diviner_1.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_diviner_1.json deleted file mode 100644 index b671e3bd..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_diviner_1.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:ritual_diviner_1" - ] - }, - "criteria": { - "has_demon_slate": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:demonslate" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:ritual_diviner_1" - } - } - }, - "requirements": [ - [ - "has_demon_slate", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_reader.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_reader.json deleted file mode 100644 index f6f08c7a..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_reader.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:ritual_reader" - ] - }, - "criteria": { - "has_master_orb": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:masterbloodorb" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:ritual_reader" - } - } - }, - "requirements": [ - [ - "has_master_orb", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_stone_blank.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_stone_blank.json deleted file mode 100644 index ef6c9fdb..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_stone_blank.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:ritual_stone_blank" - ] - }, - "criteria": { - "has_apprentice_orb": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:apprenticebloodorb" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:ritual_stone_blank" - } - } - }, - "requirements": [ - [ - "has_apprentice_orb", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_stone_master.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_stone_master.json deleted file mode 100644 index 878c9ebb..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_stone_master.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:ritual_stone_master" - ] - }, - "criteria": { - "has_magician_orb": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:magicianbloodorb" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:ritual_stone_master" - } - } - }, - "requirements": [ - [ - "has_magician_orb", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/sacrificial_dagger.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/sacrificial_dagger.json deleted file mode 100644 index 744c16e1..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/sacrificial_dagger.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:sacrificial_dagger" - ] - }, - "criteria": { - "has_glass": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "minecraft:glass" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:sacrificial_dagger" - } - } - }, - "requirements": [ - [ - "has_glass", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/smelting/ingot_hellforged.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/smelting/ingot_hellforged.json deleted file mode 100644 index bd8021ec..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/smelting/ingot_hellforged.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:smelting/ingot_hellforged" - ] - }, - "criteria": { - "has_hellforged_dust": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:sand_hellforged" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:smelting/ingot_hellforged" - } - } - }, - "requirements": [ - [ - "has_hellforged_dust", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/soul_forge.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/soul_forge.json deleted file mode 100644 index 262a22ec..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/soul_forge.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:soul_forge" - ] - }, - "criteria": { - "has_blank_slate": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:blankslate" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:soul_forge" - } - } - }, - "requirements": [ - [ - "has_blank_slate", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/misc/smelting/ingot_gold.json b/src/generated/resources/data/bloodmagic/advancements/recipes/misc/smelting/ingot_gold.json deleted file mode 100644 index aceef4c7..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/misc/smelting/ingot_gold.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:smelting/ingot_gold" - ] - }, - "criteria": { - "has_gold_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:goldsand" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:smelting/ingot_gold" - } - } - }, - "requirements": [ - [ - "has_gold_sand", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/misc/smelting/ingot_iron.json b/src/generated/resources/data/bloodmagic/advancements/recipes/misc/smelting/ingot_iron.json deleted file mode 100644 index 444757df..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/misc/smelting/ingot_iron.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:smelting/ingot_iron" - ] - }, - "criteria": { - "has_iron_sand": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:ironsand" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:smelting/ingot_iron" - } - } - }, - "requirements": [ - [ - "has_iron_sand", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/misc/smelting/ingot_netherite_scrap.json b/src/generated/resources/data/bloodmagic/advancements/recipes/misc/smelting/ingot_netherite_scrap.json deleted file mode 100644 index 5265d945..00000000 --- a/src/generated/resources/data/bloodmagic/advancements/recipes/misc/smelting/ingot_netherite_scrap.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "bloodmagic:smelting/ingot_netherite_scrap" - ] - }, - "criteria": { - "has_netherite_dust": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "bloodmagic:sand_netherite" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "bloodmagic:smelting/ingot_netherite_scrap" - } - } - }, - "requirements": [ - [ - "has_netherite_dust", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/accelerationrune.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/accelerationrune.json deleted file mode 100644 index bff0c94d..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/accelerationrune.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:accelerationrune" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/airritualstone.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/airritualstone.json deleted file mode 100644 index e8935390..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/airritualstone.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:ritualstone" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/alchemicalreactionchamber.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/alchemicalreactionchamber.json deleted file mode 100644 index e3d6ee73..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/alchemicalreactionchamber.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:alchemicalreactionchamber" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/alchemyarray.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/alchemyarray.json deleted file mode 100644 index f27b7f82..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/alchemyarray.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "bloodmagic:alchemyarray", - "rolls": 1.0, - "entries": [] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/alchemytable.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/alchemytable.json deleted file mode 100644 index 35297d28..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/alchemytable.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:alchemytable" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/altar.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/altar.json deleted file mode 100644 index 49c1cf36..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/altar.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:altar" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/altarcapacityrune.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/altarcapacityrune.json deleted file mode 100644 index a71126ce..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/altarcapacityrune.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:altarcapacityrune" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/bettercapacityrune.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/bettercapacityrune.json deleted file mode 100644 index eb0cce26..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/bettercapacityrune.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:bettercapacityrune" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/blankrune.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/blankrune.json deleted file mode 100644 index 80a59b7a..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/blankrune.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:blankrune" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/bloodlight.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/bloodlight.json deleted file mode 100644 index 20e1ab88..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/bloodlight.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "bloodmagic:bloodlight", - "rolls": 1.0, - "entries": [] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/bloodstonebrick.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/bloodstonebrick.json deleted file mode 100644 index 3f2c2b35..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/bloodstonebrick.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:bloodstonebrick" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/chargingrune.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/chargingrune.json deleted file mode 100644 index 66c32d3f..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/chargingrune.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:chargingrune" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/corrosivedemoncrystal.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/corrosivedemoncrystal.json deleted file mode 100644 index d2cad931..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/corrosivedemoncrystal.json +++ /dev/null @@ -1,173 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:corrosivedemoncrystal", - "properties": { - "age": "0" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ], - "name": "bloodmagic:corrosivecrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:corrosivedemoncrystal", - "properties": { - "age": "1" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 2 - } - ], - "name": "bloodmagic:corrosivecrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:corrosivedemoncrystal", - "properties": { - "age": "2" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 3 - } - ], - "name": "bloodmagic:corrosivecrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:corrosivedemoncrystal", - "properties": { - "age": "3" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 4 - } - ], - "name": "bloodmagic:corrosivecrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:corrosivedemoncrystal", - "properties": { - "age": "4" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 5 - } - ], - "name": "bloodmagic:corrosivecrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:corrosivedemoncrystal", - "properties": { - "age": "5" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 6 - } - ], - "name": "bloodmagic:corrosivecrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:corrosivedemoncrystal", - "properties": { - "age": "6" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 7 - } - ], - "name": "bloodmagic:corrosivecrystal" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/creeping_doubt.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/creeping_doubt.json deleted file mode 100644 index 2c5b9549..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/creeping_doubt.json +++ /dev/null @@ -1,173 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:creeping_doubt", - "properties": { - "age": "0" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ], - "name": "bloodmagic:weakbloodshard" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:creeping_doubt", - "properties": { - "age": "1" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ], - "name": "bloodmagic:weakbloodshard" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:creeping_doubt", - "properties": { - "age": "2" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ], - "name": "bloodmagic:weakbloodshard" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:creeping_doubt", - "properties": { - "age": "3" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ], - "name": "bloodmagic:weakbloodshard" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:creeping_doubt", - "properties": { - "age": "4" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ], - "name": "bloodmagic:weakbloodshard" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:creeping_doubt", - "properties": { - "age": "5" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ], - "name": "bloodmagic:weakbloodshard" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:creeping_doubt", - "properties": { - "age": "6" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ], - "name": "bloodmagic:weakbloodshard" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/deforester_charge.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/deforester_charge.json deleted file mode 100644 index 78e28375..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/deforester_charge.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "bloodmagic:deforester_charge", - "rolls": 1.0, - "entries": [] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/demoncrucible.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/demoncrucible.json deleted file mode 100644 index 3e3a8d39..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/demoncrucible.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:demoncrucible" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/demoncrystallizer.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/demoncrystallizer.json deleted file mode 100644 index 55cce224..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/demoncrystallizer.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:demoncrystallizer" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/destructivedemoncrystal.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/destructivedemoncrystal.json deleted file mode 100644 index a42c22e1..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/destructivedemoncrystal.json +++ /dev/null @@ -1,173 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:destructivedemoncrystal", - "properties": { - "age": "0" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ], - "name": "bloodmagic:destructivecrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:destructivedemoncrystal", - "properties": { - "age": "1" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 2 - } - ], - "name": "bloodmagic:destructivecrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:destructivedemoncrystal", - "properties": { - "age": "2" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 3 - } - ], - "name": "bloodmagic:destructivecrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:destructivedemoncrystal", - "properties": { - "age": "3" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 4 - } - ], - "name": "bloodmagic:destructivecrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:destructivedemoncrystal", - "properties": { - "age": "4" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 5 - } - ], - "name": "bloodmagic:destructivecrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:destructivedemoncrystal", - "properties": { - "age": "5" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 6 - } - ], - "name": "bloodmagic:destructivecrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:destructivedemoncrystal", - "properties": { - "age": "6" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 7 - } - ], - "name": "bloodmagic:destructivecrystal" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dislocationrune.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dislocationrune.json deleted file mode 100644 index d158c403..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dislocationrune.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:dislocationrune" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick1.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick1.json deleted file mode 100644 index 5bf91c81..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick1.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:dungeon_brick1" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick2.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick2.json deleted file mode 100644 index 491a46ec..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick2.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:dungeon_brick2" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick3.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick3.json deleted file mode 100644 index ef502cb0..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick3.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:dungeon_brick3" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick_assorted.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick_assorted.json deleted file mode 100644 index 01211879..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick_assorted.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:dungeon_brick_assorted" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick_gate.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick_gate.json deleted file mode 100644 index bd9af9b7..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick_gate.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:dungeon_brick_gate" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick_stairs.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick_stairs.json deleted file mode 100644 index 8df43bad..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick_stairs.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:dungeon_brick_stairs" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick_wall.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick_wall.json deleted file mode 100644 index f047c0cd..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick_wall.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:dungeon_brick_wall" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_eye.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_eye.json deleted file mode 100644 index d7a703f1..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_eye.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:dungeon_eye" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_metal.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_metal.json deleted file mode 100644 index 6b57213b..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_metal.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:dungeon_metal" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_ore.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_ore.json deleted file mode 100644 index 666396e2..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_ore.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:dungeon_ore" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_pillar_cap.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_pillar_cap.json deleted file mode 100644 index 29906c2d..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_pillar_cap.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:dungeon_pillar_cap" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_pillar_center.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_pillar_center.json deleted file mode 100644 index 5aa43bb8..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_pillar_center.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:dungeon_pillar_center" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_pillar_special.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_pillar_special.json deleted file mode 100644 index bde90c58..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_pillar_special.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:dungeon_pillar_special" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_polished.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_polished.json deleted file mode 100644 index fa0436f5..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_polished.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:dungeon_polished" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_polished_gate.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_polished_gate.json deleted file mode 100644 index 46d3c924..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_polished_gate.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:dungeon_polished_gate" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_polished_stairs.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_polished_stairs.json deleted file mode 100644 index fc7d93be..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_polished_stairs.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:dungeon_polished_stairs" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_polished_wall.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_polished_wall.json deleted file mode 100644 index e3c69dbb..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_polished_wall.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:dungeon_polished_wall" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_smallbrick.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_smallbrick.json deleted file mode 100644 index 872ac5de..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_smallbrick.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:dungeon_smallbrick" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_stone.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_stone.json deleted file mode 100644 index 7fc9228d..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_stone.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:dungeon_stone" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_tile.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_tile.json deleted file mode 100644 index b8211e0f..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_tile.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:dungeon_tile" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_tilespecial.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_tilespecial.json deleted file mode 100644 index 3f90bc80..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_tilespecial.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:dungeon_tilespecial" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/duskritualstone.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/duskritualstone.json deleted file mode 100644 index e8935390..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/duskritualstone.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:ritualstone" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/earthritualstone.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/earthritualstone.json deleted file mode 100644 index e8935390..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/earthritualstone.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:ritualstone" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/ethereal_mimic.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/ethereal_mimic.json deleted file mode 100644 index abe50fb6..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/ethereal_mimic.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:ethereal_mimic" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/fireritualstone.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/fireritualstone.json deleted file mode 100644 index e8935390..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/fireritualstone.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:ritualstone" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/fungal_charge.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/fungal_charge.json deleted file mode 100644 index 0344f5a2..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/fungal_charge.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "bloodmagic:fungal_charge", - "rolls": 1.0, - "entries": [] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/incensealtar.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/incensealtar.json deleted file mode 100644 index b588d41d..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/incensealtar.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:incensealtar" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/largebloodstonebrick.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/largebloodstonebrick.json deleted file mode 100644 index ee4181fc..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/largebloodstonebrick.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:largebloodstonebrick" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/lightritualstone.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/lightritualstone.json deleted file mode 100644 index e8935390..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/lightritualstone.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:ritualstone" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/masterritualstone.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/masterritualstone.json deleted file mode 100644 index 8b9eb94d..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/masterritualstone.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:masterritualstone" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/mimic.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/mimic.json deleted file mode 100644 index 5e904859..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/mimic.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:mimic" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/nether_soil.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/nether_soil.json deleted file mode 100644 index 5cf5a8ce..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/nether_soil.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:netherrack" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/obsidianbrickpath.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/obsidianbrickpath.json deleted file mode 100644 index 6eb3eea4..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/obsidianbrickpath.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:obsidianbrickpath" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/obsidiantilepath.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/obsidiantilepath.json deleted file mode 100644 index ee7bbbf2..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/obsidiantilepath.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:obsidiantilepath" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/orbcapacityrune.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/orbcapacityrune.json deleted file mode 100644 index 239dcb53..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/orbcapacityrune.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:orbcapacityrune" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/rawdemoncrystal.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/rawdemoncrystal.json deleted file mode 100644 index 6774eb52..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/rawdemoncrystal.json +++ /dev/null @@ -1,173 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:rawdemoncrystal", - "properties": { - "age": "0" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ], - "name": "bloodmagic:defaultcrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:rawdemoncrystal", - "properties": { - "age": "1" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 2 - } - ], - "name": "bloodmagic:defaultcrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:rawdemoncrystal", - "properties": { - "age": "2" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 3 - } - ], - "name": "bloodmagic:defaultcrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:rawdemoncrystal", - "properties": { - "age": "3" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 4 - } - ], - "name": "bloodmagic:defaultcrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:rawdemoncrystal", - "properties": { - "age": "4" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 5 - } - ], - "name": "bloodmagic:defaultcrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:rawdemoncrystal", - "properties": { - "age": "5" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 6 - } - ], - "name": "bloodmagic:defaultcrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:rawdemoncrystal", - "properties": { - "age": "6" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 7 - } - ], - "name": "bloodmagic:defaultcrystal" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/ritualstone.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/ritualstone.json deleted file mode 100644 index e8935390..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/ritualstone.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:ritualstone" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/sacrificerune.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/sacrificerune.json deleted file mode 100644 index 30afc854..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/sacrificerune.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:sacrificerune" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/selfsacrificerune.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/selfsacrificerune.json deleted file mode 100644 index edbac39e..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/selfsacrificerune.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:selfsacrificerune" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/shaped_charge.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/shaped_charge.json deleted file mode 100644 index c34bb043..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/shaped_charge.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "bloodmagic:shaped_charge", - "rolls": 1.0, - "entries": [] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/soulforge.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/soulforge.json deleted file mode 100644 index 32b39be4..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/soulforge.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:soulforge" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/speedrune.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/speedrune.json deleted file mode 100644 index 37341278..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/speedrune.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:speedrune" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/steadfastdemoncrystal.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/steadfastdemoncrystal.json deleted file mode 100644 index dea3fee2..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/steadfastdemoncrystal.json +++ /dev/null @@ -1,173 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:steadfastdemoncrystal", - "properties": { - "age": "0" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ], - "name": "bloodmagic:steadfastcrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:steadfastdemoncrystal", - "properties": { - "age": "1" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 2 - } - ], - "name": "bloodmagic:steadfastcrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:steadfastdemoncrystal", - "properties": { - "age": "2" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 3 - } - ], - "name": "bloodmagic:steadfastcrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:steadfastdemoncrystal", - "properties": { - "age": "3" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 4 - } - ], - "name": "bloodmagic:steadfastcrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:steadfastdemoncrystal", - "properties": { - "age": "4" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 5 - } - ], - "name": "bloodmagic:steadfastcrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:steadfastdemoncrystal", - "properties": { - "age": "5" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 6 - } - ], - "name": "bloodmagic:steadfastcrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:steadfastdemoncrystal", - "properties": { - "age": "6" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 7 - } - ], - "name": "bloodmagic:steadfastcrystal" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/stonebrickpath.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/stonebrickpath.json deleted file mode 100644 index 3a9b4289..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/stonebrickpath.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:stonebrickpath" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/stonetilepath.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/stonetilepath.json deleted file mode 100644 index 7796876b..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/stonetilepath.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:stonetilepath" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/veinmine_charge.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/veinmine_charge.json deleted file mode 100644 index e7f06266..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/veinmine_charge.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "name": "bloodmagic:veinmine_charge", - "rolls": 1.0, - "entries": [] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/vengefuldemoncrystal.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/vengefuldemoncrystal.json deleted file mode 100644 index c0801fe5..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/vengefuldemoncrystal.json +++ /dev/null @@ -1,173 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:vengefuldemoncrystal", - "properties": { - "age": "0" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 1 - } - ], - "name": "bloodmagic:vengefulcrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:vengefuldemoncrystal", - "properties": { - "age": "1" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 2 - } - ], - "name": "bloodmagic:vengefulcrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:vengefuldemoncrystal", - "properties": { - "age": "2" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 3 - } - ], - "name": "bloodmagic:vengefulcrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:vengefuldemoncrystal", - "properties": { - "age": "3" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 4 - } - ], - "name": "bloodmagic:vengefulcrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:vengefuldemoncrystal", - "properties": { - "age": "4" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 5 - } - ], - "name": "bloodmagic:vengefulcrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:vengefuldemoncrystal", - "properties": { - "age": "5" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 6 - } - ], - "name": "bloodmagic:vengefulcrystal" - } - ] - }, - { - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "bloodmagic:vengefuldemoncrystal", - "properties": { - "age": "6" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 7 - } - ], - "name": "bloodmagic:vengefulcrystal" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/waterritualstone.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/waterritualstone.json deleted file mode 100644 index e8935390..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/waterritualstone.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:ritualstone" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/woodbrickpath.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/woodbrickpath.json deleted file mode 100644 index d4116d40..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/woodbrickpath.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:woodbrickpath" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/woodtilepath.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/woodtilepath.json deleted file mode 100644 index fd8a04c6..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/woodtilepath.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:woodtilepath" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/wornstonebrickpath.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/wornstonebrickpath.json deleted file mode 100644 index d66e2617..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/wornstonebrickpath.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:wornstonebrickpath" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/wornstonetilepath.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/wornstonetilepath.json deleted file mode 100644 index 4de9ffb8..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/blocks/wornstonetilepath.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "bloodmagic:wornstonetilepath" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/test.json b/src/generated/resources/data/bloodmagic/loot_tables/test.json deleted file mode 100644 index 86acee43..00000000 --- a/src/generated/resources/data/bloodmagic/loot_tables/test.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:chest", - "pools": [ - { - "name": "test", - "rolls": 1.0, - "entries": [ - { - "type": "minecraft:item", - "weight": 10, - "functions": [ - { - "function": "minecraft:enchant_with_levels", - "levels": 30, - "treasure": true - } - ], - "name": "minecraft:book" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemy_table.json b/src/generated/resources/data/bloodmagic/recipes/alchemy_table.json deleted file mode 100644 index 6c9bc44a..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemy_table.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "sss", - "wbw", - "gog" - ], - "key": { - "b": { - "tag": "forge:ingots/iron" - }, - "s": { - "tag": "forge:stone" - }, - "w": { - "tag": "minecraft:planks" - }, - "g": { - "tag": "forge:ingots/gold" - }, - "o": { - "item": "bloodmagic:blankslate" - } - }, - "result": { - "item": "bloodmagic:alchemytable" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/arcane_ash.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/arcane_ash.json deleted file mode 100644 index 24f98096..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/arcane_ash.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "tag": "forge:dusts/redstone" - }, - { - "tag": "forge:dyes/white" - }, - { - "tag": "forge:gunpowder" - }, - { - "tag": "minecraft:coals" - } - ], - "output": { - "item": "bloodmagic:arcaneashes", - "nbt": "{Damage:0}" - }, - "syphon": 500, - "ticks": 200, - "upgradeLevel": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/basic_cutting_fluid.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/basic_cutting_fluid.json deleted file mode 100644 index bf555741..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/basic_cutting_fluid.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "item": "bloodmagic:plantoil" - }, - { - "tag": "forge:dusts/redstone" - }, - { - "tag": "forge:gunpowder" - }, - { - "item": "minecraft:sugar" - }, - { - "tag": "forge:dusts/coal" - }, - { - "item": "minecraft:potion" - } - ], - "output": { - "item": "bloodmagic:basiccuttingfluid", - "nbt": "{Damage:0}" - }, - "syphon": 1000, - "ticks": 200, - "upgradeLevel": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/bow_power_anointment.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/bow_power_anointment.json deleted file mode 100644 index e8eac2dc..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/bow_power_anointment.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "item": "bloodmagic:slate_vial" - }, - { - "tag": "forge:crops/nether_wart" - }, - { - "tag": "forge:ingots/iron" - }, - { - "item": "minecraft:bow" - } - ], - "output": { - "item": "bloodmagic:bow_power_anointment" - }, - "syphon": 500, - "ticks": 100, - "upgradeLevel": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/bread.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/bread.json deleted file mode 100644 index 5e30f8ec..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/bread.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "tag": "forge:crops/wheat" - }, - { - "item": "minecraft:sugar" - } - ], - "output": { - "item": "minecraft:bread" - }, - "syphon": 100, - "ticks": 100, - "upgradeLevel": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/clay_from_sand.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/clay_from_sand.json deleted file mode 100644 index 8cd302ff..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/clay_from_sand.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "tag": "forge:sand" - }, - { - "tag": "forge:sand" - }, - { - "item": "minecraft:water_bucket" - } - ], - "output": { - "item": "minecraft:clay_ball", - "count": 2 - }, - "syphon": 50, - "ticks": 100, - "upgradeLevel": 2 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/cobweb.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/cobweb.json deleted file mode 100644 index 847b555a..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/cobweb.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "tag": "forge:string" - }, - { - "tag": "forge:string" - }, - { - "tag": "forge:string" - } - ], - "output": { - "item": "minecraft:cobweb" - }, - "syphon": 50, - "ticks": 50, - "upgradeLevel": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/explosive_powder.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/explosive_powder.json deleted file mode 100644 index 87b3103b..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/explosive_powder.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "tag": "forge:gunpowder" - }, - { - "tag": "forge:gunpowder" - }, - { - "tag": "forge:dusts/coal" - } - ], - "output": { - "item": "bloodmagic:explosivepowder", - "nbt": "{Damage:0}" - }, - "syphon": 500, - "ticks": 200, - "upgradeLevel": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/flint_from_gravel.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/flint_from_gravel.json deleted file mode 100644 index ffe0ce43..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/flint_from_gravel.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "item": "minecraft:gravel" - }, - { - "item": "minecraft:flint" - } - ], - "output": { - "item": "minecraft:flint", - "count": 2 - }, - "syphon": 50, - "ticks": 20, - "upgradeLevel": 0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/fortune_anointment.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/fortune_anointment.json deleted file mode 100644 index 2f66bc4e..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/fortune_anointment.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "item": "bloodmagic:slate_vial" - }, - { - "tag": "forge:crops/nether_wart" - }, - { - "tag": "forge:dusts/redstone" - }, - { - "tag": "forge:dusts/coal" - } - ], - "output": { - "item": "bloodmagic:fortune_anointment" - }, - "syphon": 500, - "ticks": 100, - "upgradeLevel": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/gold_ore_from_gilded.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/gold_ore_from_gilded.json deleted file mode 100644 index bf34285f..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/gold_ore_from_gilded.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "item": "minecraft:gilded_blackstone" - } - ], - "output": { - "item": "minecraft:gold_nugget", - "count": 9 - }, - "syphon": 200, - "ticks": 100, - "upgradeLevel": 2 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/grass_block.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/grass_block.json deleted file mode 100644 index 03e6aee6..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/grass_block.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "item": "minecraft:dirt" - }, - { - "item": "minecraft:bone_meal" - }, - { - "item": "minecraft:wheat_seeds" - } - ], - "output": { - "item": "minecraft:grass_block" - }, - "syphon": 200, - "ticks": 200, - "upgradeLevel": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/gunpowder.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/gunpowder.json deleted file mode 100644 index aec2762a..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/gunpowder.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "tag": "forge:dusts/sulfur" - }, - { - "tag": "forge:dusts/saltpeter" - }, - { - "tag": "minecraft:coals" - } - ], - "output": { - "item": "minecraft:gunpowder", - "count": 3 - }, - "syphon": 0, - "ticks": 100, - "upgradeLevel": 0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/hidden_knowledge_anointment.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/hidden_knowledge_anointment.json deleted file mode 100644 index 228e57a5..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/hidden_knowledge_anointment.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "item": "bloodmagic:slate_vial" - }, - { - "tag": "forge:crops/nether_wart" - }, - { - "item": "minecraft:glass_bottle" - }, - { - "item": "minecraft:enchanted_book" - } - ], - "output": { - "item": "bloodmagic:hidden_knowledge_anointment" - }, - "syphon": 500, - "ticks": 100, - "upgradeLevel": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/holy_water_anointment.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/holy_water_anointment.json deleted file mode 100644 index 126bd5aa..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/holy_water_anointment.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "item": "bloodmagic:slate_vial" - }, - { - "tag": "forge:crops/nether_wart" - }, - { - "item": "minecraft:glistering_melon_slice" - }, - { - "tag": "forge:gems/quartz" - } - ], - "output": { - "item": "bloodmagic:holy_water_anointment" - }, - "syphon": 500, - "ticks": 100, - "upgradeLevel": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/leather_from_flesh.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/leather_from_flesh.json deleted file mode 100644 index 6fd3738b..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/leather_from_flesh.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "item": "minecraft:rotten_flesh" - }, - { - "item": "minecraft:rotten_flesh" - }, - { - "item": "minecraft:rotten_flesh" - }, - { - "item": "minecraft:rotten_flesh" - }, - { - "item": "minecraft:flint" - }, - { - "item": "minecraft:water_bucket" - } - ], - "output": { - "item": "minecraft:leather", - "count": 4 - }, - "syphon": 100, - "ticks": 200, - "upgradeLevel": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/looting_anointment.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/looting_anointment.json deleted file mode 100644 index cdec19e3..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/looting_anointment.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "item": "bloodmagic:slate_vial" - }, - { - "tag": "forge:crops/nether_wart" - }, - { - "tag": "forge:gems/lapis" - }, - { - "tag": "forge:bones" - } - ], - "output": { - "item": "bloodmagic:looting_anointment" - }, - "syphon": 500, - "ticks": 100, - "upgradeLevel": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/melee_damage_anointment.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/melee_damage_anointment.json deleted file mode 100644 index 496abd4b..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/melee_damage_anointment.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "item": "bloodmagic:slate_vial" - }, - { - "tag": "forge:crops/nether_wart" - }, - { - "item": "minecraft:blaze_powder" - }, - { - "tag": "forge:gems/quartz" - } - ], - "output": { - "item": "bloodmagic:melee_anointment" - }, - "syphon": 500, - "ticks": 100, - "upgradeLevel": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/nether_wart_from_block.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/nether_wart_from_block.json deleted file mode 100644 index 10442cb7..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/nether_wart_from_block.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "item": "minecraft:nether_wart_block" - } - ], - "output": { - "item": "minecraft:nether_wart" - }, - "syphon": 50, - "ticks": 40, - "upgradeLevel": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/plantoil_from_beets.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/plantoil_from_beets.json deleted file mode 100644 index 718a1062..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/plantoil_from_beets.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "tag": "forge:crops/beetroot" - }, - { - "tag": "forge:crops/beetroot" - }, - { - "tag": "forge:crops/beetroot" - }, - { - "item": "minecraft:bone_meal" - } - ], - "output": { - "item": "bloodmagic:plantoil" - }, - "syphon": 100, - "ticks": 100, - "upgradeLevel": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/plantoil_from_carrots.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/plantoil_from_carrots.json deleted file mode 100644 index 51ca6f26..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/plantoil_from_carrots.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "tag": "forge:crops/carrot" - }, - { - "tag": "forge:crops/carrot" - }, - { - "tag": "forge:crops/carrot" - }, - { - "item": "minecraft:bone_meal" - } - ], - "output": { - "item": "bloodmagic:plantoil" - }, - "syphon": 100, - "ticks": 100, - "upgradeLevel": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/plantoil_from_taters.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/plantoil_from_taters.json deleted file mode 100644 index 8c0f281b..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/plantoil_from_taters.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "tag": "forge:crops/potato" - }, - { - "tag": "forge:crops/potato" - }, - { - "item": "minecraft:bone_meal" - } - ], - "output": { - "item": "bloodmagic:plantoil" - }, - "syphon": 100, - "ticks": 100, - "upgradeLevel": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/plantoil_from_wheat.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/plantoil_from_wheat.json deleted file mode 100644 index af4e9e80..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/plantoil_from_wheat.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "tag": "forge:crops/wheat" - }, - { - "tag": "forge:crops/wheat" - }, - { - "item": "minecraft:bone_meal" - } - ], - "output": { - "item": "bloodmagic:plantoil" - }, - "syphon": 100, - "ticks": 100, - "upgradeLevel": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/quick_draw_anointment.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/quick_draw_anointment.json deleted file mode 100644 index 629a12f4..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/quick_draw_anointment.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "item": "bloodmagic:slate_vial" - }, - { - "tag": "forge:crops/nether_wart" - }, - { - "tag": "forge:string" - }, - { - "item": "minecraft:spectral_arrow" - } - ], - "output": { - "item": "bloodmagic:quick_draw_anointment" - }, - "syphon": 500, - "ticks": 100, - "upgradeLevel": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_air.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_air.json deleted file mode 100644 index 3ac1e251..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_air.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "item": "minecraft:ghast_tear" - }, - { - "tag": "forge:feathers" - }, - { - "tag": "forge:feathers" - } - ], - "output": { - "item": "bloodmagic:reagentair" - }, - "syphon": 2000, - "ticks": 200, - "upgradeLevel": 2 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_binding.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_binding.json deleted file mode 100644 index fb49418e..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_binding.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "tag": "forge:dusts/glowstone" - }, - { - "tag": "forge:dusts/redstone" - }, - { - "tag": "forge:gunpowder" - }, - { - "tag": "forge:nuggets/gold" - } - ], - "output": { - "item": "bloodmagic:reagentbinding" - }, - "syphon": 1000, - "ticks": 200, - "upgradeLevel": 3 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_blood_light.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_blood_light.json deleted file mode 100644 index c9f119f9..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_blood_light.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "tag": "forge:dusts/glowstone" - }, - { - "item": "minecraft:torch" - }, - { - "tag": "forge:dusts/redstone" - }, - { - "tag": "forge:dusts/redstone" - } - ], - "output": { - "item": "bloodmagic:reagentbloodlight" - }, - "syphon": 1000, - "ticks": 200, - "upgradeLevel": 3 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_fastminer.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_fastminer.json deleted file mode 100644 index 7e90329b..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_fastminer.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "item": "minecraft:iron_pickaxe" - }, - { - "item": "minecraft:iron_axe" - }, - { - "item": "minecraft:iron_shovel" - }, - { - "tag": "forge:gunpowder" - } - ], - "output": { - "item": "bloodmagic:reagentfastminer" - }, - "syphon": 2000, - "ticks": 200, - "upgradeLevel": 2 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_growth.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_growth.json deleted file mode 100644 index 8707950f..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_growth.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "tag": "minecraft:saplings" - }, - { - "tag": "minecraft:saplings" - }, - { - "item": "minecraft:sugar_cane" - }, - { - "item": "minecraft:sugar" - } - ], - "output": { - "item": "bloodmagic:reagentgrowth" - }, - "syphon": 2000, - "ticks": 200, - "upgradeLevel": 2 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_holding.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_holding.json deleted file mode 100644 index d293e725..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_holding.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "tag": "forge:chests" - }, - { - "tag": "forge:leather" - }, - { - "tag": "forge:string" - }, - { - "tag": "forge:string" - } - ], - "output": { - "item": "bloodmagic:reagentholding" - }, - "syphon": 2000, - "ticks": 200, - "upgradeLevel": 2 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_lava.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_lava.json deleted file mode 100644 index 6618996f..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_lava.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "item": "minecraft:lava_bucket" - }, - { - "tag": "forge:dusts/redstone" - }, - { - "tag": "forge:cobblestone" - }, - { - "tag": "forge:storage_blocks/coal" - } - ], - "output": { - "item": "bloodmagic:reagentlava" - }, - "syphon": 1000, - "ticks": 200, - "upgradeLevel": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_magnetism.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_magnetism.json deleted file mode 100644 index 4fb4d117..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_magnetism.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "tag": "forge:string" - }, - { - "tag": "forge:ingots/gold" - }, - { - "tag": "forge:ingots/gold" - }, - { - "tag": "forge:storage_blocks/iron" - } - ], - "output": { - "item": "bloodmagic:reagentmagnetism" - }, - "syphon": 1000, - "ticks": 200, - "upgradeLevel": 3 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_sight.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_sight.json deleted file mode 100644 index fb57653d..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_sight.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "tag": "forge:dusts/glowstone" - }, - { - "tag": "forge:glass" - }, - { - "tag": "forge:glass" - }, - { - "item": "bloodmagic:divinationsigil" - } - ], - "output": { - "item": "bloodmagic:reagentsight" - }, - "syphon": 500, - "ticks": 200, - "upgradeLevel": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_void.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_void.json deleted file mode 100644 index d549746e..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_void.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "item": "minecraft:bucket" - }, - { - "tag": "forge:string" - }, - { - "tag": "forge:string" - }, - { - "tag": "forge:gunpowder" - } - ], - "output": { - "item": "bloodmagic:reagentvoid" - }, - "syphon": 1000, - "ticks": 200, - "upgradeLevel": 2 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_water.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_water.json deleted file mode 100644 index 93a5b884..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/reagent_water.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "item": "minecraft:sugar" - }, - { - "item": "minecraft:water_bucket" - }, - { - "item": "minecraft:water_bucket" - } - ], - "output": { - "item": "bloodmagic:reagentwater" - }, - "syphon": 300, - "ticks": 200, - "upgradeLevel": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/sand_coal.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/sand_coal.json deleted file mode 100644 index a3fb3e74..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/sand_coal.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "item": "minecraft:coal" - }, - { - "item": "minecraft:coal" - }, - { - "item": "minecraft:flint" - } - ], - "output": { - "item": "bloodmagic:coalsand", - "count": 4 - }, - "syphon": 400, - "ticks": 200, - "upgradeLevel": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/sand_gold.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/sand_gold.json deleted file mode 100644 index 618980ef..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/sand_gold.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "tag": "forge:ores/gold" - }, - { - "tag": "bloodmagic:arc/cuttingfluid" - } - ], - "output": { - "item": "bloodmagic:goldsand", - "count": 2 - }, - "syphon": 400, - "ticks": 200, - "upgradeLevel": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/sand_iron.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/sand_iron.json deleted file mode 100644 index 29fd3e67..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/sand_iron.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "tag": "forge:ores/iron" - }, - { - "tag": "bloodmagic:arc/cuttingfluid" - } - ], - "output": { - "item": "bloodmagic:ironsand", - "count": 2 - }, - "syphon": 400, - "ticks": 200, - "upgradeLevel": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/silk_touch_anointment.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/silk_touch_anointment.json deleted file mode 100644 index 764753f6..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/silk_touch_anointment.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "item": "bloodmagic:slate_vial" - }, - { - "tag": "forge:crops/nether_wart" - }, - { - "item": "minecraft:cobweb" - }, - { - "tag": "forge:nuggets/gold" - } - ], - "output": { - "item": "bloodmagic:silk_touch_anointment" - }, - "syphon": 500, - "ticks": 100, - "upgradeLevel": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/slate_vial.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/slate_vial.json deleted file mode 100644 index 2a613dbe..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/slate_vial.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "item": "bloodmagic:blankslate" - }, - { - "tag": "forge:glass" - }, - { - "tag": "forge:glass" - }, - { - "tag": "forge:glass" - }, - { - "tag": "forge:glass" - }, - { - "tag": "forge:glass" - } - ], - "output": { - "item": "bloodmagic:slate_vial", - "count": 8 - }, - "syphon": 500, - "ticks": 200, - "upgradeLevel": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/smelting_anointment.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/smelting_anointment.json deleted file mode 100644 index a23514d9..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/smelting_anointment.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "item": "bloodmagic:slate_vial" - }, - { - "tag": "forge:crops/nether_wart" - }, - { - "item": "minecraft:furnace" - }, - [ - { - "item": "minecraft:charcoal" - }, - { - "item": "minecraft:coal" - } - ] - ], - "output": { - "item": "bloodmagic:smelting_anointment" - }, - "syphon": 500, - "ticks": 100, - "upgradeLevel": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/alchemytable/string.json b/src/generated/resources/data/bloodmagic/recipes/alchemytable/string.json deleted file mode 100644 index 0455b315..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/alchemytable/string.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "bloodmagic:alchemytable", - "input": [ - { - "tag": "minecraft:wool" - }, - { - "item": "minecraft:flint" - } - ], - "output": { - "item": "minecraft:string", - "count": 4 - }, - "syphon": 100, - "ticks": 100, - "upgradeLevel": 0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/air_tool.json b/src/generated/resources/data/bloodmagic/recipes/altar/air_tool.json deleted file mode 100644 index a34cb046..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/altar/air_tool.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "bloodmagic:altar", - "input": { - "item": "minecraft:ghast_tear" - }, - "output": { - "item": "bloodmagic:airscribetool", - "nbt": "{Damage:0}" - }, - "upgradeLevel": 2, - "altarSyphon": 1000, - "consumptionRate": 5, - "drainRate": 5 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/apprenticebloodorb.json b/src/generated/resources/data/bloodmagic/recipes/altar/apprenticebloodorb.json deleted file mode 100644 index 3637afb8..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/altar/apprenticebloodorb.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:altar", - "input": { - "tag": "forge:storage_blocks/redstone" - }, - "output": { - "item": "bloodmagic:apprenticebloodorb" - }, - "upgradeLevel": 1, - "altarSyphon": 5000, - "consumptionRate": 5, - "drainRate": 5 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/bucket_life.json b/src/generated/resources/data/bloodmagic/recipes/altar/bucket_life.json deleted file mode 100644 index 6902924e..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/altar/bucket_life.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:altar", - "input": { - "item": "minecraft:bucket" - }, - "output": { - "item": "bloodmagic:life_essence_bucket" - }, - "upgradeLevel": 0, - "altarSyphon": 1000, - "consumptionRate": 5, - "drainRate": 0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/daggerofsacrifice.json b/src/generated/resources/data/bloodmagic/recipes/altar/daggerofsacrifice.json deleted file mode 100644 index f1d7fc16..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/altar/daggerofsacrifice.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:altar", - "input": { - "item": "minecraft:iron_sword" - }, - "output": { - "item": "bloodmagic:daggerofsacrifice" - }, - "upgradeLevel": 1, - "altarSyphon": 3000, - "consumptionRate": 5, - "drainRate": 5 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/demonicslate.json b/src/generated/resources/data/bloodmagic/recipes/altar/demonicslate.json deleted file mode 100644 index 60a29822..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/altar/demonicslate.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:altar", - "input": { - "item": "bloodmagic:infusedslate" - }, - "output": { - "item": "bloodmagic:demonslate" - }, - "upgradeLevel": 3, - "altarSyphon": 15000, - "consumptionRate": 20, - "drainRate": 20 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/dusk_tool.json b/src/generated/resources/data/bloodmagic/recipes/altar/dusk_tool.json deleted file mode 100644 index a8a08519..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/altar/dusk_tool.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "bloodmagic:altar", - "input": { - "tag": "forge:storage_blocks/coal" - }, - "output": { - "item": "bloodmagic:duskscribetool", - "nbt": "{Damage:0}" - }, - "upgradeLevel": 3, - "altarSyphon": 2000, - "consumptionRate": 20, - "drainRate": 10 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/earth_tool.json b/src/generated/resources/data/bloodmagic/recipes/altar/earth_tool.json deleted file mode 100644 index 72ddfcc8..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/altar/earth_tool.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "bloodmagic:altar", - "input": { - "tag": "forge:obsidian" - }, - "output": { - "item": "bloodmagic:earthscribetool", - "nbt": "{Damage:0}" - }, - "upgradeLevel": 2, - "altarSyphon": 1000, - "consumptionRate": 5, - "drainRate": 5 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/fire_tool.json b/src/generated/resources/data/bloodmagic/recipes/altar/fire_tool.json deleted file mode 100644 index 859c6e17..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/altar/fire_tool.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "bloodmagic:altar", - "input": { - "item": "minecraft:magma_cream" - }, - "output": { - "item": "bloodmagic:firescribetool", - "nbt": "{Damage:0}" - }, - "upgradeLevel": 2, - "altarSyphon": 1000, - "consumptionRate": 5, - "drainRate": 5 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/imbuedslate.json b/src/generated/resources/data/bloodmagic/recipes/altar/imbuedslate.json deleted file mode 100644 index b1a577b1..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/altar/imbuedslate.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:altar", - "input": { - "item": "bloodmagic:reinforcedslate" - }, - "output": { - "item": "bloodmagic:infusedslate" - }, - "upgradeLevel": 2, - "altarSyphon": 5000, - "consumptionRate": 15, - "drainRate": 10 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/magicianbloodorb.json b/src/generated/resources/data/bloodmagic/recipes/altar/magicianbloodorb.json deleted file mode 100644 index 941c312f..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/altar/magicianbloodorb.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:altar", - "input": { - "tag": "forge:storage_blocks/gold" - }, - "output": { - "item": "bloodmagic:magicianbloodorb" - }, - "upgradeLevel": 2, - "altarSyphon": 25000, - "consumptionRate": 20, - "drainRate": 20 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/masterbloodorb.json b/src/generated/resources/data/bloodmagic/recipes/altar/masterbloodorb.json deleted file mode 100644 index f40e0229..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/altar/masterbloodorb.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:altar", - "input": { - "item": "bloodmagic:weakbloodshard" - }, - "output": { - "item": "bloodmagic:masterbloodorb" - }, - "upgradeLevel": 3, - "altarSyphon": 40000, - "consumptionRate": 30, - "drainRate": 50 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/reinforcedslate.json b/src/generated/resources/data/bloodmagic/recipes/altar/reinforcedslate.json deleted file mode 100644 index 52a37c81..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/altar/reinforcedslate.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:altar", - "input": { - "item": "bloodmagic:blankslate" - }, - "output": { - "item": "bloodmagic:reinforcedslate" - }, - "upgradeLevel": 1, - "altarSyphon": 2000, - "consumptionRate": 5, - "drainRate": 5 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/slate.json b/src/generated/resources/data/bloodmagic/recipes/altar/slate.json deleted file mode 100644 index 3be29e67..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/altar/slate.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:altar", - "input": { - "tag": "forge:stone" - }, - "output": { - "item": "bloodmagic:blankslate" - }, - "upgradeLevel": 0, - "altarSyphon": 1000, - "consumptionRate": 5, - "drainRate": 5 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/soul_snare.json b/src/generated/resources/data/bloodmagic/recipes/altar/soul_snare.json deleted file mode 100644 index ffa64e8f..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/altar/soul_snare.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:altar", - "input": { - "tag": "forge:string" - }, - "output": { - "item": "bloodmagic:soulsnare" - }, - "upgradeLevel": 0, - "altarSyphon": 500, - "consumptionRate": 5, - "drainRate": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/water_tool.json b/src/generated/resources/data/bloodmagic/recipes/altar/water_tool.json deleted file mode 100644 index 95508bc1..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/altar/water_tool.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "bloodmagic:altar", - "input": { - "tag": "forge:storage_blocks/lapis" - }, - "output": { - "item": "bloodmagic:waterscribetool", - "nbt": "{Damage:0}" - }, - "upgradeLevel": 2, - "altarSyphon": 1000, - "consumptionRate": 5, - "drainRate": 5 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/altar/weakbloodorb.json b/src/generated/resources/data/bloodmagic/recipes/altar/weakbloodorb.json deleted file mode 100644 index 16769109..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/altar/weakbloodorb.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:altar", - "input": { - "tag": "forge:gems/diamond" - }, - "output": { - "item": "bloodmagic:weakbloodorb" - }, - "upgradeLevel": 0, - "altarSyphon": 2000, - "consumptionRate": 5, - "drainRate": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc.json b/src/generated/resources/data/bloodmagic/recipes/arc.json deleted file mode 100644 index 2b02de09..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/arc.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "sss", - "SoS", - "IfI" - ], - "key": { - "s": { - "tag": "forge:stone" - }, - "f": { - "item": "minecraft:furnace" - }, - "o": { - "type": "bloodmagic:bloodorb", - "orb_tier": 3 - }, - "I": { - "tag": "forge:storage_blocks/iron" - }, - "S": { - "item": "bloodmagic:infusedslate" - } - }, - "result": { - "item": "bloodmagic:alchemicalreactionchamber" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/clay_from_sand.json b/src/generated/resources/data/bloodmagic/recipes/arc/clay_from_sand.json deleted file mode 100644 index 4843ce04..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/arc/clay_from_sand.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "bloodmagic:arc", - "input": { - "tag": "forge:sand" - }, - "tool": { - "tag": "bloodmagic:arc/hydrate" - }, - "inputfluid": { - "amount": 200, - "fluid": "minecraft:water" - }, - "addedoutput": [ - { - "chance": 0.5, - "type": { - "item": "minecraft:clay_ball" - } - } - ], - "output": { - "item": "minecraft:clay_ball" - }, - "consumeingredient": false -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/clay_from_terracotta.json b/src/generated/resources/data/bloodmagic/recipes/arc/clay_from_terracotta.json deleted file mode 100644 index da406447..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/arc/clay_from_terracotta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "bloodmagic:arc", - "input": { - "item": "minecraft:terracotta" - }, - "tool": { - "tag": "bloodmagic:arc/hydrate" - }, - "inputfluid": { - "amount": 200, - "fluid": "minecraft:water" - }, - "output": { - "item": "minecraft:clay" - }, - "consumeingredient": false -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/dustsfrom_gravel_gold.json b/src/generated/resources/data/bloodmagic/recipes/arc/dustsfrom_gravel_gold.json deleted file mode 100644 index c77dec87..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/arc/dustsfrom_gravel_gold.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:arc", - "input": { - "tag": "bloodmagic:gravels/gold" - }, - "tool": { - "tag": "bloodmagic:arc/cuttingfluid" - }, - "output": { - "item": "bloodmagic:goldsand" - }, - "consumeingredient": false -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/dustsfrom_gravel_iron.json b/src/generated/resources/data/bloodmagic/recipes/arc/dustsfrom_gravel_iron.json deleted file mode 100644 index f2b834b7..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/arc/dustsfrom_gravel_iron.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:arc", - "input": { - "tag": "bloodmagic:gravels/iron" - }, - "tool": { - "tag": "bloodmagic:arc/cuttingfluid" - }, - "output": { - "item": "bloodmagic:ironsand" - }, - "consumeingredient": false -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/dustsfrom_gravel_netherite_scrap.json b/src/generated/resources/data/bloodmagic/recipes/arc/dustsfrom_gravel_netherite_scrap.json deleted file mode 100644 index 498f1d0f..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/arc/dustsfrom_gravel_netherite_scrap.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:arc", - "input": { - "tag": "bloodmagic:gravels/netherite_scrap" - }, - "tool": { - "tag": "bloodmagic:arc/cuttingfluid" - }, - "output": { - "item": "bloodmagic:sand_netherite" - }, - "consumeingredient": false -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/dustsfrom_ingot_gold.json b/src/generated/resources/data/bloodmagic/recipes/arc/dustsfrom_ingot_gold.json deleted file mode 100644 index c1cdecc1..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/arc/dustsfrom_ingot_gold.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:arc", - "input": { - "tag": "forge:ingots/gold" - }, - "tool": { - "tag": "bloodmagic:arc/explosive" - }, - "output": { - "item": "bloodmagic:goldsand" - }, - "consumeingredient": false -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/dustsfrom_ingot_iron.json b/src/generated/resources/data/bloodmagic/recipes/arc/dustsfrom_ingot_iron.json deleted file mode 100644 index 7c4e0afd..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/arc/dustsfrom_ingot_iron.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:arc", - "input": { - "tag": "forge:ingots/iron" - }, - "tool": { - "tag": "bloodmagic:arc/explosive" - }, - "output": { - "item": "bloodmagic:ironsand" - }, - "consumeingredient": false -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/dustsfrom_ingot_netherite_scrap.json b/src/generated/resources/data/bloodmagic/recipes/arc/dustsfrom_ingot_netherite_scrap.json deleted file mode 100644 index fc4af18a..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/arc/dustsfrom_ingot_netherite_scrap.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:arc", - "input": { - "item": "minecraft:netherite_scrap" - }, - "tool": { - "tag": "bloodmagic:arc/explosive" - }, - "output": { - "item": "bloodmagic:sand_netherite" - }, - "consumeingredient": false -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/dustsfrom_ore_gold.json b/src/generated/resources/data/bloodmagic/recipes/arc/dustsfrom_ore_gold.json deleted file mode 100644 index 8aa0031c..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/arc/dustsfrom_ore_gold.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "bloodmagic:arc", - "input": { - "tag": "forge:ores/gold" - }, - "tool": { - "tag": "bloodmagic:arc/cuttingfluid" - }, - "output": { - "item": "bloodmagic:goldsand", - "count": 2 - }, - "consumeingredient": false -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/dustsfrom_ore_iron.json b/src/generated/resources/data/bloodmagic/recipes/arc/dustsfrom_ore_iron.json deleted file mode 100644 index 6afdf627..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/arc/dustsfrom_ore_iron.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "bloodmagic:arc", - "input": { - "tag": "forge:ores/iron" - }, - "tool": { - "tag": "bloodmagic:arc/cuttingfluid" - }, - "output": { - "item": "bloodmagic:ironsand", - "count": 2 - }, - "consumeingredient": false -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/dustsfrom_ore_netherite_scrap.json b/src/generated/resources/data/bloodmagic/recipes/arc/dustsfrom_ore_netherite_scrap.json deleted file mode 100644 index cfc195d4..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/arc/dustsfrom_ore_netherite_scrap.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "bloodmagic:arc", - "input": { - "tag": "forge:ores/netherite_scrap" - }, - "tool": { - "tag": "bloodmagic:arc/cuttingfluid" - }, - "output": { - "item": "bloodmagic:sand_netherite", - "count": 2 - }, - "consumeingredient": false -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/fragmentsgold.json b/src/generated/resources/data/bloodmagic/recipes/arc/fragmentsgold.json deleted file mode 100644 index 74ed09a7..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/arc/fragmentsgold.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "bloodmagic:arc", - "input": { - "tag": "forge:ores/gold" - }, - "tool": { - "tag": "bloodmagic:arc/explosive" - }, - "output": { - "item": "bloodmagic:goldfragment", - "count": 3 - }, - "consumeingredient": false -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/fragmentsiron.json b/src/generated/resources/data/bloodmagic/recipes/arc/fragmentsiron.json deleted file mode 100644 index bdd4aad2..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/arc/fragmentsiron.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "bloodmagic:arc", - "input": { - "tag": "forge:ores/iron" - }, - "tool": { - "tag": "bloodmagic:arc/explosive" - }, - "output": { - "item": "bloodmagic:ironfragment", - "count": 3 - }, - "consumeingredient": false -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/fragmentsnetherite_scrap.json b/src/generated/resources/data/bloodmagic/recipes/arc/fragmentsnetherite_scrap.json deleted file mode 100644 index 2f2e64a0..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/arc/fragmentsnetherite_scrap.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "bloodmagic:arc", - "input": { - "tag": "forge:ores/netherite_scrap" - }, - "tool": { - "tag": "bloodmagic:arc/explosive" - }, - "output": { - "item": "bloodmagic:fragment_netherite_scrap", - "count": 3 - }, - "consumeingredient": false -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/gravelsgold.json b/src/generated/resources/data/bloodmagic/recipes/arc/gravelsgold.json deleted file mode 100644 index 0920bb12..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/arc/gravelsgold.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "bloodmagic:arc", - "input": { - "tag": "bloodmagic:fragments/gold" - }, - "tool": { - "tag": "bloodmagic:arc/resonator" - }, - "addedoutput": [ - { - "chance": 0.05, - "type": { - "item": "bloodmagic:corrupted_tinydust" - } - }, - { - "chance": 0.01, - "type": { - "item": "bloodmagic:corrupted_tinydust" - } - } - ], - "output": { - "item": "bloodmagic:goldgravel" - }, - "consumeingredient": false -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/gravelsiron.json b/src/generated/resources/data/bloodmagic/recipes/arc/gravelsiron.json deleted file mode 100644 index 980da2fa..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/arc/gravelsiron.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "bloodmagic:arc", - "input": { - "tag": "bloodmagic:fragments/iron" - }, - "tool": { - "tag": "bloodmagic:arc/resonator" - }, - "addedoutput": [ - { - "chance": 0.05, - "type": { - "item": "bloodmagic:corrupted_tinydust" - } - }, - { - "chance": 0.01, - "type": { - "item": "bloodmagic:corrupted_tinydust" - } - } - ], - "output": { - "item": "bloodmagic:irongravel" - }, - "consumeingredient": false -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/gravelsnetherite_scrap.json b/src/generated/resources/data/bloodmagic/recipes/arc/gravelsnetherite_scrap.json deleted file mode 100644 index 86971ad1..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/arc/gravelsnetherite_scrap.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "bloodmagic:arc", - "input": { - "tag": "bloodmagic:fragments/netherite_scrap" - }, - "tool": { - "tag": "bloodmagic:arc/resonator" - }, - "addedoutput": [ - { - "chance": 0.05, - "type": { - "item": "bloodmagic:corrupted_tinydust" - } - }, - { - "chance": 0.01, - "type": { - "item": "bloodmagic:corrupted_tinydust" - } - } - ], - "output": { - "item": "bloodmagic:gravel_netherite_scrap" - }, - "consumeingredient": false -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/netherrack_to_sulfer.json b/src/generated/resources/data/bloodmagic/recipes/arc/netherrack_to_sulfer.json deleted file mode 100644 index ee5e9bdc..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/arc/netherrack_to_sulfer.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "bloodmagic:arc", - "input": { - "tag": "forge:netherrack" - }, - "tool": { - "tag": "bloodmagic:arc/explosive" - }, - "outputfluid": { - "fluid": "minecraft:lava", - "amount": 5 - }, - "output": { - "item": "bloodmagic:sulfur" - }, - "consumeingredient": false -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/ore/dustgold.json b/src/generated/resources/data/bloodmagic/recipes/arc/ore/dustgold.json deleted file mode 100644 index 284985ab..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/arc/ore/dustgold.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "bloodmagic:arc", - "input": { - "item": "minecraft:gold_ore" - }, - "tool": { - "tag": "bloodmagic:arc/cuttingfluid" - }, - "output": { - "item": "bloodmagic:goldsand", - "count": 2 - }, - "consumeingredient": false -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/ore/dustiron.json b/src/generated/resources/data/bloodmagic/recipes/arc/ore/dustiron.json deleted file mode 100644 index 185879fb..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/arc/ore/dustiron.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "bloodmagic:arc", - "input": { - "item": "minecraft:iron_ore" - }, - "tool": { - "tag": "bloodmagic:arc/cuttingfluid" - }, - "output": { - "item": "bloodmagic:ironsand", - "count": 2 - }, - "consumeingredient": false -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/reversion/apprentice_blood_orb.json b/src/generated/resources/data/bloodmagic/recipes/arc/reversion/apprentice_blood_orb.json deleted file mode 100644 index 393c065a..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/arc/reversion/apprentice_blood_orb.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:arc", - "input": { - "item": "bloodmagic:apprenticebloodorb" - }, - "tool": { - "tag": "bloodmagic:arc/reverter" - }, - "output": { - "item": "minecraft:redstone_block" - }, - "consumeingredient": true -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/reversion/magician_blood_orb.json b/src/generated/resources/data/bloodmagic/recipes/arc/reversion/magician_blood_orb.json deleted file mode 100644 index 4ddb9c5c..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/arc/reversion/magician_blood_orb.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:arc", - "input": { - "item": "bloodmagic:magicianbloodorb" - }, - "tool": { - "tag": "bloodmagic:arc/reverter" - }, - "output": { - "item": "minecraft:gold_block" - }, - "consumeingredient": true -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/reversion/master_blood_orb.json b/src/generated/resources/data/bloodmagic/recipes/arc/reversion/master_blood_orb.json deleted file mode 100644 index a258faa9..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/arc/reversion/master_blood_orb.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:arc", - "input": { - "item": "bloodmagic:masterbloodorb" - }, - "tool": { - "tag": "bloodmagic:arc/reverter" - }, - "output": { - "item": "bloodmagic:weakbloodshard" - }, - "consumeingredient": true -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/reversion/weak_blood_orb.json b/src/generated/resources/data/bloodmagic/recipes/arc/reversion/weak_blood_orb.json deleted file mode 100644 index 52823f43..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/arc/reversion/weak_blood_orb.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:arc", - "input": { - "item": "bloodmagic:weakbloodorb" - }, - "tool": { - "tag": "bloodmagic:arc/reverter" - }, - "output": { - "item": "minecraft:diamond" - }, - "consumeingredient": true -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/arc/weakbloodshard.json b/src/generated/resources/data/bloodmagic/recipes/arc/weakbloodshard.json deleted file mode 100644 index 806f31b2..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/arc/weakbloodshard.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "bloodmagic:arc", - "input": { - "item": "bloodmagic:infusedslate" - }, - "tool": { - "tag": "bloodmagic:arc/reverter" - }, - "addedoutput": [ - { - "chance": 0.2, - "type": { - "item": "bloodmagic:weakbloodshard" - } - } - ], - "output": { - "item": "bloodmagic:weakbloodshard" - }, - "consumeingredient": false -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/airsigil.json b/src/generated/resources/data/bloodmagic/recipes/array/airsigil.json deleted file mode 100644 index 7cd5e7ff..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/array/airsigil.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:array", - "texture": "bloodmagic:textures/models/alchemyarrays/airsigil.png", - "baseinput": { - "item": "bloodmagic:reagentair" - }, - "addedinput": { - "item": "bloodmagic:reinforcedslate" - }, - "output": { - "item": "bloodmagic:airsigil" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/bloodlightsigil.json b/src/generated/resources/data/bloodmagic/recipes/array/bloodlightsigil.json deleted file mode 100644 index 2e6e3e48..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/array/bloodlightsigil.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:array", - "texture": "bloodmagic:textures/models/alchemyarrays/lightsigil.png", - "baseinput": { - "item": "bloodmagic:reagentbloodlight" - }, - "addedinput": { - "item": "bloodmagic:infusedslate" - }, - "output": { - "item": "bloodmagic:bloodlightsigil" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/bounce.json b/src/generated/resources/data/bloodmagic/recipes/array/bounce.json deleted file mode 100644 index d15b0de6..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/array/bounce.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:array", - "texture": "bloodmagic:textures/models/alchemyarrays/bouncearray.png", - "baseinput": { - "tag": "forge:slimeballs" - }, - "addedinput": { - "tag": "forge:dusts/redstone" - }, - "output": { - "item": "minecraft:air" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/day.json b/src/generated/resources/data/bloodmagic/recipes/array/day.json deleted file mode 100644 index 32c6212b..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/array/day.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:array", - "texture": "bloodmagic:textures/models/alchemyarrays/sunarray.png", - "baseinput": { - "item": "minecraft:coal" - }, - "addedinput": { - "item": "minecraft:coal" - }, - "output": { - "item": "minecraft:air" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/divinationsigil.json b/src/generated/resources/data/bloodmagic/recipes/array/divinationsigil.json deleted file mode 100644 index b7b8d0bf..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/array/divinationsigil.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:array", - "texture": "bloodmagic:textures/models/alchemyarrays/divinationsigil.png", - "baseinput": { - "item": "minecraft:redstone" - }, - "addedinput": { - "item": "bloodmagic:blankslate" - }, - "output": { - "item": "bloodmagic:divinationsigil" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/fastminersigil.json b/src/generated/resources/data/bloodmagic/recipes/array/fastminersigil.json deleted file mode 100644 index b3644330..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/array/fastminersigil.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:array", - "texture": "bloodmagic:textures/models/alchemyarrays/fastminersigil.png", - "baseinput": { - "item": "bloodmagic:reagentfastminer" - }, - "addedinput": { - "item": "bloodmagic:reinforcedslate" - }, - "output": { - "item": "bloodmagic:miningsigil" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/grove.json b/src/generated/resources/data/bloodmagic/recipes/array/grove.json deleted file mode 100644 index f09741a3..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/array/grove.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:array", - "texture": "bloodmagic:textures/models/alchemyarrays/growthsigil.png", - "baseinput": { - "tag": "forge:bones" - }, - "addedinput": { - "tag": "forge:bones" - }, - "output": { - "item": "minecraft:air" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/growthsigil.json b/src/generated/resources/data/bloodmagic/recipes/array/growthsigil.json deleted file mode 100644 index 22e90ecc..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/array/growthsigil.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:array", - "texture": "bloodmagic:textures/models/alchemyarrays/growthsigil.png", - "baseinput": { - "item": "bloodmagic:reagentgrowth" - }, - "addedinput": { - "item": "bloodmagic:reinforcedslate" - }, - "output": { - "item": "bloodmagic:growthsigil" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/holdingsigil.json b/src/generated/resources/data/bloodmagic/recipes/array/holdingsigil.json deleted file mode 100644 index 9aa7670a..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/array/holdingsigil.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:array", - "texture": "bloodmagic:textures/models/alchemyarrays/sightsigil.png", - "baseinput": { - "item": "bloodmagic:reagentholding" - }, - "addedinput": { - "item": "bloodmagic:infusedslate" - }, - "output": { - "item": "bloodmagic:sigilofholding" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/lavasigil.json b/src/generated/resources/data/bloodmagic/recipes/array/lavasigil.json deleted file mode 100644 index f71cd318..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/array/lavasigil.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:array", - "texture": "bloodmagic:textures/models/alchemyarrays/lavasigil.png", - "baseinput": { - "item": "bloodmagic:reagentlava" - }, - "addedinput": { - "item": "bloodmagic:blankslate" - }, - "output": { - "item": "bloodmagic:lavasigil" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/living_boots.json b/src/generated/resources/data/bloodmagic/recipes/array/living_boots.json deleted file mode 100644 index 6150d54b..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/array/living_boots.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "bloodmagic:array", - "texture": "bloodmagic:textures/models/alchemyarrays/bindingarray.png", - "baseinput": { - "item": "bloodmagic:reagentbinding" - }, - "addedinput": { - "item": "minecraft:iron_boots" - }, - "output": { - "item": "bloodmagic:livingboots", - "nbt": "{Damage:0}" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/living_helmet.json b/src/generated/resources/data/bloodmagic/recipes/array/living_helmet.json deleted file mode 100644 index b11c33dc..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/array/living_helmet.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "bloodmagic:array", - "texture": "bloodmagic:textures/models/alchemyarrays/bindingarray.png", - "baseinput": { - "item": "bloodmagic:reagentbinding" - }, - "addedinput": { - "item": "minecraft:iron_helmet" - }, - "output": { - "item": "bloodmagic:livinghelmet", - "nbt": "{Damage:0}" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/living_leggings.json b/src/generated/resources/data/bloodmagic/recipes/array/living_leggings.json deleted file mode 100644 index 28e8f5ce..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/array/living_leggings.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "bloodmagic:array", - "texture": "bloodmagic:textures/models/alchemyarrays/bindingarray.png", - "baseinput": { - "item": "bloodmagic:reagentbinding" - }, - "addedinput": { - "item": "minecraft:iron_leggings" - }, - "output": { - "item": "bloodmagic:livingleggings", - "nbt": "{Damage:0}" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/living_plate.json b/src/generated/resources/data/bloodmagic/recipes/array/living_plate.json deleted file mode 100644 index 803b429c..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/array/living_plate.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "bloodmagic:array", - "texture": "bloodmagic:textures/models/alchemyarrays/bindingarray.png", - "baseinput": { - "item": "bloodmagic:reagentbinding" - }, - "addedinput": { - "item": "minecraft:iron_chestplate" - }, - "output": { - "item": "bloodmagic:livingplate", - "nbt": "{Damage:0}" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/magnetismsigil.json b/src/generated/resources/data/bloodmagic/recipes/array/magnetismsigil.json deleted file mode 100644 index 324ec177..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/array/magnetismsigil.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:array", - "texture": "bloodmagic:textures/models/alchemyarrays/magnetismsigil.png", - "baseinput": { - "item": "bloodmagic:reagentmagnetism" - }, - "addedinput": { - "item": "bloodmagic:infusedslate" - }, - "output": { - "item": "bloodmagic:sigilofmagnetism" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/movement.json b/src/generated/resources/data/bloodmagic/recipes/array/movement.json deleted file mode 100644 index 2d4f6309..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/array/movement.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:array", - "texture": "bloodmagic:textures/models/alchemyarrays/movementarray.png", - "baseinput": { - "item": "minecraft:feather" - }, - "addedinput": { - "tag": "forge:dusts/redstone" - }, - "output": { - "item": "minecraft:air" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/night.json b/src/generated/resources/data/bloodmagic/recipes/array/night.json deleted file mode 100644 index c0130213..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/array/night.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:array", - "texture": "bloodmagic:textures/models/alchemyarrays/moonarray.png", - "baseinput": { - "item": "minecraft:lapis_lazuli" - }, - "addedinput": { - "item": "minecraft:lapis_lazuli" - }, - "output": { - "item": "minecraft:air" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/seersigil.json b/src/generated/resources/data/bloodmagic/recipes/array/seersigil.json deleted file mode 100644 index 3441514b..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/array/seersigil.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:array", - "texture": "bloodmagic:textures/models/alchemyarrays/sightsigil.png", - "baseinput": { - "item": "bloodmagic:reagentsight" - }, - "addedinput": { - "item": "bloodmagic:reinforcedslate" - }, - "output": { - "item": "bloodmagic:seersigil" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/spike.json b/src/generated/resources/data/bloodmagic/recipes/array/spike.json deleted file mode 100644 index 88ce4ff5..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/array/spike.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:array", - "texture": "bloodmagic:textures/models/alchemyarrays/spikearray.png", - "baseinput": { - "item": "minecraft:cobblestone" - }, - "addedinput": { - "tag": "forge:ingots/iron" - }, - "output": { - "item": "minecraft:air" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/updraft.json b/src/generated/resources/data/bloodmagic/recipes/array/updraft.json deleted file mode 100644 index 700967ce..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/array/updraft.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:array", - "texture": "bloodmagic:textures/models/alchemyarrays/updraftarray.png", - "baseinput": { - "item": "minecraft:feather" - }, - "addedinput": { - "tag": "forge:dusts/glowstone" - }, - "output": { - "item": "minecraft:air" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/voidsigil.json b/src/generated/resources/data/bloodmagic/recipes/array/voidsigil.json deleted file mode 100644 index 4d10c446..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/array/voidsigil.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:array", - "texture": "bloodmagic:textures/models/alchemyarrays/voidsigil.png", - "baseinput": { - "item": "bloodmagic:reagentvoid" - }, - "addedinput": { - "item": "bloodmagic:reinforcedslate" - }, - "output": { - "item": "bloodmagic:voidsigil" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/array/watersigil.json b/src/generated/resources/data/bloodmagic/recipes/array/watersigil.json deleted file mode 100644 index 0862f909..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/array/watersigil.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:array", - "texture": "bloodmagic:textures/models/alchemyarrays/watersigil.png", - "baseinput": { - "item": "bloodmagic:reagentwater" - }, - "addedinput": { - "item": "bloodmagic:blankslate" - }, - "output": { - "item": "bloodmagic:watersigil" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/blood_altar.json b/src/generated/resources/data/bloodmagic/recipes/blood_altar.json deleted file mode 100644 index aa83901e..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/blood_altar.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "a a", - "aba", - "cdc" - ], - "key": { - "a": { - "tag": "forge:stone" - }, - "b": { - "item": "minecraft:furnace" - }, - "c": { - "tag": "forge:ingots/gold" - }, - "d": { - "item": "minecraft:gold_ingot" - } - }, - "result": { - "item": "bloodmagic:altar" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/blood_rune_acceleration.json b/src/generated/resources/data/bloodmagic/recipes/blood_rune_acceleration.json deleted file mode 100644 index a7e0d300..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/blood_rune_acceleration.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "aba", - "cdc", - "aea" - ], - "key": { - "a": { - "item": "minecraft:bucket" - }, - "b": { - "item": "bloodmagic:demonslate" - }, - "c": { - "tag": "forge:ingots/gold" - }, - "d": { - "item": "bloodmagic:speedrune" - }, - "e": { - "type": "bloodmagic:bloodorb", - "orb_tier": 4 - } - }, - "result": { - "item": "bloodmagic:accelerationrune" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/blood_rune_aug_capacity.json b/src/generated/resources/data/bloodmagic/recipes/blood_rune_aug_capacity.json deleted file mode 100644 index 7a79f948..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/blood_rune_aug_capacity.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "aba", - "cdc", - "aea" - ], - "key": { - "a": { - "tag": "forge:obsidian" - }, - "b": { - "item": "bloodmagic:demonslate" - }, - "c": { - "item": "minecraft:bucket" - }, - "d": { - "item": "bloodmagic:altarcapacityrune" - }, - "e": { - "type": "bloodmagic:bloodorb", - "orb_tier": 4 - } - }, - "result": { - "item": "bloodmagic:bettercapacityrune" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/blood_rune_blank.json b/src/generated/resources/data/bloodmagic/recipes/blood_rune_blank.json deleted file mode 100644 index dba609b8..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/blood_rune_blank.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "asa", - "aoa", - "aaa" - ], - "key": { - "a": { - "tag": "forge:stone" - }, - "s": { - "item": "bloodmagic:blankslate" - }, - "o": { - "type": "bloodmagic:bloodorb", - "orb_tier": 1 - } - }, - "result": { - "item": "bloodmagic:blankrune" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/blood_rune_capacity.json b/src/generated/resources/data/bloodmagic/recipes/blood_rune_capacity.json deleted file mode 100644 index daf3fef6..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/blood_rune_capacity.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "aba", - "bcb", - "ada" - ], - "key": { - "a": { - "tag": "forge:stone" - }, - "b": { - "item": "minecraft:bucket" - }, - "c": { - "item": "bloodmagic:blankrune" - }, - "d": { - "item": "bloodmagic:infusedslate" - } - }, - "result": { - "item": "bloodmagic:altarcapacityrune" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/blood_rune_charging.json b/src/generated/resources/data/bloodmagic/recipes/blood_rune_charging.json deleted file mode 100644 index acd341f6..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/blood_rune_charging.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "RsR", - "GrG", - "ReR" - ], - "key": { - "R": { - "tag": "forge:dusts/redstone" - }, - "r": { - "item": "bloodmagic:blankrune" - }, - "s": { - "item": "bloodmagic:demonslate" - }, - "e": { - "type": "bloodmagic:bloodorb", - "orb_tier": 4 - }, - "G": { - "tag": "forge:dusts/glowstone" - } - }, - "result": { - "item": "bloodmagic:chargingrune" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/blood_rune_displacement.json b/src/generated/resources/data/bloodmagic/recipes/blood_rune_displacement.json deleted file mode 100644 index b43644d9..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/blood_rune_displacement.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "aba", - "bcb", - "ada" - ], - "key": { - "a": { - "tag": "forge:stone" - }, - "b": { - "item": "minecraft:water_bucket" - }, - "c": { - "item": "bloodmagic:blankrune" - }, - "d": { - "item": "bloodmagic:infusedslate" - } - }, - "result": { - "item": "bloodmagic:dislocationrune" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/blood_rune_orb.json b/src/generated/resources/data/bloodmagic/recipes/blood_rune_orb.json deleted file mode 100644 index 1ca7d126..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/blood_rune_orb.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "aba", - "cdc", - "aba" - ], - "key": { - "a": { - "tag": "forge:stone" - }, - "b": { - "type": "bloodmagic:bloodorb", - "orb_tier": 1 - }, - "c": { - "item": "bloodmagic:blankrune" - }, - "d": { - "type": "bloodmagic:bloodorb", - "orb_tier": 4 - } - }, - "result": { - "item": "bloodmagic:orbcapacityrune" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/blood_rune_sacrifice.json b/src/generated/resources/data/bloodmagic/recipes/blood_rune_sacrifice.json deleted file mode 100644 index 3d43229b..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/blood_rune_sacrifice.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "aba", - "cdc", - "aea" - ], - "key": { - "a": { - "tag": "forge:stone" - }, - "b": { - "item": "bloodmagic:reinforcedslate" - }, - "c": { - "tag": "forge:ingots/gold" - }, - "d": { - "item": "bloodmagic:blankrune" - }, - "e": { - "type": "bloodmagic:bloodorb", - "orb_tier": 2 - } - }, - "result": { - "item": "bloodmagic:sacrificerune" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/blood_rune_self_sacrifice.json b/src/generated/resources/data/bloodmagic/recipes/blood_rune_self_sacrifice.json deleted file mode 100644 index 054a70d8..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/blood_rune_self_sacrifice.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "aba", - "cdc", - "aea" - ], - "key": { - "a": { - "tag": "forge:stone" - }, - "b": { - "item": "bloodmagic:reinforcedslate" - }, - "c": { - "item": "minecraft:glowstone_dust" - }, - "d": { - "item": "bloodmagic:blankrune" - }, - "e": { - "type": "bloodmagic:bloodorb", - "orb_tier": 2 - } - }, - "result": { - "item": "bloodmagic:selfsacrificerune" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/blood_rune_speed.json b/src/generated/resources/data/bloodmagic/recipes/blood_rune_speed.json deleted file mode 100644 index 7ef75bfc..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/blood_rune_speed.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "aba", - "cdc", - "aba" - ], - "key": { - "a": { - "tag": "forge:stone" - }, - "b": { - "item": "bloodmagic:blankslate" - }, - "c": { - "item": "minecraft:sugar" - }, - "d": { - "item": "bloodmagic:blankrune" - } - }, - "result": { - "item": "bloodmagic:speedrune" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/bloodstonebrick.json b/src/generated/resources/data/bloodmagic/recipes/bloodstonebrick.json deleted file mode 100644 index 44fbc33d..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/bloodstonebrick.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "ss", - "ss" - ], - "key": { - "s": { - "item": "bloodmagic:largebloodstonebrick" - } - }, - "result": { - "item": "bloodmagic:bloodstonebrick", - "count": 4 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/corrupted_dust.json b/src/generated/resources/data/bloodmagic/recipes/corrupted_dust.json deleted file mode 100644 index cdcfdbab..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/corrupted_dust.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "sss", - "sss", - "sss" - ], - "key": { - "s": { - "tag": "bloodmagic:tiny_dusts/corrupted" - } - }, - "result": { - "item": "bloodmagic:corrupted_dust" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/experience_tome.json b/src/generated/resources/data/bloodmagic/recipes/experience_tome.json deleted file mode 100644 index 633dbd55..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/experience_tome.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "ses", - "lbl", - "gog" - ], - "key": { - "b": { - "item": "minecraft:enchanted_book" - }, - "s": { - "tag": "forge:string" - }, - "e": { - "tag": "forge:storage_blocks/lapis" - }, - "g": { - "tag": "forge:ingots/gold" - }, - "l": { - "item": "bloodmagic:infusedslate" - }, - "o": { - "type": "bloodmagic:bloodorb", - "orb_tier": 3 - } - }, - "result": { - "item": "bloodmagic:experiencebook" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/hellforged_block.json b/src/generated/resources/data/bloodmagic/recipes/hellforged_block.json deleted file mode 100644 index 3c7c8bbb..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/hellforged_block.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "sss", - "sss", - "sss" - ], - "key": { - "s": { - "tag": "forge:ingots/hellforged" - } - }, - "result": { - "item": "bloodmagic:dungeon_metal" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/incense_altar.json b/src/generated/resources/data/bloodmagic/recipes/incense_altar.json deleted file mode 100644 index 95826002..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/incense_altar.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "s s", - "shs", - "coc" - ], - "key": { - "s": { - "tag": "forge:stone" - }, - "c": { - "tag": "forge:cobblestone" - }, - "h": { - "item": "minecraft:charcoal" - }, - "o": { - "type": "bloodmagic:bloodorb", - "orb_tier": 1 - } - }, - "result": { - "item": "bloodmagic:incensealtar" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/largebloodstonebrick.json b/src/generated/resources/data/bloodmagic/recipes/largebloodstonebrick.json deleted file mode 100644 index 915b47ef..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/largebloodstonebrick.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:stone" - }, - { - "item": "bloodmagic:weakbloodshard" - } - ], - "result": { - "item": "bloodmagic:largebloodstonebrick", - "count": 8 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/lava_crystal.json b/src/generated/resources/data/bloodmagic/recipes/lava_crystal.json deleted file mode 100644 index 7a96e775..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/lava_crystal.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "aba", - "bcb", - "ded" - ], - "key": { - "a": { - "tag": "forge:glass" - }, - "b": { - "item": "minecraft:lava_bucket" - }, - "c": { - "type": "bloodmagic:bloodorb", - "orb_tier": 1 - }, - "d": { - "tag": "forge:obsidian" - }, - "e": { - "tag": "forge:gems/diamond" - } - }, - "result": { - "item": "bloodmagic:lavacrystal" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/path/path_stone.json b/src/generated/resources/data/bloodmagic/recipes/path/path_stone.json deleted file mode 100644 index 3bcdf018..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/path/path_stone.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:stone" - }, - { - "tag": "forge:stone" - }, - { - "tag": "forge:stone" - }, - { - "tag": "forge:stone" - }, - { - "type": "bloodmagic:bloodorb", - "orb_tier": 3 - } - ], - "result": { - "item": "bloodmagic:stonebrickpath", - "count": 4 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/path/path_stonetile.json b/src/generated/resources/data/bloodmagic/recipes/path/path_stonetile.json deleted file mode 100644 index 64521902..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/path/path_stonetile.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "bloodmagic:stonebrickpath" - }, - { - "item": "bloodmagic:stonebrickpath" - }, - { - "item": "bloodmagic:stonebrickpath" - }, - { - "item": "bloodmagic:stonebrickpath" - } - ], - "result": { - "item": "bloodmagic:stonetilepath", - "count": 4 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/path/path_wood.json b/src/generated/resources/data/bloodmagic/recipes/path/path_wood.json deleted file mode 100644 index d04415bf..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/path/path_wood.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "minecraft:planks" - }, - { - "tag": "minecraft:planks" - }, - { - "tag": "minecraft:planks" - }, - { - "tag": "minecraft:planks" - }, - { - "type": "bloodmagic:bloodorb", - "orb_tier": 2 - } - ], - "result": { - "item": "bloodmagic:woodbrickpath", - "count": 4 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/path/path_woodtile.json b/src/generated/resources/data/bloodmagic/recipes/path/path_woodtile.json deleted file mode 100644 index 2d0a2641..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/path/path_woodtile.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "bloodmagic:woodbrickpath" - }, - { - "item": "bloodmagic:woodbrickpath" - }, - { - "item": "bloodmagic:woodbrickpath" - }, - { - "item": "bloodmagic:woodbrickpath" - } - ], - "result": { - "item": "bloodmagic:woodtilepath", - "count": 4 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/path/path_wornstone.json b/src/generated/resources/data/bloodmagic/recipes/path/path_wornstone.json deleted file mode 100644 index 6a43f7e0..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/path/path_wornstone.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "bloodmagic:stonebrickpath" - }, - { - "item": "bloodmagic:stonebrickpath" - }, - { - "item": "bloodmagic:stonebrickpath" - }, - { - "item": "bloodmagic:stonebrickpath" - }, - { - "type": "bloodmagic:bloodorb", - "orb_tier": 4 - } - ], - "result": { - "item": "bloodmagic:wornstonebrickpath", - "count": 4 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/path/path_wornstonetile.json b/src/generated/resources/data/bloodmagic/recipes/path/path_wornstonetile.json deleted file mode 100644 index 1efd2976..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/path/path_wornstonetile.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "bloodmagic:wornstonebrickpath" - }, - { - "item": "bloodmagic:wornstonebrickpath" - }, - { - "item": "bloodmagic:wornstonebrickpath" - }, - { - "item": "bloodmagic:wornstonebrickpath" - } - ], - "result": { - "item": "bloodmagic:wornstonetilepath", - "count": 4 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/primitive_furnace_cell.json b/src/generated/resources/data/bloodmagic/recipes/primitive_furnace_cell.json deleted file mode 100644 index 501b146b..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/primitive_furnace_cell.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "csc", - "cfc", - "coc" - ], - "key": { - "c": { - "tag": "forge:cobblestone" - }, - "f": { - "tag": "forge:storage_blocks/coal" - }, - "s": { - "item": "bloodmagic:blankslate" - }, - "o": { - "type": "bloodmagic:bloodorb", - "orb_tier": 3 - } - }, - "result": { - "item": "bloodmagic:furnacecell_primitive" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/primitive_hydration_cell.json b/src/generated/resources/data/bloodmagic/recipes/primitive_hydration_cell.json deleted file mode 100644 index 241d455f..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/primitive_hydration_cell.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "csc", - "cBc", - "coc" - ], - "key": { - "B": { - "item": "minecraft:water_bucket" - }, - "c": { - "tag": "forge:cobblestone" - }, - "o": { - "type": "bloodmagic:bloodorb", - "orb_tier": 3 - }, - "s": { - "item": "bloodmagic:blankslate" - } - }, - "result": { - "item": "bloodmagic:primitive_hydration_cell" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/ritual_diviner_0.json b/src/generated/resources/data/bloodmagic/recipes/ritual_diviner_0.json deleted file mode 100644 index 5806cf36..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/ritual_diviner_0.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "dfd", - "ase", - "dwd" - ], - "key": { - "a": { - "item": "bloodmagic:airscribetool" - }, - "s": { - "tag": "forge:rods/wooden" - }, - "d": { - "tag": "forge:gems/diamond" - }, - "e": { - "item": "bloodmagic:earthscribetool" - }, - "f": { - "item": "bloodmagic:firescribetool" - }, - "w": { - "item": "bloodmagic:waterscribetool" - } - }, - "result": { - "item": "bloodmagic:ritualdiviner" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/ritual_diviner_1.json b/src/generated/resources/data/bloodmagic/recipes/ritual_diviner_1.json deleted file mode 100644 index 46a797ed..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/ritual_diviner_1.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - " S ", - "tdt", - " S " - ], - "key": { - "S": { - "item": "bloodmagic:demonslate" - }, - "t": { - "item": "bloodmagic:duskscribetool" - }, - "d": { - "item": "bloodmagic:ritualdiviner" - } - }, - "result": { - "item": "bloodmagic:ritualdivinerdusk" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/ritual_reader.json b/src/generated/resources/data/bloodmagic/recipes/ritual_reader.json deleted file mode 100644 index 27805eff..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/ritual_reader.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "gog", - "isi", - " s " - ], - "key": { - "s": { - "item": "bloodmagic:demonslate" - }, - "g": { - "tag": "forge:glass" - }, - "i": { - "tag": "forge:ingots/gold" - }, - "o": { - "type": "bloodmagic:bloodorb", - "orb_tier": 4 - } - }, - "result": { - "item": "bloodmagic:ritualtinkerer" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/ritual_stone_blank.json b/src/generated/resources/data/bloodmagic/recipes/ritual_stone_blank.json deleted file mode 100644 index aa493752..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/ritual_stone_blank.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "aba", - "bcb", - "aba" - ], - "key": { - "a": { - "tag": "forge:obsidian" - }, - "b": { - "item": "bloodmagic:reinforcedslate" - }, - "c": { - "type": "bloodmagic:bloodorb", - "orb_tier": 2 - } - }, - "result": { - "item": "bloodmagic:ritualstone", - "count": 4 - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/ritual_stone_master.json b/src/generated/resources/data/bloodmagic/recipes/ritual_stone_master.json deleted file mode 100644 index 4cdb269e..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/ritual_stone_master.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "aba", - "bcb", - "aba" - ], - "key": { - "a": { - "tag": "forge:obsidian" - }, - "b": { - "item": "bloodmagic:ritualstone" - }, - "c": { - "type": "bloodmagic:bloodorb", - "orb_tier": 3 - } - }, - "result": { - "item": "bloodmagic:masterritualstone" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/sacrificial_dagger.json b/src/generated/resources/data/bloodmagic/recipes/sacrificial_dagger.json deleted file mode 100644 index 23a4dcab..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/sacrificial_dagger.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "ggg", - " Gg", - "i g" - ], - "key": { - "g": { - "tag": "forge:glass" - }, - "G": { - "tag": "forge:ingots/gold" - }, - "i": { - "tag": "forge:ingots/iron" - } - }, - "result": { - "item": "bloodmagic:sacrificialdagger" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/smelting/ingot_gold.json b/src/generated/resources/data/bloodmagic/recipes/smelting/ingot_gold.json deleted file mode 100644 index e8bbf60c..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/smelting/ingot_gold.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "tag": "forge:dusts/gold" - }, - "result": "minecraft:gold_ingot", - "experience": 0.0, - "cookingtime": 200 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/smelting/ingot_hellforged.json b/src/generated/resources/data/bloodmagic/recipes/smelting/ingot_hellforged.json deleted file mode 100644 index 6a06b2a3..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/smelting/ingot_hellforged.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "tag": "forge:dusts/hellforged" - }, - "result": "bloodmagic:ingot_hellforged", - "experience": 0.0, - "cookingtime": 200 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/smelting/ingot_iron.json b/src/generated/resources/data/bloodmagic/recipes/smelting/ingot_iron.json deleted file mode 100644 index 7ca7a664..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/smelting/ingot_iron.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "tag": "forge:dusts/iron" - }, - "result": "minecraft:iron_ingot", - "experience": 0.0, - "cookingtime": 200 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/smelting/ingot_netherite_scrap.json b/src/generated/resources/data/bloodmagic/recipes/smelting/ingot_netherite_scrap.json deleted file mode 100644 index 2edc11a3..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/smelting/ingot_netherite_scrap.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "tag": "forge:dusts/netherite_scrap" - }, - "result": "minecraft:netherite_scrap", - "experience": 0.0, - "cookingtime": 200 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soul_forge.json b/src/generated/resources/data/bloodmagic/recipes/soul_forge.json deleted file mode 100644 index 1b03fe65..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soul_forge.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "i i", - "sSs", - "sos" - ], - "key": { - "s": { - "tag": "forge:stone" - }, - "S": { - "item": "bloodmagic:blankslate" - }, - "i": { - "tag": "forge:ingots/iron" - }, - "o": { - "tag": "forge:storage_blocks/iron" - } - }, - "result": { - "item": "bloodmagic:soulforge" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/commontartaricgem.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/commontartaricgem.json deleted file mode 100644 index c87b1cc0..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/commontartaricgem.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "item": "bloodmagic:soulgemlesser" - }, - "input1": { - "tag": "forge:gems/diamond" - }, - "input2": { - "tag": "forge:storage_blocks/gold" - }, - "input3": { - "item": "bloodmagic:infusedslate" - }, - "output": { - "item": "bloodmagic:soulgemcommon" - }, - "minimumDrain": 240.0, - "drain": 50.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/corrosive_crystal_block.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/corrosive_crystal_block.json deleted file mode 100644 index 11d80db6..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/corrosive_crystal_block.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "item": "bloodmagic:corrosivecrystal" - }, - "input1": { - "item": "bloodmagic:corrosivecrystal" - }, - "input2": { - "item": "bloodmagic:corrosivecrystal" - }, - "input3": { - "item": "bloodmagic:corrosivecrystal" - }, - "output": { - "item": "bloodmagic:corrosivedemoncrystal" - }, - "minimumDrain": 1200.0, - "drain": 100.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/deforester_charge.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/deforester_charge.json deleted file mode 100644 index b8478f16..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/deforester_charge.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "tag": "forge:cobblestone" - }, - "input1": { - "item": "minecraft:charcoal" - }, - "input2": { - "tag": "minecraft:logs" - }, - "input3": { - "tag": "minecraft:planks" - }, - "output": { - "item": "bloodmagic:deforester_charge", - "count": 8 - }, - "minimumDrain": 10.0, - "drain": 0.5 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/deforester_charge_fortune_1.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/deforester_charge_fortune_1.json deleted file mode 100644 index 9902d84e..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/deforester_charge_fortune_1.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "item": "bloodmagic:deforester_charge" - }, - "input1": { - "tag": "forge:crops/nether_wart" - }, - "input2": { - "tag": "forge:dusts/redstone" - }, - "input3": { - "tag": "forge:dusts/coal" - }, - "output": { - "item": "bloodmagic:deforester_charge", - "nbt": "{anointment_holder:{anointments:[{damage:1,max_damage:1,level:1,key:\"bloodmagic:fortune\"}]}}" - }, - "minimumDrain": 60.0, - "drain": 1.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/deforester_charge_silk_touch.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/deforester_charge_silk_touch.json deleted file mode 100644 index 95be85d4..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/deforester_charge_silk_touch.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "item": "bloodmagic:deforester_charge" - }, - "input1": { - "tag": "forge:crops/nether_wart" - }, - "input2": { - "item": "minecraft:cobweb" - }, - "input3": { - "tag": "forge:nuggets/gold" - }, - "output": { - "item": "bloodmagic:deforester_charge", - "nbt": "{anointment_holder:{anointments:[{damage:1,max_damage:1,level:1,key:\"bloodmagic:silk_touch\"}]}}" - }, - "minimumDrain": 60.0, - "drain": 1.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/deforester_charge_smelting.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/deforester_charge_smelting.json deleted file mode 100644 index 3ed21416..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/deforester_charge_smelting.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "item": "bloodmagic:deforester_charge" - }, - "input1": { - "tag": "forge:crops/nether_wart" - }, - "input2": { - "item": "minecraft:furnace" - }, - "input3": [ - { - "item": "minecraft:charcoal" - }, - { - "item": "minecraft:coal" - } - ], - "output": { - "item": "bloodmagic:deforester_charge", - "nbt": "{anointment_holder:{anointments:[{damage:1,max_damage:1,level:1,key:\"bloodmagic:smelting\"}]}}" - }, - "minimumDrain": 60.0, - "drain": 1.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/demon_crucible.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/demon_crucible.json deleted file mode 100644 index 57f6fe29..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/demon_crucible.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "item": "minecraft:cauldron" - }, - "input1": { - "tag": "forge:stone" - }, - "input2": { - "tag": "forge:gems/lapis" - }, - "input3": { - "tag": "forge:gems/diamond" - }, - "output": { - "item": "bloodmagic:demoncrucible" - }, - "minimumDrain": 400.0, - "drain": 100.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/demon_crystallizer.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/demon_crystallizer.json deleted file mode 100644 index 1283b4e1..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/demon_crystallizer.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "item": "bloodmagic:soulforge" - }, - "input1": { - "tag": "forge:stone" - }, - "input2": { - "tag": "forge:gems/lapis" - }, - "input3": { - "tag": "forge:glass" - }, - "output": { - "item": "bloodmagic:demoncrystallizer" - }, - "minimumDrain": 500.0, - "drain": 100.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/destructive_crystal_block.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/destructive_crystal_block.json deleted file mode 100644 index 6423e1a6..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/destructive_crystal_block.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "item": "bloodmagic:destructivecrystal" - }, - "input1": { - "item": "bloodmagic:destructivecrystal" - }, - "input2": { - "item": "bloodmagic:destructivecrystal" - }, - "input3": { - "item": "bloodmagic:destructivecrystal" - }, - "output": { - "item": "bloodmagic:destructivedemoncrystal" - }, - "minimumDrain": 1200.0, - "drain": 100.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/fungal_charge.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/fungal_charge.json deleted file mode 100644 index 9a849f6d..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/fungal_charge.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "tag": "forge:cobblestone" - }, - "input1": { - "item": "minecraft:charcoal" - }, - "input2": { - "tag": "minecraft:mushroom_hyphae" - }, - "input3": { - "tag": "forge:mushrooms" - }, - "output": { - "item": "bloodmagic:fungal_charge", - "count": 8 - }, - "minimumDrain": 10.0, - "drain": 0.5 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/fungal_charge_fortune_1.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/fungal_charge_fortune_1.json deleted file mode 100644 index b913ba14..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/fungal_charge_fortune_1.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "item": "bloodmagic:fungal_charge" - }, - "input1": { - "tag": "forge:crops/nether_wart" - }, - "input2": { - "tag": "forge:dusts/redstone" - }, - "input3": { - "tag": "forge:dusts/coal" - }, - "output": { - "item": "bloodmagic:fungal_charge", - "nbt": "{anointment_holder:{anointments:[{damage:1,max_damage:1,level:1,key:\"bloodmagic:fortune\"}]}}" - }, - "minimumDrain": 60.0, - "drain": 1.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/fungal_charge_silk_touch.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/fungal_charge_silk_touch.json deleted file mode 100644 index 50c7537b..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/fungal_charge_silk_touch.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "item": "bloodmagic:fungal_charge" - }, - "input1": { - "tag": "forge:crops/nether_wart" - }, - "input2": { - "item": "minecraft:cobweb" - }, - "input3": { - "tag": "forge:nuggets/gold" - }, - "output": { - "item": "bloodmagic:fungal_charge", - "nbt": "{anointment_holder:{anointments:[{damage:1,max_damage:1,level:1,key:\"bloodmagic:silk_touch\"}]}}" - }, - "minimumDrain": 60.0, - "drain": 1.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/fungal_charge_smelting.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/fungal_charge_smelting.json deleted file mode 100644 index a47141b1..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/fungal_charge_smelting.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "item": "bloodmagic:fungal_charge" - }, - "input1": { - "tag": "forge:crops/nether_wart" - }, - "input2": { - "item": "minecraft:furnace" - }, - "input3": [ - { - "item": "minecraft:charcoal" - }, - { - "item": "minecraft:coal" - } - ], - "output": { - "item": "bloodmagic:fungal_charge", - "nbt": "{anointment_holder:{anointments:[{damage:1,max_damage:1,level:1,key:\"bloodmagic:smelting\"}]}}" - }, - "minimumDrain": 60.0, - "drain": 1.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/greatertartaricgem.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/greatertartaricgem.json deleted file mode 100644 index a46a9f6d..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/greatertartaricgem.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "item": "bloodmagic:soulgemcommon" - }, - "input1": { - "item": "bloodmagic:demonslate" - }, - "input2": { - "item": "bloodmagic:weakbloodshard" - }, - "input3": { - "tag": "bloodmagic:crystals/demon" - }, - "output": { - "item": "bloodmagic:soulgemgreater" - }, - "minimumDrain": 1000.0, - "drain": 100.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/lessertartaricgem.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/lessertartaricgem.json deleted file mode 100644 index cf5f5b19..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/lessertartaricgem.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "item": "bloodmagic:soulgempetty" - }, - "input1": { - "tag": "forge:gems/diamond" - }, - "input2": { - "tag": "forge:storage_blocks/redstone" - }, - "input3": { - "tag": "forge:storage_blocks/lapis" - }, - "output": { - "item": "bloodmagic:soulgemlesser" - }, - "minimumDrain": 60.0, - "drain": 20.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/pettytartaricgem.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/pettytartaricgem.json deleted file mode 100644 index 10c7417a..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/pettytartaricgem.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "tag": "forge:dusts/redstone" - }, - "input1": { - "tag": "forge:ingots/gold" - }, - "input2": { - "tag": "forge:glass" - }, - "input3": { - "tag": "forge:gems/lapis" - }, - "output": { - "item": "bloodmagic:soulgempetty" - }, - "minimumDrain": 1.0, - "drain": 1.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/primitive_crystalline_resonator.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/primitive_crystalline_resonator.json deleted file mode 100644 index 833978f6..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/primitive_crystalline_resonator.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "tag": "forge:stone" - }, - "input1": { - "tag": "forge:ingots" - }, - "input2": { - "item": "bloodmagic:defaultcrystal" - }, - "input3": { - "item": "bloodmagic:defaultcrystal" - }, - "output": { - "item": "bloodmagic:primitive_crystalline_resonator", - "nbt": "{Damage:0}" - }, - "minimumDrain": 1200.0, - "drain": 200.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/raw_crystal_block.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/raw_crystal_block.json deleted file mode 100644 index 6d9a3a3b..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/raw_crystal_block.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "item": "bloodmagic:defaultcrystal" - }, - "input1": { - "item": "bloodmagic:defaultcrystal" - }, - "input2": { - "item": "bloodmagic:defaultcrystal" - }, - "input3": { - "item": "bloodmagic:defaultcrystal" - }, - "output": { - "item": "bloodmagic:rawdemoncrystal" - }, - "minimumDrain": 1200.0, - "drain": 100.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/sanguine_reverter.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/sanguine_reverter.json deleted file mode 100644 index ee37a2fb..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/sanguine_reverter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "item": "minecraft:shears" - }, - "input1": { - "tag": "forge:stone" - }, - "input2": { - "item": "bloodmagic:infusedslate" - }, - "input3": { - "tag": "forge:ingots/iron" - }, - "output": { - "item": "bloodmagic:sanguinereverter", - "nbt": "{Damage:0}" - }, - "minimumDrain": 350.0, - "drain": 30.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/sentientaxe.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/sentientaxe.json deleted file mode 100644 index ee04cc66..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/sentientaxe.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "item": "bloodmagic:soulgempetty" - }, - "input1": { - "item": "minecraft:iron_axe" - }, - "output": { - "item": "bloodmagic:soulaxe", - "nbt": "{Damage:0}" - }, - "minimumDrain": 0.0, - "drain": 0.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/sentientpickaxe.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/sentientpickaxe.json deleted file mode 100644 index c553a505..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/sentientpickaxe.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "item": "bloodmagic:soulgempetty" - }, - "input1": { - "item": "minecraft:iron_pickaxe" - }, - "output": { - "item": "bloodmagic:soulpickaxe", - "nbt": "{Damage:0}" - }, - "minimumDrain": 0.0, - "drain": 0.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/sentientscythe.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/sentientscythe.json deleted file mode 100644 index 77c85c8b..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/sentientscythe.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "item": "bloodmagic:soulgempetty" - }, - "input1": { - "item": "minecraft:iron_hoe" - }, - "output": { - "item": "bloodmagic:soulscythe", - "nbt": "{Damage:0}" - }, - "minimumDrain": 0.0, - "drain": 0.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/sentientshovel.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/sentientshovel.json deleted file mode 100644 index 205d060e..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/sentientshovel.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "item": "bloodmagic:soulgempetty" - }, - "input1": { - "item": "minecraft:iron_shovel" - }, - "output": { - "item": "bloodmagic:soulshovel", - "nbt": "{Damage:0}" - }, - "minimumDrain": 0.0, - "drain": 0.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/sentientsword.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/sentientsword.json deleted file mode 100644 index ca642e55..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/sentientsword.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "item": "bloodmagic:soulgempetty" - }, - "input1": { - "item": "minecraft:iron_sword" - }, - "output": { - "item": "bloodmagic:soulsword", - "nbt": "{Damage:0}" - }, - "minimumDrain": 0.0, - "drain": 0.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/shaped_charge.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/shaped_charge.json deleted file mode 100644 index b7c7fa04..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/shaped_charge.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "tag": "forge:cobblestone" - }, - "input1": { - "item": "minecraft:charcoal" - }, - "input2": { - "tag": "forge:sand" - }, - "input3": { - "tag": "forge:stone" - }, - "output": { - "item": "bloodmagic:shaped_charge", - "count": 8 - }, - "minimumDrain": 10.0, - "drain": 0.5 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/shaped_charge_fortune_1.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/shaped_charge_fortune_1.json deleted file mode 100644 index d8a1c3db..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/shaped_charge_fortune_1.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "item": "bloodmagic:shaped_charge" - }, - "input1": { - "tag": "forge:crops/nether_wart" - }, - "input2": { - "tag": "forge:dusts/redstone" - }, - "input3": { - "tag": "forge:dusts/coal" - }, - "output": { - "item": "bloodmagic:shaped_charge", - "nbt": "{anointment_holder:{anointments:[{damage:1,max_damage:1,level:1,key:\"bloodmagic:fortune\"}]}}" - }, - "minimumDrain": 60.0, - "drain": 1.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/shaped_charge_silk_touch.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/shaped_charge_silk_touch.json deleted file mode 100644 index 380a43ac..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/shaped_charge_silk_touch.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "item": "bloodmagic:shaped_charge" - }, - "input1": { - "tag": "forge:crops/nether_wart" - }, - "input2": { - "item": "minecraft:cobweb" - }, - "input3": { - "tag": "forge:nuggets/gold" - }, - "output": { - "item": "bloodmagic:shaped_charge", - "nbt": "{anointment_holder:{anointments:[{damage:1,max_damage:1,level:1,key:\"bloodmagic:silk_touch\"}]}}" - }, - "minimumDrain": 60.0, - "drain": 1.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/shaped_charge_smelting.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/shaped_charge_smelting.json deleted file mode 100644 index 0fb26bc8..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/shaped_charge_smelting.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "item": "bloodmagic:shaped_charge" - }, - "input1": { - "tag": "forge:crops/nether_wart" - }, - "input2": { - "item": "minecraft:furnace" - }, - "input3": [ - { - "item": "minecraft:charcoal" - }, - { - "item": "minecraft:coal" - } - ], - "output": { - "item": "bloodmagic:shaped_charge", - "nbt": "{anointment_holder:{anointments:[{damage:1,max_damage:1,level:1,key:\"bloodmagic:smelting\"}]}}" - }, - "minimumDrain": 60.0, - "drain": 1.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/steadfast_crystal_block.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/steadfast_crystal_block.json deleted file mode 100644 index 90efc02e..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/steadfast_crystal_block.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "item": "bloodmagic:steadfastcrystal" - }, - "input1": { - "item": "bloodmagic:steadfastcrystal" - }, - "input2": { - "item": "bloodmagic:steadfastcrystal" - }, - "input3": { - "item": "bloodmagic:steadfastcrystal" - }, - "output": { - "item": "bloodmagic:steadfastdemoncrystal" - }, - "minimumDrain": 1200.0, - "drain": 100.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/throwing_dagger.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/throwing_dagger.json deleted file mode 100644 index b173f229..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/throwing_dagger.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "tag": "forge:ingots/iron" - }, - "input1": { - "tag": "forge:ingots/iron" - }, - "input2": { - "tag": "forge:string" - }, - "output": { - "item": "bloodmagic:throwing_dagger", - "count": 16 - }, - "minimumDrain": 32.0, - "drain": 5.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/throwing_dagger_syringe.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/throwing_dagger_syringe.json deleted file mode 100644 index c7fadcb8..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/throwing_dagger_syringe.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "tag": "forge:stone" - }, - "input1": { - "tag": "forge:glass" - }, - "output": { - "item": "bloodmagic:throwing_dagger_syringe", - "count": 8 - }, - "minimumDrain": 10.0, - "drain": 2.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/vein_charge.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/vein_charge.json deleted file mode 100644 index eadea857..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/vein_charge.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "tag": "forge:cobblestone" - }, - "input1": { - "item": "minecraft:charcoal" - }, - "input2": { - "tag": "forge:sandstone" - }, - "input3": { - "tag": "forge:sand" - }, - "output": { - "item": "bloodmagic:veinmine_charge", - "count": 8 - }, - "minimumDrain": 10.0, - "drain": 0.5 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/vein_charge_fortune_1.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/vein_charge_fortune_1.json deleted file mode 100644 index 4790182d..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/vein_charge_fortune_1.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "item": "bloodmagic:veinmine_charge" - }, - "input1": { - "tag": "forge:crops/nether_wart" - }, - "input2": { - "tag": "forge:dusts/redstone" - }, - "input3": { - "tag": "forge:dusts/coal" - }, - "output": { - "item": "bloodmagic:veinmine_charge", - "nbt": "{anointment_holder:{anointments:[{damage:1,max_damage:1,level:1,key:\"bloodmagic:fortune\"}]}}" - }, - "minimumDrain": 60.0, - "drain": 1.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/vein_charge_silk_touch.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/vein_charge_silk_touch.json deleted file mode 100644 index ccf0709a..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/vein_charge_silk_touch.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "item": "bloodmagic:veinmine_charge" - }, - "input1": { - "tag": "forge:crops/nether_wart" - }, - "input2": { - "item": "minecraft:cobweb" - }, - "input3": { - "tag": "forge:nuggets/gold" - }, - "output": { - "item": "bloodmagic:veinmine_charge", - "nbt": "{anointment_holder:{anointments:[{damage:1,max_damage:1,level:1,key:\"bloodmagic:silk_touch\"}]}}" - }, - "minimumDrain": 60.0, - "drain": 1.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/vein_charge_smelting.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/vein_charge_smelting.json deleted file mode 100644 index 4c46a2cd..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/vein_charge_smelting.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "item": "bloodmagic:veinmine_charge" - }, - "input1": { - "tag": "forge:crops/nether_wart" - }, - "input2": { - "item": "minecraft:furnace" - }, - "input3": [ - { - "item": "minecraft:charcoal" - }, - { - "item": "minecraft:coal" - } - ], - "output": { - "item": "bloodmagic:veinmine_charge", - "nbt": "{anointment_holder:{anointments:[{damage:1,max_damage:1,level:1,key:\"bloodmagic:smelting\"}]}}" - }, - "minimumDrain": 60.0, - "drain": 1.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/soulforge/vengeful_crystal_block.json b/src/generated/resources/data/bloodmagic/recipes/soulforge/vengeful_crystal_block.json deleted file mode 100644 index 96fed3ca..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/soulforge/vengeful_crystal_block.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "bloodmagic:soulforge", - "input0": { - "item": "bloodmagic:vengefulcrystal" - }, - "input1": { - "item": "bloodmagic:vengefulcrystal" - }, - "input2": { - "item": "bloodmagic:vengefulcrystal" - }, - "input3": { - "item": "bloodmagic:vengefulcrystal" - }, - "output": { - "item": "bloodmagic:vengefuldemoncrystal" - }, - "minimumDrain": 1200.0, - "drain": 100.0 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/weak_activation_crystal.json b/src/generated/resources/data/bloodmagic/recipes/weak_activation_crystal.json deleted file mode 100644 index ba19a174..00000000 --- a/src/generated/resources/data/bloodmagic/recipes/weak_activation_crystal.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "bloodmagic:altar", - "input": { - "item": "bloodmagic:lavacrystal" - }, - "output": { - "item": "bloodmagic:activationcrystalweak" - }, - "upgradeLevel": 2, - "altarSyphon": 10000, - "consumptionRate": 20, - "drainRate": 10 -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/tags/items/arc/cuttingfluid.json b/src/generated/resources/data/bloodmagic/tags/items/arc/cuttingfluid.json deleted file mode 100644 index c111d035..00000000 --- a/src/generated/resources/data/bloodmagic/tags/items/arc/cuttingfluid.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "bloodmagic:basiccuttingfluid" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/tags/items/arc/explosive.json b/src/generated/resources/data/bloodmagic/tags/items/arc/explosive.json deleted file mode 100644 index 7488cf64..00000000 --- a/src/generated/resources/data/bloodmagic/tags/items/arc/explosive.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "bloodmagic:explosivepowder", - "bloodmagic:primitive_explosive_cell" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/tags/items/arc/furnace.json b/src/generated/resources/data/bloodmagic/tags/items/arc/furnace.json deleted file mode 100644 index 40b104b1..00000000 --- a/src/generated/resources/data/bloodmagic/tags/items/arc/furnace.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "bloodmagic:furnacecell_primitive", - "bloodmagic:lavacrystal" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/tags/items/arc/hydrate.json b/src/generated/resources/data/bloodmagic/tags/items/arc/hydrate.json deleted file mode 100644 index dba4afa1..00000000 --- a/src/generated/resources/data/bloodmagic/tags/items/arc/hydrate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "bloodmagic:primitive_hydration_cell" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/tags/items/arc/resonator.json b/src/generated/resources/data/bloodmagic/tags/items/arc/resonator.json deleted file mode 100644 index 5ed4cd52..00000000 --- a/src/generated/resources/data/bloodmagic/tags/items/arc/resonator.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "bloodmagic:primitive_crystalline_resonator", - "bloodmagic:crystalline_resonator" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/tags/items/arc/reverter.json b/src/generated/resources/data/bloodmagic/tags/items/arc/reverter.json deleted file mode 100644 index ab081891..00000000 --- a/src/generated/resources/data/bloodmagic/tags/items/arc/reverter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "bloodmagic:sanguinereverter" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/tags/items/arc/sieve.json b/src/generated/resources/data/bloodmagic/tags/items/arc/sieve.json deleted file mode 100644 index 7d46ac2c..00000000 --- a/src/generated/resources/data/bloodmagic/tags/items/arc/sieve.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "bloodmagic:airscribetool" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/tags/items/arc/tool.json b/src/generated/resources/data/bloodmagic/tags/items/arc/tool.json deleted file mode 100644 index 46ccea84..00000000 --- a/src/generated/resources/data/bloodmagic/tags/items/arc/tool.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "replace": false, - "values": [ - "#bloodmagic:arc/furnace", - "#bloodmagic:arc/reverter", - "#bloodmagic:arc/sieve", - "#bloodmagic:arc/explosive", - "#bloodmagic:arc/hydrate", - "#bloodmagic:arc/resonator", - "#bloodmagic:arc/cuttingfluid" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/tags/items/crystals/demon.json b/src/generated/resources/data/bloodmagic/tags/items/crystals/demon.json deleted file mode 100644 index 0ad4148e..00000000 --- a/src/generated/resources/data/bloodmagic/tags/items/crystals/demon.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - "bloodmagic:defaultcrystal", - "bloodmagic:corrosivecrystal", - "bloodmagic:destructivecrystal", - "bloodmagic:vengefulcrystal", - "bloodmagic:steadfastcrystal" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/tags/items/dusts/corrupted.json b/src/generated/resources/data/bloodmagic/tags/items/dusts/corrupted.json deleted file mode 100644 index a84e11a0..00000000 --- a/src/generated/resources/data/bloodmagic/tags/items/dusts/corrupted.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "bloodmagic:corrupted_dust" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/tags/items/fragments/gold.json b/src/generated/resources/data/bloodmagic/tags/items/fragments/gold.json deleted file mode 100644 index be036261..00000000 --- a/src/generated/resources/data/bloodmagic/tags/items/fragments/gold.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "bloodmagic:goldfragment" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/tags/items/fragments/iron.json b/src/generated/resources/data/bloodmagic/tags/items/fragments/iron.json deleted file mode 100644 index 9bc54fba..00000000 --- a/src/generated/resources/data/bloodmagic/tags/items/fragments/iron.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "bloodmagic:ironfragment" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/tags/items/fragments/netherite_scrap.json b/src/generated/resources/data/bloodmagic/tags/items/fragments/netherite_scrap.json deleted file mode 100644 index 1f0d5a35..00000000 --- a/src/generated/resources/data/bloodmagic/tags/items/fragments/netherite_scrap.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "bloodmagic:fragment_netherite_scrap" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/tags/items/gravels/gold.json b/src/generated/resources/data/bloodmagic/tags/items/gravels/gold.json deleted file mode 100644 index 8c75a5af..00000000 --- a/src/generated/resources/data/bloodmagic/tags/items/gravels/gold.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "bloodmagic:goldgravel" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/tags/items/gravels/iron.json b/src/generated/resources/data/bloodmagic/tags/items/gravels/iron.json deleted file mode 100644 index 5c317952..00000000 --- a/src/generated/resources/data/bloodmagic/tags/items/gravels/iron.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "bloodmagic:irongravel" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/tags/items/gravels/netherite_scrap.json b/src/generated/resources/data/bloodmagic/tags/items/gravels/netherite_scrap.json deleted file mode 100644 index a957a0e3..00000000 --- a/src/generated/resources/data/bloodmagic/tags/items/gravels/netherite_scrap.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "bloodmagic:gravel_netherite_scrap" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/tags/items/tiny_dusts/corrupted.json b/src/generated/resources/data/bloodmagic/tags/items/tiny_dusts/corrupted.json deleted file mode 100644 index e792ed30..00000000 --- a/src/generated/resources/data/bloodmagic/tags/items/tiny_dusts/corrupted.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "bloodmagic:corrupted_tinydust" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/fluids/life.json b/src/generated/resources/data/forge/tags/fluids/life.json deleted file mode 100644 index 59895a90..00000000 --- a/src/generated/resources/data/forge/tags/fluids/life.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "bloodmagic:life_essence_fluid", - "bloodmagic:life_essence_fluid_flowing" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/dusts/coal.json b/src/generated/resources/data/forge/tags/items/dusts/coal.json deleted file mode 100644 index c9d575d6..00000000 --- a/src/generated/resources/data/forge/tags/items/dusts/coal.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "bloodmagic:coalsand" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/dusts/gold.json b/src/generated/resources/data/forge/tags/items/dusts/gold.json deleted file mode 100644 index 959fcf7a..00000000 --- a/src/generated/resources/data/forge/tags/items/dusts/gold.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "bloodmagic:goldsand" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/dusts/hellforged.json b/src/generated/resources/data/forge/tags/items/dusts/hellforged.json deleted file mode 100644 index 129c8f3d..00000000 --- a/src/generated/resources/data/forge/tags/items/dusts/hellforged.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "bloodmagic:sand_hellforged" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/dusts/iron.json b/src/generated/resources/data/forge/tags/items/dusts/iron.json deleted file mode 100644 index d3d71370..00000000 --- a/src/generated/resources/data/forge/tags/items/dusts/iron.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "bloodmagic:ironsand" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/dusts/netherite_scrap.json b/src/generated/resources/data/forge/tags/items/dusts/netherite_scrap.json deleted file mode 100644 index 3d4d11de..00000000 --- a/src/generated/resources/data/forge/tags/items/dusts/netherite_scrap.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "bloodmagic:sand_netherite" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/dusts/saltpeter.json b/src/generated/resources/data/forge/tags/items/dusts/saltpeter.json deleted file mode 100644 index 5313e4e2..00000000 --- a/src/generated/resources/data/forge/tags/items/dusts/saltpeter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "bloodmagic:saltpeter" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/dusts/sulfur.json b/src/generated/resources/data/forge/tags/items/dusts/sulfur.json deleted file mode 100644 index 092ad725..00000000 --- a/src/generated/resources/data/forge/tags/items/dusts/sulfur.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "bloodmagic:sulfur" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ingots/hellforged.json b/src/generated/resources/data/forge/tags/items/ingots/hellforged.json deleted file mode 100644 index d71afc0c..00000000 --- a/src/generated/resources/data/forge/tags/items/ingots/hellforged.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "bloodmagic:ingot_hellforged" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores/copper.json b/src/generated/resources/data/forge/tags/items/ores/copper.json deleted file mode 100644 index 5e8aecc9..00000000 --- a/src/generated/resources/data/forge/tags/items/ores/copper.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "replace": false, - "values": [] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores/lead.json b/src/generated/resources/data/forge/tags/items/ores/lead.json deleted file mode 100644 index 5e8aecc9..00000000 --- a/src/generated/resources/data/forge/tags/items/ores/lead.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "replace": false, - "values": [] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores/osmium.json b/src/generated/resources/data/forge/tags/items/ores/osmium.json deleted file mode 100644 index 5e8aecc9..00000000 --- a/src/generated/resources/data/forge/tags/items/ores/osmium.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "replace": false, - "values": [] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores/silver.json b/src/generated/resources/data/forge/tags/items/ores/silver.json deleted file mode 100644 index 5e8aecc9..00000000 --- a/src/generated/resources/data/forge/tags/items/ores/silver.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "replace": false, - "values": [] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores/tin.json b/src/generated/resources/data/forge/tags/items/ores/tin.json deleted file mode 100644 index 5e8aecc9..00000000 --- a/src/generated/resources/data/forge/tags/items/ores/tin.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "replace": false, - "values": [] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mushroom_hyphae.json b/src/generated/resources/data/minecraft/tags/blocks/mushroom_hyphae.json deleted file mode 100644 index f8f96ad1..00000000 --- a/src/generated/resources/data/minecraft/tags/blocks/mushroom_hyphae.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:brown_mushroom_block", - "minecraft:red_mushroom_block", - "minecraft:crimson_hyphae", - "minecraft:warped_hyphae", - "minecraft:stripped_crimson_hyphae", - "minecraft:stripped_warped_hyphae", - "minecraft:nether_wart_block", - "minecraft:warped_wart_block", - "minecraft:shroomlight" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mushroom_stem.json b/src/generated/resources/data/minecraft/tags/blocks/mushroom_stem.json deleted file mode 100644 index 8055c89d..00000000 --- a/src/generated/resources/data/minecraft/tags/blocks/mushroom_stem.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:mushroom_stem", - "minecraft:crimson_stem", - "minecraft:warped_stem" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/walls.json b/src/generated/resources/data/minecraft/tags/blocks/walls.json deleted file mode 100644 index a79e9654..00000000 --- a/src/generated/resources/data/minecraft/tags/blocks/walls.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "bloodmagic:dungeon_brick_wall", - "bloodmagic:dungeon_polished_wall" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/mushroom_hyphae.json b/src/generated/resources/data/minecraft/tags/items/mushroom_hyphae.json deleted file mode 100644 index f8f96ad1..00000000 --- a/src/generated/resources/data/minecraft/tags/items/mushroom_hyphae.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:brown_mushroom_block", - "minecraft:red_mushroom_block", - "minecraft:crimson_hyphae", - "minecraft:warped_hyphae", - "minecraft:stripped_crimson_hyphae", - "minecraft:stripped_warped_hyphae", - "minecraft:nether_wart_block", - "minecraft:warped_wart_block", - "minecraft:shroomlight" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/mushroom_stem.json b/src/generated/resources/data/minecraft/tags/items/mushroom_stem.json deleted file mode 100644 index 8055c89d..00000000 --- a/src/generated/resources/data/minecraft/tags/items/mushroom_stem.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:mushroom_stem", - "minecraft:crimson_stem", - "minecraft:warped_stem" - ] -} \ No newline at end of file diff --git a/src/main/java/com/wayoftime/bloodmagic/BloodMagic.java b/src/main/java/com/wayoftime/bloodmagic/BloodMagic.java new file mode 100644 index 00000000..b8f3bf50 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/BloodMagic.java @@ -0,0 +1,61 @@ +package com.wayoftime.bloodmagic; + +import com.google.common.collect.Lists; +import com.wayoftime.bloodmagic.api.BloodMagicPlugin; +import com.wayoftime.bloodmagic.api.IBloodMagicPlugin; +import com.wayoftime.bloodmagic.core.RegistrarBloodMagicBlocks; +import com.wayoftime.bloodmagic.core.util.PluginUtil; +import com.wayoftime.bloodmagic.proxy.IProxy; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import org.apache.commons.lang3.tuple.Pair; + +import java.io.File; +import java.util.List; + +@Mod(modid = BloodMagic.MODID, name = BloodMagic.NAME, version = BloodMagic.VERSION) +public class BloodMagic { + + public static final String MODID = "bloodmagic"; + public static final String NAME = "Blood Magic: Alchemical Wizardry"; + public static final String VERSION = "${VERSION}"; + public static final List> PLUGINS = Lists.newArrayList(); + public static final CreativeTabs TAB_BM = new CreativeTabs(MODID) { + @Override + public ItemStack createIcon() { + return new ItemStack(RegistrarBloodMagicBlocks.BLOOD_ALTAR); + } + }; + + @SidedProxy(clientSide = "com.wayoftime.bloodmagic.proxy.ClientProxy", serverSide = "com.wayoftime.bloodmagic.proxy.ServerProxy") + public static IProxy PROXY; + @Mod.Instance(value = MODID) + public static BloodMagic INSTANCE; + public static File configDir; + + static { + FluidRegistry.enableUniversalBucket(); + } + + @Mod.EventHandler + public void preInit(FMLPreInitializationEvent event) { + configDir = new File(event.getModConfigurationDirectory(), BloodMagic.MODID); + if (!configDir.exists()) + configDir.mkdirs(); + + PLUGINS.addAll(PluginUtil.gatherPlugins(event.getAsmData())); + PluginUtil.injectAPIInstances(PluginUtil.gatherInjections(event.getAsmData())); + + PROXY.preInit(); // TODO - Remove proxy. Switch altar model to json + } + + @Mod.EventHandler + public void init(FMLInitializationEvent event) { + PluginUtil.handlePluginStep(PluginUtil.RegistrationStep.PLUGIN_REGISTER); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/api/impl/BloodMagicAPI.java b/src/main/java/com/wayoftime/bloodmagic/api/impl/BloodMagicAPI.java new file mode 100644 index 00000000..1a581e1d --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/api/impl/BloodMagicAPI.java @@ -0,0 +1,67 @@ +package com.wayoftime.bloodmagic.api.impl; + +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Multimap; +import com.wayoftime.bloodmagic.api.IBloodMagicAPI; +import com.wayoftime.bloodmagic.core.altar.ComponentType; +import com.wayoftime.bloodmagic.core.util.BMLog; +import net.minecraft.block.state.IBlockState; + +import javax.annotation.Nonnull; +import java.util.List; + +public class BloodMagicAPI implements IBloodMagicAPI { + + public static final BloodMagicAPI INSTANCE = new BloodMagicAPI(); + + private final BloodMagicBlacklist blacklist; + private final BloodMagicRecipeRegistrar recipeRegistrar; + private final BloodMagicValueManager valueManager; + private final Multimap altarComponents; + + public BloodMagicAPI() { + this.blacklist = new BloodMagicBlacklist(); + this.recipeRegistrar = new BloodMagicRecipeRegistrar(); + this.valueManager = new BloodMagicValueManager(); + this.altarComponents = ArrayListMultimap.create(); + } + + @Nonnull + @Override + public BloodMagicBlacklist getBlacklist() { + return blacklist; + } + + @Nonnull + @Override + public BloodMagicRecipeRegistrar getRecipeRegistrar() { + return recipeRegistrar; + } + + @Nonnull + @Override + public BloodMagicValueManager getValueManager() { + return valueManager; + } + + @Override + public void registerAltarComponent(@Nonnull IBlockState state, @Nonnull String componentType) { + ComponentType component = null; + for (ComponentType type : ComponentType.VALUES) { + if (type.name().equalsIgnoreCase(componentType)) { + component = type; + break; + } + } + + if (component != null) { + BMLog.API_VERBOSE.info("Registered {} as a {} altar component.", state, componentType); + altarComponents.put(component, state); + } else BMLog.API.warn("Invalid Altar component type: {}.", componentType); + } + + @Nonnull + public List getComponentStates(ComponentType component) { + return (List) altarComponents.get(component); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/api/impl/BloodMagicBlacklist.java b/src/main/java/com/wayoftime/bloodmagic/api/impl/BloodMagicBlacklist.java new file mode 100644 index 00000000..df9eed71 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/api/impl/BloodMagicBlacklist.java @@ -0,0 +1,106 @@ +package com.wayoftime.bloodmagic.api.impl; + +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; +import com.wayoftime.bloodmagic.api.IBloodMagicBlacklist; +import com.wayoftime.bloodmagic.core.util.BMLog; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; + +import javax.annotation.Nonnull; +import java.util.Set; + +public class BloodMagicBlacklist implements IBloodMagicBlacklist { + + private final Set teleposer; + private final Set teleposerEntities; + private final Set transposition; + private final Set greenGrove; + private final Set sacrifice; + + public BloodMagicBlacklist() { + this.teleposer = Sets.newHashSet(); + this.teleposerEntities = Sets.newHashSet(); + this.transposition = Sets.newHashSet(); + this.greenGrove = Sets.newHashSet(); + this.sacrifice = Sets.newHashSet(); + } + + @Override + public void addTeleposer(@Nonnull IBlockState state) { + if (!teleposer.contains(state)) { + BMLog.API_VERBOSE.info("Blacklist: Added {} to the Teleposer blacklist.", state); + teleposer.add(state); + } + } + + public void addTeleposer(@Nonnull Block block) { + for (IBlockState state : block.getBlockState().getValidStates()) + addTeleposer(state); + } + + @Override + public void addTeleposer(@Nonnull ResourceLocation entityId) { + if (!teleposerEntities.contains(entityId)) { + BMLog.API_VERBOSE.info("Blacklist: Added {} to the Teleposer blacklist.", entityId); + teleposerEntities.add(entityId); + } + } + + @Override + public void addTransposition(@Nonnull IBlockState state) { + if (!transposition.contains(state)) { + BMLog.API_VERBOSE.info("Blacklist: Added {} to the Transposition blacklist.", state); + transposition.add(state); + } + } + + public void addTransposition(@Nonnull Block block) { + for (IBlockState state : block.getBlockState().getValidStates()) + addTransposition(state); + } + + @Override + public void addGreenGrove(@Nonnull IBlockState state) { + if (!greenGrove.contains(state)) { + BMLog.API_VERBOSE.info("Blacklist: Added {} to the Green Grove blacklist.", state); + greenGrove.add(state); + } + } + + public void addGreenGrove(@Nonnull Block block) { + for (IBlockState state : block.getBlockState().getValidStates()) + addGreenGrove(state); + } + + @Override + public void addWellOfSuffering(@Nonnull ResourceLocation entityId) { + if (!sacrifice.contains(entityId)) { + BMLog.API_VERBOSE.info("Blacklist: Added {} to the Well of Suffering blacklist.", entityId); + sacrifice.add(entityId); + } + } + + // Internal use getters + + public Set getTeleposer() { + return ImmutableSet.copyOf(teleposer); + } + + public Set getTeleposerEntities() { + return ImmutableSet.copyOf(teleposerEntities); + } + + public Set getTransposition() { + return ImmutableSet.copyOf(transposition); + } + + public Set getGreenGrove() { + return ImmutableSet.copyOf(greenGrove); + } + + public Set getSacrifice() { + return ImmutableSet.copyOf(sacrifice); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/api/impl/BloodMagicCorePlugin.java b/src/main/java/com/wayoftime/bloodmagic/api/impl/BloodMagicCorePlugin.java new file mode 100644 index 00000000..5a909067 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/api/impl/BloodMagicCorePlugin.java @@ -0,0 +1,174 @@ +package com.wayoftime.bloodmagic.api.impl; + +import com.wayoftime.bloodmagic.BloodMagic; +import com.wayoftime.bloodmagic.api.BloodMagicPlugin; +import com.wayoftime.bloodmagic.api.IBloodMagicAPI; +import com.wayoftime.bloodmagic.api.IBloodMagicPlugin; +import com.wayoftime.bloodmagic.api.IBloodMagicRecipeRegistrar; +import com.wayoftime.bloodmagic.core.RegistrarBloodMagicBlocks; +import com.wayoftime.bloodmagic.core.RegistrarBloodMagicRecipes; +import com.wayoftime.bloodmagic.core.altar.ComponentType; +import net.minecraft.block.Block; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.state.BlockStateContainer; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.registry.ForgeRegistries; + +@BloodMagicPlugin +public class BloodMagicCorePlugin implements IBloodMagicPlugin { + + @Override + public void register(IBloodMagicAPI apiInterface) { + BloodMagicAPI api = (BloodMagicAPI) apiInterface; + // Add forced blacklistings +// api.getBlacklist().addTeleposer(RegistrarBloodMagicBlocks.INPUT_ROUTING_NODE); +// api.getBlacklist().addTransposition(RegistrarBloodMagicBlocks.INPUT_ROUTING_NODE); +// api.getBlacklist().addTeleposer(RegistrarBloodMagicBlocks.OUTPUT_ROUTING_NODE); +// api.getBlacklist().addTransposition(RegistrarBloodMagicBlocks.OUTPUT_ROUTING_NODE); +// api.getBlacklist().addTeleposer(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE); +// api.getBlacklist().addTransposition(RegistrarBloodMagicBlocks.ITEM_ROUTING_NODE); +// api.getBlacklist().addTeleposer(RegistrarBloodMagicBlocks.MASTER_ROUTING_NODE); +// api.getBlacklist().addTransposition(RegistrarBloodMagicBlocks.MASTER_ROUTING_NODE); +// api.getBlacklist().addTeleposer(RegistrarBloodMagicBlocks.DEMON_CRYSTAL); +// api.getBlacklist().addTransposition(RegistrarBloodMagicBlocks.DEMON_CRYSTAL); +// api.getBlacklist().addTeleposer(RegistrarBloodMagicBlocks.INVERSION_PILLAR); +// api.getBlacklist().addTransposition(RegistrarBloodMagicBlocks.INVERSION_PILLAR); + api.getBlacklist().addWellOfSuffering(new ResourceLocation("armor_stand")); + api.getBlacklist().addWellOfSuffering(new ResourceLocation(BloodMagic.MODID, "sentient_specter")); + + api.getValueManager().setSacrificialValue(new ResourceLocation("armor_stand"), 0); + api.getValueManager().setSacrificialValue(new ResourceLocation(BloodMagic.MODID, "sentient_specter"), 0); + +// api.getValueManager().setTranquility(Blocks.LAVA, new TranquilityStack(EnumTranquilityType.LAVA, 1.2D)); +// api.getValueManager().setTranquility(Blocks.FLOWING_LAVA, new TranquilityStack(EnumTranquilityType.LAVA, 1.2D)); +// api.getValueManager().setTranquility(Blocks.WATER, new TranquilityStack(EnumTranquilityType.WATER, 1.0D)); +// api.getValueManager().setTranquility(Blocks.FLOWING_WATER, new TranquilityStack(EnumTranquilityType.WATER, 1.0D)); +// api.getValueManager().setTranquility(RegistrarBloodMagicBlocks.LIFE_ESSENCE, new TranquilityStack(EnumTranquilityType.WATER, 1.5D)); +// api.getValueManager().setTranquility(Blocks.NETHERRACK, new TranquilityStack(EnumTranquilityType.FIRE, 0.5D)); +// api.getValueManager().setTranquility(Blocks.DIRT, new TranquilityStack(EnumTranquilityType.EARTHEN, 0.25D)); +// api.getValueManager().setTranquility(Blocks.FARMLAND, new TranquilityStack(EnumTranquilityType.EARTHEN, 1.0D)); +// api.getValueManager().setTranquility(Blocks.POTATOES, new TranquilityStack(EnumTranquilityType.CROP, 1.0D)); +// api.getValueManager().setTranquility(Blocks.CARROTS, new TranquilityStack(EnumTranquilityType.CROP, 1.0D)); +// api.getValueManager().setTranquility(Blocks.WHEAT, new TranquilityStack(EnumTranquilityType.CROP, 1.0D)); +// api.getValueManager().setTranquility(Blocks.NETHER_WART, new TranquilityStack(EnumTranquilityType.CROP, 1.0D)); +// api.getValueManager().setTranquility(Blocks.BEETROOTS, new TranquilityStack(EnumTranquilityType.CROP, 1.0D)); + + handleConfigValues(api); + + // Add standard blocks for altar components + api.registerAltarComponent(Blocks.GLOWSTONE.getDefaultState(), ComponentType.GLOWSTONE.name()); + api.registerAltarComponent(Blocks.SEA_LANTERN.getDefaultState(), ComponentType.GLOWSTONE.name()); + api.registerAltarComponent(Blocks.BEACON.getDefaultState(), ComponentType.BEACON.name()); + + api.registerAltarComponent(RegistrarBloodMagicBlocks.BLOODSTONE_BRICK.getDefaultState(), ComponentType.BLOODSTONE.name()); + api.registerAltarComponent(RegistrarBloodMagicBlocks.BLOODSTONE_TILE.getDefaultState(), ComponentType.BLOODSTONE.name()); +// api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.CRYSTAL_BRICK), ComponentType.CRYSTAL.name()); +// api.registerAltarComponent(decorative.getDefaultState().withProperty(decorative.getProperty(), EnumDecorative.CRYSTAL_TILE), ComponentType.CRYSTAL.name()); + + + api.registerAltarComponent(RegistrarBloodMagicBlocks.BLOOD_RUNE_BLANK.getDefaultState(), ComponentType.BLOOD_RUNE.name()); + api.registerAltarComponent(RegistrarBloodMagicBlocks.BLOOD_RUNE_ACCELERATION.getDefaultState(), ComponentType.BLOOD_RUNE.name()); + api.registerAltarComponent(RegistrarBloodMagicBlocks.BLOOD_RUNE_CAPACITY.getDefaultState(), ComponentType.BLOOD_RUNE.name()); + api.registerAltarComponent(RegistrarBloodMagicBlocks.BLOOD_RUNE_AUGMENTED_CAPACITY.getDefaultState(), ComponentType.BLOOD_RUNE.name()); + api.registerAltarComponent(RegistrarBloodMagicBlocks.BLOOD_RUNE_CHARGING.getDefaultState(), ComponentType.BLOOD_RUNE.name()); + api.registerAltarComponent(RegistrarBloodMagicBlocks.BLOOD_RUNE_DISPLACEMENT.getDefaultState(), ComponentType.BLOOD_RUNE.name()); + api.registerAltarComponent(RegistrarBloodMagicBlocks.BLOOD_RUNE_EFFICIENCY.getDefaultState(), ComponentType.BLOOD_RUNE.name()); + api.registerAltarComponent(RegistrarBloodMagicBlocks.BLOOD_RUNE_ORB.getDefaultState(), ComponentType.BLOOD_RUNE.name()); + api.registerAltarComponent(RegistrarBloodMagicBlocks.BLOOD_RUNE_SACRIFICE.getDefaultState(), ComponentType.BLOOD_RUNE.name()); + api.registerAltarComponent(RegistrarBloodMagicBlocks.BLOOD_RUNE_SELF_SACRIFICE.getDefaultState(), ComponentType.BLOOD_RUNE.name()); + api.registerAltarComponent(RegistrarBloodMagicBlocks.BLOOD_RUNE_SPEED.getDefaultState(), ComponentType.BLOOD_RUNE.name()); + } + + @Override + public void registerRecipes(IBloodMagicRecipeRegistrar recipeRegistrar) { + RegistrarBloodMagicRecipes.registerAltarRecipes((BloodMagicRecipeRegistrar) recipeRegistrar); +// RegistrarBloodMagicRecipes.registerAlchemyTableRecipes((BloodMagicRecipeRegistrar) recipeRegistrar); +// RegistrarBloodMagicRecipes.registerTartaricForgeRecipes((BloodMagicRecipeRegistrar) recipeRegistrar); +// RegistrarBloodMagicRecipes.registerAlchemyArrayRecipes((BloodMagicRecipeRegistrar) recipeRegistrar); +// RegistrarBloodMagicRecipes.registerSacrificeCraftRecipes((BloodMagicRecipeRegistrar) recipeRegistrar); + } + + private static void handleConfigValues(BloodMagicAPI api) { +// for (String value : ConfigHandler.values.sacrificialValues) +// { +// String[] split = value.split(";"); +// if (split.length != 2) // Not valid format +// continue; +// +// api.getValueManager().setSacrificialValue(new ResourceLocation(split[0]), Integer.parseInt(split[1])); +// } +// +// for (String value : ConfigHandler.blacklist.teleposer) +// { +// EntityEntry entityEntry = ForgeRegistries.ENTITIES.getValue(new ResourceLocation(value)); +// if (entityEntry == null) +// { // It's not an entity (or at least not a valid one), so let's try a block. +// String[] blockData = value.split("\\["); +// Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(blockData[0])); +// if (block == Blocks.AIR || block == null) // Not a valid block either +// continue; +// +// if (blockData.length > 1) +// { // We have properties listed, so let's build a state. +// api.getBlacklist().addTeleposer(parseState(value)); +// continue; +// } +// +// api.getBlacklist().addTeleposer(block); +// continue; +// } +// +// api.getBlacklist().addTeleposer(entityEntry.getRegistryName()); +// } +// +// for (String value : ConfigHandler.blacklist.transposer) +// { +// String[] blockData = value.split("\\["); +// Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(blockData[0])); +// if (block == Blocks.AIR || block == null) // Not a valid block +// continue; +// +// if (blockData.length > 1) +// { // We have properties listed, so let's build a state. +// api.getBlacklist().addTeleposer(parseState(value)); +// continue; +// } +// +// api.getBlacklist().addTeleposer(block); +// } +// +// for (String value : ConfigHandler.blacklist.wellOfSuffering) +// { +// EntityEntry entityEntry = ForgeRegistries.ENTITIES.getValue(new ResourceLocation(value)); +// if (entityEntry == null) // Not a valid entity +// continue; +// +// api.getBlacklist().addWellOfSuffering(entityEntry.getRegistryName()); +// } + } + + private static IBlockState parseState(String blockInfo) { + String[] split = blockInfo.split("\\["); + split[1] = split[1].substring(0, split[1].lastIndexOf("]")); // Make sure brackets are removed from state + + Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(split[0])); // Find the block + if (block == Blocks.AIR) + return Blocks.AIR.getDefaultState(); // The block is air, so we're looking at invalid data + + BlockStateContainer blockState = block.getBlockState(); + IBlockState returnState = blockState.getBaseState(); + + // Force our values into the state + String[] stateValues = split[1].split(","); // Splits up each value + for (String value : stateValues) { + String[] valueSplit = value.split("="); // Separates property and value + IProperty property = blockState.getProperty(valueSplit[0]); + if (property != null) + returnState = returnState.withProperty(property, (Comparable) property.parseValue(valueSplit[1]).get()); // Force the property into the state + } + + return returnState; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java b/src/main/java/com/wayoftime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java new file mode 100644 index 00000000..a2a20ce6 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/api/impl/BloodMagicRecipeRegistrar.java @@ -0,0 +1,357 @@ +package com.wayoftime.bloodmagic.api.impl; + +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; +import com.wayoftime.bloodmagic.api.IBloodMagicRecipeRegistrar; +import com.wayoftime.bloodmagic.api.impl.recipe.*; +import com.wayoftime.bloodmagic.core.altar.AltarTier; +import com.wayoftime.bloodmagic.core.network.IBloodOrb; +import com.wayoftime.bloodmagic.core.recipe.IngredientBloodOrb; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.crafting.CraftingHelper; + +import javax.annotation.Nonnegative; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +public class BloodMagicRecipeRegistrar implements IBloodMagicRecipeRegistrar { + + private final Set altarRecipes; + private final Set alchemyRecipes; + private final Set tartaricForgeRecipes; + private final Set alchemyArrayRecipes; + private final Set sacrificeCraftRecipes; + + public BloodMagicRecipeRegistrar() { + this.altarRecipes = Sets.newHashSet(); + this.alchemyRecipes = Sets.newHashSet(); + this.tartaricForgeRecipes = Sets.newHashSet(); + this.alchemyArrayRecipes = Sets.newHashSet(); + this.sacrificeCraftRecipes = Sets.newHashSet(); + } + + @Override + public void addBloodAltar(@Nonnull Ingredient input, @Nonnull ItemStack output, @Nonnegative int minimumTier, @Nonnegative int syphon, @Nonnegative int consumeRate, @Nonnegative int drainRate) { + Preconditions.checkNotNull(input, "input cannot be null."); + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative."); + Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); + Preconditions.checkArgument(consumeRate >= 0, "consumeRate cannot be negative."); + Preconditions.checkArgument(drainRate >= 0, "drainRate cannot be negative."); + + altarRecipes.add(new RecipeBloodAltar(input, output, minimumTier, syphon, consumeRate, drainRate)); + } + + public void addBloodAltar(@Nonnull Ingredient input, @Nonnull ItemStack output, @Nonnull AltarTier tier, @Nonnegative int syphon, @Nonnegative int consumeRate, @Nonnegative int drainRate) { + addBloodAltar(input, output, tier.ordinal(), syphon, consumeRate, drainRate); + } + + + @Override + public boolean removeBloodAltar(@Nonnull ItemStack input) { + Preconditions.checkNotNull(input, "input cannot be null."); + + return altarRecipes.remove(getBloodAltar(input)); + } + + @Override + public void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks, @Nonnegative int minimumTier, @Nonnull Ingredient... input) { + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); + Preconditions.checkArgument(ticks >= 0, "ticks cannot be negative."); + Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative."); + Preconditions.checkNotNull(input, "input cannot be null."); + + NonNullList inputs = NonNullList.from(Ingredient.EMPTY, input); + alchemyRecipes.add(new RecipeAlchemyTable(inputs, output, syphon, ticks, minimumTier)); + } + + public void addAlchemyTable(@Nonnull ItemStack output, @Nonnegative int syphon, @Nonnegative int ticks, @Nonnegative int minimumTier, @Nonnull Object... input) { + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); + Preconditions.checkArgument(ticks >= 0, "ticks cannot be negative."); + Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative."); + Preconditions.checkNotNull(input, "input cannot be null."); + + List ingredients = Lists.newArrayList(); + for (Object object : input) { + if (object instanceof ItemStack && ((ItemStack) object).getItem() instanceof IBloodOrb) { + ingredients.add(new IngredientBloodOrb(((IBloodOrb) ((ItemStack) object).getItem()).getOrb((ItemStack) object))); + continue; + } + + ingredients.add(CraftingHelper.getIngredient(object)); + } + + addAlchemyTable(output, syphon, ticks, minimumTier, ingredients.toArray(new Ingredient[0])); + } + + public void addAlchemyTable(RecipeAlchemyTable recipe) { + alchemyRecipes.add(recipe); + } + + @Override + public boolean removeAlchemyTable(@Nonnull ItemStack... input) { + Preconditions.checkNotNull(input, "inputs cannot be null."); + + for (ItemStack stack : input) + Preconditions.checkNotNull(stack, "input cannot be null."); + + return alchemyRecipes.remove(getAlchemyTable(Lists.newArrayList(input))); + } + + @Override + public void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain, @Nonnull Ingredient... input) { + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(minimumSouls >= 0, "minimumSouls cannot be negative."); + Preconditions.checkArgument(soulDrain >= 0, "soulDrain cannot be negative."); + Preconditions.checkNotNull(input, "input cannot be null."); + + NonNullList inputs = NonNullList.from(Ingredient.EMPTY, input); + tartaricForgeRecipes.add(new RecipeTartaricForge(inputs, output, minimumSouls, soulDrain)); + } + + @Override + public boolean removeTartaricForge(@Nonnull ItemStack... input) { + Preconditions.checkNotNull(input, "inputs cannot be null."); + + for (ItemStack stack : input) + Preconditions.checkNotNull(stack, "input cannot be null."); + + return tartaricForgeRecipes.remove(getTartaricForge(Lists.newArrayList(input))); + } + + public void addTartaricForge(@Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain, @Nonnull Object... input) { + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(minimumSouls >= 0, "minimumSouls cannot be negative."); + Preconditions.checkArgument(soulDrain >= 0, "soulDrain cannot be negative."); + Preconditions.checkNotNull(input, "input cannot be null."); + + List ingredients = Lists.newArrayList(); + for (Object object : input) { + if (object instanceof ItemStack && ((ItemStack) object).getItem() instanceof IBloodOrb) { + ingredients.add(new IngredientBloodOrb(((IBloodOrb) ((ItemStack) object).getItem()).getOrb((ItemStack) object))); + continue; + } + + ingredients.add(CraftingHelper.getIngredient(object)); + } + + addTartaricForge(output, minimumSouls, soulDrain, ingredients.toArray(new Ingredient[0])); + } + + @Override + public void addAlchemyArray(@Nonnull Ingredient input, @Nonnull Ingredient catalyst, @Nonnull ItemStack output, @Nullable ResourceLocation circleTexture) { + Preconditions.checkNotNull(input, "input cannot be null."); + Preconditions.checkNotNull(catalyst, "catalyst cannot be null."); + Preconditions.checkNotNull(output, "output cannot be null."); + + alchemyArrayRecipes.add(new RecipeAlchemyArray(input, catalyst, output, circleTexture)); + } + + @Override + public boolean removeAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst) { + Preconditions.checkNotNull(input, "input cannot be null."); + Preconditions.checkNotNull(catalyst, "catalyst cannot be null."); + + return alchemyArrayRecipes.remove(getAlchemyArray(input, catalyst)); + } + + public void addAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst, @Nonnull ItemStack output, @Nullable ResourceLocation circleTexture) { + Preconditions.checkNotNull(input, "input cannot be null."); + Preconditions.checkNotNull(catalyst, "catalyst cannot be null."); + Preconditions.checkNotNull(output, "output cannot be null."); + + addAlchemyArray(Ingredient.fromStacks(input), Ingredient.fromStacks(catalyst), output, circleTexture); + } + + public void addSacrificeCraft(@Nonnull ItemStack output, @Nonnegative double healthRequired, @Nonnull Object... input) { + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(healthRequired >= 0, "healthRequired cannot be negative."); + Preconditions.checkNotNull(input, "input cannot be null."); + + List ingredients = Lists.newArrayList(); + for (Object object : input) { + if (object instanceof ItemStack && ((ItemStack) object).getItem() instanceof IBloodOrb) { + ingredients.add(new IngredientBloodOrb(((IBloodOrb) ((ItemStack) object).getItem()).getOrb((ItemStack) object))); + continue; + } + + ingredients.add(CraftingHelper.getIngredient(object)); + } + + addSacrificeCraft(output, healthRequired, ingredients.toArray(new Ingredient[0])); + } + + @Override + public boolean removeSacrificeCraft(@Nonnull ItemStack... input) { + Preconditions.checkNotNull(input, "inputs cannot be null."); + + for (ItemStack stack : input) + Preconditions.checkNotNull(stack, "input cannot be null."); + + return sacrificeCraftRecipes.remove(getSacrificeCraft(Lists.newArrayList(input))); + } + + @Override + public void addSacrificeCraft(@Nonnull ItemStack output, @Nonnegative double healthRequired, @Nonnull Ingredient... input) { + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(healthRequired >= 0, "healthRequired cannot be negative."); + Preconditions.checkNotNull(input, "input cannot be null."); + + NonNullList inputs = NonNullList.from(Ingredient.EMPTY, input); + sacrificeCraftRecipes.add(new RecipeSacrificeCraft(inputs, output, healthRequired)); + } + + @Nullable + public RecipeBloodAltar getBloodAltar(@Nonnull ItemStack input) { + Preconditions.checkNotNull(input, "input cannot be null."); + if (input.isEmpty()) + return null; + + for (RecipeBloodAltar recipe : altarRecipes) + if (recipe.getInput().test(input)) + return recipe; + + return null; + } + + @Nullable + public RecipeAlchemyTable getAlchemyTable(@Nonnull List input) { + Preconditions.checkNotNull(input, "input cannot be null."); + if (input.isEmpty()) + return null; + + mainLoop: + for (RecipeAlchemyTable recipe : alchemyRecipes) { + if (recipe.getInput().size() != input.size()) + continue; + + List recipeInput = new ArrayList<>(recipe.getInput()); + + for (int i = 0; i < input.size(); i++) { + boolean matched = false; + for (int j = 0; j < recipeInput.size(); j++) { + Ingredient ingredient = recipeInput.get(j); + if (ingredient.apply(input.get(i))) { + matched = true; + recipeInput.remove(j); + break; + } + } + + if (!matched) + continue mainLoop; + } + + return recipe; + } + + return null; + } + + @Nullable + public RecipeTartaricForge getTartaricForge(@Nonnull List input) { + Preconditions.checkNotNull(input, "input cannot be null."); + if (input.isEmpty()) + return null; + + mainLoop: + for (RecipeTartaricForge recipe : tartaricForgeRecipes) { + if (recipe.getInput().size() != input.size()) + continue; + + List recipeInput = new ArrayList<>(recipe.getInput()); + + for (int i = 0; i < input.size(); i++) { + boolean matched = false; + for (int j = 0; j < recipeInput.size(); j++) { + Ingredient ingredient = recipeInput.get(j); + if (ingredient.apply(input.get(i))) { + matched = true; + recipeInput.remove(j); + break; + } + } + + if (!matched) + continue mainLoop; + } + + return recipe; + } + + return null; + } + + @Nullable + public RecipeSacrificeCraft getSacrificeCraft(@Nonnull List input) { + Preconditions.checkNotNull(input, "input cannot be null."); + if (input.isEmpty()) + return null; + + mainLoop: + for (RecipeSacrificeCraft recipe : sacrificeCraftRecipes) { + if (recipe.getInput().size() != input.size()) + continue; + + List recipeInput = new ArrayList<>(recipe.getInput()); + + for (int i = 0; i < input.size(); i++) { + boolean matched = false; + for (int j = 0; j < recipeInput.size(); j++) { + Ingredient ingredient = recipeInput.get(j); + if (ingredient.apply(input.get(i))) { + matched = true; + recipeInput.remove(j); + break; + } + } + + if (!matched) + continue mainLoop; + } + + return recipe; + } + + return null; + } + + @Nullable + public RecipeAlchemyArray getAlchemyArray(@Nonnull ItemStack input, @Nonnull ItemStack catalyst) { + Preconditions.checkNotNull(input, "input cannot be null."); + if (input.isEmpty()) + return null; + + for (RecipeAlchemyArray recipe : alchemyArrayRecipes) + if (recipe.getInput().test(input) && recipe.getCatalyst().test(catalyst)) + return recipe; + + return null; + } + + public Set getAltarRecipes() { + return ImmutableSet.copyOf(altarRecipes); + } + + public Set getAlchemyRecipes() { + return ImmutableSet.copyOf(alchemyRecipes); + } + + public Set getTartaricForgeRecipes() { + return ImmutableSet.copyOf(tartaricForgeRecipes); + } + + public Set getAlchemyArrayRecipes() { + return ImmutableSet.copyOf(alchemyArrayRecipes); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/api/impl/BloodMagicValueManager.java b/src/main/java/com/wayoftime/bloodmagic/api/impl/BloodMagicValueManager.java new file mode 100644 index 00000000..3bb38ce4 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/api/impl/BloodMagicValueManager.java @@ -0,0 +1,62 @@ +package com.wayoftime.bloodmagic.api.impl; + +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; +import com.wayoftime.bloodmagic.api.IBloodMagicValueManager; +import com.wayoftime.bloodmagic.core.util.BMLog; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.ResourceLocation; + +import javax.annotation.Nonnull; +import java.util.Map; + +public class BloodMagicValueManager implements IBloodMagicValueManager { + + private final Map sacrificial; +// private final Map tranquility; // TODO - Tranquility + + public BloodMagicValueManager() { + this.sacrificial = Maps.newHashMap(); +// this.tranquility = Maps.newHashMap(); // TODO - Tranquility + } + + @Override + public void setSacrificialValue(@Nonnull ResourceLocation entityId, int value) { + BMLog.API_VERBOSE.info("Value Manager: Set sacrificial value of {} to {}.", entityId, value); + sacrificial.put(entityId, value); + } + + // TODO - Tranquility + @Override + public void setTranquility(@Nonnull IBlockState state, @Nonnull String tranquilityType, double value) { +// EnumTranquilityType tranquility = null; +// for (EnumTranquilityType type : EnumTranquilityType.values()) { +// if (type.name().equalsIgnoreCase(tranquilityType)) { +// tranquility = type; +// break; +// } +// } +// +// if (tranquility != null) { +// BMLog.API_VERBOSE.info("Value Manager: Set tranquility value of {} to {} @ {}", state, tranquilityType, value); +// this.tranquility.put(state, new TranquilityStack(tranquility, value)); +// } else BMLog.API.warn("Invalid tranquility type: {}.", tranquilityType); + } + + // TODO - Tranquility +// public void setTranquility(Block block, TranquilityStack tranquilityStack) { +// for (IBlockState state : block.getBlockState().getValidStates()) { +// BMLog.API_VERBOSE.info("Value Manager: Set tranquility value of {} to {} @ {}", state, tranquilityStack.type, tranquilityStack.value); +// tranquility.put(state, tranquilityStack); +// } +// } + + public Map getSacrificial() { + return ImmutableMap.copyOf(sacrificial); + } + + // TODO - Tranquility +// public Map getTranquility() { +// return ImmutableMap.copyOf(tranquility); +// } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/api/impl/recipe/RecipeAlchemyArray.java b/src/main/java/com/wayoftime/bloodmagic/api/impl/recipe/RecipeAlchemyArray.java new file mode 100644 index 00000000..ef086fdc --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/api/impl/recipe/RecipeAlchemyArray.java @@ -0,0 +1,53 @@ +package com.wayoftime.bloodmagic.api.impl.recipe; + +import com.google.common.base.Preconditions; +import com.wayoftime.bloodmagic.BloodMagic; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.ResourceLocation; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +public class RecipeAlchemyArray { + + @Nonnull + private final Ingredient input; + @Nonnull + private final Ingredient catalyst; + @Nonnull + private final ItemStack output; + @Nonnull + private final ResourceLocation circleTexture; + + public RecipeAlchemyArray(@Nonnull Ingredient input, @Nonnull Ingredient catalyst, @Nonnull ItemStack output, @Nullable ResourceLocation circleTexture) { + Preconditions.checkNotNull(input, "input cannot be null."); + Preconditions.checkNotNull(catalyst, "catalyst cannot be null."); + Preconditions.checkNotNull(output, "output cannot be null."); + + this.input = input; + this.catalyst = catalyst; + this.output = output; + this.circleTexture = circleTexture == null ? new ResourceLocation(BloodMagic.MODID, "textures/models/AlchemyArrays/WIPArray.png") : circleTexture; + } + + @Nonnull + public Ingredient getInput() { + return input; + } + + @Nonnull + public Ingredient getCatalyst() { + return catalyst; + } + + @Nonnull + public ItemStack getOutput() { + return output; + } + + @Nonnull + public ResourceLocation getCircleTexture() { + return circleTexture; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/api/impl/recipe/RecipeAlchemyTable.java b/src/main/java/com/wayoftime/bloodmagic/api/impl/recipe/RecipeAlchemyTable.java new file mode 100644 index 00000000..f7e5e0d9 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/api/impl/recipe/RecipeAlchemyTable.java @@ -0,0 +1,59 @@ +package com.wayoftime.bloodmagic.api.impl.recipe; + +import com.google.common.base.Preconditions; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.NonNullList; + +import javax.annotation.Nonnegative; +import javax.annotation.Nonnull; + +public class RecipeAlchemyTable { + + @Nonnull + private final NonNullList input; + @Nonnull + private final ItemStack output; + @Nonnegative + private final int syphon; + @Nonnegative + private final int ticks; + @Nonnegative + private final int minimumTier; + + public RecipeAlchemyTable(@Nonnull NonNullList input, @Nonnull ItemStack output, int syphon, int ticks, int minimumTier) { + Preconditions.checkNotNull(input, "input cannot be null."); + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); + Preconditions.checkArgument(ticks >= 0, "ticks cannot be negative."); + Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative."); + + this.input = input; + this.output = output; + this.syphon = syphon; + this.ticks = ticks; + this.minimumTier = minimumTier; + } + + @Nonnull + public final NonNullList getInput() { + return input; + } + + @Nonnull + public final ItemStack getOutput() { + return output; + } + + public final int getSyphon() { + return syphon; + } + + public final int getTicks() { + return ticks; + } + + public final int getMinimumTier() { + return minimumTier; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java b/src/main/java/com/wayoftime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java new file mode 100644 index 00000000..2fe6fa19 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/api/impl/recipe/RecipeBloodAltar.java @@ -0,0 +1,72 @@ +package com.wayoftime.bloodmagic.api.impl.recipe; + +import com.google.common.base.Preconditions; +import com.wayoftime.bloodmagic.core.altar.AltarTier; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; + +import javax.annotation.Nonnegative; +import javax.annotation.Nonnull; + +public class RecipeBloodAltar { + + @Nonnull + private final Ingredient input; + @Nonnull + private final ItemStack output; + @Nonnull + private final AltarTier minimumTier; + @Nonnegative + private final int syphon; + @Nonnegative + private final int consumeRate; + @Nonnegative + private final int drainRate; + + public RecipeBloodAltar(@Nonnull Ingredient input, @Nonnull ItemStack output, @Nonnegative int minimumTier, @Nonnegative int syphon, @Nonnegative int consumeRate, @Nonnegative int drainRate) { + Preconditions.checkNotNull(input, "input cannot be null."); + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative."); + Preconditions.checkArgument(minimumTier <= AltarTier.values().length, "minimumTier cannot be higher than max tier"); + Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); + Preconditions.checkArgument(consumeRate >= 0, "consumeRate cannot be negative."); + Preconditions.checkArgument(drainRate >= 0, "drain cannot be negative."); + + this.input = input; + this.output = output; + this.minimumTier = AltarTier.values()[minimumTier]; + this.syphon = syphon; + this.consumeRate = consumeRate; + this.drainRate = drainRate; + } + + @Nonnull + public final Ingredient getInput() { + return input; + } + + @Nonnull + public final ItemStack getOutput() { + return output; + } + + @Nonnull + public AltarTier getMinimumTier() { + return minimumTier; + } + + @Nonnegative + public final int getSyphon() { + return syphon; + } + + @Nonnegative + public final int getConsumeRate() { + return consumeRate; + } + + @Nonnegative + public final int getDrainRate() { + return drainRate; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/api/impl/recipe/RecipeSacrificeCraft.java b/src/main/java/com/wayoftime/bloodmagic/api/impl/recipe/RecipeSacrificeCraft.java new file mode 100644 index 00000000..cefd7802 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/api/impl/recipe/RecipeSacrificeCraft.java @@ -0,0 +1,43 @@ +package com.wayoftime.bloodmagic.api.impl.recipe; + +import com.google.common.base.Preconditions; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.NonNullList; + +import javax.annotation.Nonnegative; +import javax.annotation.Nonnull; + +public class RecipeSacrificeCraft { + @Nonnull + private final NonNullList input; + @Nonnull + private final ItemStack output; + @Nonnegative + private final double healthRequired; + + public RecipeSacrificeCraft(@Nonnull NonNullList input, @Nonnull ItemStack output, @Nonnegative double healthRequired) { + Preconditions.checkNotNull(input, "input cannot be null."); + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(healthRequired >= 0, "healthRequired cannot be negative."); + + this.input = input; + this.output = output; + this.healthRequired = healthRequired; + } + + @Nonnull + public final NonNullList getInput() { + return input; + } + + @Nonnull + public final ItemStack getOutput() { + return output; + } + + @Nonnegative + public final double getHealthRequired() { + return healthRequired; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/api/impl/recipe/RecipeTartaricForge.java b/src/main/java/com/wayoftime/bloodmagic/api/impl/recipe/RecipeTartaricForge.java new file mode 100644 index 00000000..6b2b7bca --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/api/impl/recipe/RecipeTartaricForge.java @@ -0,0 +1,53 @@ +package com.wayoftime.bloodmagic.api.impl.recipe; + +import com.google.common.base.Preconditions; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.NonNullList; + +import javax.annotation.Nonnegative; +import javax.annotation.Nonnull; + +public class RecipeTartaricForge { + + @Nonnull + private final NonNullList input; + @Nonnull + private final ItemStack output; + @Nonnegative + private final double minimumSouls; + @Nonnegative + private final double soulDrain; + + public RecipeTartaricForge(@Nonnull NonNullList input, @Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain) { + Preconditions.checkNotNull(input, "input cannot be null."); + Preconditions.checkNotNull(output, "output cannot be null."); + Preconditions.checkArgument(minimumSouls >= 0, "minimumSouls cannot be negative."); + Preconditions.checkArgument(soulDrain >= 0, "soulDrain cannot be negative."); + + this.input = input; + this.output = output; + this.minimumSouls = minimumSouls; + this.soulDrain = soulDrain; + } + + @Nonnull + public final NonNullList getInput() { + return input; + } + + @Nonnull + public final ItemStack getOutput() { + return output; + } + + @Nonnegative + public final double getMinimumSouls() { + return minimumSouls; + } + + @Nonnegative + public final double getSoulDrain() { + return soulDrain; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/block/BlockBloodAltar.java b/src/main/java/com/wayoftime/bloodmagic/block/BlockBloodAltar.java new file mode 100644 index 00000000..0e4db770 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/block/BlockBloodAltar.java @@ -0,0 +1,133 @@ +package com.wayoftime.bloodmagic.block; + +import com.wayoftime.bloodmagic.BloodMagic; +import com.wayoftime.bloodmagic.core.altar.IAltarManipulator; +import com.wayoftime.bloodmagic.core.util.register.IItemProvider; +import com.wayoftime.bloodmagic.tile.TileBloodAltar; +import net.minecraft.block.Block; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.InventoryHelper; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.ItemHandlerHelper; + +import javax.annotation.Nullable; + +public class BlockBloodAltar extends Block implements IItemProvider { + + public BlockBloodAltar() { + super(Material.ROCK); + + setTranslationKey(BloodMagic.MODID + ":blood_altar"); + setCreativeTab(BloodMagic.TAB_BM); + setHardness(2.0F); + setResistance(5.0F); + setSoundType(SoundType.STONE); + setHarvestLevel("pickaxe", 1); + } + + @Override + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + TileEntity tile = world.getTileEntity(pos); + if (!(tile instanceof TileBloodAltar) || !tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) + return false; + + IItemHandler altarInv = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); + if (altarInv == null) + return false; + + if (player.isSneaking()) { + ItemStack extracted = altarInv.extractItem(0, altarInv.getSlotLimit(0), false); + if (extracted.isEmpty()) + return false; + + ItemHandlerHelper.giveItemToPlayer(player, extracted); + tile.markDirty(); + return true; + } else { + ItemStack held = player.getHeldItem(hand); + if (held.isEmpty()) + return false; + + if (held.getItem() instanceof IAltarManipulator && ((IAltarManipulator) held.getItem()).tryManipulate(player, held, world, pos)) + return false; + + if (!altarInv.extractItem(0, 1, true).isEmpty()) + return false; + + ItemStack insert = held.copy(); + insert.setCount(1); + ItemHandlerHelper.insertItem(altarInv, insert, false); + ((TileBloodAltar) tile).resetProgress(); + tile.markDirty(); + if (!player.capabilities.isCreativeMode) + held.shrink(1); + return true; + } + } + + @Override + public void breakBlock(World world, BlockPos pos, IBlockState state) { + TileEntity tile = world.getTileEntity(pos); + if (tile == null) + return; + + IItemHandler itemHandler = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); + if (itemHandler != null) + for (int i = 0; i < itemHandler.getSlots(); i++) + InventoryHelper.spawnItemStack(world, pos.getX(), pos.getY(), pos.getZ(), itemHandler.getStackInSlot(i)); + } + + @Override + public boolean isNormalCube(IBlockState state) { + return false; + } + + @Override + public boolean isOpaqueCube(IBlockState state) { + return false; + } + + @Override + public boolean causesSuffocation(IBlockState state) { + return false; + } + + @Override + public boolean isFullBlock(IBlockState state) { + return false; + } + + @Override + public boolean isFullCube(IBlockState state) { + return false; + } + + @Override + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Nullable + @Override + public TileEntity createTileEntity(World world, IBlockState state) { + return new TileBloodAltar(); + } + + @Nullable + @Override + public Item getItem() { + return new ItemBlock(this); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/block/BlockBloodRune.java b/src/main/java/com/wayoftime/bloodmagic/block/BlockBloodRune.java new file mode 100644 index 00000000..94c7ff7a --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/block/BlockBloodRune.java @@ -0,0 +1,19 @@ +package com.wayoftime.bloodmagic.block; + +import com.wayoftime.bloodmagic.core.altar.BloodRunes; +import net.minecraft.block.material.Material; + +public class BlockBloodRune extends BlockMundane { + + private final BloodRunes rune; + + public BlockBloodRune(BloodRunes rune) { + super(Material.ROCK, "blood_rune_" + rune.getName(), true); + + this.rune = rune; + } + + public BloodRunes getRune() { + return rune; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/block/BlockDemonDecor.java b/src/main/java/com/wayoftime/bloodmagic/block/BlockDemonDecor.java new file mode 100644 index 00000000..41eb4112 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/block/BlockDemonDecor.java @@ -0,0 +1,33 @@ +package com.wayoftime.bloodmagic.block; + +import com.wayoftime.bloodmagic.BloodMagic; +import com.wayoftime.bloodmagic.core.will.DemonWill; +import net.minecraft.block.material.Material; +import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import javax.annotation.Nullable; +import java.util.List; + +public class BlockDemonDecor extends BlockMundane { + + private final DemonWill type; + + public BlockDemonDecor(Material material, String decorType, DemonWill type) { + super(material, decorType + "_" + type.getName()); + + setTranslationKey(BloodMagic.MODID + ":" + decorType); + + this.type = type; + } + + @SideOnly(Side.CLIENT) + @Override + public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { + tooltip.add(I18n.format("tooltip.bloodmagic:demon_will_" + type.getName())); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/block/BlockMundane.java b/src/main/java/com/wayoftime/bloodmagic/block/BlockMundane.java new file mode 100644 index 00000000..f97583fe --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/block/BlockMundane.java @@ -0,0 +1,37 @@ +package com.wayoftime.bloodmagic.block; + +import com.wayoftime.bloodmagic.BloodMagic; +import com.wayoftime.bloodmagic.core.util.register.IItemProvider; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; + +import javax.annotation.Nullable; + +// QoL default block +public class BlockMundane extends Block implements IItemProvider { + + private final boolean hasItem; + + public BlockMundane(Material material, String name, boolean withItem) { + super(material); + + this.hasItem = withItem; + + setTranslationKey(BloodMagic.MODID + ":" + name); + setCreativeTab(BloodMagic.TAB_BM); + setRegistryName(name); + setDefaultState(getBlockState().getBaseState()); + } + + public BlockMundane(Material material, String name) { + this(material, name, true); + } + + @Nullable + @Override + public Item getItem() { + return hasItem ? new ItemBlock(this) : null; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/block/BlockStairsExtended.java b/src/main/java/com/wayoftime/bloodmagic/block/BlockStairsExtended.java new file mode 100644 index 00000000..ffdb36f6 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/block/BlockStairsExtended.java @@ -0,0 +1,36 @@ +package com.wayoftime.bloodmagic.block; + +import com.wayoftime.bloodmagic.BloodMagic; +import com.wayoftime.bloodmagic.core.util.register.IItemProvider; +import com.wayoftime.bloodmagic.core.util.register.IVariantProvider; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; +import net.minecraft.block.BlockStairs; +import net.minecraft.block.state.IBlockState; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; + +import javax.annotation.Nullable; + +// Because Mojang doesn't want us making our own stairs apparently +public class BlockStairsExtended extends BlockStairs implements IItemProvider, IVariantProvider { + + public BlockStairsExtended(IBlockState modelState) { + super(modelState); + + String name = modelState.getBlock().getRegistryName().getPath() + "_stairs"; + setRegistryName(name); + setTranslationKey(BloodMagic.MODID + ":" + name); + setCreativeTab(BloodMagic.TAB_BM); + } + + @Nullable + @Override + public Item getItem() { + return new ItemBlock(this); + } + + @Override + public void collectVariants(Int2ObjectMap variants) { + variants.put(0, "facing=south,half=bottom,shape=straight"); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/client/Sprite.java b/src/main/java/com/wayoftime/bloodmagic/client/Sprite.java new file mode 100644 index 00000000..8fd428d6 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/client/Sprite.java @@ -0,0 +1,56 @@ +package com.wayoftime.bloodmagic.client; + +import net.minecraft.client.renderer.BufferBuilder; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.util.ResourceLocation; + +public class Sprite { + + private final ResourceLocation textureLocation; + private final int textureX; + private final int textureY; + private final int textureWidth; + private final int textureHeight; + + public Sprite(ResourceLocation textureLocation, int textureX, int textureY, int textureWidth, int textureHeight) { + this.textureLocation = textureLocation; + this.textureX = textureX; + this.textureY = textureY; + this.textureWidth = textureWidth; + this.textureHeight = textureHeight; + } + + public ResourceLocation getTextureLocation() { + return textureLocation; + } + + public int getTextureX() { + return textureX; + } + + public int getTextureY() { + return textureY; + } + + public int getTextureWidth() { + return textureWidth; + } + + public int getTextureHeight() { + return textureHeight; + } + + public void draw(int x, int y) { + float f = 0.00390625F; + float f1 = 0.00390625F; + Tessellator tessellator = Tessellator.getInstance(); + BufferBuilder buffer = tessellator.getBuffer(); + buffer.begin(7, DefaultVertexFormats.POSITION_TEX); + buffer.pos((double) x, (double) (y + getTextureHeight()), 1.0F).tex((double) ((float) (getTextureX()) * f), (double) ((float) (getTextureY() + getTextureHeight()) * f1)).endVertex(); + buffer.pos((double) (x + getTextureWidth()), (double) (y + getTextureHeight()), 1.0F).tex((double) ((float) (getTextureX() + getTextureWidth()) * f), (double) ((float) (getTextureY() + getTextureHeight()) * f1)).endVertex(); + buffer.pos((double) (x + getTextureWidth()), (double) (y), 1.0F).tex((double) ((float) (getTextureX() + getTextureWidth()) * f), (double) ((float) (getTextureY()) * f1)).endVertex(); + buffer.pos((double) x, (double) (y), 1.0F).tex((double) ((float) (getTextureX()) * f), (double) ((float) (getTextureY()) * f1)).endVertex(); + tessellator.draw(); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/client/render/TESRBloodAltar.java b/src/main/java/com/wayoftime/bloodmagic/client/render/TESRBloodAltar.java new file mode 100644 index 00000000..75dc21a7 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/client/render/TESRBloodAltar.java @@ -0,0 +1,87 @@ +package com.wayoftime.bloodmagic.client.render; + +import com.wayoftime.bloodmagic.core.RegistrarBloodMagic; +import com.wayoftime.bloodmagic.tile.TileBloodAltar; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.items.CapabilityItemHandler; + +public class TESRBloodAltar extends TileEntitySpecialRenderer { + + private static final float MIN_HEIGHT = 0.499f; + private static final float MAX_HEIGHT = 0.745f; + private static final float SIZE = 0.8F; + + @Override + public void render(TileBloodAltar te, double x, double y, double z, float partialTicks, int destroyStage, float alpha) { + GlStateManager.pushMatrix(); + renderFluid(te, x, y, z); + GlStateManager.popMatrix(); + GlStateManager.pushMatrix(); + renderItem(te, x, y, z); + GlStateManager.popMatrix(); + } + + private void renderFluid(TileBloodAltar te, double x, double y, double z) { + FluidTank fluidTank = (FluidTank) te.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, null); + float level = (float) fluidTank.getFluidAmount() / (float) fluidTank.getCapacity(); + if (level <= 0) + return; + + GlStateManager.translate(x, y, z); + Tessellator tessellator = Tessellator.getInstance(); + BufferBuilder builder = tessellator.getBuffer(); + TextureAtlasSprite stillImage = Minecraft.getMinecraft().getTextureMapBlocks().getTextureExtry(RegistrarBloodMagic.FLUID_LIFE_ESSENCE.getStill().toString()); + if (stillImage == null) + return; + + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); + setGLColorFromInt(RegistrarBloodMagic.FLUID_LIFE_ESSENCE.getColor()); + GlStateManager.translate(0.5, MIN_HEIGHT + ((MAX_HEIGHT - MIN_HEIGHT) * level), 0.5); + + double uMin = (double) stillImage.getMinU(); + double uMax = (double) stillImage.getMaxU(); + double vMin = (double) stillImage.getMinV(); + double vMax = (double) stillImage.getMaxV(); + + builder.begin(7, DefaultVertexFormats.POSITION_TEX); + builder.pos(SIZE / 2f, 0, SIZE / 2f).tex(uMax, vMax).endVertex(); + builder.pos(SIZE / 2f, 0, -SIZE / 2f).tex(uMax, vMin).endVertex(); + builder.pos(-SIZE / 2f, 0, -SIZE / 2f).tex(uMin, vMin).endVertex(); + builder.pos(-SIZE / 2f, 0, SIZE / 2f).tex(uMin, vMax).endVertex(); + tessellator.draw(); + } + + private void renderItem(TileBloodAltar te, double x, double y, double z) { + ItemStack contained = te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null).getStackInSlot(0); + if (contained.isEmpty()) + return; + + GlStateManager.translate(x, y, z); + RenderItem itemRenderer = Minecraft.getMinecraft().getRenderItem(); + float rotation = 720.0F * (System.currentTimeMillis() & 0x3FFFL) / 0x3FFFL; + + GlStateManager.translate(0.5F, 0.9F, 0.5F); + GlStateManager.rotate(rotation, 0.0F, 1.0F, 0.0F); + + RenderHelper.enableStandardItemLighting(); + itemRenderer.renderItem(contained, ItemCameraTransforms.TransformType.GROUND); + RenderHelper.disableStandardItemLighting(); + } + + private static void setGLColorFromInt(int color) { + float red = (color >> 16 & 0xFF) / 255.0F; + float green = (color >> 8 & 0xFF) / 255.0F; + float blue = (color & 0xFF) / 255.0F; + + GlStateManager.color(red, green, blue, 1.0F); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/BloodMagicConfiguration.java b/src/main/java/com/wayoftime/bloodmagic/core/BloodMagicConfiguration.java new file mode 100644 index 00000000..5c9672df --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/BloodMagicConfiguration.java @@ -0,0 +1,19 @@ +package com.wayoftime.bloodmagic.core; + +import com.wayoftime.bloodmagic.BloodMagic; +import net.minecraftforge.common.config.Config; + +@Config(modid = BloodMagic.MODID, name = BloodMagic.MODID + "/" + BloodMagic.MODID, category = "") +public class BloodMagicConfiguration { + + public static LoggingConfig logging = new LoggingConfig(); + + public static class LoggingConfig { + @Config.Comment("Prints information like plugin detection and how long it takes plugins to load their various stages.") + public boolean enableApiLogging = true; + @Config.Comment("Extremely verbose logging for things like recipe addition.") + public boolean enableVerboseApiLogging; + @Config.Comment("Debug printing that may help with debugging certain issues.") + public boolean enableDebugLogging; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/RegistrarBloodMagic.java b/src/main/java/com/wayoftime/bloodmagic/core/RegistrarBloodMagic.java new file mode 100644 index 00000000..9fb6fbf5 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/RegistrarBloodMagic.java @@ -0,0 +1,41 @@ +package com.wayoftime.bloodmagic.core; + +import com.google.common.base.Stopwatch; +import com.wayoftime.bloodmagic.BloodMagic; +import com.wayoftime.bloodmagic.core.util.BMLog; +import com.wayoftime.bloodmagic.core.util.PluginUtil; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + +@Mod.EventBusSubscriber(modid = BloodMagic.MODID) +public class RegistrarBloodMagic { + + public static final Fluid FLUID_LIFE_ESSENCE = new Fluid(BloodMagic.MODID + ":life_essence", new ResourceLocation(BloodMagic.MODID, "blocks/life_essence_flowing"), new ResourceLocation(BloodMagic.MODID, "blocks/life_essence_still"), 0x8C150C); + + @SubscribeEvent + public static void registerBlocks(RegistryEvent.Register event) { + Stopwatch stopwatch = Stopwatch.createStarted(); + RegistrarBloodMagicBlocks.register(event.getRegistry()); + BMLog.DEBUG.info("Registered blocks in {}.", stopwatch.stop()); + } + + @SubscribeEvent + public static void registerItems(RegistryEvent.Register event) { + Stopwatch stopwatch = Stopwatch.createStarted(); + RegistrarBloodMagicItems.register(event.getRegistry()); + BMLog.DEBUG.info("Registered items in {}.", stopwatch.stop()); + } + + @SubscribeEvent + public static void registerRecipes(RegistryEvent event) { + Stopwatch stopwatch = Stopwatch.createStarted(); + PluginUtil.handlePluginStep(PluginUtil.RegistrationStep.RECIPE_REGISTER); + BMLog.DEBUG.info("Registered recipes in {}.", stopwatch.stop()); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/RegistrarBloodMagicBlocks.java b/src/main/java/com/wayoftime/bloodmagic/core/RegistrarBloodMagicBlocks.java new file mode 100644 index 00000000..8c234ca5 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/RegistrarBloodMagicBlocks.java @@ -0,0 +1,117 @@ +package com.wayoftime.bloodmagic.core; + +import com.google.common.collect.Lists; +import com.wayoftime.bloodmagic.BloodMagic; +import com.wayoftime.bloodmagic.block.BlockBloodAltar; +import com.wayoftime.bloodmagic.block.BlockBloodRune; +import com.wayoftime.bloodmagic.block.BlockMundane; +import com.wayoftime.bloodmagic.client.render.TESRBloodAltar; +import com.wayoftime.bloodmagic.core.altar.BloodRunes; +import com.wayoftime.bloodmagic.tile.TileBloodAltar; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.statemap.StateMapperBase; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.event.ModelRegistryEvent; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fluids.BlockFluidClassic; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fml.client.registry.ClientRegistry; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.registries.IForgeRegistry; + +import java.util.List; + +@GameRegistry.ObjectHolder(BloodMagic.MODID) +@Mod.EventBusSubscriber(modid = BloodMagic.MODID) +public class RegistrarBloodMagicBlocks { + + public static final Block LIFE_ESSENCE = Blocks.AIR; + public static final Block BLOOD_ALTAR = Blocks.AIR; + public static final Block BLOODSTONE_BRICK= Blocks.AIR; + public static final Block BLOODSTONE_TILE = Blocks.AIR; + + public static final Block BLOOD_RUNE_BLANK = Blocks.AIR; + public static final Block BLOOD_RUNE_SPEED = Blocks.AIR; + public static final Block BLOOD_RUNE_EFFICIENCY = Blocks.AIR; + public static final Block BLOOD_RUNE_SACRIFICE = Blocks.AIR; + public static final Block BLOOD_RUNE_SELF_SACRIFICE = Blocks.AIR; + public static final Block BLOOD_RUNE_DISPLACEMENT = Blocks.AIR; + public static final Block BLOOD_RUNE_CAPACITY = Blocks.AIR; + public static final Block BLOOD_RUNE_AUGMENTED_CAPACITY = Blocks.AIR; + public static final Block BLOOD_RUNE_ORB = Blocks.AIR; + public static final Block BLOOD_RUNE_ACCELERATION = Blocks.AIR; + public static final Block BLOOD_RUNE_CHARGING = Blocks.AIR; + + static List blocks; + + public static void register(IForgeRegistry registry) { + GameRegistry.registerTileEntity(TileBloodAltar.class, new ResourceLocation(BloodMagic.MODID, "blood_altar")); + FluidRegistry.addBucketForFluid(RegistrarBloodMagic.FLUID_LIFE_ESSENCE); + + blocks = Lists.newArrayList( + new BlockFluidClassic(RegistrarBloodMagic.FLUID_LIFE_ESSENCE, Material.WATER).setTranslationKey(BloodMagic.MODID + ".life_essence").setRegistryName("life_essence"), + new BlockBloodAltar().setRegistryName("blood_altar"), + new BlockMundane(Material.ROCK, "bloodstone_brick"), + new BlockMundane(Material.ROCK, "bloodstone_tile") + ); + + for (BloodRunes rune : BloodRunes.values()) + blocks.add(new BlockBloodRune(rune)); + + // TODO - Re-enable whenever I feel like it +// for (DemonWillType type : DemonWillType.VALUES) { +// blocks.add(new BlockDemonDecor(Material.ROCK, "demon_stone", type)); +// blocks.add(new BlockDemonDecor(Material.ROCK, "demon_stone_polished", type)); +// Block brickBlock; +// blocks.add(brickBlock = new BlockDemonDecor(Material.ROCK, "demon_brick", type)); +// blocks.add(new BlockDemonDecor(Material.ROCK, "demon_brick_small", type)); +// blocks.add(new BlockDemonDecor(Material.ROCK, "demon_tile", type)); +// blocks.add(new BlockDemonDecor(Material.ROCK, "demon_tile_special", type)); +// blocks.add(new BlockDemonDecor(Material.IRON, "demon_metal", type)); +// blocks.add(new BlockStairsExtended(brickBlock.getDefaultState()) { +// @SideOnly(Side.CLIENT) +// @Override +// public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { +// tooltip.add(I18n.format("tooltip.bloodmagic:demon_will_" + type.getName())); +// } +// }.setTranslationKey(BloodMagic.MODID + ":demon_stairs")); +// } + + registry.registerAll(blocks.toArray(new Block[0])); + } + + @SideOnly(Side.CLIENT) + @SubscribeEvent + public static void registerModels(ModelRegistryEvent event) { + ClientRegistry.bindTileEntitySpecialRenderer(TileBloodAltar.class, new TESRBloodAltar()); + + ModelLoader.setCustomStateMapper(LIFE_ESSENCE, new StateMapperBase() { + @Override + protected ModelResourceLocation getModelResourceLocation(IBlockState state) { + return new ModelResourceLocation(state.getBlock().getRegistryName(), "fluid"); + } + }); + + for (Block block : blocks) { + Item item = Item.getItemFromBlock(block); + if (item == Items.AIR) + continue; + + boolean flag = RegistrarBloodMagicItems.handleModel(item); + + + if (!flag) // If we haven't registered a model by now, we don't need any special handling so we'll just use the default model. + ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(item.getRegistryName(), "normal")); + } + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/RegistrarBloodMagicItems.java b/src/main/java/com/wayoftime/bloodmagic/core/RegistrarBloodMagicItems.java new file mode 100644 index 00000000..f66f7bc7 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/RegistrarBloodMagicItems.java @@ -0,0 +1,152 @@ +package com.wayoftime.bloodmagic.core; + +import com.google.common.collect.Lists; +import com.wayoftime.bloodmagic.BloodMagic; +import com.wayoftime.bloodmagic.core.network.BloodOrb; +import com.wayoftime.bloodmagic.core.util.register.IModelLocator; +import com.wayoftime.bloodmagic.core.will.DemonWill; +import com.wayoftime.bloodmagic.core.type.SlateType; +import com.wayoftime.bloodmagic.core.util.register.IItemProvider; +import com.wayoftime.bloodmagic.core.util.register.IVariantProvider; +import com.wayoftime.bloodmagic.item.*; +import com.wayoftime.bloodmagic.item.sigil.ItemSigil; +import com.wayoftime.bloodmagic.item.sigil.SigilAir; +import com.wayoftime.bloodmagic.item.sigil.SigilDivination; +import com.wayoftime.bloodmagic.item.sigil.SigilFastMiner; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; +import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.init.Items; +import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.event.ModelRegistryEvent; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.registries.IForgeRegistry; + +import java.util.List; + +@GameRegistry.ObjectHolder(BloodMagic.MODID) +@Mod.EventBusSubscriber(modid = BloodMagic.MODID) +public class RegistrarBloodMagicItems { + + public static final Item BLOOD_ORB_WEAK = Items.AIR; + public static final Item BLOOD_ORB_APPRENTICE = Items.AIR; + public static final Item BLOOD_ORB_MAGICIAN = Items.AIR; + public static final Item BLOOD_ORB_MASTER = Items.AIR; + public static final Item BLOOD_ORB_ARCHMAGE = Items.AIR; + public static final Item BLOOD_ORB_TRANSCENDENT = Items.AIR; + + public static final Item DAGGER_SELF_SACRIFICE = Items.AIR; + public static final Item DAGGER_SELF_SACRIFICE_CREATIVE = Items.AIR; + + public static final Item SLATE_BLANK = Items.AIR; + public static final Item SLATE_REINFORCED = Items.AIR; + public static final Item SLATE_IMBUED = Items.AIR; + public static final Item SLATE_DEMONIC = Items.AIR; + public static final Item SLATE_ETHEREAL = Items.AIR; + + public static final Item SIGIL_DIVINATION = Items.AIR; + public static final Item SIGIL_AIR = Items.AIR; + public static final Item SIGIL_FAST_MINER = Items.AIR; + + public static final Item LIVING_ARMOR_HEAD = Items.AIR; + public static final Item LIVING_ARMOR_CHEST = Items.AIR; + public static final Item LIVING_ARMOR_LEGS = Items.AIR; + public static final Item LIVING_ARMOR_FEET = Items.AIR; + public static final Item LIVING_TOME = Items.AIR; + + public static final Item SENTIENT_SWORD = Items.AIR; + public static final Item MONSTER_SOUL = Items.AIR; + public static final Item DEMON_WILL_CRYSTAL_RAW = Items.AIR; + public static final Item DEMON_WILL_CRYSTAL_CORROSIVE = Items.AIR; + public static final Item DEMON_WILL_CRYSTAL_DESTRUCTIVE = Items.AIR; + public static final Item DEMON_WILL_CRYSTAL_VENGEFUL = Items.AIR; + public static final Item DEMON_WILL_CRYSTAL_STEADFAST = Items.AIR; + + static List items = Lists.newArrayList(); + + public static void register(IForgeRegistry registry) { + for (Block block : RegistrarBloodMagicBlocks.blocks) { + if (block instanceof IItemProvider) { + Item item = ((IItemProvider) block).getItem(); + if (item != null) + items.add(item.setRegistryName(block.getRegistryName())); + } + } + + items.addAll(Lists.newArrayList( + new ItemBloodOrb(new BloodOrb(new ResourceLocation(BloodMagic.MODID, "weak"), 1, 5000, 2)), + new ItemBloodOrb(new BloodOrb(new ResourceLocation(BloodMagic.MODID, "apprentice"), 2, 25000, 5)), + new ItemBloodOrb(new BloodOrb(new ResourceLocation(BloodMagic.MODID, "magician"), 3, 150000, 15)), + new ItemBloodOrb(new BloodOrb(new ResourceLocation(BloodMagic.MODID, "master"), 4, 1000000, 25)), + new ItemBloodOrb(new BloodOrb(new ResourceLocation(BloodMagic.MODID, "archmage"), 5, 10000000, 50)), + new ItemBloodOrb(new BloodOrb(new ResourceLocation(BloodMagic.MODID, "transcendent"), 6, 30000000, 50)), + new ItemDaggerSelfSacrifice(ItemDaggerSelfSacrifice.Type.NORMAL), + new ItemDaggerSelfSacrifice(ItemDaggerSelfSacrifice.Type.CREATIVE), + new ItemMundane("slate_" + SlateType.BLANK.getName()), + new ItemMundane("slate_" + SlateType.REINFORCED.getName()), + new ItemMundane("slate_" + SlateType.IMBUED.getName()), + new ItemMundane("slate_" + SlateType.DEMONIC.getName()), + new ItemMundane("slate_" + SlateType.ETHEREAL.getName()), + new ItemSigil(new SigilDivination(), "divination"), + new ItemSigil(new SigilAir(), "air"), + new ItemSigil(new SigilFastMiner(), "fast_miner"), + new ItemLivingArmor(EntityEquipmentSlot.HEAD), + new ItemLivingArmor(EntityEquipmentSlot.CHEST), + new ItemLivingArmor(EntityEquipmentSlot.LEGS), + new ItemLivingArmor(EntityEquipmentSlot.FEET), + new ItemAltarBuilder(), + new ItemSentientSword(), + new ItemMonsterSoul() + )); + + for (DemonWill type : DemonWill.VALUES) + items.add(new ItemMundane("demon_will_crystal_" + type.getName())); + + items.add(new ItemLivingTome()); // Last so it's at the bottom of the creative tab + + registry.registerAll(items.toArray(new Item[0])); + } + + @SideOnly(Side.CLIENT) + @SubscribeEvent + public static void registerModels(ModelRegistryEvent event) { + for (Item item : items) { + boolean flag = handleModel(item); + + if (!flag) { // If we haven't registered a model by now, we don't need any special handling so we'll just use the default model. + ResourceLocation modelPath = item.getRegistryName(); + if (item instanceof IModelLocator) + modelPath = ((IModelLocator) item).getModelPath(); + + ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(modelPath, item instanceof ItemBlock ? "normal" : "inventory")); + } + } + } + + static boolean handleModel(Item item) { + if (item instanceof IVariantProvider) { + ResourceLocation modelPath = item.getRegistryName(); + if (item instanceof IModelLocator) + modelPath = ((IModelLocator) item).getModelPath(); + + Int2ObjectMap variants = new Int2ObjectOpenHashMap<>(); + ((IVariantProvider) item).collectVariants(variants); + + for (Int2ObjectMap.Entry entry : variants.int2ObjectEntrySet()) + ModelLoader.setCustomModelResourceLocation(item, entry.getIntKey(), new ModelResourceLocation(modelPath, entry.getValue())); + + return true; + } + + return false; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/RegistrarBloodMagicLivingArmor.java b/src/main/java/com/wayoftime/bloodmagic/core/RegistrarBloodMagicLivingArmor.java new file mode 100644 index 00000000..262ec531 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/RegistrarBloodMagicLivingArmor.java @@ -0,0 +1,108 @@ +package com.wayoftime.bloodmagic.core; + +import com.google.common.collect.Maps; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.wayoftime.bloodmagic.BloodMagic; +import com.wayoftime.bloodmagic.core.living.LivingUpgrade; +import com.wayoftime.bloodmagic.core.util.ResourceUtil; +import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import org.apache.commons.io.FilenameUtils; +import org.apache.commons.io.IOUtils; + +import javax.annotation.Nonnull; +import java.nio.charset.StandardCharsets; +import java.nio.file.Path; +import java.util.Map; +import java.util.stream.Collectors; + +/* + * TODO - See checklist + * - [-] Upgrades (Names pulled from 2.0 class names) + * - [x] Arrow Protect + * - [-] Arrow Shot + * - [-] Critical Strike + * - [ ] Digging + * - [ ] Elytra + * - This will wait for Forge to add the ability to make them properly. I'm not adding that hacky shit back in. + * - [ ] Experience + * - [ ] Fall Protect + * - [ ] Fire Resist + * - [ ] Grave Digger + * - [ ] Grim Reaper Sprint + * - [ ] Health boost + * - [x] Jump + * - [ ] Knockback Resist + * - [ ] Melee Damage + * - [ ] Night Sight + * - [ ] Physical Protect + * - [ ] Poison Resist + * - [ ] Repairing + * - [ ] Self Sacrifice + * - [ ] Solar Powered + * - [ ] Speed + * - [ ] Sprint Attack + * - [ ] Step Assist + * - [ ] Downgrades (Names pulled from 2.0 class names) + * - [ ] Battle Hungry + * - [ ] Crippled Arm + * - [ ] Dig Slowdown + * - [ ] Disoriented + * - [ ] Melee Decrease + * - [ ] Quenched + * - [ ] Slippery + * - [ ] Slow Heal + * - [ ] Slowness + * - [ ] Storm Trooper + * - [-] Equipment + * - [x] Living Helmet + * - [x] Living Chestplate + * - [x] Living Leggings + * - [x] Living Boots + * - [ ] Tools (Replacements for Bound equipment. Need their own (up|down)grade sets once implemented.) + * - [ ] Living Sword + * - [ ] Living Pickaxe + * - [ ] Living Axe + * - [ ] Living Shovel + */ +@Mod.EventBusSubscriber(modid = BloodMagic.MODID) +public class RegistrarBloodMagicLivingArmor { + + private static final Map DEFINITIONS = ResourceUtil.gatherResources("/data", "living_armor", p -> FilenameUtils.getExtension(p.toFile().getName()).equals("json")).stream().collect(Collectors.toMap(key -> FilenameUtils.getBaseName(key.toFile().getName()), value -> value)); + private static final Gson GSON = new GsonBuilder().serializeNulls().create(); + public static final Map UPGRADES = Maps.newHashMap(); + public static final LivingUpgrade UPGRADE_ARROW_PROTECT = parseDefinition("arrow_protect"); + public static final LivingUpgrade UPGRADE_ARROW_SHOT = parseDefinition("arrow_shot"); + public static final LivingUpgrade UPGRADE_CRITICAL_STRIKE = parseDefinition("critical_strike"); + public static final LivingUpgrade UPGRADE_JUMP = parseDefinition("jump"); + + @SubscribeEvent + public static void registerUpgrades(RegistryEvent.Register event) { + addUpgrade(UPGRADE_ARROW_PROTECT); + addUpgrade(UPGRADE_ARROW_SHOT); + addUpgrade(UPGRADE_CRITICAL_STRIKE); + addUpgrade(UPGRADE_JUMP); + } + + private static void addUpgrade(LivingUpgrade upgrade) { + UPGRADES.put(upgrade.getKey(), upgrade); + } + + @Nonnull + public static LivingUpgrade parseDefinition(String fileName) { + Path path = DEFINITIONS.get(fileName); + if (path == null) + return LivingUpgrade.DUMMY; + + try { + return GSON.fromJson(IOUtils.toString(path.toUri(), StandardCharsets.UTF_8), LivingUpgrade.class); + } catch (Exception e) { + e.printStackTrace(); + return LivingUpgrade.DUMMY; + } + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/com/wayoftime/bloodmagic/core/RegistrarBloodMagicRecipes.java new file mode 100644 index 00000000..75f89717 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -0,0 +1,41 @@ +package com.wayoftime.bloodmagic.core; + +import com.wayoftime.bloodmagic.api.impl.BloodMagicRecipeRegistrar; +import com.wayoftime.bloodmagic.core.altar.AltarTier; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidUtil; +import net.minecraftforge.oredict.OreIngredient; + +import static com.wayoftime.bloodmagic.core.RegistrarBloodMagicItems.*; + +public class RegistrarBloodMagicRecipes { + + public static void registerAltarRecipes(BloodMagicRecipeRegistrar registrar) { + // Tier 1 + registrar.addBloodAltar(new OreIngredient("gemDiamond"), new ItemStack(BLOOD_ORB_WEAK), AltarTier.ONE, 2000, 2, 1); + registrar.addBloodAltar(new OreIngredient("stone"), new ItemStack(SLATE_BLANK), AltarTier.ONE, 1000, 5, 5); + registrar.addBloodAltar(Ingredient.fromItem(Items.BUCKET), FluidUtil.getFilledBucket(new FluidStack(RegistrarBloodMagic.FLUID_LIFE_ESSENCE, 1000)), AltarTier.ONE, 1000, 5, 5); + + // Tier 2 + registrar.addBloodAltar(new OreIngredient("blockRedstone"), new ItemStack(BLOOD_ORB_APPRENTICE), AltarTier.TWO, 5000, 5, 5); + registrar.addBloodAltar(Ingredient.fromItem(SLATE_BLANK), new ItemStack(SLATE_REINFORCED), AltarTier.TWO, 2000, 5, 5); + + // Tier 3 + registrar.addBloodAltar(new OreIngredient("blockGold"), new ItemStack(BLOOD_ORB_MAGICIAN), AltarTier.THREE, 25000, 20, 20); + registrar.addBloodAltar(Ingredient.fromItem(SLATE_REINFORCED), new ItemStack(SLATE_IMBUED), AltarTier.THREE, 5000, 15, 10); + + // Tier 4 + registrar.addBloodAltar(new OreIngredient("ingotIron"), new ItemStack(BLOOD_ORB_MASTER), AltarTier.FOUR, 40000, 30, 50); // TODO - Blood Shard input + registrar.addBloodAltar(Ingredient.fromItem(SLATE_IMBUED), new ItemStack(SLATE_DEMONIC), AltarTier.FOUR, 15000, 20, 20); + + // Tier 5 + registrar.addBloodAltar(new OreIngredient("netherStar"), new ItemStack(BLOOD_ORB_ARCHMAGE), AltarTier.FIVE, 80000, 50, 100); + registrar.addBloodAltar(Ingredient.fromItem(SLATE_DEMONIC), new ItemStack(SLATE_ETHEREAL), AltarTier.FIVE, 30000, 40, 100); + + // Tier 6 + registrar.addBloodAltar(new OreIngredient("gemDiamond"), new ItemStack(BLOOD_ORB_TRANSCENDENT), AltarTier.SIX, 200000, 100, 200); // TODO - Whatever this input is supposed to be + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/altar/AltarComponent.java b/src/main/java/com/wayoftime/bloodmagic/core/altar/AltarComponent.java new file mode 100644 index 00000000..79f77c01 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/altar/AltarComponent.java @@ -0,0 +1,36 @@ +package com.wayoftime.bloodmagic.core.altar; + +import net.minecraft.util.math.BlockPos; + +public class AltarComponent { + + private final BlockPos offset; + private final ComponentType type; + private boolean upgradeSlot; + + public AltarComponent(BlockPos offset, ComponentType type) { + this.offset = offset; + this.type = type; + } + + public AltarComponent(BlockPos offset) { + this(offset, ComponentType.NOT_AIR); + } + + public BlockPos getOffset() { + return offset; + } + + public ComponentType getType() { + return type; + } + + public AltarComponent asUpgradeSlot() { + this.upgradeSlot = true; + return this; + } + + public boolean isUpgradeSlot() { + return upgradeSlot; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/altar/AltarTier.java b/src/main/java/com/wayoftime/bloodmagic/core/altar/AltarTier.java new file mode 100644 index 00000000..9fb6c42c --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/altar/AltarTier.java @@ -0,0 +1,147 @@ +package com.wayoftime.bloodmagic.core.altar; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; +import net.minecraft.util.math.BlockPos; + +import java.util.List; +import java.util.function.Consumer; + +import static com.wayoftime.bloodmagic.core.altar.ComponentType.*; + +public enum AltarTier { + + ONE { + @Override + public void buildComponents(Consumer components) { + // No-op + } + }, + TWO { + @Override + public void buildComponents(Consumer components) { + components.accept(new AltarComponent(new BlockPos(-1, -1, -1), BLOOD_RUNE)); + components.accept(new AltarComponent(new BlockPos(0, -1, -1), BLOOD_RUNE).asUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(1, -1, -1), BLOOD_RUNE)); + components.accept(new AltarComponent(new BlockPos(-1, -1, 0), BLOOD_RUNE).asUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(1, -1, 0), BLOOD_RUNE).asUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(-1, -1, 1), BLOOD_RUNE)); + components.accept(new AltarComponent(new BlockPos(0, -1, 1), BLOOD_RUNE).asUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(1, -1, 1), BLOOD_RUNE)); + } + }, + THREE { + @Override + public void buildComponents(Consumer components) { + // Re-list the tier 2 non-upgrade components. Leaves out the upgradeable components so they aren't double counted + components.accept(new AltarComponent(new BlockPos(-1, -1, -1), BLOOD_RUNE).asUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(1, -1, -1), BLOOD_RUNE).asUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(-1, -1, 1), BLOOD_RUNE).asUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(1, -1, 1), BLOOD_RUNE).asUpgradeSlot()); + + components.accept(new AltarComponent(new BlockPos(-3, -1, -3))); + components.accept(new AltarComponent(new BlockPos(-3, 0, -3))); + components.accept(new AltarComponent(new BlockPos(3, -1, -3))); + components.accept(new AltarComponent(new BlockPos(3, 0, -3))); + components.accept(new AltarComponent(new BlockPos(-3, -1, 3))); + components.accept(new AltarComponent(new BlockPos(-3, 0, 3))); + components.accept(new AltarComponent(new BlockPos(3, -1, 3))); + components.accept(new AltarComponent(new BlockPos(3, 0, 3))); + components.accept(new AltarComponent(new BlockPos(-3, 1, -3), GLOWSTONE)); + components.accept(new AltarComponent(new BlockPos(3, 1, -3), GLOWSTONE)); + components.accept(new AltarComponent(new BlockPos(-3, 1, 3), GLOWSTONE)); + components.accept(new AltarComponent(new BlockPos(3, 1, 3), GLOWSTONE)); + + for (int i = -2; i <= 2; i++) { + components.accept(new AltarComponent(new BlockPos(3, -2, i), BLOOD_RUNE).asUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(-3, -2, i), BLOOD_RUNE).asUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(i, -2, 3), BLOOD_RUNE).asUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(i, -2, -3), BLOOD_RUNE).asUpgradeSlot()); + } + } + }, + FOUR { + @Override + public void buildComponents(Consumer components) { + for (int i = -3; i <= 3; i++) { + components.accept(new AltarComponent(new BlockPos(5, -3, i), BLOOD_RUNE).asUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(-5, -3, i), BLOOD_RUNE).asUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(i, -3, 5), BLOOD_RUNE).asUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(i, -3, -5), BLOOD_RUNE).asUpgradeSlot()); + } + + for (int i = -2; i <= 1; i++) { + components.accept(new AltarComponent(new BlockPos(5, i, 5))); + components.accept(new AltarComponent(new BlockPos(5, i, -5))); + components.accept(new AltarComponent(new BlockPos(-5, i, -5))); + components.accept(new AltarComponent(new BlockPos(-5, i, 5))); + } + + components.accept(new AltarComponent(new BlockPos(5, 2, 5), BLOODSTONE)); + components.accept(new AltarComponent(new BlockPos(5, 2, -5), BLOODSTONE)); + components.accept(new AltarComponent(new BlockPos(-5, 2, -5), BLOODSTONE)); + components.accept(new AltarComponent(new BlockPos(-5, 2, 5), BLOODSTONE)); + } + }, + FIVE { + @Override + public void buildComponents(Consumer components) { + components.accept(new AltarComponent(new BlockPos(-8, -3, 8), BEACON)); + components.accept(new AltarComponent(new BlockPos(-8, -3, -8), BEACON)); + components.accept(new AltarComponent(new BlockPos(8, -3, -8), BEACON)); + components.accept(new AltarComponent(new BlockPos(8, -3, 8), BEACON)); + + for (int i = -6; i <= 6; i++) { + components.accept(new AltarComponent(new BlockPos(8, -4, i), BLOOD_RUNE).asUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(-8, -4, i), BLOOD_RUNE).asUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(i, -4, 8), BLOOD_RUNE).asUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(i, -4, -8), BLOOD_RUNE).asUpgradeSlot()); + } + } + }, + SIX { + @Override + public void buildComponents(Consumer components) { + for (int i = -4; i <= 2; i++) { + components.accept(new AltarComponent(new BlockPos(11, i, 11))); + components.accept(new AltarComponent(new BlockPos(-11, i, -11))); + components.accept(new AltarComponent(new BlockPos(11, i, -11))); + components.accept(new AltarComponent(new BlockPos(-11, i, 11))); + } + + components.accept(new AltarComponent(new BlockPos(11, 3, 11), CRYSTAL)); + components.accept(new AltarComponent(new BlockPos(-11, 3, -11), CRYSTAL)); + components.accept(new AltarComponent(new BlockPos(11, 3, -11), CRYSTAL)); + components.accept(new AltarComponent(new BlockPos(-11, 3, 11), CRYSTAL)); + + for (int i = -9; i <= 9; i++) { + components.accept(new AltarComponent(new BlockPos(11, -5, i), BLOOD_RUNE).asUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(-11, -5, i), BLOOD_RUNE).asUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(i, -5, 11), BLOOD_RUNE).asUpgradeSlot()); + components.accept(new AltarComponent(new BlockPos(i, -5, -11), BLOOD_RUNE).asUpgradeSlot()); + } + } + }; + + public static final AltarTier[] VALUES = values(); + + private final List components; + private final int displayInt; + + AltarTier() { + List list = Lists.newArrayList(); + buildComponents(list::add); + this.components = ImmutableList.copyOf(list); + this.displayInt = ordinal() + 1; + } + + public abstract void buildComponents(Consumer components); + + public List getComponents() { + return components; + } + + public int getDisplayNumber() { + return displayInt; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/altar/AltarUpgrades.java b/src/main/java/com/wayoftime/bloodmagic/core/altar/AltarUpgrades.java new file mode 100644 index 00000000..8ea6b3b1 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/altar/AltarUpgrades.java @@ -0,0 +1,70 @@ +package com.wayoftime.bloodmagic.core.altar; + +import com.google.common.collect.Maps; +import net.minecraftforge.fluids.Fluid; + +import java.util.EnumMap; + +import static com.wayoftime.bloodmagic.core.altar.BloodRunes.*; + +public class AltarUpgrades { + + private final EnumMap upgrades; + + public AltarUpgrades() { + this.upgrades = Maps.newEnumMap(BloodRunes.class); + } + + public AltarUpgrades upgrade(BloodRunes runeType) { + upgrades.compute(runeType, (k, v) -> v == null ? 1 : v + 1); + return this; + } + + public int getAccelerationCount() { + return getCount(ACCELERATION); + } + + public float getCapacityModifier() { + return (float) ((1 * Math.pow(1.10, getCount(AUGMENTED_CAPACITY))) + 0.20 * getCount(CAPACITY)); + } + + public int getChargingFrequency() { + return Math.max(20 - getCount(ACCELERATION), 1); + } + + public int getChargingRate() { + return (int) (10 * getCount(CHARGING) * (1 + getConsumptionModifier() / 2)); + } + + public float getConsumptionModifier() { + return (float) (0.20 * getCount(SPEED)); + } + + public float getDislocationModifier() { + return (float) (Math.pow(1.2, getCount(DISPLACEMENT))); + } + + public float getEfficiencyModifier() { + return (float) Math.pow(0.85, getCount(EFFICIENCY)); + } + + public int getMaxCharge() { + return (int) (Fluid.BUCKET_VOLUME * Math.max(0.5 * getCapacityModifier(), 1) * getCount(CHARGING)); + } + + public float getOrbCapacityModifier() { + return (float) (1.02 * getCount(ORB)); + } + + public float getSacrificeModifier() { + return (float) (0.10 * getCount(SACRIFICE)); + } + + public float getSelfSacrificeModifier() { + return (float) (0.10 * getCount(SELF_SACRIFICE)); + } + + public int getCount(BloodRunes rune) { + return upgrades.getOrDefault(rune, 0); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/altar/AltarUtil.java b/src/main/java/com/wayoftime/bloodmagic/core/altar/AltarUtil.java new file mode 100644 index 00000000..26fe81d1 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/altar/AltarUtil.java @@ -0,0 +1,151 @@ +package com.wayoftime.bloodmagic.core.altar; + +import com.google.common.collect.Maps; +import com.wayoftime.bloodmagic.api.impl.BloodMagicAPI; +import com.wayoftime.bloodmagic.block.BlockBloodRune; +import com.wayoftime.bloodmagic.core.RegistrarBloodMagic; +import com.wayoftime.bloodmagic.core.RegistrarBloodMagicBlocks; +import com.wayoftime.bloodmagic.core.util.BooleanResult; +import com.wayoftime.bloodmagic.event.SacrificeEvent; +import com.wayoftime.bloodmagic.tile.TileBloodAltar; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fluids.FluidStack; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.EnumMap; +import java.util.List; + +public class AltarUtil { + + private static final EnumMap COMPONENT_DEFAULT_STATES; + static { + COMPONENT_DEFAULT_STATES = Maps.newEnumMap(ComponentType.class); + COMPONENT_DEFAULT_STATES.put(ComponentType.GLOWSTONE, Blocks.GLOWSTONE.getDefaultState()); + COMPONENT_DEFAULT_STATES.put(ComponentType.BLOODSTONE, RegistrarBloodMagicBlocks.BLOODSTONE_BRICK.getDefaultState()); + COMPONENT_DEFAULT_STATES.put(ComponentType.BEACON, Blocks.BEACON.getDefaultState()); + COMPONENT_DEFAULT_STATES.put(ComponentType.BLOOD_RUNE, RegistrarBloodMagicBlocks.BLOOD_RUNE_BLANK.getDefaultState()); + COMPONENT_DEFAULT_STATES.put(ComponentType.CRYSTAL, Blocks.BEDROCK.getDefaultState()); // FIXME - Crystal + COMPONENT_DEFAULT_STATES.put(ComponentType.NOT_AIR, Blocks.STONEBRICK.getDefaultState()); + } + + public static BooleanResult handleSacrifice(EntityLivingBase living, int baseAmount) { + TileBloodAltar altar = findNearestAltar(living.getEntityWorld(), new BlockPos(living), 2); + if (altar == null) + return new BooleanResult<>(0, false); + + boolean isPlayer = living instanceof EntityPlayer; + AltarUpgrades upgrades = altar.getUpgrades(); + int modifiedAmount = (int) (baseAmount * (1 + (isPlayer ? upgrades.getSelfSacrificeModifier() : upgrades.getSacrificeModifier()))); + + SacrificeEvent event = isPlayer ? new SacrificeEvent.SelfSacrifice(living, baseAmount, modifiedAmount) : new SacrificeEvent(living, baseAmount, modifiedAmount); + MinecraftForge.EVENT_BUS.post(event); + modifiedAmount = event.getModifiedAmount(); + + int filled = altar.getTank().fill(new FluidStack(RegistrarBloodMagic.FLUID_LIFE_ESSENCE, modifiedAmount), true); + if (filled != 0) + altar.markDirty(); + + return new BooleanResult<>(filled, true); + } + + public static BooleanResult handleSacrifice(EntityLivingBase living) { + boolean isPlayer = living instanceof EntityPlayer; + int baseAmount = isPlayer ? 200 : BloodMagicAPI.INSTANCE.getValueManager().getSacrificial().getOrDefault(EntityList.getKey(living), 200); + return handleSacrifice(living, baseAmount); + } + + @Nonnull + public static AltarTier getTier(World world, BlockPos pos) { + TileEntity tile = world.getTileEntity(pos); + if (!(tile instanceof TileBloodAltar)) + return AltarTier.ONE; + + AltarTier lastCheck = AltarTier.ONE; + for (AltarTier tier : AltarTier.VALUES) { + for (AltarComponent component : tier.getComponents()) { + List validStates = BloodMagicAPI.INSTANCE.getComponentStates(component.getType()); + IBlockState worldState = world.getBlockState(pos.add(component.getOffset())); + if (component.getType() == ComponentType.NOT_AIR && worldState.getMaterial() != Material.AIR) + continue; + + if (!validStates.contains(worldState)) + return lastCheck; + } + + lastCheck = tier; + } + + return lastCheck; + } + + @Nonnull + public static AltarUpgrades getUpgrades(World world, BlockPos pos, AltarTier currentTier) { + AltarUpgrades upgrades = new AltarUpgrades(); + + for (AltarTier tier : AltarTier.VALUES) { + if (tier.ordinal() > currentTier.ordinal()) + break; + + for (AltarComponent component : tier.getComponents()) { + if (!component.isUpgradeSlot() || component.getType() != ComponentType.BLOOD_RUNE) + continue; + + IBlockState state = world.getBlockState(pos.add(component.getOffset())); + if (state.getBlock() instanceof BlockBloodRune) + upgrades.upgrade(((BlockBloodRune) state.getBlock()).getRune()); + } + } + + return upgrades; + } + + // FIXME - This does not search properly. It may provide an altar that isn't the closest + @Nullable + public static TileBloodAltar findNearestAltar(World world, BlockPos pos, int searchRadius) { + BlockPos.MutableBlockPos offsetPos = new BlockPos.MutableBlockPos(pos); + for (int x = -searchRadius; x < searchRadius; x++) { + for (int y = -searchRadius; y < searchRadius; y++) { + for (int z = -searchRadius; z < searchRadius; z++) { + TileEntity tile = world.getTileEntity(offsetPos.setPos(pos.getX() + x, pos.getY() + y, pos.getZ() + z)); + if (tile instanceof TileBloodAltar) + return (TileBloodAltar) tile; + } + } + } + + return null; + } + + public static void constructAltar(World world, BlockPos altarPos, AltarTier buildTo) { + BlockPos.MutableBlockPos mutablePos = new BlockPos.MutableBlockPos(); + for (AltarTier tier : AltarTier.VALUES) { + if (tier.ordinal() > buildTo.ordinal()) + return; + + for (AltarComponent component : tier.getComponents()) { + mutablePos.setPos(altarPos.getX() + component.getOffset().getX(), altarPos.getY() + component.getOffset().getY(), altarPos.getZ() + component.getOffset().getZ()); + world.setBlockState(mutablePos, COMPONENT_DEFAULT_STATES.get(component.getType())); + } + } + } + + public static void destroyAltar(World world, BlockPos altarPos) { + BlockPos.MutableBlockPos mutablePos = new BlockPos.MutableBlockPos(); + for (AltarTier tier : AltarTier.VALUES) { + for (AltarComponent component : tier.getComponents()) { + mutablePos.setPos(altarPos.getX() + component.getOffset().getX(), altarPos.getY() + component.getOffset().getY(), altarPos.getZ() + component.getOffset().getZ()); + world.setBlockToAir(mutablePos); + } + } + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/altar/BloodRunes.java b/src/main/java/com/wayoftime/bloodmagic/core/altar/BloodRunes.java new file mode 100644 index 00000000..9c10a8c1 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/altar/BloodRunes.java @@ -0,0 +1,26 @@ +package com.wayoftime.bloodmagic.core.altar; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum BloodRunes implements IStringSerializable { + + BLANK, + SPEED, + EFFICIENCY, + SACRIFICE, + SELF_SACRIFICE, + DISPLACEMENT, + CAPACITY, + AUGMENTED_CAPACITY, + ORB, + ACCELERATION, + CHARGING, + ; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/altar/ComponentType.java b/src/main/java/com/wayoftime/bloodmagic/core/altar/ComponentType.java new file mode 100644 index 00000000..212283ae --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/altar/ComponentType.java @@ -0,0 +1,14 @@ +package com.wayoftime.bloodmagic.core.altar; + +public enum ComponentType { + + GLOWSTONE, + BLOODSTONE, + BEACON, + BLOOD_RUNE, + CRYSTAL, + NOT_AIR, + ; + + public static final ComponentType[] VALUES = values(); +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/altar/IAltarManipulator.java b/src/main/java/com/wayoftime/bloodmagic/core/altar/IAltarManipulator.java new file mode 100644 index 00000000..22ca8db8 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/altar/IAltarManipulator.java @@ -0,0 +1,25 @@ +package com.wayoftime.bloodmagic.core.altar; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +/** + * Allows items to interact with the altar via right click without being inserted. + */ +public interface IAltarManipulator { + + /** + * Allows an item to decide whether or not it should be inserted into the altar. + * + * @param player The player interacting with the altar + * @param stack The ItemStack being tested + * @param world The World the altar is in + * @param pos The position in the world of the altar + * @return false if the item should be inserted, true if not. + */ + default boolean tryManipulate(EntityPlayer player, ItemStack stack, World world, BlockPos pos) { + return true; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/living/ILivingContainer.java b/src/main/java/com/wayoftime/bloodmagic/core/living/ILivingContainer.java new file mode 100644 index 00000000..dfaf0419 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/living/ILivingContainer.java @@ -0,0 +1,54 @@ +package com.wayoftime.bloodmagic.core.living; + +import net.minecraft.client.resources.I18n; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.input.Keyboard; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.List; + +public interface ILivingContainer { + + @Nullable + default LivingStats getLivingStats(@Nonnull ItemStack stack) { + if (!stack.hasTagCompound() || !stack.getTagCompound().hasKey("livingStats")) + return null; + + return LivingStats.fromNBT(stack.getTagCompound().getCompoundTag("livingStats")); + } + + default void updateLivingStates(@Nonnull ItemStack stack, @Nullable LivingStats stats) { + if (stats == null) { + if (stack.hasTagCompound()) + stack.getTagCompound().removeTag("livingStats"); + return; + } + + if (!stack.hasTagCompound()) + stack.setTagCompound(new NBTTagCompound()); + + stack.getTagCompound().setTag("livingStats", stats.serializeNBT()); + } + + @SideOnly(Side.CLIENT) + static void appendLivingTooltip(LivingStats stats, List tooltip, boolean trainable) { + if (stats != null) { + if (trainable) + tooltip.add(I18n.format("tooltip.bloodmagic:living_points", stats.getUsedPoints(), stats.getMaxPoints())); + + stats.getUpgrades().forEach((k, v) -> { + if (k.getLevel(v) <= 0) + return; + + if (!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || k.getNextRequirement(v) == 0) + tooltip.add(I18n.format(k.getUnlocalizedName()) + " " + I18n.format("enchantment.level." + k.getLevel(v))); + else + tooltip.add(I18n.format(k.getUnlocalizedName()) + ": " + v + "/" + k.getNextRequirement(v)); + }); + } + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/living/LivingStats.java b/src/main/java/com/wayoftime/bloodmagic/core/living/LivingStats.java new file mode 100644 index 00000000..efe16fea --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/living/LivingStats.java @@ -0,0 +1,136 @@ +package com.wayoftime.bloodmagic.core.living; + +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; +import com.wayoftime.bloodmagic.core.RegistrarBloodMagicLivingArmor; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.util.INBTSerializable; + +import javax.annotation.Nullable; +import java.util.Map; + +public class LivingStats implements INBTSerializable { + + public static final int DEFAULT_UPGRADE_POINTS = 100; + + private final Map upgrades; + private int maxPoints = DEFAULT_UPGRADE_POINTS; + + public LivingStats(Map upgrades) { + this.upgrades = upgrades; + } + + public LivingStats() { + this(Maps.newHashMap()); + } + + public Map getUpgrades() { + return ImmutableMap.copyOf(upgrades); + } + + public LivingStats addExperience(ResourceLocation key, int experience) { + LivingUpgrade upgrade = RegistrarBloodMagicLivingArmor.UPGRADES.get(key); + int current = upgrades.getOrDefault(upgrade, 0); + if (upgrade.getNextRequirement(current) == 0) + return this; + + upgrades.put(upgrade, current + experience); + return this; + } + + public int getLevel(ResourceLocation key) { + LivingUpgrade upgrade = RegistrarBloodMagicLivingArmor.UPGRADES.get(key); + return upgrade.getLevel(upgrades.getOrDefault(upgrade, 0)); + } + + public int getUsedPoints() { + int total = 0; + for (Map.Entry applied : upgrades.entrySet()) { + int experience = applied.getValue(); + int level = applied.getKey().getLevel(experience); + int cost = applied.getKey().getLevelCost(level); + total += cost; + } + + return total; + } + + public int getMaxPoints() { + return maxPoints; + } + + public LivingStats setMaxPoints(int maxPoints) { + this.maxPoints = maxPoints; + return this; + } + + @Override + public NBTTagCompound serializeNBT() { + NBTTagCompound compound = new NBTTagCompound(); + NBTTagList statList = new NBTTagList(); + upgrades.forEach((k, v) -> { + NBTTagCompound upgrade = new NBTTagCompound(); + upgrade.setString("key", k.getKey().toString()); + upgrade.setInteger("exp", v); + statList.appendTag(upgrade); + }); + compound.setTag("upgrades", statList); + + compound.setInteger("maxPoints", maxPoints); + + return compound; + } + + @Override + public void deserializeNBT(NBTTagCompound nbt) { + NBTTagList statList = nbt.getTagList("upgrades", 10); + + for (NBTBase base : statList) { + if (!(base instanceof NBTTagCompound)) + continue; + + LivingUpgrade upgrade = RegistrarBloodMagicLivingArmor.UPGRADES.get(new ResourceLocation(((NBTTagCompound) base).getString("key"))); + if (upgrade == null) + continue; + int experience = ((NBTTagCompound) base).getInteger("exp"); + upgrades.put(upgrade, experience); + } + + maxPoints = nbt.getInteger("maxPoints"); + } + + public static LivingStats fromNBT(NBTTagCompound statTag) { + LivingStats stats = new LivingStats(); + stats.deserializeNBT(statTag); + return stats; + } + + @Nullable + public static LivingStats fromPlayer(EntityPlayer player) { + return fromPlayer(player, false); + } + + @Nullable + public static LivingStats fromPlayer(EntityPlayer player, boolean createNew) { + if (!LivingUtil.hasFullSet(player)) + return null; + + ItemStack chest = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + LivingStats stats = ((ILivingContainer) chest.getItem()).getLivingStats(chest); + return stats == null && createNew ? new LivingStats() : stats; + } + + public static void toPlayer(EntityPlayer player, LivingStats stats) { + if (!LivingUtil.hasFullSet(player)) + return; + + ItemStack chest = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST); + ((ILivingContainer) chest.getItem()).updateLivingStates(chest, stats); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/living/LivingStatusWatcher.java b/src/main/java/com/wayoftime/bloodmagic/core/living/LivingStatusWatcher.java new file mode 100644 index 00000000..e71a0ec4 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/living/LivingStatusWatcher.java @@ -0,0 +1,73 @@ +package com.wayoftime.bloodmagic.core.living; + +import com.wayoftime.bloodmagic.BloodMagic; +import com.wayoftime.bloodmagic.core.RegistrarBloodMagicLivingArmor; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.DamageSource; +import net.minecraft.util.math.Vec3d; +import net.minecraftforge.event.entity.living.LivingEvent; +import net.minecraftforge.event.entity.living.LivingHurtEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + +@Mod.EventBusSubscriber(modid = BloodMagic.MODID) +public class LivingStatusWatcher { + + @SubscribeEvent + public static void onJump(LivingEvent.LivingJumpEvent event) { + if (!(event.getEntity() instanceof EntityPlayer)) + return; + + EntityPlayer player = (EntityPlayer) event.getEntity(); + LivingStats stats = LivingUtil.applyNewExperience(player, RegistrarBloodMagicLivingArmor.UPGRADE_JUMP, 1); + if (stats == null) + return; + + int level = stats.getLevel(RegistrarBloodMagicLivingArmor.UPGRADE_JUMP.getKey()); + double jumpBonus = RegistrarBloodMagicLivingArmor.UPGRADE_JUMP.getBonusValue("jump", level).doubleValue(); + player.motionY += jumpBonus; + + if (level >= 3) { + Vec3d lookVec = player.getLookVec(); + player.motionX += player.motionX == 0 ? 0 : lookVec.x * jumpBonus; + player.motionZ += player.motionZ == 0 ? 0 : lookVec.z * jumpBonus; + } + } + + @SubscribeEvent + public static void onDamage(LivingHurtEvent event) { + if (!(event.getEntity() instanceof EntityPlayer)) + return; + + handleFallDamage(event); + handleProjectileDamage(event); + } + + private static void handleFallDamage(LivingHurtEvent event) { + if (event.getSource() != DamageSource.FALL) + return; + + EntityPlayer player = (EntityPlayer) event.getEntity(); + LivingStats stats = LivingStats.fromPlayer(player); + if (stats == null) + return; + + int level = stats.getLevel(RegistrarBloodMagicLivingArmor.UPGRADE_JUMP.getKey()); + double fallBonus = RegistrarBloodMagicLivingArmor.UPGRADE_JUMP.getBonusValue("fall", level).doubleValue(); + event.setAmount(event.getAmount() * Math.max(1F - (float) fallBonus, 0F)); + } + + private static void handleProjectileDamage(LivingHurtEvent event) { + if (!event.getSource().isProjectile()) + return; + + EntityPlayer player = (EntityPlayer) event.getEntity(); + LivingStats stats = LivingUtil.applyNewExperience(player, RegistrarBloodMagicLivingArmor.UPGRADE_ARROW_PROTECT, 1); + if (stats == null) + return; + + int level = stats.getLevel(RegistrarBloodMagicLivingArmor.UPGRADE_ARROW_PROTECT.getKey()); + double damageBonus = RegistrarBloodMagicLivingArmor.UPGRADE_ARROW_PROTECT.getBonusValue("arrow_protect", level).doubleValue(); + event.setAmount(event.getAmount() * Math.max(1F - (float) damageBonus, 0F)); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/living/LivingUpgrade.java b/src/main/java/com/wayoftime/bloodmagic/core/living/LivingUpgrade.java new file mode 100644 index 00000000..f4e68b96 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/living/LivingUpgrade.java @@ -0,0 +1,198 @@ +package com.wayoftime.bloodmagic.core.living; + +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Multimap; +import com.google.common.collect.Sets; +import com.google.gson.*; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.reflect.TypeToken; +import net.minecraft.entity.ai.attributes.AttributeModifier; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.DamageSource; +import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.lang.reflect.Type; +import java.util.*; +import java.util.function.Consumer; + +@JsonAdapter(LivingUpgrade.Deserializer.class) +public class LivingUpgrade { + + public static final LivingUpgrade DUMMY = new LivingUpgrade(new ResourceLocation("dummy"), levels -> levels.add(new Level(0, 0))); + + private final ResourceLocation key; + private final Set incompatible; + private final TreeMap experienceToLevel; + private final Map levelToCost; + private final Map bonuses; + private boolean isNegative; + private String unlocalizedName = null; + private IAttributeProvider attributeProvider; + private IArmorProvider armorProvider; + + public LivingUpgrade(ResourceLocation key, Consumer> experienceMapper) { + this.key = key; + this.incompatible = Sets.newHashSet(); + this.experienceToLevel = Maps.newTreeMap(); + this.levelToCost = Maps.newHashMap(); + this.bonuses = Maps.newHashMap(); + + List levels = Lists.newArrayList(); + experienceMapper.accept(levels); + + for (int i = 0; i < levels.size(); i++) { + Level level = levels.get(i); + experienceToLevel.put(level.experienceNeeded, i + 1); + levelToCost.put(i + 1, level.upgradeCost); + } + } + + public LivingUpgrade withBonusSet(String id, Consumer> modifiers) { + List values = NonNullList.create(); + modifiers.accept(values); + if (values.size() != levelToCost.size()) + throw new RuntimeException("Bonus size and level size must be the same."); + + bonuses.put(id, new Bonus(id, values)); + return this; + } + + @Nonnull + public Number getBonusValue(String id, int level) { + List modifiers = bonuses.getOrDefault(id, Bonus.DEFAULT).modifiers; + if (modifiers.isEmpty() || level > modifiers.size()) + return 0; + + return modifiers.get(level - 1); + } + + public LivingUpgrade withAttributeProvider(IAttributeProvider attributeProvider) { + this.attributeProvider = attributeProvider; + return this; + } + + @Nullable + public IAttributeProvider getAttributeProvider() { + return attributeProvider; + } + + public LivingUpgrade withArmorProvider(IArmorProvider armorProvider) { + this.armorProvider = armorProvider; + return this; + } + + @Nullable + public IArmorProvider getArmorProvider() { + return armorProvider; + } + + public String getUnlocalizedName() { + return unlocalizedName == null ? unlocalizedName = "upgrade." + key.getNamespace() + ":" + key.getPath() + ".name" : unlocalizedName; + } + + public boolean isNegative() { + return isNegative; + } + + public boolean isCompatible(ResourceLocation otherUpgrade) { + return !incompatible.contains(otherUpgrade); + } + + public LivingUpgrade addIncompatibility(ResourceLocation... otherKeys) { + Collections.addAll(incompatible, otherKeys); + return this; + } + + public int getLevel(int experience) { + Map.Entry floor = experienceToLevel.floorEntry(experience); + return floor == null ? 0 : floor.getValue(); + } + + public int getNextRequirement(int experience) { + Integer ret = experienceToLevel.ceilingKey(experience + 1); + return ret == null ? 0 : ret; + } + + public int getLevelCost(int level) { + return levelToCost.getOrDefault(level, 0); + } + + public ResourceLocation getKey() { + return key; + } + + public LivingUpgrade asDowngrade() { + this.isNegative = true; + return this; + } + + @Override + public String toString() { + return key.toString(); + } + + public interface IAttributeProvider { + void handleAttributes(LivingStats stats, Multimap attributeMap, int level); + } + + public interface IArmorProvider { + double getProtection(EntityPlayer player, LivingStats stats, DamageSource source, int level); + } + + public static class Level { + @SerializedName("xp") + private final int experienceNeeded; + @SerializedName("cost") + private final int upgradeCost; + + public Level(int experienceNeeded, int upgradeCost) { + this.experienceNeeded = experienceNeeded; + this.upgradeCost = upgradeCost; + } + } + + public static class Bonus { + + private static final Bonus DEFAULT = new Bonus("null", Collections.emptyList()); + + private final String id; + private final List modifiers; + + public Bonus(String id, List modifiers) { + this.id = id; + this.modifiers = modifiers; + } + } + + public static class Deserializer implements JsonDeserializer { + @Override + public LivingUpgrade deserialize(JsonElement element, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { + JsonObject json = element.getAsJsonObject(); + ResourceLocation id = new ResourceLocation(json.getAsJsonPrimitive("id").getAsString()); + List levels = context.deserialize(json.getAsJsonArray("levels"), new TypeToken>(){}.getType()); + boolean negative = json.has("negative") && json.getAsJsonPrimitive("negative").getAsBoolean(); + + LivingUpgrade upgrade = new LivingUpgrade(id, upgradeLevels -> upgradeLevels.addAll(levels)); + if (negative) + upgrade.asDowngrade(); + + if (json.has("incompatibilities")) { + String[] incompatibilities = context.deserialize(json.getAsJsonArray("incompatibilities"), String[].class); + for (String incompat : incompatibilities) + upgrade.addIncompatibility(new ResourceLocation(incompat)); + } + + if (json.has("bonuses")) { + Map bonuses = context.deserialize(json.getAsJsonObject("bonuses"), new TypeToken>(){}.getType()); + bonuses.forEach((k, v) -> upgrade.withBonusSet(k, numbers -> Collections.addAll(numbers, v))); + } + + return upgrade; + } + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/living/LivingUtil.java b/src/main/java/com/wayoftime/bloodmagic/core/living/LivingUtil.java new file mode 100644 index 00000000..5c74d8fc --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/living/LivingUtil.java @@ -0,0 +1,63 @@ +package com.wayoftime.bloodmagic.core.living; + +import com.wayoftime.bloodmagic.event.LivingEquipmentEvent; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraftforge.common.MinecraftForge; + +import javax.annotation.Nullable; + +public class LivingUtil { + + @Nullable + public static LivingStats applyNewExperience(EntityPlayer player, LivingUpgrade upgrade, int experience) { + LivingStats stats = LivingStats.fromPlayer(player, true); + if (stats == null) + return null; + + LivingEquipmentEvent.GainExperience event = new LivingEquipmentEvent.GainExperience(player, stats, upgrade, experience); + if (MinecraftForge.EVENT_BUS.post(event)) + return stats; + + experience = event.getExperience(); + + int currentExperience = stats.getUpgrades().getOrDefault(upgrade, 0); + int requiredForLevel = upgrade.getNextRequirement(currentExperience) - currentExperience; + + // If we're going to level up from this, check points + if (requiredForLevel <= experience) { + int currentPoints = stats.getUsedPoints(); + // If we're already capped or somehow over the cap, we don't want to add experience + if (currentPoints >= stats.getMaxPoints()) + return stats; + + int nextPointCost = upgrade.getLevelCost(upgrade.getLevel(currentExperience) + 1); + // If there's no more levels in this upgrade, we don't want to add experience + if (nextPointCost == -1) + return stats; + + // If applying this new level will go over our cap, we don't want to add experience + if (currentPoints + nextPointCost > stats.getMaxPoints()) + return stats; + } + + int newLevel = upgrade.getLevel(currentExperience + experience); + if (upgrade.getLevel(currentExperience) != newLevel) { + MinecraftForge.EVENT_BUS.post(new LivingEquipmentEvent.LevelUp(player, stats, upgrade)); + player.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic:living_upgrade_level_increase", new TextComponentTranslation(upgrade.getUnlocalizedName()), newLevel), true); + } + + stats.addExperience(upgrade.getKey(), experience); + LivingStats.toPlayer(player, stats); + return stats; + } + + public static boolean hasFullSet(EntityPlayer player) { + for (ItemStack stack : player.inventory.armorInventory) + if (stack.isEmpty() || !(stack.getItem() instanceof ILivingContainer)) + return false; + + return true; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/network/Binding.java b/src/main/java/com/wayoftime/bloodmagic/core/network/Binding.java new file mode 100644 index 00000000..0e8ae5ce --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/network/Binding.java @@ -0,0 +1,76 @@ +package com.wayoftime.bloodmagic.core.network; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTUtil; +import net.minecraftforge.common.util.INBTSerializable; + +import javax.annotation.Nullable; +import java.util.UUID; + +public class Binding implements INBTSerializable { + + private UUID uuid; + private String name; + + public Binding(UUID uuid, String name) { + this.uuid = uuid; + this.name = name; + } + + public Binding(EntityPlayer player) { + this(player.getGameProfile().getId(), player.getGameProfile().getName()); + } + + private Binding() { + // No-op + } + + @Override + public NBTTagCompound serializeNBT() { + NBTTagCompound tag = new NBTTagCompound(); + tag.setTag("id", NBTUtil.createUUIDTag(uuid)); + tag.setString("name", name); + return tag; + } + + @Override + public void deserializeNBT(NBTTagCompound nbt) { + this.uuid = NBTUtil.getUUIDFromTag(nbt.getCompoundTag("id")); + this.name = nbt.getString("name"); + } + + public UUID getOwnerId() { + return uuid; + } + + public Binding setOwnerId(UUID uuid) { + this.uuid = uuid; + return this; + } + + public String getOwnerName() { + return name; + } + + public Binding setOwnerName(String name) { + this.name = name; + return this; + } + + @Nullable + public static Binding fromStack(ItemStack stack) { + if (!stack.hasTagCompound()) // Definitely hasn't been bound yet. + return null; + + NBTBase bindingTag = stack.getTagCompound().getTag("binding"); + if (bindingTag.getId() != 10 || bindingTag.isEmpty()) // Make sure it's both a tag compound and that it has actual data. + return null; + + Binding binding = new Binding(); + binding.deserializeNBT((NBTTagCompound) bindingTag); + return binding; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/network/BloodOrb.java b/src/main/java/com/wayoftime/bloodmagic/core/network/BloodOrb.java new file mode 100644 index 00000000..f812e172 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/network/BloodOrb.java @@ -0,0 +1,48 @@ +package com.wayoftime.bloodmagic.core.network; + +import com.wayoftime.bloodmagic.core.util.OrbUtil; +import net.minecraft.util.ResourceLocation; +import org.apache.commons.lang3.builder.ToStringBuilder; + +public class BloodOrb { + + private final ResourceLocation name; + private final int tier; + private final int capacity; + private final int fillRate; + + public BloodOrb(ResourceLocation name, int tier, int capacity, int fillRate) { + this.name = name; + this.tier = tier; + this.capacity = capacity; + this.fillRate = fillRate; + + OrbUtil.addOrb(this); + } + + public ResourceLocation getName() { + return name; + } + + public int getTier() { + return tier; + } + + public int getCapacity() { + return capacity; + } + + public int getFillRate() { + return fillRate; + } + + @Override + public String toString() { + return new ToStringBuilder(this) + .append("name", name) + .append("tier", tier) + .append("capacity", capacity) + .append("fillRate", fillRate) + .toString(); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/network/IBloodOrb.java b/src/main/java/com/wayoftime/bloodmagic/core/network/IBloodOrb.java new file mode 100644 index 00000000..a2547100 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/network/IBloodOrb.java @@ -0,0 +1,12 @@ +package com.wayoftime.bloodmagic.core.network; + +import net.minecraft.item.ItemStack; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +public interface IBloodOrb { + + @Nullable + BloodOrb getOrb(@Nonnull ItemStack stack); +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/network/NetworkInteraction.java b/src/main/java/com/wayoftime/bloodmagic/core/network/NetworkInteraction.java new file mode 100644 index 00000000..1be1a707 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/network/NetworkInteraction.java @@ -0,0 +1,78 @@ +package com.wayoftime.bloodmagic.core.network; + +import net.minecraft.command.ICommandSender; +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.world.World; + +public class NetworkInteraction { + + private static final ITextComponent EMPTY = new TextComponentString(""); + + private final ITextComponent description; + private final int amount; + private boolean syphon; + + public NetworkInteraction(ITextComponent description, int amount) { + this.description = description; + this.amount = amount; + } + + public NetworkInteraction(int amount) { + this(EMPTY, amount); + } + + public boolean isSyphon() { + return syphon || amount < 0; + } + + public ITextComponent getDescription() { + return description; + } + + public int getAmount() { + return amount; + } + + public NetworkInteraction syphon() { + this.syphon = true; + return this; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o instanceof NetworkInteraction) + return ((NetworkInteraction) o).getDescription().equals(description); + + return false; + } + + @Override + public int hashCode() { + return description.hashCode(); + } + + public static NetworkInteraction asBlockInfo(World world, BlockPos pos, int amount) { + return new NetworkInteraction(new TextComponentString("block|" + world.provider.getDimension() + "|" + pos.toLong()), amount); + } + + public static NetworkInteraction asItemInfo(ItemStack itemStack, World world, Entity entity, int amount) { + return new NetworkInteraction(new TextComponentString("item|" + itemStack.getItem().getRegistryName() + "|" + world.provider.getDimension() + "|" + entity.getPersistentID()), amount); + } + + public static NetworkInteraction asItemInfo(ItemStack itemStack, World world, BlockPos pos, int amount) { + return new NetworkInteraction(new TextComponentString("item|" + itemStack.getItem().getRegistryName() + "|" + world.provider.getDimension() + "|" + pos.toLong()), amount); + } + + public static NetworkInteraction asItemInfo(ItemStack itemStack, int amount) { + return new NetworkInteraction(new TextComponentString("item|" + itemStack.getItem().getRegistryName()), amount); + } + + public static NetworkInteraction asCommandInfo(ICommandSender sender, String command, int amount) { + return new NetworkInteraction(new TextComponentString("command|" + command + "|" + sender.getName()), amount); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/network/SNSavedData.java b/src/main/java/com/wayoftime/bloodmagic/core/network/SNSavedData.java new file mode 100644 index 00000000..22ad0111 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/network/SNSavedData.java @@ -0,0 +1,81 @@ +package com.wayoftime.bloodmagic.core.network; + +import com.google.common.collect.Maps; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.world.World; +import net.minecraft.world.storage.WorldSavedData; +import net.minecraftforge.common.DimensionManager; + +import javax.annotation.Nonnull; +import java.util.Map; +import java.util.UUID; + +public class SNSavedData extends WorldSavedData { + + public static final String ID = "bloodmagic_soul_network_data"; + + private final Map networks = Maps.newHashMap(); + + public SNSavedData(String name) { + super(name); + } + + public SNSavedData() { + this(ID); + } + + public SoulNetwork getNetwork(EntityPlayer player) { + return getNetwork(player.getGameProfile().getId()); + } + + public SoulNetwork getNetwork(UUID uuid) { + SoulNetwork network = networks.get(uuid); + if (network == null) { + networks.put(uuid, network = SoulNetwork.newEmpty(uuid).withParent(this)); + markDirty(); + } + + return network; + } + + @Override + public void readFromNBT(NBTTagCompound nbt) { + NBTTagList networks = nbt.getTagList("networks", 10); + for (NBTBase tag : networks) { + if (tag.getId() != 10) // Only compounds + continue; + + SoulNetwork network = SoulNetwork.fromNbt((NBTTagCompound) tag); + network.withParent(this); + this.networks.put(network.getOwnerId(), network); + } + } + + @Override + public NBTTagCompound writeToNBT(NBTTagCompound compound) { + NBTTagList networks = new NBTTagList(); + for (SoulNetwork network : this.networks.values()) + networks.appendTag(network.serializeNBT()); + + compound.setTag("networks", networks); + return compound; + } + + @Nonnull + public static SoulNetwork getSoulNetwork(UUID uuid) { + World world = DimensionManager.getWorld(0); + if (world == null || world.getMapStorage() == null) + return new SNSavedData().getNetwork(uuid); + + SNSavedData savedData = (SNSavedData) world.getMapStorage().getOrLoadData(SNSavedData.class, ID); + if (savedData == null) { + savedData = new SNSavedData(); + world.getMapStorage().setData(ID, savedData); + } + + return savedData.getNetwork(uuid); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/network/SoulNetwork.java b/src/main/java/com/wayoftime/bloodmagic/core/network/SoulNetwork.java new file mode 100644 index 00000000..141fa54e --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/network/SoulNetwork.java @@ -0,0 +1,140 @@ +package com.wayoftime.bloodmagic.core.network; + +import com.google.common.collect.EvictingQueue; +import com.wayoftime.bloodmagic.BloodMagic; +import com.wayoftime.bloodmagic.core.util.BooleanResult; +import com.wayoftime.bloodmagic.event.SoulNetworkEvent; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.DamageSource; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.INBTSerializable; + +import java.util.Queue; +import java.util.UUID; + +public class SoulNetwork implements INBTSerializable { + + public static final DamageSource WEAK_SOUL = new DamageSource(BloodMagic.MODID + ":weak_soul").setDamageBypassesArmor().setDamageIsAbsolute().setMagicDamage(); + + private final Queue interactionHistory; + private SNSavedData parent; + private UUID ownerId; + private int currentEssence; + private int currentTier; + private int maxForTier; + + private SoulNetwork() { + this.interactionHistory = EvictingQueue.create(16); + } + + @Override + public NBTTagCompound serializeNBT() { + NBTTagCompound tag = new NBTTagCompound(); + tag.setString("owner", ownerId.toString()); + tag.setInteger("essence", currentEssence); + tag.setInteger("tier", currentTier); + tag.setInteger("maxForTier", maxForTier); + return tag; + } + + @Override + public void deserializeNBT(NBTTagCompound nbt) { + this.ownerId = UUID.fromString(nbt.getString("owner")); + this.currentEssence = nbt.getInteger("essence"); + this.currentTier = nbt.getInteger("tier"); + this.maxForTier = nbt.getInteger("maxForTier"); + } + + public SoulNetwork withParent(SNSavedData parent) { + this.parent = parent; + return this; + } + + public SNSavedData getParent() { + return parent; + } + + public UUID getOwnerId() { + return ownerId; + } + + public BooleanResult submitInteraction(NetworkInteraction interaction) { + if (interaction.getAmount() == 0) + return new BooleanResult<>(0, true); + + if (!interaction.isSyphon()) { + SoulNetworkEvent.Fill event = new SoulNetworkEvent.Fill(this, interaction, maxForTier); + if (MinecraftForge.EVENT_BUS.post(event)) + return new BooleanResult<>(0, false); + + if (currentEssence > event.getMaximum()) + return new BooleanResult<>(0, false); + + int oldCurrent = currentEssence; + currentEssence = Math.min(event.getMaximum(), currentEssence + event.getTicket().getAmount()); + markDirty(); + interactionHistory.remove(interaction); // Allows an existing interaction to be moved back up to the top with whatever new amount is changed + interactionHistory.add(interaction); + return new BooleanResult<>(currentEssence - oldCurrent, true); + } else { + SoulNetworkEvent.Syphon event = new SoulNetworkEvent.Syphon(this, interaction); + if (MinecraftForge.EVENT_BUS.post(event)) + return new BooleanResult<>(0, false); + + int newEssence = currentEssence - event.getTicket().getAmount(); + if (newEssence < 0) { + currentEssence = 0; + markDirty(); + return new BooleanResult<>(currentEssence, false); + } + + currentEssence -= event.getTicket().getAmount(); + markDirty(); + interactionHistory.remove(interaction); + interactionHistory.add(interaction); + return new BooleanResult<>(event.getTicket().getAmount(), true); + } + } + + public int getEssence() { + return currentEssence; + } + + public SoulNetwork setEssence(int essence) { + this.currentEssence = Math.min(this.maxForTier, essence); + markDirty(); + return this; + } + + public SoulNetwork setTier(int newTier, int maxForTier) { + this.currentTier = newTier; + this.maxForTier = maxForTier; + markDirty(); + return this; + } + + public int getTier() { + return currentTier; + } + + public void markDirty() { + if (parent != null) + parent.markDirty(); + } + + public static SoulNetwork get(UUID uuid) { + return SNSavedData.getSoulNetwork(uuid); + } + + public static SoulNetwork newEmpty(UUID uuid) { + SoulNetwork network = new SoulNetwork(); + network.ownerId = uuid; + return network; + } + + public static SoulNetwork fromNbt(NBTTagCompound tag) { + SoulNetwork network = new SoulNetwork(); + network.deserializeNBT(tag); + return network; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/network/SoulNetworkEventHandler.java b/src/main/java/com/wayoftime/bloodmagic/core/network/SoulNetworkEventHandler.java new file mode 100644 index 00000000..50288193 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/network/SoulNetworkEventHandler.java @@ -0,0 +1,48 @@ +package com.wayoftime.bloodmagic.core.network; + +import com.wayoftime.bloodmagic.BloodMagic; +import com.wayoftime.bloodmagic.event.BindingEvent; +import com.wayoftime.bloodmagic.item.IBindable; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.FakePlayer; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + +@Mod.EventBusSubscriber(modid = BloodMagic.MODID) +public class SoulNetworkEventHandler { + + @SubscribeEvent + public static void onItemUse(PlayerInteractEvent.RightClickItem event) { + if (event.getWorld().isRemote) + return; + + EntityPlayer player = event.getEntityPlayer(); + ItemStack clicked = event.getItemStack(); + if (player instanceof FakePlayer) + return; + + if (clicked.getItem() instanceof IBindable) { + IBindable bindable = (IBindable) clicked.getItem(); + Binding binding = bindable.getBinding(clicked); + if (binding == null && bindable.onBind(player, clicked)) { + binding = new Binding(player); + BindingEvent bindingEvent = new BindingEvent(clicked, binding, player); + if (!MinecraftForge.EVENT_BUS.post(bindingEvent)) + IBindable.applyBinding(clicked, binding); + } + } + + if (clicked.getItem() instanceof IBloodOrb) { + BloodOrb orb = ((IBloodOrb) clicked.getItem()).getOrb(clicked); + if (orb == null) + return; + + SoulNetwork network = SoulNetwork.get(player.getGameProfile().getId()); + if (orb.getTier() > network.getTier()) + network.setTier(orb.getTier(), orb.getCapacity()); + } + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/recipe/IngredientBloodOrb.java b/src/main/java/com/wayoftime/bloodmagic/core/recipe/IngredientBloodOrb.java new file mode 100644 index 00000000..9aac8114 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/recipe/IngredientBloodOrb.java @@ -0,0 +1,83 @@ +package com.wayoftime.bloodmagic.core.recipe; + +import com.google.common.collect.Lists; +import com.wayoftime.bloodmagic.core.network.BloodOrb; +import com.wayoftime.bloodmagic.core.network.IBloodOrb; +import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntComparators; +import it.unimi.dsi.fastutil.ints.IntList; +import net.minecraft.client.util.RecipeItemHelper; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.NonNullList; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.List; + +public class IngredientBloodOrb extends Ingredient { + + private final BloodOrb orb; + private NonNullList orbs; + private IntList itemIds = null; + private ItemStack[] items; + + public IngredientBloodOrb(BloodOrb orb) { + super(); + + this.orb = orb; + +// List orbGet = OrbRegistry.getOrbsDownToTier(orb.getTier()); + List orbGet = Lists.newArrayList(); + orbs = NonNullList.withSize(orbGet.size(), ItemStack.EMPTY); + + for (int i = 0; i < orbGet.size(); i++) + orbs.set(i, orbGet.get(i)); + } + + @Override + @Nonnull + public ItemStack[] getMatchingStacks() { + if (items == null) + items = orbs.toArray(new ItemStack[0]); + return items; + } + + @Override + @Nonnull + @SideOnly(Side.CLIENT) + public IntList getValidItemStacksPacked() { + if (this.itemIds == null || itemIds.size() != orbs.size()) { + this.itemIds = new IntArrayList(orbs.size()); + + for (ItemStack itemstack : orbs) + this.itemIds.add(RecipeItemHelper.pack(itemstack)); + + this.itemIds.sort(IntComparators.NATURAL_COMPARATOR); + } + + return this.itemIds; + } + + @Override + public boolean apply(@Nullable ItemStack input) { + if (input == null || input.isEmpty()) + return false; + + if (!input.hasTagCompound()) + return false; + + if (!(input.getItem() instanceof IBloodOrb)) + return false; + + BloodOrb orb = ((IBloodOrb) input.getItem()).getOrb(input); + return orb != null && orb.getTier() >= this.orb.getTier(); + } + + @Override + protected void invalidate() { + this.itemIds = null; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/recipe/IngredientBloodOrbFactory.java b/src/main/java/com/wayoftime/bloodmagic/core/recipe/IngredientBloodOrbFactory.java new file mode 100644 index 00000000..cb497394 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/recipe/IngredientBloodOrbFactory.java @@ -0,0 +1,21 @@ +package com.wayoftime.bloodmagic.core.recipe; + +import com.google.gson.JsonObject; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.JsonUtils; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.crafting.IIngredientFactory; +import net.minecraftforge.common.crafting.JsonContext; + +import javax.annotation.Nonnull; + +public class IngredientBloodOrbFactory implements IIngredientFactory { + + @Nonnull + @Override + public Ingredient parse(JsonContext context, JsonObject json) { + ResourceLocation orb = new ResourceLocation(JsonUtils.getString(json, "orb")); +// return new IngredientBloodOrb(RegistrarBloodMagic.BLOOD_ORBS.getValue(orb)); + return null; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/type/SlateType.java b/src/main/java/com/wayoftime/bloodmagic/core/type/SlateType.java new file mode 100644 index 00000000..1f3c8ea3 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/type/SlateType.java @@ -0,0 +1,23 @@ +package com.wayoftime.bloodmagic.core.type; + +import java.util.Locale; + +public enum SlateType { + + BLANK, + REINFORCED, + IMBUED, + DEMONIC, + ETHEREAL, + ; + + private final String name; + + SlateType() { + this.name = name().toLowerCase(Locale.ROOT); + } + + public String getName() { + return name; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/util/BMLog.java b/src/main/java/com/wayoftime/bloodmagic/core/util/BMLog.java new file mode 100644 index 00000000..0f8201e6 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/util/BMLog.java @@ -0,0 +1,61 @@ +package com.wayoftime.bloodmagic.core.util; + +import com.wayoftime.bloodmagic.core.BloodMagicConfiguration; +import org.apache.commons.lang3.text.WordUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +public enum BMLog { + + DEFAULT("Blood Magic") { + @Override + boolean enabled() { + return true; + } + }, + DEBUG() { + @Override + boolean enabled() { + return BloodMagicConfiguration.logging.enableDebugLogging; + } + }, + API() { + @Override + boolean enabled() { + return BloodMagicConfiguration.logging.enableApiLogging; + } + }, + API_VERBOSE() { + @Override + boolean enabled() { + return BloodMagicConfiguration.logging.enableVerboseApiLogging; + } + }; + + private final Logger logger; + + BMLog(String logName) { + logger = LogManager.getLogger(logName); + } + + BMLog() { + logger = LogManager.getLogger("Blood Magic|" + WordUtils.capitalizeFully(name().replace("_", " "))); + } + + abstract boolean enabled(); + + public void info(String input, Object... args) { + if (enabled()) + logger.info(input, args); + } + + public void error(String input, Object... args) { + if (enabled()) + logger.error(input, args); + } + + public void warn(String input, Object... args) { + if (enabled()) + logger.warn(input, args); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/util/BooleanResult.java b/src/main/java/com/wayoftime/bloodmagic/core/util/BooleanResult.java new file mode 100644 index 00000000..3bf98bc8 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/util/BooleanResult.java @@ -0,0 +1,20 @@ +package com.wayoftime.bloodmagic.core.util; + +public class BooleanResult { + + private final T value; + private final boolean success; + + public BooleanResult(T value, boolean success) { + this.value = value; + this.success = success; + } + + public T getValue() { + return value; + } + + public boolean isSuccess() { + return success; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/util/InventoryUtil.java b/src/main/java/com/wayoftime/bloodmagic/core/util/InventoryUtil.java new file mode 100644 index 00000000..8f01b374 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/util/InventoryUtil.java @@ -0,0 +1,31 @@ +package com.wayoftime.bloodmagic.core.util; + +import com.google.common.collect.Lists; +import net.minecraft.item.ItemStack; +import net.minecraftforge.items.IItemHandler; + +import javax.annotation.Nonnull; +import java.util.Collections; +import java.util.List; +import java.util.function.Predicate; + +public class InventoryUtil { + + public static final Predicate NO_EMPTY = stack -> !stack.isEmpty(); + + @Nonnull + public static List findMatchingItems(IItemHandler inventory, Predicate filter) { + List found = null; + for (int i = 0; i < inventory.getSlots(); i++) { + ItemStack stack = inventory.getStackInSlot(i); + if (filter.test(stack)) { + if (found == null) + found = Lists.newArrayList(); + + found.add(stack); + } + } + + return found == null ? Collections.emptyList() : found; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/util/JsonUtil.java b/src/main/java/com/wayoftime/bloodmagic/core/util/JsonUtil.java new file mode 100644 index 00000000..038a430e --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/util/JsonUtil.java @@ -0,0 +1,102 @@ +package com.wayoftime.bloodmagic.core.util; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.reflect.TypeToken; +import org.apache.commons.io.FileUtils; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; + +/** + * A simple utility for reading and writing JSON files. To handle custom (de)serialization, use + * {@link com.google.gson.annotations.JsonAdapter} on your types. + */ +public class JsonUtil { + + private static final Gson GSON = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().serializeNulls().create(); + + /** + * Reads a {@link T} back from the given file. If the file does not exist, a new file will be generated with the + * provided default and the default will be returned. + * + * @param token The token type to use for deserialization. + * @param file The file to read the JSON from. + * @param def The default value to use if the file does not exist. + * @param The object type to give back. + * @return a {@link T} that was read from the given file or {@code def} if the file did not exist. + */ + @Nonnull + public static T fromJson(@Nonnull TypeToken token, @Nonnull File file, @Nonnull T def) { + T ret = fromJson(token, file); + if (ret == null) { + toJson(def, token, file); + ret = def; + } + + return ret; + } + + /** + * Reads a {@link T} back from the given file. If the file does not exist, {@code null} is returned. If an exception + * is thrown during deserialization, {@code null} is also returned. + * + * @param token The token type to use for deserialization. + * @param file - The file to read the JSON from. + * @param The object type to give back. + * @return a {@link T} that was read from the given file, {@code null} if the file does not exist, or {@code null} if + * an exception was thrown. + */ + @Nullable + public static T fromJson(@Nonnull TypeToken token, @Nonnull File file) { + if (!file.exists()) + return null; + + try (FileReader reader = new FileReader(file)) { + return GSON.fromJson(reader, token.getType()); + } catch (Exception e) { + e.printStackTrace(); + } + + return null; + } + + public static T fromJson(@Nonnull TypeToken token, @Nonnull String json) { + return GSON.fromJson(json, token.getType()); + } + + /** + * Converts a {@link T} to JSON and writes it to file. If the file does not exist, a new one is created. If the file + * does exist, the contents are overwritten with the new value. + * + * @param type The object to write to JSON. + * @param token The token type to use for serialization. + * @param file The file to write the JSON to. + * @param The object type to write. + */ + public static void toJson(@Nonnull T type, @Nonnull TypeToken token, @Nonnull File file) { + if (!file.exists()) { + try { + FileUtils.forceMkdirParent(file); + file.createNewFile(); + } catch (Exception e) { + e.printStackTrace(); + return; + } + } + + try (FileWriter writer = new FileWriter(file)) { + writer.write(getJson(type, token)); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public static String getJson(@Nonnull T type, @Nonnull TypeToken token) { + return GSON.toJson(type, token.getType()); + } +} + diff --git a/src/main/java/com/wayoftime/bloodmagic/core/util/ModifiableValue.java b/src/main/java/com/wayoftime/bloodmagic/core/util/ModifiableValue.java new file mode 100644 index 00000000..d22e288b --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/util/ModifiableValue.java @@ -0,0 +1,40 @@ +package com.wayoftime.bloodmagic.core.util; + +import java.util.Objects; + +public class ModifiableValue { + + private T value; + + public ModifiableValue(T value) { + this.value = value; + } + + public T getValue() { + return value; + } + + public void setValue(T value) { + this.value = value; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof ModifiableValue)) return false; + + ModifiableValue that = (ModifiableValue) o; + + return value != null ? value.equals(that.value) : that.value == null; + } + + @Override + public int hashCode() { + return value != null ? value.hashCode() : 0; + } + + @Override + public String toString() { + return Objects.toString(value); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/util/OrbUtil.java b/src/main/java/com/wayoftime/bloodmagic/core/util/OrbUtil.java new file mode 100644 index 00000000..a873a7ae --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/util/OrbUtil.java @@ -0,0 +1,24 @@ +package com.wayoftime.bloodmagic.core.util; + +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Lists; +import com.wayoftime.bloodmagic.core.network.BloodOrb; + +import java.util.List; + +public class OrbUtil { + + public static final List ORBS = Lists.newArrayList(); + public static final ArrayListMultimap TIERED = ArrayListMultimap.create(); + + public static void addOrb(BloodOrb orb) { + ORBS.add(orb); + + TIERED.put(orb.getTier(), orb); + } + + // TODO :LUL: This needs to be implemented before orb-related recipes can be added. + public static List getOrbsMatching(int tier) { + return Lists.newArrayList(); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/util/PluginUtil.java b/src/main/java/com/wayoftime/bloodmagic/core/util/PluginUtil.java new file mode 100644 index 00000000..f60d4a26 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/util/PluginUtil.java @@ -0,0 +1,137 @@ +package com.wayoftime.bloodmagic.core.util; + +import com.google.common.base.Stopwatch; +import com.google.common.collect.Lists; +import com.wayoftime.bloodmagic.BloodMagic; +import com.wayoftime.bloodmagic.api.BloodMagicPlugin; +import com.wayoftime.bloodmagic.api.IBloodMagicAPI; +import com.wayoftime.bloodmagic.api.IBloodMagicPlugin; +import com.wayoftime.bloodmagic.api.impl.BloodMagicAPI; +import com.wayoftime.bloodmagic.api.impl.BloodMagicCorePlugin; +import net.minecraftforge.common.util.EnumHelper; +import net.minecraftforge.fml.common.discovery.ASMDataTable; +import org.apache.commons.lang3.tuple.Pair; + +import javax.annotation.Nonnull; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.util.List; +import java.util.Set; +import java.util.function.Consumer; + +public class PluginUtil { + + @SuppressWarnings("unchecked") + @Nonnull + public static List> gatherPlugins(ASMDataTable dataTable) { + Stopwatch stopwatch = Stopwatch.createStarted(); + List> discoveredAnnotations = Lists.newArrayList(); + Set discoveredPlugins = dataTable.getAll(BloodMagicPlugin.class.getName()); + + for (ASMDataTable.ASMData data : discoveredPlugins) { + try { + Class asmClass = Class.forName(data.getClassName()); + Class pluginClass = asmClass.asSubclass(IBloodMagicPlugin.class); + + IBloodMagicPlugin instance = pluginClass.newInstance(); + + BMLog.API.info("Discovered plugin at {}", data.getClassName()); + discoveredAnnotations.add(Pair.of(instance, pluginClass.getAnnotation(BloodMagicPlugin.class))); + } catch (Exception e) { + e.printStackTrace(); + } + } + + // Bring core plugin up to top + discoveredAnnotations.sort((o1, o2) -> { + if (o1.getLeft().getClass() == BloodMagicCorePlugin.class) + return -1; + + return o1.getClass().getCanonicalName().compareToIgnoreCase(o2.getClass().getCanonicalName()); + }); + BMLog.API.info("Discovered {} potential plugin(s) in {}", discoveredAnnotations.size(), stopwatch.stop()); + return discoveredAnnotations; + } + + @Nonnull + public static List gatherInjections(ASMDataTable dataTable) { + Stopwatch stopwatch = Stopwatch.createStarted(); + List injectees = Lists.newArrayList(); + Set discoveredInjectees = dataTable.getAll(BloodMagicPlugin.Inject.class.getName()); + + for (ASMDataTable.ASMData data : discoveredInjectees) { + try { + Class asmClass = Class.forName(data.getClassName()); + Field toInject = asmClass.getDeclaredField(data.getObjectName()); + if (toInject.getType() != IBloodMagicAPI.class) { + BMLog.API.error("Mod requested API injection on field {}.{} which is an invalid type.", data.getClassName(), data.getObjectName()); + continue; + } + + BMLog.API.info("Discovered injection request at {}.{}", data.getClassName(), data.getObjectName()); + injectees.add(toInject); + } catch (Exception e) { + e.printStackTrace(); + } + } + + BMLog.API.info("Discovered {} potential API injection(s) in {}", injectees.size(), stopwatch.stop()); + return injectees; + } + + public static void handlePluginStep(RegistrationStep step) { + Stopwatch total = Stopwatch.createStarted(); + int errors = 0; + for (Pair plugin : BloodMagic.PLUGINS) { + Stopwatch per = Stopwatch.createStarted(); + try { + step.getConsumer().accept(plugin); + } catch (Exception e) { + errors++; + BMLog.DEFAULT.error("Error handling plugin step {} at {}: {}: {}", step, plugin.getLeft().getClass(), e.getClass().getSimpleName(), e.getMessage()); + } + BMLog.API.info("Handled plugin step {} at {} in {}", step, plugin.getLeft().getClass(), per.stop()); + } + + BMLog.API.info("Handled {} plugin(s) at step {} with {} errors in {}", BloodMagic.PLUGINS.size() - errors, step, errors, total.stop()); + } + + public static void injectAPIInstances(List injectees) { + Stopwatch total = Stopwatch.createStarted(); + int errors = 0; + + for (Field injectee : injectees) { + Stopwatch per = Stopwatch.createStarted(); + if (!Modifier.isStatic(injectee.getModifiers())) + continue; + + try { + EnumHelper.setFailsafeFieldValue(injectee, null, BloodMagicAPI.INSTANCE); + } catch (Exception e) { + errors++; + BMLog.DEFAULT.error("Error injecting API instance at {}.{}", injectee.getDeclaringClass().getCanonicalName(), injectee.getName()); + } + BMLog.API.info("Injected API instance at {}.{} in {}", injectee.getDeclaringClass().getCanonicalName(), injectee.getName(), per.stop()); + } + + BMLog.API.info("Injected API {} times with {} errors in {}", injectees.size() - errors, errors, total.stop()); + } + + public enum RegistrationStep { + + PLUGIN_REGISTER(p -> p.getLeft().register(BloodMagicAPI.INSTANCE)), + RECIPE_REGISTER(p -> p.getLeft().registerRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar())) + ; + + private final Consumer> consumer; + + RegistrationStep(Consumer> consumer) { + this.consumer = consumer; + } + + @Nonnull + public Consumer> getConsumer() { + return consumer; + } + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/util/RegistryAddCallbackWrapper.java b/src/main/java/com/wayoftime/bloodmagic/core/util/RegistryAddCallbackWrapper.java new file mode 100644 index 00000000..97888e6d --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/util/RegistryAddCallbackWrapper.java @@ -0,0 +1,51 @@ +package com.wayoftime.bloodmagic.core.util; + +import net.minecraftforge.common.util.EnumHelper; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.registries.ForgeRegistry; +import net.minecraftforge.registries.IForgeRegistry; +import net.minecraftforge.registries.IForgeRegistryEntry; + +import javax.annotation.Nonnull; +import java.lang.reflect.Field; +import java.util.function.BiConsumer; + +public final class RegistryAddCallbackWrapper> { + + private static final Field CALLBACK_FIELD; + + static { + try { + CALLBACK_FIELD = ForgeRegistry.class.getDeclaredField("add"); + CALLBACK_FIELD.setAccessible(true); + } catch (NoSuchFieldException e) { + throw new RuntimeException("Could not find AddCallback field."); + } + } + + private final Class registryType; + private final BiConsumer addCheck; + private final Runnable postCallback; + + public RegistryAddCallbackWrapper(@Nonnull Class registryType, @Nonnull BiConsumer addCheck, @Nonnull Runnable postCallback) { + this.registryType = registryType; + this.addCheck = addCheck; + this.postCallback = postCallback; + } + + public void wrapParent() throws Exception { + ForgeRegistry registry = (ForgeRegistry) GameRegistry.findRegistry(registryType); + //noinspection unchecked + IForgeRegistry.AddCallback oldCallback = (IForgeRegistry.AddCallback) CALLBACK_FIELD.get(registry); + EnumHelper.setFailsafeFieldValue(CALLBACK_FIELD, registry, (IForgeRegistry.AddCallback) (owner, stage, id, obj, oldObj) -> { + oldCallback.onAdd(owner, stage, id, obj, oldObj); + addCheck.accept(obj, oldObj); + }); + BMLog.DEBUG.info("Wrapped add callback for {} registry.", registry.getRegistrySuperType().getSimpleName()); + } + + @Nonnull + public Runnable getPostCallback() { + return postCallback; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/util/ResourceUtil.java b/src/main/java/com/wayoftime/bloodmagic/core/util/ResourceUtil.java new file mode 100644 index 00000000..39254fd2 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/util/ResourceUtil.java @@ -0,0 +1,85 @@ +package com.wayoftime.bloodmagic.core.util; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.FolderResourcePack; +import net.minecraft.client.resources.IResourcePack; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import org.apache.commons.io.IOUtils; + +import javax.annotation.Nonnull; +import java.io.File; +import java.io.IOException; +import java.lang.reflect.Field; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.nio.file.*; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import java.util.function.Predicate; +import java.util.stream.Collectors; + +public class ResourceUtil { + + @Nonnull + public static Set gatherResources(String home, String following, Predicate predicate) { + FileSystem fileSystem = null; + try { + URL url = ResourceUtil.class.getResource(home); + if (url != null) { + URI uri = url.toURI(); + Path path; + if (uri.getScheme().equals("file")) { + path = Paths.get(ResourceUtil.class.getResource(home + "/" + following).toURI()); + } else { + if (!uri.getScheme().equals("jar")) { + BMLog.DEFAULT.error("Unsupported URI scheme {}", uri.getScheme()); + return Collections.emptySet(); + } + + fileSystem = FileSystems.newFileSystem(uri, Collections.emptyMap()); + path = fileSystem.getPath(home + "/" + following); + } + + return Files.walk(path).filter(predicate).collect(Collectors.toSet()); + } + } catch (IOException | URISyntaxException e) { + e.printStackTrace(); + } finally { + IOUtils.closeQuietly(fileSystem); + } + + return Collections.emptySet(); + } + + @Nonnull + public static Set gatherResources(String home, String following) { + return gatherResources(home, following, p -> true); + } + + @Nonnull + public static ResourceLocation addContext(ResourceLocation rl, String context) { + return new ResourceLocation(rl.getNamespace(), context + rl.getPath()); + } + + @SideOnly(Side.CLIENT) + public static void injectDirectoryAsResource(File resourceDir) { + if (!resourceDir.exists() || !resourceDir.isDirectory()) + return; + + FolderResourcePack resourcePack = new FolderResourcePack(resourceDir); + Field _defaultResourcePacks = ReflectionHelper.findField(Minecraft.class, "field_110449_ao", "defaultResourcePacks"); + try { + _defaultResourcePacks.setAccessible(true); + // noinspection unchecked + List defaultResourcePacks = (List) _defaultResourcePacks.get(Minecraft.getMinecraft()); + defaultResourcePacks.add(resourcePack); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/util/register/IItemProvider.java b/src/main/java/com/wayoftime/bloodmagic/core/util/register/IItemProvider.java new file mode 100644 index 00000000..3e505de5 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/util/register/IItemProvider.java @@ -0,0 +1,13 @@ +package com.wayoftime.bloodmagic.core.util.register; + +import net.minecraft.item.Item; + +import javax.annotation.Nullable; + +public interface IItemProvider { + + @Nullable + default Item getItem() { + return null; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/util/register/IModelLocator.java b/src/main/java/com/wayoftime/bloodmagic/core/util/register/IModelLocator.java new file mode 100644 index 00000000..c23d6f7e --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/util/register/IModelLocator.java @@ -0,0 +1,16 @@ +package com.wayoftime.bloodmagic.core.util.register; + +import net.minecraft.util.ResourceLocation; + +import javax.annotation.Nonnull; + +public interface IModelLocator { + + /** + * Allows an item to point to a custom model path instead of using the registry name. + * + * @return the path to the model. + */ + @Nonnull + ResourceLocation getModelPath(); +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/util/register/IVariantProvider.java b/src/main/java/com/wayoftime/bloodmagic/core/util/register/IVariantProvider.java new file mode 100644 index 00000000..0432a016 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/util/register/IVariantProvider.java @@ -0,0 +1,15 @@ +package com.wayoftime.bloodmagic.core.util.register; + +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; + +public interface IVariantProvider { + + /** + * A mapping of meta -> state variant + * + * @param variants A map to populate with all variants + */ + default void collectVariants(Int2ObjectMap variants) { + variants.put(0, "inventory"); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/will/DemonWill.java b/src/main/java/com/wayoftime/bloodmagic/core/will/DemonWill.java new file mode 100644 index 00000000..afca4f50 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/will/DemonWill.java @@ -0,0 +1,22 @@ +package com.wayoftime.bloodmagic.core.will; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum DemonWill implements IStringSerializable { + + RAW, + CORROSIVE, + DESTRUCTIVE, + VENGEFUL, + STEADFAST, + ; + + public static final DemonWill[] VALUES = values(); + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/will/DemonWillHolder.java b/src/main/java/com/wayoftime/bloodmagic/core/will/DemonWillHolder.java new file mode 100644 index 00000000..8590afdf --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/will/DemonWillHolder.java @@ -0,0 +1,67 @@ +package com.wayoftime.bloodmagic.core.will; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.INBTSerializable; + +import javax.annotation.Nullable; + +public class DemonWillHolder implements INBTSerializable { + + private DemonWill type; + private double amount; + + public DemonWillHolder(DemonWill type, double amount) { + this.type = type; + this.amount = amount; + } + + private DemonWillHolder() { + // No-op + } + + public DemonWill getType() { + return type; + } + + public double getAmount() { + return amount; + } + + public void setAmount(double amount) { + this.amount = amount; + } + + public void modifyAmount(double change) { + this.amount += change; + } + + @Override + public NBTTagCompound serializeNBT() { + NBTTagCompound tag = new NBTTagCompound(); + tag.setInteger("type", type.ordinal()); + tag.setDouble("amount", amount); + return tag; + } + + @Override + public void deserializeNBT(NBTTagCompound nbt) { + this.type = DemonWill.VALUES[nbt.getInteger("type")]; + this.amount = nbt.getDouble("amount"); + } + + @Nullable + public static DemonWillHolder fromStack(ItemStack stack) { + if (!stack.hasTagCompound()) // Definitely hasn't been bound yet. + return null; + + NBTBase willTag = stack.getTagCompound().getTag("demonWill"); + if (willTag.getId() != 10 || willTag.isEmpty()) // Make sure it's both a tag compound and that it has actual data. + return null; + + DemonWillHolder holder = new DemonWillHolder(); + holder.deserializeNBT((NBTTagCompound) willTag); + return holder; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/will/DemonicWillEventHandler.java b/src/main/java/com/wayoftime/bloodmagic/core/will/DemonicWillEventHandler.java new file mode 100644 index 00000000..b2252d9c --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/will/DemonicWillEventHandler.java @@ -0,0 +1,100 @@ +package com.wayoftime.bloodmagic.core.will; + +import com.wayoftime.bloodmagic.BloodMagic; +import com.wayoftime.bloodmagic.core.RegistrarBloodMagicItems; +import com.wayoftime.bloodmagic.core.util.InventoryUtil; +import com.wayoftime.bloodmagic.event.DemonicWillEvent; +import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.monster.IMob; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumHand; +import net.minecraft.world.EnumDifficulty; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.FakePlayer; +import net.minecraftforge.event.entity.living.LivingDropsEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; + +import java.util.function.Predicate; + +@Mod.EventBusSubscriber(modid = BloodMagic.MODID) +public class DemonicWillEventHandler { + + @SubscribeEvent + public static void gatherDrops(LivingDropsEvent event) { + if (!(event.getEntityLiving() instanceof IMob) && event.getEntityLiving().getEntityWorld().getDifficulty() != EnumDifficulty.PEACEFUL) + return; + + Entity sourceEntity = event.getSource().getTrueSource(); + if (!(sourceEntity instanceof EntityPlayer) || sourceEntity instanceof FakePlayer) + return; + + EntityPlayer player = (EntityPlayer) sourceEntity; + ItemStack held = player.getHeldItem(EnumHand.MAIN_HAND); + if (held.isEmpty() || !(held.getItem() instanceof ISentientEquipment)) + return; + + DemonWillHolder willDrop = ((ISentientEquipment) held.getItem()).getWillDrop(player, event.getEntityLiving(), held, event.getLootingLevel()); + if (willDrop == null) + return; + + DemonicWillEvent.GatherWillDrops willDropEvent = new DemonicWillEvent.GatherWillDrops(player, event.getEntityLiving(), held, event.getLootingLevel(), willDrop.getAmount()); + if (MinecraftForge.EVENT_BUS.post(willDropEvent)) + return; + + willDrop.setAmount(willDropEvent.getDroppedWill()); + IItemHandler inventory = player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); + if (inventory == null) + return; // shut up intellij this is never going to happen + + InventoryUtil.findMatchingItems(inventory, InventoryUtil.NO_EMPTY.and(new WillContainerFilter(willDrop.getType()))).forEach(stack -> { + if (willDrop.getAmount() <= 0) + return; + + IWillContainer container = (IWillContainer) stack.getItem(); + DemonWillHolder holder = container.getDemonWill(stack); + if (holder == null) + holder = new DemonWillHolder(willDrop.getType(), 0); + + holder.modifyAmount(Math.min(willDrop.getAmount(), container.getMaxContained(stack))); + willDrop.modifyAmount(-holder.getAmount()); + }); + + if (willDrop.getAmount() >= 0) { + ItemStack drop = new ItemStack(RegistrarBloodMagicItems.MONSTER_SOUL); + ((IWillContainer) drop.getItem()).applyDemonWill(drop, willDrop); + event.getDrops().add(new EntityItem(player.getEntityWorld(), event.getEntity().posX, event.getEntity().posY, event.getEntity().posZ, drop)); + } + } + + private static class WillContainerFilter implements Predicate { + + private final DemonWill type; + + public WillContainerFilter(DemonWill type) { + this.type = type; + } + + @Override + public boolean test(ItemStack stack) { + if (stack.getItem() instanceof IWillContainer) { + IWillContainer container = (IWillContainer) stack.getItem(); + double max = container.getMaxContained(stack); + DemonWillHolder holder = container.getDemonWill(stack); + if (holder == null) + return true; + + if (holder.getType() != type) + return false; + + return holder.getAmount() < max; + } + + return false; + } + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/will/ISentientEquipment.java b/src/main/java/com/wayoftime/bloodmagic/core/will/ISentientEquipment.java new file mode 100644 index 00000000..adcfe479 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/will/ISentientEquipment.java @@ -0,0 +1,43 @@ +package com.wayoftime.bloodmagic.core.will; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.monster.EntitySlime; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import javax.annotation.Nullable; + +public interface ISentientEquipment { + + @Nullable + default DemonWillHolder getWillDrop(EntityPlayer player, EntityLivingBase attacked, ItemStack stack, int looting) { + double willModifier = attacked instanceof EntitySlime ? 0.67 : 1; + DemonWill type = getDemonWill(stack); + DemonWillHolder ret = null; + for (int i = 0; i <= looting; i++) { + if (i == 0 || player.getEntityWorld().rand.nextDouble() <= 0.4) { + if (ret == null) + ret = new DemonWillHolder(type, 0); + + ret.modifyAmount(willModifier * (getWillDropAmount(stack) * player.getEntityWorld().rand.nextDouble() * (attacked.getMaxHealth() / 20D))); + } + } + + return ret; + } + + double getWillDropAmount(ItemStack stack); + + default boolean isActivated(ItemStack stack) { + return stack.hasTagCompound() && stack.getTagCompound().getBoolean("sentientActivated"); + } + + default DemonWill getDemonWill(ItemStack stack) { + NBTTagCompound tagCompound = stack.getTagCompound(); + if (tagCompound == null || !tagCompound.hasKey("willType")) + return DemonWill.RAW; + + return DemonWill.valueOf(tagCompound.getString("willType")); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/core/will/IWillContainer.java b/src/main/java/com/wayoftime/bloodmagic/core/will/IWillContainer.java new file mode 100644 index 00000000..c4058151 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/core/will/IWillContainer.java @@ -0,0 +1,38 @@ +package com.wayoftime.bloodmagic.core.will; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import javax.annotation.Nullable; +import java.util.List; + +public interface IWillContainer { + + double getMaxContained(ItemStack stack); + + @Nullable + default DemonWillHolder getDemonWill(ItemStack stack) { + return DemonWillHolder.fromStack(stack); + } + + default void applyDemonWill(ItemStack stack, DemonWillHolder holder) { + NBTTagCompound tag = stack.getTagCompound(); + if (tag == null) + stack.setTagCompound(tag = new NBTTagCompound()); + + tag.setTag("demonWill", holder.serializeNBT()); + } + + static void appendTooltip(ItemStack stack, List tooltip) { + if (!(stack.getItem() instanceof IWillContainer)) + return; + + DemonWillHolder holder = ((IWillContainer) stack.getItem()).getDemonWill(stack); + if (holder == null) + return; + + // TODO - Localize + tooltip.add("Will: " + holder.getType()); + tooltip.add("Amount: " + holder.getAmount()); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/event/BindingEvent.java b/src/main/java/com/wayoftime/bloodmagic/event/BindingEvent.java new file mode 100644 index 00000000..97f8606c --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/event/BindingEvent.java @@ -0,0 +1,33 @@ +package com.wayoftime.bloodmagic.event; + +import com.wayoftime.bloodmagic.core.network.Binding; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.eventhandler.Cancelable; +import net.minecraftforge.fml.common.eventhandler.Event; + +@Cancelable +public class BindingEvent extends Event { + + private final ItemStack stack; + private final Binding binding; + private final EntityPlayer player; + + public BindingEvent(ItemStack stack, Binding binding, EntityPlayer player) { + this.stack = stack; + this.binding = binding; + this.player = player; + } + + public ItemStack getStack() { + return stack; + } + + public Binding getBinding() { + return binding; + } + + public EntityPlayer getPlayer() { + return player; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/event/DemonicWillEvent.java b/src/main/java/com/wayoftime/bloodmagic/event/DemonicWillEvent.java new file mode 100644 index 00000000..f8c80fee --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/event/DemonicWillEvent.java @@ -0,0 +1,52 @@ +package com.wayoftime.bloodmagic.event; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.eventhandler.Cancelable; +import net.minecraftforge.fml.common.eventhandler.Event; + +public class DemonicWillEvent extends Event { + + @Cancelable + public static class GatherWillDrops extends DemonicWillEvent { + + private final EntityPlayer player; + private final EntityLivingBase attacked; + private final ItemStack stack; + private final int looting; + private double droppedWill; + + public GatherWillDrops(EntityPlayer player, EntityLivingBase attacked, ItemStack stack, int looting, double droppedWill) { + this.player = player; + this.attacked = attacked; + this.stack = stack; + this.looting = looting; + this.droppedWill = droppedWill; + } + + public EntityPlayer getPlayer() { + return player; + } + + public EntityLivingBase getAttacked() { + return attacked; + } + + public ItemStack getStack() { + return stack; + } + + public int getLooting() { + return looting; + } + + public double getDroppedWill() { + return droppedWill; + } + + public void setDroppedWill(double droppedWill) { + this.droppedWill = droppedWill; + } + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/event/LivingEquipmentEvent.java b/src/main/java/com/wayoftime/bloodmagic/event/LivingEquipmentEvent.java new file mode 100644 index 00000000..318d4e70 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/event/LivingEquipmentEvent.java @@ -0,0 +1,66 @@ +package com.wayoftime.bloodmagic.event; + +import com.wayoftime.bloodmagic.core.living.LivingStats; +import com.wayoftime.bloodmagic.core.living.LivingUpgrade; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraftforge.fml.common.eventhandler.Cancelable; +import net.minecraftforge.fml.common.eventhandler.Event; + +public class LivingEquipmentEvent extends Event { + + private final EntityPlayer player; + private final LivingStats stats; + + public LivingEquipmentEvent(EntityPlayer player, LivingStats stats) { + this.player = player; + this.stats = stats; + } + + public EntityPlayer getPlayer() { + return player; + } + + public LivingStats getStats() { + return stats; + } + + @Cancelable + public static class GainExperience extends LivingEquipmentEvent { + + private final LivingUpgrade upgrade; + private int experience; + + public GainExperience(EntityPlayer player, LivingStats stats, LivingUpgrade upgrade, int experience) { + super(player, stats); + this.upgrade = upgrade; + this.experience = experience; + } + + public LivingUpgrade getUpgrade() { + return upgrade; + } + + public int getExperience() { + return experience; + } + + public void setExperience(int experience) { + this.experience = experience; + } + } + + public static class LevelUp extends LivingEquipmentEvent { + + private final LivingUpgrade upgrade; + + public LevelUp(EntityPlayer player, LivingStats stats, LivingUpgrade upgrade) { + super(player, stats); + + this.upgrade = upgrade; + } + + public LivingUpgrade getUpgrade() { + return upgrade; + } + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/event/SacrificeEvent.java b/src/main/java/com/wayoftime/bloodmagic/event/SacrificeEvent.java new file mode 100644 index 00000000..e13b92d4 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/event/SacrificeEvent.java @@ -0,0 +1,45 @@ +package com.wayoftime.bloodmagic.event; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraftforge.fml.common.eventhandler.Event; + +public class SacrificeEvent extends Event { + + protected final EntityLivingBase sacrificed; + private final int baseAmount; + private int modifiedAmount; + + public SacrificeEvent(EntityLivingBase sacrificed, int baseAmount, int modifiedAmount) { + this.sacrificed = sacrificed; + this.baseAmount = baseAmount; + this.modifiedAmount = modifiedAmount; + } + + public EntityLivingBase getSacrificed() { + return sacrificed; + } + + public int getBaseAmount() { + return baseAmount; + } + + public int getModifiedAmount() { + return modifiedAmount; + } + + public void setModifiedAmount(int modifiedAmount) { + this.modifiedAmount = modifiedAmount; + } + + public static class SelfSacrifice extends SacrificeEvent { + + public SelfSacrifice(EntityLivingBase sacrificed, int baseAmount, int modifiedAmount) { + super(sacrificed, baseAmount, modifiedAmount); + } + + public EntityPlayer getPlayer() { + return (EntityPlayer) sacrificed; + } + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/event/SoulNetworkEvent.java b/src/main/java/com/wayoftime/bloodmagic/event/SoulNetworkEvent.java new file mode 100644 index 00000000..a0c76954 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/event/SoulNetworkEvent.java @@ -0,0 +1,99 @@ +package com.wayoftime.bloodmagic.event; + +import com.wayoftime.bloodmagic.core.network.SoulNetwork; +import com.wayoftime.bloodmagic.core.network.NetworkInteraction; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.eventhandler.Cancelable; +import net.minecraftforge.fml.common.eventhandler.Event; + +public class SoulNetworkEvent extends Event { + + private final SoulNetwork network; + private NetworkInteraction ticket; + + public SoulNetworkEvent(SoulNetwork network, NetworkInteraction ticket) { + this.network = network; + this.ticket = ticket; + } + + public SoulNetwork getNetwork() { + return network; + } + + public NetworkInteraction getTicket() { + return ticket; + } + + public void setTicket(NetworkInteraction ticket) { + this.ticket = ticket; + } + + @Cancelable + public static class Syphon extends SoulNetworkEvent { + + private boolean shouldDamage; + + public Syphon(SoulNetwork network, NetworkInteraction ticket) { + super(network, ticket); + } + + public boolean shouldDamage() { + return shouldDamage; + } + + public void setShouldDamage(boolean shouldDamage) { + this.shouldDamage = shouldDamage; + } + + public static class Item extends Syphon { + + private final ItemStack stack; + + public Item(SoulNetwork network, NetworkInteraction ticket, ItemStack stack) { + super(network, ticket); + + this.stack = stack; + } + + public ItemStack getStack() { + return stack; + } + } + + public static class User extends Syphon { + + private final EntityPlayer user; + + public User(SoulNetwork network, NetworkInteraction ticket, EntityPlayer user) { + super(network, ticket); + + this.user = user; + } + + public EntityPlayer getUser() { + return user; + } + } + } + + @Cancelable + public static class Fill extends SoulNetworkEvent { + + private int maximum; + + public Fill(SoulNetwork network, NetworkInteraction ticket, int maximum) { + super(network, ticket); + + this.maximum = maximum; + } + + public int getMaximum() { + return maximum; + } + + public void setMaximum(int maximum) { + this.maximum = maximum; + } + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/item/IBindable.java b/src/main/java/com/wayoftime/bloodmagic/item/IBindable.java new file mode 100644 index 00000000..83a34cbf --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/item/IBindable.java @@ -0,0 +1,58 @@ +package com.wayoftime.bloodmagic.item; + +import com.wayoftime.bloodmagic.core.network.Binding; +import net.minecraft.client.resources.I18n; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import javax.annotation.Nullable; +import java.util.List; + +/** + * Implement this interface on any Item that can be bound to a player. + */ +public interface IBindable { + + /** + * Gets an object that stores who this item is bound to. + *

+ * If the item is not bound, this will be null. + * + * @param stack - The owned ItemStack + * @return - The binding object + */ + @Nullable + default Binding getBinding(ItemStack stack) { + Binding binding = Binding.fromStack(stack); + return !stack.isEmpty() && binding != null ? binding : null; + } + + /** + * Called when the player attempts to bind the item. + * + * @param player - The Player attempting to bind the item + * @param stack - The ItemStack to attempt binding + * @return If binding was successful. + */ + default boolean onBind(EntityPlayer player, ItemStack stack) { + return true; + } + + static void applyBinding(ItemStack stack, EntityPlayer player) { + Binding binding = new Binding(player); + applyBinding(stack, binding); + } + + static void applyBinding(ItemStack stack, Binding binding) { + if (!stack.hasTagCompound()) + stack.setTagCompound(new NBTTagCompound()); + + stack.getTagCompound().setTag("binding", binding.serializeNBT()); + } + + static void appendTooltip(Binding binding, List tooltip) { + if (binding != null) + tooltip.add(I18n.format("tooltip.bloodmagic:bound_owner", binding.getOwnerName())); + } +} \ No newline at end of file diff --git a/src/main/java/com/wayoftime/bloodmagic/item/ItemAltarBuilder.java b/src/main/java/com/wayoftime/bloodmagic/item/ItemAltarBuilder.java new file mode 100644 index 00000000..07d5b66c --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/item/ItemAltarBuilder.java @@ -0,0 +1,84 @@ +package com.wayoftime.bloodmagic.item; + +import com.wayoftime.bloodmagic.block.BlockBloodAltar; +import com.wayoftime.bloodmagic.core.altar.AltarTier; +import com.wayoftime.bloodmagic.core.altar.AltarUtil; +import com.wayoftime.bloodmagic.core.altar.IAltarManipulator; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.world.World; + +import javax.annotation.Nullable; +import java.util.List; + +public class ItemAltarBuilder extends ItemMundane implements IAltarManipulator { + + public ItemAltarBuilder() { + super("altar_builder"); + + setMaxStackSize(1); + } + + @Override + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + if (world.isRemote) + return ActionResult.newResult(EnumActionResult.PASS, player.getHeldItem(hand)); + + if (player.isSneaking()) { + ItemStack held = player.getHeldItem(hand); + AltarTier newTier = cycleTier(held); + player.sendStatusMessage(new TextComponentTranslation("chat.bloodmagic:altar_builder_cycled", new TextComponentTranslation("enchantment.level." + newTier.getDisplayNumber())), true); + return ActionResult.newResult(EnumActionResult.SUCCESS, held); + } + + return super.onItemRightClick(world, player, hand); + } + + @Override + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + IBlockState state = world.getBlockState(pos); + if (state.getBlock() instanceof BlockBloodAltar) { + AltarUtil.constructAltar(world, pos, getCurrentTier(player.getHeldItem(hand))); + return EnumActionResult.SUCCESS; + } + + return super.onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ); + } + + @Override + public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { + tooltip.add(I18n.format("tooltip.bloodmagic:tier", I18n.format("enchantment.level." + getCurrentTier(stack).getDisplayNumber()))); + } + + private AltarTier getCurrentTier(ItemStack stack) { + if (!stack.hasTagCompound()) + return AltarTier.ONE; + + return AltarTier.VALUES[Math.min(AltarTier.VALUES.length - 1, Math.max(0, stack.getTagCompound().getInteger("altar_tier")))]; + } + + private AltarTier cycleTier(ItemStack stack) { + AltarTier current = getCurrentTier(stack); + int nextOrdinal = current.ordinal() + 1; + if (nextOrdinal >= AltarTier.VALUES.length) + nextOrdinal = 0; + + NBTTagCompound tag = stack.getTagCompound(); + if (tag == null) + stack.setTagCompound(tag = new NBTTagCompound()); + + tag.setInteger("altar_tier", nextOrdinal); + return AltarTier.VALUES[nextOrdinal]; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/item/ItemBindable.java b/src/main/java/com/wayoftime/bloodmagic/item/ItemBindable.java new file mode 100644 index 00000000..f4f20fde --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/item/ItemBindable.java @@ -0,0 +1,26 @@ +package com.wayoftime.bloodmagic.item; + +import com.wayoftime.bloodmagic.core.network.Binding; +import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +import javax.annotation.Nullable; +import java.util.List; + +public class ItemBindable extends ItemMundane implements IBindable { + + public ItemBindable(String name) { + super(name); + } + + @Override + public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { + Binding binding = getBinding(stack); + if (binding == null) + return; + + tooltip.add(I18n.format("tooltip.bloodmagic:bound_owner", binding.getOwnerName())); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/item/ItemBloodOrb.java b/src/main/java/com/wayoftime/bloodmagic/item/ItemBloodOrb.java new file mode 100644 index 00000000..b54ff3d9 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/item/ItemBloodOrb.java @@ -0,0 +1,55 @@ +package com.wayoftime.bloodmagic.item; + +import com.wayoftime.bloodmagic.core.network.*; +import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.world.World; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.List; + +public class ItemBloodOrb extends ItemBindable implements IBloodOrb { + + private final BloodOrb orb; + + public ItemBloodOrb(BloodOrb orb) { + super("blood_orb_" + orb.getName().getPath()); + + this.orb = orb; + + setMaxStackSize(1); + } + + @Override + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + ItemStack held = player.getHeldItem(hand); + Binding binding = getBinding(held); + if (binding != null) { + SoulNetwork network = SoulNetwork.get(binding.getOwnerId()); + if (player.capabilities.isCreativeMode || player.attackEntityFrom(SoulNetwork.WEAK_SOUL, 1.0F)) + network.submitInteraction(NetworkInteraction.asItemInfo(held, world, player, 200)); + } + + return super.onItemRightClick(world, player, hand); + } + + @Override + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.addInformation(stack, world, tooltip, flag); + + BloodOrb orb = getOrb(stack); + if (orb != null && flag.isAdvanced()) + tooltip.add(I18n.format("tooltip.bloodmagic:object_owner", orb.getName().getNamespace())); + } + + @Nullable + @Override + public BloodOrb getOrb(@Nonnull ItemStack stack) { + return orb; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/item/ItemDaggerSelfSacrifice.java b/src/main/java/com/wayoftime/bloodmagic/item/ItemDaggerSelfSacrifice.java new file mode 100644 index 00000000..b1aa8299 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/item/ItemDaggerSelfSacrifice.java @@ -0,0 +1,55 @@ +package com.wayoftime.bloodmagic.item; + +import com.wayoftime.bloodmagic.BloodMagic; +import com.wayoftime.bloodmagic.core.RegistrarBloodMagic; +import com.wayoftime.bloodmagic.core.altar.AltarUtil; +import com.wayoftime.bloodmagic.core.network.SoulNetwork; +import com.wayoftime.bloodmagic.core.util.BooleanResult; +import com.wayoftime.bloodmagic.tile.TileBloodAltar; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.fluids.FluidStack; + +public class ItemDaggerSelfSacrifice extends ItemMundane { + + private final Type type; + + public ItemDaggerSelfSacrifice(Type sacrifice) { + super("dagger_self_sacrifice" + (sacrifice == Type.CREATIVE ? "_creative" : "")); + + setMaxStackSize(1); + + this.type = sacrifice; + + if (sacrifice != Type.CREATIVE) + addPropertyOverride(new ResourceLocation(BloodMagic.MODID, "charged"), (stack, worldIn, entityIn) -> stack.hasTagCompound() && stack.getTagCompound().hasKey("charge") ? 1.0F : 0.0F); + } + + @Override + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + player.attackEntityFrom(SoulNetwork.WEAK_SOUL, 2.0F); + BooleanResult fillResult = AltarUtil.handleSacrifice(player, type.amount); + if (!fillResult.isSuccess()) + return ActionResult.newResult(EnumActionResult.PASS, player.getHeldItem(hand)); + + return ActionResult.newResult(EnumActionResult.SUCCESS, player.getHeldItem(hand)); + } + + public enum Type { + NORMAL(200), + CREATIVE(Integer.MAX_VALUE), + ; + + private final int amount; + + Type(int amount) { + this.amount = amount; + } + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/item/ItemLivingArmor.java b/src/main/java/com/wayoftime/bloodmagic/item/ItemLivingArmor.java new file mode 100644 index 00000000..7af6a6c7 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/item/ItemLivingArmor.java @@ -0,0 +1,163 @@ +package com.wayoftime.bloodmagic.item; + +import com.google.common.collect.Multimap; +import com.wayoftime.bloodmagic.BloodMagic; +import com.wayoftime.bloodmagic.core.RegistrarBloodMagicItems; +import com.wayoftime.bloodmagic.core.living.ILivingContainer; +import com.wayoftime.bloodmagic.core.living.LivingStats; +import com.wayoftime.bloodmagic.core.living.LivingUpgrade; +import com.wayoftime.bloodmagic.core.living.LivingUtil; +import com.wayoftime.bloodmagic.core.network.Binding; +import com.wayoftime.bloodmagic.core.network.SoulNetwork; +import com.wayoftime.bloodmagic.core.network.NetworkInteraction; +import com.wayoftime.bloodmagic.core.util.BooleanResult; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.ai.attributes.AttributeModifier; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; +import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; +import net.minecraft.util.DamageSource; +import net.minecraft.world.World; +import net.minecraftforge.common.ISpecialArmor; +import net.minecraftforge.common.util.EnumHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.List; +import java.util.Map; + +public class ItemLivingArmor extends ItemArmor implements ILivingContainer, ISpecialArmor, IBindable { + + public static final ArmorMaterial MATERIAL = EnumHelper.addArmorMaterial("living", "living", 100, new int[]{1, 2, 3, 4}, 3, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 2.0F); + private static final int MAX_ABSORPTION = 100000; + + public ItemLivingArmor(EntityEquipmentSlot slot) { + super(MATERIAL, 0, slot); + + setTranslationKey(BloodMagic.MODID + ":living_armor_" + slot.getName()); + setRegistryName("living_armor_" + slot.getName()); + setCreativeTab(BloodMagic.TAB_BM); + } + + @Override + public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { + if (getBinding(stack) == null) + IBindable.applyBinding(stack, player); + + super.onArmorTick(world, player, stack); + } + + @Override + public Multimap getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack) { + Multimap modifiers = super.getAttributeModifiers(slot, stack); + if (slot != EntityEquipmentSlot.CHEST) + return modifiers; + + LivingStats stats = getLivingStats(stack); + if (stats == null) + return modifiers; + + stats.getUpgrades().forEach((k, v) -> { + if (k.getAttributeProvider() != null) + k.getAttributeProvider().handleAttributes(stats, modifiers, k.getLevel(v)); + }); + + return modifiers; + } + + @Override + public ArmorProperties getProperties(EntityLivingBase player, @Nonnull ItemStack armor, DamageSource source, double damage, int slot) { + if (source == DamageSource.DROWN || source == DamageSource.OUT_OF_WORLD) + return new ArmorProperties(-1, 0D, 0); + + double armorReduction; + double damageAmount = 0.25; + double armorPenetrationReduction = 0; + + if (armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOR_FEET || armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOR_HEAD) + damageAmount = 3d / 20d * 0.6; + else if (armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOR_LEGS) + damageAmount = 6d / 20d * 0.6; + else if (armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOR_CHEST) + damageAmount = 0.64; + + if (armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOR_CHEST) { + armorReduction = 0.24 / 0.64; // This values puts it at iron level + + if (!LivingUtil.hasFullSet((EntityPlayer) player)) + return new ArmorProperties(-1, damageAmount * armorReduction, MAX_ABSORPTION); + + LivingStats stats = getLivingStats(armor); + double protection = 1.0D; + if (stats != null) + for (Map.Entry entry : stats.getUpgrades().entrySet()) + if (entry.getKey().getArmorProvider() != null) + protection *= 1 - entry.getKey().getArmorProvider().getProtection((EntityPlayer) player, stats, source, entry.getKey().getLevel(entry.getValue())); + + armorReduction += (1 - protection) * (1 - armorReduction); + damageAmount *= armorReduction; + return new ArmorProperties(-1, source.isUnblockable() ? 1 - protection : damageAmount, MAX_ABSORPTION); + } else if (source.isUnblockable()) + return new ArmorProperties(-1, damageAmount * armorPenetrationReduction, MAX_ABSORPTION); + + return new ArmorProperties(-1, damageAmount, MAX_ABSORPTION); + } + + @Override + public int getArmorDisplay(EntityPlayer player, @Nonnull ItemStack armor, int slot) { + if (armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOR_HEAD) + return 3; + if (armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOR_CHEST) + return 8; + if (armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOR_LEGS) + return 6; + if (armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOR_FEET) + return 3; + + return 0; + } + + @Nullable + @Override + public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type) { + if (this == RegistrarBloodMagicItems.LIVING_ARMOR_CHEST || this == RegistrarBloodMagicItems.LIVING_ARMOR_HEAD || this == RegistrarBloodMagicItems.LIVING_ARMOR_FEET) + return "bloodmagic:textures/models/armor/living_armor_layer_1.png"; + + if (this == RegistrarBloodMagicItems.LIVING_ARMOR_LEGS) + return "bloodmagic:textures/models/armor/living_armor_layer_2.png"; + + return null; + } + + @Override + public void damageArmor(EntityLivingBase entity, @Nonnull ItemStack stack, DamageSource source, int damage, int slot) { + if (stack.getItem() == RegistrarBloodMagicItems.LIVING_ARMOR_CHEST && damage > getMaxDamage(stack) - getDamage(stack)) { + Binding binding = getBinding(stack); + if (binding == null) { + entity.attackEntityFrom(SoulNetwork.WEAK_SOUL, 2.0F); + return; + } + + BooleanResult result = SoulNetwork.get(binding.getOwnerId()).submitInteraction(NetworkInteraction.asItemInfo(stack, entity.getEntityWorld(), entity, damage * 100).syphon()); + if (!result.isSuccess()) + entity.attackEntityFrom(SoulNetwork.WEAK_SOUL, 2.0F); + + return; + } + + stack.damageItem(damage, entity); + } + + @SideOnly(Side.CLIENT) + @Override + public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { + ILivingContainer.appendLivingTooltip(getLivingStats(stack), tooltip, true); + IBindable.appendTooltip(getBinding(stack), tooltip); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/item/ItemLivingTome.java b/src/main/java/com/wayoftime/bloodmagic/item/ItemLivingTome.java new file mode 100644 index 00000000..42ea8c5d --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/item/ItemLivingTome.java @@ -0,0 +1,63 @@ +package com.wayoftime.bloodmagic.item; + +import com.wayoftime.bloodmagic.core.RegistrarBloodMagicLivingArmor; +import com.wayoftime.bloodmagic.core.living.ILivingContainer; +import com.wayoftime.bloodmagic.core.living.LivingStats; +import com.wayoftime.bloodmagic.core.living.LivingUtil; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; +import net.minecraft.world.World; + +import javax.annotation.Nullable; +import java.util.List; + +public class ItemLivingTome extends ItemMundane implements ILivingContainer { + + public ItemLivingTome() { + super("living_tome"); + } + + @Override + public ActionResult onItemRightClick(World worldIn, EntityPlayer player, EnumHand hand) { + ItemStack held = player.getHeldItem(hand); + + LivingStats armorStats = LivingStats.fromPlayer(player, true); + if (armorStats == null) + return ActionResult.newResult(EnumActionResult.PASS, held); + + LivingStats tomeStats = getLivingStats(held); + if (tomeStats == null) + return ActionResult.newResult(EnumActionResult.PASS, held); + + tomeStats.getUpgrades().forEach((k, v) -> LivingUtil.applyNewExperience(player, k, v)); +// LivingStats.toPlayer(player, armorStats); + held.shrink(1); + return ActionResult.newResult(EnumActionResult.SUCCESS, held); + } + + @Override + public void getSubItems(CreativeTabs tab, NonNullList items) { + if (!isInCreativeTab(tab)) + return; + + RegistrarBloodMagicLivingArmor.UPGRADES.values().forEach(upgrade -> { + int exp = 0; + while ((exp = upgrade.getNextRequirement(exp)) != 0) { + ItemStack tome = new ItemStack(this); + updateLivingStates(tome, new LivingStats().setMaxPoints(upgrade.getLevelCost(exp)).addExperience(upgrade.getKey(), exp)); + items.add(tome); + } + }); + } + + @Override + public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { + ILivingContainer.appendLivingTooltip(getLivingStats(stack), tooltip, false); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/item/ItemMonsterSoul.java b/src/main/java/com/wayoftime/bloodmagic/item/ItemMonsterSoul.java new file mode 100644 index 00000000..cdbd3224 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/item/ItemMonsterSoul.java @@ -0,0 +1,56 @@ +package com.wayoftime.bloodmagic.item; + +import com.wayoftime.bloodmagic.BloodMagic; +import com.wayoftime.bloodmagic.core.util.register.IModelLocator; +import com.wayoftime.bloodmagic.core.will.DemonWill; +import com.wayoftime.bloodmagic.core.will.DemonWillHolder; +import com.wayoftime.bloodmagic.core.will.IWillContainer; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.List; + +public class ItemMonsterSoul extends ItemMundane implements IWillContainer, IModelLocator { + + public ItemMonsterSoul() { + super("monster_soul"); + + setMaxStackSize(1); + addPropertyOverride(new ResourceLocation(BloodMagic.MODID, "will"), (stack, worldIn, entityIn) -> { + DemonWillHolder holder = getDemonWill(stack); + return holder == null || holder.getType() == DemonWill.RAW ? 0F : Float.parseFloat("0." + holder.getType().ordinal()); + }); + } + + @Override + public void getSubItems(CreativeTabs tab, NonNullList items) { + for (DemonWill will : DemonWill.VALUES) { + ItemStack stack = new ItemStack(this); + applyDemonWill(stack, new DemonWillHolder(will, 0)); + items.add(stack); + } + } + + @Override + public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { + IWillContainer.appendTooltip(stack, tooltip); + } + + @Override + public double getMaxContained(ItemStack stack) { + DemonWillHolder holder = getDemonWill(stack); + return holder == null ? Double.MAX_VALUE : holder.getAmount(); + } + + @Nonnull + @Override + public ResourceLocation getModelPath() { + return new ResourceLocation(BloodMagic.MODID, "soul/monster_soul"); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/item/ItemMundane.java b/src/main/java/com/wayoftime/bloodmagic/item/ItemMundane.java new file mode 100644 index 00000000..9433134b --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/item/ItemMundane.java @@ -0,0 +1,13 @@ +package com.wayoftime.bloodmagic.item; + +import com.wayoftime.bloodmagic.BloodMagic; +import net.minecraft.item.Item; + +public class ItemMundane extends Item { + + public ItemMundane(String name) { + setTranslationKey(BloodMagic.MODID + ":" + name); + setCreativeTab(BloodMagic.TAB_BM); + setRegistryName(name); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/item/ItemSentientSword.java b/src/main/java/com/wayoftime/bloodmagic/item/ItemSentientSword.java new file mode 100644 index 00000000..9c351f71 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/item/ItemSentientSword.java @@ -0,0 +1,50 @@ +package com.wayoftime.bloodmagic.item; + +import com.wayoftime.bloodmagic.BloodMagic; +import com.wayoftime.bloodmagic.core.util.register.IModelLocator; +import com.wayoftime.bloodmagic.core.will.DemonWill; +import com.wayoftime.bloodmagic.core.will.ISentientEquipment; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemSword; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; + +import javax.annotation.Nonnull; + +public class ItemSentientSword extends ItemSword implements ISentientEquipment, IModelLocator { + + public ItemSentientSword() { + super(ToolMaterial.IRON); + + setRegistryName("sentient_sword"); + setTranslationKey(BloodMagic.MODID + ":sentient_sword"); + setCreativeTab(BloodMagic.TAB_BM); + + addPropertyOverride(new ResourceLocation(BloodMagic.MODID, "will"), (stack, worldIn, entityIn) -> Float.parseFloat("0." + getDemonWill(stack).ordinal())); + addPropertyOverride(new ResourceLocation(BloodMagic.MODID, "active"), (stack, worldIn, entityIn) -> isActivated(stack) ? 1.0F : 0.0F); + } + + @Override + public void getSubItems(CreativeTabs tab, NonNullList items) { + for (DemonWill will : DemonWill.VALUES) { + ItemStack stack = new ItemStack(this); + NBTTagCompound tag = new NBTTagCompound(); + tag.setString("willType", will.name()); + stack.setTagCompound(tag); + items.add(stack); + } + } + + @Override + public double getWillDropAmount(ItemStack stack) { + return 1; + } + + @Nonnull + @Override + public ResourceLocation getModelPath() { + return new ResourceLocation(BloodMagic.MODID, "soul/sentient_sword"); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/item/sigil/ISigil.java b/src/main/java/com/wayoftime/bloodmagic/item/sigil/ISigil.java new file mode 100644 index 00000000..31bc6766 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/item/sigil/ISigil.java @@ -0,0 +1,51 @@ +package com.wayoftime.bloodmagic.item.sigil; + +import com.wayoftime.bloodmagic.core.network.Binding; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import javax.annotation.Nonnegative; +import javax.annotation.Nonnull; + +public interface ISigil { + + @Nonnull + default EnumActionResult onRightClick(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull World world, @Nonnull EnumHand hand, @Nonnull Binding binding) { + return EnumActionResult.PASS; + } + + default EnumActionResult onInteract(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull EnumFacing side, @Nonnull EnumHand hand, @Nonnull Binding binding) { + return EnumActionResult.PASS; + } + + @Nonnegative + int getCost(); + + interface Toggle extends ISigil { + + default void onToggle(boolean active, @Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull World world, @Nonnull EnumHand hand, @Nonnull Binding binding) { + + } + + default void onUpdate(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull World world, @Nonnegative int itemSlot, boolean isHeld, @Nonnull Binding binding) { + + } + } + + interface Holding extends ISigil { + + int getSize(ItemStack stack); + + int getEquippedSigil(ItemStack stack); + + NonNullList getHeldSigils(ItemStack stack); + + void setHeldSigils(ItemStack stack, NonNullList inventory); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/item/sigil/ItemSigil.java b/src/main/java/com/wayoftime/bloodmagic/item/sigil/ItemSigil.java new file mode 100644 index 00000000..42a2341f --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/item/sigil/ItemSigil.java @@ -0,0 +1,176 @@ +package com.wayoftime.bloodmagic.item.sigil; + +import com.wayoftime.bloodmagic.BloodMagic; +import com.wayoftime.bloodmagic.core.network.Binding; +import com.wayoftime.bloodmagic.core.network.SoulNetwork; +import com.wayoftime.bloodmagic.core.network.NetworkInteraction; +import com.wayoftime.bloodmagic.core.util.BooleanResult; +import com.wayoftime.bloodmagic.core.util.register.IVariantProvider; +import com.wayoftime.bloodmagic.item.IBindable; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.IItemPropertyGetter; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.*; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.common.util.FakePlayer; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import javax.annotation.Nullable; +import java.util.List; + +/* + * TODO - See checklist + * - [-] Sigils + * - [x] Divination + * - [x] Air + * - [x] Fast Miner + * - [-] Haste + * - [ ] Water + * - [ ] Lava + * - [ ] Void + * - [ ] Green Grove + * - [ ] Blood Light + * - [ ] Elemental Affinity + * - [ ] Magnetism + * - [ ] Suppression + * - [ ] Seer + * - Perhaps this could be modified to show network interaction history instead of additional altar data? + * - [ ] Ender Severance + * - [ ] Whirlwind + * - [ ] Phantom Bridge + * - [ ] Compression + * - [ ] Holding + * - [ ] Teleposition + * - [ ] Transposition + * - [ ] Claw + * - [ ] Bounce + * - [ ] Frost + */ +public class ItemSigil extends Item implements IBindable, IVariantProvider { + + private final ISigil sigil; + + public ItemSigil(ISigil sigil, String name) { + this.sigil = sigil; + + setCreativeTab(BloodMagic.TAB_BM); + setTranslationKey(BloodMagic.MODID + ":sigil_" + name); + setRegistryName("sigil_" + name); + setMaxStackSize(1); + + if (sigil instanceof ISigil.Toggle) { + addPropertyOverride(new ResourceLocation(BloodMagic.MODID, "toggled"), new IItemPropertyGetter() { + @SideOnly(Side.CLIENT) + @Override + public float apply(ItemStack stack, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) { + return isActive(stack) ? 1.0F : 0.0F; + } + }); + } + } + + @Override + public ActionResult onItemRightClick(World world, EntityPlayer player, EnumHand hand) { + if (player instanceof FakePlayer) + return ActionResult.newResult(EnumActionResult.FAIL, player.getHeldItem(hand)); + + ItemStack sigilStack = getSigilStack(player, hand); + Binding binding = getBinding(sigilStack); + if (binding == null || binding.getOwnerId() == null) + return ActionResult.newResult(EnumActionResult.FAIL, player.getHeldItem(hand)); + + if (sigil instanceof ISigil.Toggle && player.isSneaking()) { + boolean newState = toggleState(sigilStack); + ((ISigil.Toggle) sigil).onToggle(newState, sigilStack, player, world, hand, binding); + return ActionResult.newResult(EnumActionResult.SUCCESS, player.getHeldItem(hand)); + } + + EnumActionResult result = sigil.onRightClick(sigilStack, player, world, hand, binding); + if (result == EnumActionResult.SUCCESS) { + BooleanResult syphonResult = SoulNetwork.get(binding.getOwnerId()).submitInteraction(NetworkInteraction.asItemInfo(sigilStack, world, player, sigil.getCost()).syphon()); + if (!syphonResult.isSuccess()) + player.attackEntityFrom(SoulNetwork.WEAK_SOUL, 2.0F); + } + + return ActionResult.newResult(result, player.getHeldItem(hand)); + } + + @Override + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + if (player instanceof FakePlayer) + return EnumActionResult.FAIL; + + ItemStack stack = getSigilStack(player, hand); + Binding binding = getBinding(stack); + if (binding == null) + return EnumActionResult.FAIL; + + return sigil.onInteract(stack, player, world, pos, facing, hand, binding); + } + + @Override + public void onUpdate(ItemStack stack, World world, Entity entity, int itemSlot, boolean isSelected) { + if (!(entity instanceof EntityPlayer) || entity instanceof FakePlayer) + return; + + ItemStack sigilStack = getSigilStack(stack); + if (sigil instanceof ISigil.Toggle) { + Binding binding = getBinding(sigilStack); + if (binding != null && isActive(sigilStack)) { + ((ISigil.Toggle) sigil).onUpdate(sigilStack, (EntityPlayer) entity, world, itemSlot, isSelected, binding); + if (world.getTotalWorldTime() % 100 == 0) { + BooleanResult result = SoulNetwork.get(binding.getOwnerId()).submitInteraction(NetworkInteraction.asItemInfo(sigilStack, world, entity, sigil.getCost()).syphon()); + if (!result.isSuccess()) + entity.attackEntityFrom(SoulNetwork.WEAK_SOUL, 1.0F); + } + } + } + } + + @Override + public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { + IBindable.appendTooltip(getBinding(stack), tooltip); + } + + @Override + public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { + return slotChanged; + } + + public ISigil getSigil() { + return sigil; + } + + public ItemStack getSigilStack(EntityPlayer player, EnumHand hand) { + return getSigilStack(player.getHeldItem(hand)); + } + + public ItemStack getSigilStack(ItemStack sigilStack) { + if (sigil instanceof ISigil.Holding) { + ISigil.Holding holding = (ISigil.Holding) sigil; + int current = holding.getEquippedSigil(sigilStack); + return holding.getHeldSigils(sigilStack).get(current); + } + + return sigilStack; + } + + public boolean toggleState(ItemStack stack) { + if (!stack.hasTagCompound()) + return false; + + boolean newState = !isActive(stack); + stack.getTagCompound().setBoolean("active", newState); + return newState; + } + + public boolean isActive(ItemStack stack) { + return stack.hasTagCompound() && stack.getTagCompound().getBoolean("active"); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/item/sigil/SigilAir.java b/src/main/java/com/wayoftime/bloodmagic/item/sigil/SigilAir.java new file mode 100644 index 00000000..1d246d9a --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/item/sigil/SigilAir.java @@ -0,0 +1,46 @@ +package com.wayoftime.bloodmagic.item.sigil; + +import com.wayoftime.bloodmagic.core.network.Binding; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.World; + +import javax.annotation.Nonnull; + +public class SigilAir implements ISigil { + + @Override + public int getCost() { + return 50; + } + + @Nonnull + @Override + public EnumActionResult onRightClick(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull World world, @Nonnull EnumHand hand, Binding binding) { + if (world.isRemote) { + Vec3d vec = player.getLookVec(); + double wantedVelocity = 1.7; + + // TODO - Revisit after potions +// if (player.isPotionActive(RegistrarBloodMagic.BOOST)) { +// int amplifier = player.getActivePotionEffect(RegistrarBloodMagic.BOOST).getAmplifier(); +// wantedVelocity += (1 + amplifier) * (0.35); +// } + + player.motionX = vec.x * wantedVelocity; + player.motionY = vec.y * wantedVelocity; + player.motionZ = vec.z * wantedVelocity; + world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F); + } + + if (!world.isRemote) + player.fallDistance = 0; + + return EnumActionResult.SUCCESS; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/item/sigil/SigilDivination.java b/src/main/java/com/wayoftime/bloodmagic/item/sigil/SigilDivination.java new file mode 100644 index 00000000..70851889 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/item/sigil/SigilDivination.java @@ -0,0 +1,27 @@ +package com.wayoftime.bloodmagic.item.sigil; + +import com.wayoftime.bloodmagic.core.network.Binding; +import com.wayoftime.bloodmagic.core.network.SoulNetwork; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.world.World; + +import javax.annotation.Nonnull; + +public class SigilDivination implements ISigil { + + @Override + public int getCost() { + return 0; + } + + @Nonnull + @Override + public EnumActionResult onRightClick(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull World world, @Nonnull EnumHand hand, Binding binding) { + player.sendStatusMessage(new TextComponentString("Current Essence: " + SoulNetwork.get(binding.getOwnerId()).getEssence()), true); + return EnumActionResult.PASS; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/item/sigil/SigilFastMiner.java b/src/main/java/com/wayoftime/bloodmagic/item/sigil/SigilFastMiner.java new file mode 100644 index 00000000..535f4cd3 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/item/sigil/SigilFastMiner.java @@ -0,0 +1,23 @@ +package com.wayoftime.bloodmagic.item.sigil; + +import com.wayoftime.bloodmagic.core.network.Binding; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.PotionEffect; +import net.minecraft.world.World; + +import javax.annotation.Nonnull; + +public class SigilFastMiner implements ISigil.Toggle { + + @Override + public int getCost() { + return 100; + } + + @Override + public void onUpdate(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull World world, int itemSlot, boolean isHeld, @Nonnull Binding binding) { + player.addPotionEffect(new PotionEffect(MobEffects.HASTE, 2, 0, true, false)); + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/item/sigil/SigilHaste.java b/src/main/java/com/wayoftime/bloodmagic/item/sigil/SigilHaste.java new file mode 100644 index 00000000..0c401a30 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/item/sigil/SigilHaste.java @@ -0,0 +1,23 @@ +package com.wayoftime.bloodmagic.item.sigil; + +import com.wayoftime.bloodmagic.core.network.Binding; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.PotionEffect; +import net.minecraft.world.World; + +import javax.annotation.Nonnull; + +public class SigilHaste implements ISigil.Toggle { + + @Override + public int getCost() { + return 250; + } + + @Override + public void onUpdate(@Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull World world, int itemSlot, boolean isHeld, @Nonnull Binding binding) { + player.addPotionEffect(new PotionEffect(MobEffects.SPEED, 2, 0, true, false)); // TODO - RegistrarBloodMagic.BOOST + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/proxy/ClientProxy.java b/src/main/java/com/wayoftime/bloodmagic/proxy/ClientProxy.java new file mode 100644 index 00000000..39c0539c --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/proxy/ClientProxy.java @@ -0,0 +1,15 @@ +package com.wayoftime.bloodmagic.proxy; + +import com.wayoftime.bloodmagic.BloodMagic; +import net.minecraftforge.client.model.obj.OBJLoader; +import org.lwjgl.opengl.Display; + +public class ClientProxy implements IProxy { + + @Override + public void preInit() { + OBJLoader.INSTANCE.addDomain(BloodMagic.MODID); + + Display.setTitle("Basically 1.13"); // TODO - :BigThink: + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/proxy/IProxy.java b/src/main/java/com/wayoftime/bloodmagic/proxy/IProxy.java new file mode 100644 index 00000000..8f215817 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/proxy/IProxy.java @@ -0,0 +1,8 @@ +package com.wayoftime.bloodmagic.proxy; + +public interface IProxy { + + default void preInit() { + + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/proxy/ServerProxy.java b/src/main/java/com/wayoftime/bloodmagic/proxy/ServerProxy.java new file mode 100644 index 00000000..2ca5b44b --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/proxy/ServerProxy.java @@ -0,0 +1,4 @@ +package com.wayoftime.bloodmagic.proxy; + +public class ServerProxy implements IProxy { +} diff --git a/src/main/java/com/wayoftime/bloodmagic/tile/TileBloodAltar.java b/src/main/java/com/wayoftime/bloodmagic/tile/TileBloodAltar.java new file mode 100644 index 00000000..8a2b82cb --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/tile/TileBloodAltar.java @@ -0,0 +1,268 @@ +package com.wayoftime.bloodmagic.tile; + +import com.wayoftime.bloodmagic.api.event.BloodMagicCraftedEvent; +import com.wayoftime.bloodmagic.api.impl.BloodMagicAPI; +import com.wayoftime.bloodmagic.api.impl.recipe.RecipeBloodAltar; +import com.wayoftime.bloodmagic.core.RegistrarBloodMagic; +import com.wayoftime.bloodmagic.core.altar.AltarTier; +import com.wayoftime.bloodmagic.core.altar.AltarUpgrades; +import com.wayoftime.bloodmagic.core.altar.AltarUtil; +import com.wayoftime.bloodmagic.core.network.*; +import com.wayoftime.bloodmagic.item.IBindable; +import com.wayoftime.bloodmagic.tile.base.TileBase; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.ITickable; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.WorldServer; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fml.common.registry.ForgeRegistries; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.ItemStackHandler; + +import javax.annotation.Nullable; + +/* + * TODO - See checklist + * - [-] Upgrades + * - [x] Self Sacrifice + * - [x] Sacrifice + * - [x] Capacity + * - [x] Augmented Capacity + * - [ ] Speed + * - [ ] Displacement + * - [ ] Orb + * - [ ] Acceleration + * - [ ] Charging + * - [-] Tanks + * - [x] Main tank keeps buffer filled + * - [ ] Buffer fills main tank + */ +public class TileBloodAltar extends TileBase implements ITickable { + + private FluidTank tank = new FluidTank(new FluidStack(RegistrarBloodMagic.FLUID_LIFE_ESSENCE, 0), 10000); + private FluidTank buffer = new FluidTank(new FluidStack(RegistrarBloodMagic.FLUID_LIFE_ESSENCE, 0), 1000); // Buffer has 10% the capacity of the tank + private ItemStackHandler itemHandler = new ItemStackHandler(1); + private AltarTier currentTier = AltarTier.ONE; + private AltarUpgrades upgrades = new AltarUpgrades(); + private float progress; + private RecipeBloodAltar recipe = null; + private int drained; + private long lastCompletionTime; + + public TileBloodAltar() { + tank.setTileEntity(this); + } + + @Override + public void update() { + if (getWorld().getTotalWorldTime() % 20 == 0) { + currentTier = AltarUtil.getTier(getWorld(), getPos()); + upgrades = AltarUtil.getUpgrades(getWorld(), pos, currentTier); + handleTankUpdates(); + } + + if (getWorld().getTotalWorldTime() - lastCompletionTime > 20) + handleRecipe(); + } + + protected void handleTankUpdates() { + tank.setCapacity((int) (Fluid.BUCKET_VOLUME * 10 * upgrades.getCapacityModifier())); + if (tank.getCapacity() < tank.getFluidAmount()) + tank.setFluid(new FluidStack(RegistrarBloodMagic.FLUID_LIFE_ESSENCE, tank.getCapacity())); + + buffer.setCapacity((int) (tank.getCapacity() * 0.1D)); + if (buffer.getCapacity() < buffer.getFluidAmount()) + buffer.setFluid(new FluidStack(RegistrarBloodMagic.FLUID_LIFE_ESSENCE, buffer.getCapacity())); + + if (buffer.getCapacity() > buffer.getFluidAmount() && tank.getFluidAmount() > 0) { + FluidStack drained = tank.drain(100, true); + if (drained != null) + buffer.fill(drained, true); + } + } + + protected void handleRecipe() { + ItemStack inputItem = itemHandler.getStackInSlot(0); + if (inputItem.isEmpty()) + return; + + // Only look for a recipe if the altar currently has blood in it as well as the current recipe is null or the item doesn't match the recipe input + if (tank.getFluidAmount() > 0 && (recipe == null || !recipe.getInput().apply(inputItem))) { + RecipeBloodAltar newRecipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getBloodAltar(inputItem); + if (newRecipe != null && newRecipe.getMinimumTier().ordinal() <= currentTier.ordinal()) + recipe = newRecipe; + } + + // Match orbs + if (recipe == null) { + if (inputItem.getItem() instanceof IBloodOrb && inputItem.getItem() instanceof IBindable) { + BloodOrb orb = ((IBloodOrb) inputItem.getItem()).getOrb(inputItem); + Binding binding = ((IBindable) inputItem.getItem()).getBinding(inputItem); + if (orb != null && binding != null) { + if (currentTier.ordinal() < orb.getTier()) + return; + + SoulNetwork network = SoulNetwork.get(binding.getOwnerId()); + if (network.getEssence() < orb.getCapacity()) { + FluidStack drained = tank.drain(new FluidStack(RegistrarBloodMagic.FLUID_LIFE_ESSENCE, orb.getFillRate()), true); + if (drained != null) + network.submitInteraction(NetworkInteraction.asItemInfo(inputItem, world, pos, drained.amount)); + } + } + } + + return; + } + + // Check tier + if (recipe.getMinimumTier().ordinal() > currentTier.ordinal()) + return; + + // Check and handle progress loss + if (tank.getFluidAmount() <= 0) { + progress = Math.max(0, progress - (recipe.getDrainRate() / (recipe.getSyphon() * inputItem.getCount()))); + if (getWorld() instanceof WorldServer) + ((WorldServer) getWorld()).spawnParticle(EnumParticleTypes.SMOKE_NORMAL, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 1, 0.1, 0, 0.1, 0); + return; + } + + FluidStack tankDrain = tank.drain(new FluidStack(RegistrarBloodMagic.FLUID_LIFE_ESSENCE, recipe.getConsumeRate()), true); + if (tankDrain == null) + return; + + if (getWorld() instanceof WorldServer) + ((WorldServer) getWorld()).spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 1, 0.2, 0, 0.2, 0); + + drained += tankDrain.amount; + progress = (float) drained / (Math.max(recipe.getSyphon() * inputItem.getCount(), 1)); + + if (progress >= 1.0F) { + BloodMagicCraftedEvent.Altar event = new BloodMagicCraftedEvent.Altar(recipe.getOutput(), inputItem); + MinecraftForge.EVENT_BUS.post(event); + + if (getWorld() instanceof WorldServer) + ((WorldServer) getWorld()).spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 40, 0.3, 0, 0.3, 0); + + itemHandler.setStackInSlot(0, event.getOutput()); + lastCompletionTime = getWorld().getTotalWorldTime(); + resetProgress(); + } + } + + @Override + public void deserialize(NBTTagCompound tag) { + tank.readFromNBT(tag.getCompoundTag("tank")); + tank.setTileEntity(this); + itemHandler.deserializeNBT(tag.getCompoundTag("inventory")); + progress = tag.getFloat("progress"); + currentTier = AltarTier.VALUES[tag.getInteger("tier")]; + drained = tag.getInteger("drained"); + lastCompletionTime = tag.getLong("lastCompletionTime"); + } + + @Override + public void serialize(NBTTagCompound tag) { + tag.setTag("tank", tank.writeToNBT(new NBTTagCompound())); + tag.setTag("inventory", itemHandler.serializeNBT()); + tag.setFloat("progress", progress); + tag.setInteger("tier", currentTier.ordinal()); + tag.setInteger("drained", drained); + tag.setLong("lastCompletionTime", lastCompletionTime); + } + + @Override + public boolean hasCapability(Capability capability, @Nullable EnumFacing facing) { + return super.hasCapability(capability, facing) || capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY; + } + + @Nullable + @Override + public T getCapability(Capability capability, @Nullable EnumFacing facing) { + if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) + return facing == null ? (T) tank : (T) buffer; + + if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) + return (T) itemHandler; + + return super.getCapability(capability, facing); + } + + @Override + public NBTTagCompound getUpdateTag() { + NBTTagCompound tag = new NBTTagCompound(); + writeToNBT(tag); + ItemStack contained = itemHandler.getStackInSlot(0); + if (!contained.isEmpty()) { + NBTTagCompound itemTag = new NBTTagCompound(); + itemTag.setString("item", contained.getItem().getRegistryName().toString()); + itemTag.setInteger("count", contained.getCount()); + itemTag.setInteger("data", contained.getMetadata()); + NBTTagCompound shareTag = contained.getItem().getNBTShareTag(contained); + if (shareTag != null) + itemTag.setTag("nbt", shareTag); + + tag.setTag("item", itemTag); + } + + tag.setTag("tank", tank.writeToNBT(new NBTTagCompound())); + tag.setFloat("progress", progress); + return tag; + } + + @Override + public void handleUpdateTag(NBTTagCompound tag) { + readCurrentPos(tag); + if (tag.hasKey("item")) { + Item item = ForgeRegistries.ITEMS.getValue(new ResourceLocation(tag.getString("item"))); + int count = tag.getInteger("count"); + int meta = tag.getInteger("data"); + NBTTagCompound nbt = null; + if (tag.hasKey("nbt")) + nbt = tag.getCompoundTag("nbt"); + + ItemStack stack = new ItemStack(item, count, meta); + if (nbt != null) + stack.deserializeNBT(nbt); + itemHandler.setStackInSlot(0, stack); + } else { + itemHandler.setStackInSlot(0, ItemStack.EMPTY); + } + tank.readFromNBT(tag.getCompoundTag("tank")); + progress = tag.getFloat("progress"); + } + + public void resetProgress() { + recipe = null; + drained = 0; + progress = 0.0F; + } + + public FluidTank getTank() { + return tank; + } + + public boolean isCrafting() { + return recipe != null; + } + + public AltarTier getCurrentTier() { + return currentTier; + } + + public float getProgress() { + return progress; + } + + public AltarUpgrades getUpgrades() { + return upgrades; + } +} diff --git a/src/main/java/com/wayoftime/bloodmagic/tile/base/TileBase.java b/src/main/java/com/wayoftime/bloodmagic/tile/base/TileBase.java new file mode 100644 index 00000000..2350d953 --- /dev/null +++ b/src/main/java/com/wayoftime/bloodmagic/tile/base/TileBase.java @@ -0,0 +1,127 @@ +package com.wayoftime.bloodmagic.tile.base; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +/** + * Base tile class. + *

+ * Handles data syncing and core data writing/reading. + */ +public class TileBase extends TileEntity { + + @Override + public final void readFromNBT(NBTTagCompound compound) { + super.readFromNBT(compound); + + if (compound.hasKey("baseData")) + deserializeBase(compound.getCompoundTag("baseData")); + + deserialize(compound.getCompoundTag("tileData")); + } + + @Override + public final NBTTagCompound writeToNBT(NBTTagCompound compound) { + super.writeToNBT(compound); + + NBTTagCompound base = serializeBase(); + if (base != null) + compound.setTag("baseData", base); + + NBTTagCompound tileData = new NBTTagCompound(); + serialize(tileData); + compound.setTag("tileData", tileData); + return compound; + } + + /** + * Called by {@link #readFromNBT(NBTTagCompound)} + *

+ * Internal data (such as coordinates) are handled for you. Just read the data you need. + * + * @param tagCompound - The tag compound to read from + */ + public void deserialize(NBTTagCompound tagCompound) { + + } + + /** + * Package private method for reading base data from the tag compound. + * + * @param tagCompound - The tag compound to read from + */ + void deserializeBase(NBTTagCompound tagCompound) { + + } + + /** + * Called by {@link #writeToNBT(NBTTagCompound)} + *

+ * Internal data (such as coordinates) are handled for you. Just read the data you need. + * + * @param tagCompound - The tag compound to write to. + * @return the modified tag compound + */ + public void serialize(NBTTagCompound tagCompound) { + + } + + /** + * Package private method for writing base data to the tag compound. + * + * @return the modified tag compound + */ + NBTTagCompound serializeBase() { + return null; + } + + protected final NBTTagCompound writeCurrentPos(NBTTagCompound compound) { + compound.setString("id", getKey(getClass()).toString()); + compound.setInteger("x", this.pos.getX()); + compound.setInteger("y", this.pos.getY()); + compound.setInteger("z", this.pos.getZ()); + return compound; + } + + protected final void readCurrentPos(NBTTagCompound tag) { + this.pos = new BlockPos(tag.getInteger("x"), tag.getInteger("y"), tag.getInteger("z")); + } + + public void notifyUpdate() { + IBlockState state = world.getBlockState(pos); + getWorld().notifyBlockUpdate(pos, state, state, 3); + } + + // Data syncing + + @Override + public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { + return oldState.getBlock() != newState.getBlock(); + } + + @Override + public final SPacketUpdateTileEntity getUpdatePacket() { + return new SPacketUpdateTileEntity(getPos(), -999, writeToNBT(new NBTTagCompound())); + } + + @Override + public final void onDataPacket(NetworkManager net, SPacketUpdateTileEntity pkt) { + super.onDataPacket(net, pkt); + readFromNBT(pkt.getNbtCompound()); + } + + @Override + public NBTTagCompound getUpdateTag() { + return writeToNBT(new NBTTagCompound()); + } + + @Override + public void handleUpdateTag(NBTTagCompound tag) { + readFromNBT(tag); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/BloodMagic.java b/src/main/java/wayoftime/bloodmagic/BloodMagic.java deleted file mode 100644 index a59eb766..00000000 --- a/src/main/java/wayoftime/bloodmagic/BloodMagic.java +++ /dev/null @@ -1,319 +0,0 @@ -package wayoftime.bloodmagic; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import com.google.gson.Gson; - -import net.minecraft.block.Block; -import net.minecraft.data.DataGenerator; -import net.minecraft.fluid.Fluid; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipeSerializer; -import net.minecraft.potion.Effect; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.event.ColorHandlerEvent; -import net.minecraftforge.client.event.ModelRegistryEvent; -import net.minecraftforge.client.model.ModelLoaderRegistry; -import net.minecraftforge.client.model.generators.ItemModelProvider; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.crafting.CraftingHelper; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.ModLoadingContext; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.config.ModConfig; -import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; -import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; -import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent; -import net.minecraftforge.fml.event.lifecycle.GatherDataEvent; -import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; -import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; -import net.minecraftforge.fml.event.server.FMLServerStartingEvent; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import wayoftime.bloodmagic.client.ClientEvents; -import wayoftime.bloodmagic.client.hud.Elements; -import wayoftime.bloodmagic.client.key.BloodMagicKeyHandler; -import wayoftime.bloodmagic.client.key.KeyBindings; -import wayoftime.bloodmagic.client.model.MimicModelLoader; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.common.data.GeneratorBaseRecipes; -import wayoftime.bloodmagic.common.data.GeneratorBlockStates; -import wayoftime.bloodmagic.common.data.GeneratorBlockTags; -import wayoftime.bloodmagic.common.data.GeneratorFluidTags; -import wayoftime.bloodmagic.common.data.GeneratorItemModels; -import wayoftime.bloodmagic.common.data.GeneratorItemTags; -import wayoftime.bloodmagic.common.data.GeneratorLanguage; -import wayoftime.bloodmagic.common.data.GeneratorLootTable; -import wayoftime.bloodmagic.common.data.recipe.BloodMagicRecipeProvider; -import wayoftime.bloodmagic.common.item.BloodMagicItems; -import wayoftime.bloodmagic.common.registries.BloodMagicEntityTypes; -import wayoftime.bloodmagic.common.registries.BloodMagicRecipeSerializers; -import wayoftime.bloodmagic.core.AnointmentRegistrar; -import wayoftime.bloodmagic.core.LivingArmorRegistrar; -import wayoftime.bloodmagic.core.recipe.IngredientBloodOrb; -import wayoftime.bloodmagic.core.registry.AlchemyArrayRegistry; -import wayoftime.bloodmagic.core.registry.OrbRegistry; -import wayoftime.bloodmagic.impl.BloodMagicAPI; -import wayoftime.bloodmagic.impl.BloodMagicCorePlugin; -import wayoftime.bloodmagic.loot.GlobalLootModifier; -import wayoftime.bloodmagic.network.BloodMagicPacketHandler; -import wayoftime.bloodmagic.potion.BloodMagicPotions; -import wayoftime.bloodmagic.ritual.ModRituals; -import wayoftime.bloodmagic.ritual.RitualManager; -import wayoftime.bloodmagic.structures.ModDungeons; -import wayoftime.bloodmagic.tile.TileAlchemicalReactionChamber; -import wayoftime.bloodmagic.tile.TileAlchemyArray; -import wayoftime.bloodmagic.tile.TileAlchemyTable; -import wayoftime.bloodmagic.tile.TileAltar; -import wayoftime.bloodmagic.tile.TileDeforesterCharge; -import wayoftime.bloodmagic.tile.TileDemonCrucible; -import wayoftime.bloodmagic.tile.TileDemonCrystal; -import wayoftime.bloodmagic.tile.TileDemonCrystallizer; -import wayoftime.bloodmagic.tile.TileFungalCharge; -import wayoftime.bloodmagic.tile.TileIncenseAltar; -import wayoftime.bloodmagic.tile.TileMasterRitualStone; -import wayoftime.bloodmagic.tile.TileMimic; -import wayoftime.bloodmagic.tile.TileShapedExplosive; -import wayoftime.bloodmagic.tile.TileSoulForge; -import wayoftime.bloodmagic.tile.TileVeinMineCharge; -import wayoftime.bloodmagic.util.handler.event.GenericHandler; -import wayoftime.bloodmagic.util.handler.event.WillHandler; - -@Mod("bloodmagic") -//@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) -public class BloodMagic -{ - public static final String MODID = "bloodmagic"; - // Directly reference a log4j logger. - public static final Logger LOGGER = LogManager.getLogger(); - - private static Gson GSON = null; - - public static final BloodMagicPacketHandler packetHandler = new BloodMagicPacketHandler(); - public static final RitualManager RITUAL_MANAGER = new RitualManager(); - - public BloodMagic() - { - IEventBus modBus = FMLJavaModLoadingContext.get().getModEventBus(); - - modBus.addListener(this::setup); - modBus.addListener(this::onLoadComplete); - - BloodMagicBlocks.BLOCKS.register(modBus); - BloodMagicItems.ITEMS.register(modBus); -// RegistrarBloodMagic.BLOOD_ORBS.createAndRegister(modBus, "bloodorbs"); - BloodMagicItems.BLOOD_ORBS.createAndRegister(modBus, "bloodorbs"); - LivingArmorRegistrar.UPGRADES.createAndRegister(modBus, "upgrades"); - AnointmentRegistrar.ANOINTMENTS.createAndRegister(modBus, "anointments"); - BloodMagicItems.BASICITEMS.register(modBus); - BloodMagicBlocks.BASICBLOCKS.register(modBus); - BloodMagicBlocks.DUNGEONBLOCKS.register(modBus); - BloodMagicBlocks.FLUIDS.register(modBus); - BloodMagicBlocks.CONTAINERS.register(modBus); - BloodMagicEntityTypes.ENTITY_TYPES.register(modBus); - - GlobalLootModifier.GLM.register(modBus); - - BloodMagicRecipeSerializers.RECIPE_SERIALIZERS.register(modBus); - - // Register the setup method for modloading - modBus.addListener(this::setup); - // Register the enqueueIMC method for modloading - modBus.addListener(this::enqueueIMC); - // Register the processIMC method for modloading - modBus.addListener(this::processIMC); - // Register the doClientStuff method for modloading - modBus.addListener(this::doClientStuff); - modBus.addListener(this::loadModels); - modBus.addListener(this::gatherData); - - modBus.addGenericListener(Fluid.class, this::registerFluids); - modBus.addGenericListener(TileEntityType.class, this::registerTileEntityTypes); - modBus.addGenericListener(IRecipeSerializer.class, this::registerRecipes); - modBus.addGenericListener(Effect.class, BloodMagicPotions::registerPotions); - - MinecraftForge.EVENT_BUS.register(new GenericHandler()); -// MinecraftForge.EVENT_BUS.register(new ClientHandler()); - modBus.addListener(this::registerColors); - - MinecraftForge.EVENT_BUS.register(new WillHandler()); -// MinecraftForge.EVENT_BUS.register(new BloodMagicBlocks()); -// MinecraftForge.EVENT_BUS.addListener(this::commonSetup); - - // Register ourselves for server and other game events we are interested in - MinecraftForge.EVENT_BUS.register(this); - - ModLoadingContext context = ModLoadingContext.get(); - context.registerConfig(ModConfig.Type.CLIENT, ConfigManager.CLIENT_SPEC); - - ModDungeons.init(); - } - - private void registerRecipes(RegistryEvent.Register> event) - { -// System.out.println("Registering IngredientBloodOrb Serializer."); - CraftingHelper.register(IngredientBloodOrb.NAME, IngredientBloodOrb.Serializer.INSTANCE); - -// event.getRegistry().registerAll( -// new SewingRecipe.Serializer().setRegistryName("sewing") -// ); - } - - public static ResourceLocation rl(String name) - { - return new ResourceLocation(BloodMagic.MODID, name); - } - - public void registerFluids(RegistryEvent.Register event) - { - - } - - public void onLoadComplete(FMLLoadCompleteEvent event) - { - OrbRegistry.tierMap.put(BloodMagicItems.ORB_WEAK.get().getTier(), new ItemStack(BloodMagicItems.WEAK_BLOOD_ORB.get())); - OrbRegistry.tierMap.put(BloodMagicItems.ORB_APPRENTICE.get().getTier(), new ItemStack(BloodMagicItems.APPRENTICE_BLOOD_ORB.get())); - OrbRegistry.tierMap.put(BloodMagicItems.ORB_MAGICIAN.get().getTier(), new ItemStack(BloodMagicItems.MAGICIAN_BLOOD_ORB.get())); - OrbRegistry.tierMap.put(BloodMagicItems.ORB_MASTER.get().getTier(), new ItemStack(BloodMagicItems.MASTER_BLOOD_ORB.get())); - BloodMagicCorePlugin.INSTANCE.register(BloodMagicAPI.INSTANCE); - RITUAL_MANAGER.discover(); - ModRituals.initHarvestHandlers(); - LivingArmorRegistrar.register(); - AnointmentRegistrar.register(); - AlchemyArrayRegistry.registerBaseArrays(); - } - - public void registerTileEntityTypes(RegistryEvent.Register> event) - { - LOGGER.info("Attempting to register Tile Entities"); - event.getRegistry().register(TileEntityType.Builder.create(TileAltar::new, BloodMagicBlocks.BLOOD_ALTAR.get()).build(null).setRegistryName("altar")); - event.getRegistry().register(TileEntityType.Builder.create(TileAlchemyArray::new, BloodMagicBlocks.ALCHEMY_ARRAY.get()).build(null).setRegistryName("alchemyarray")); - event.getRegistry().register(TileEntityType.Builder.create(TileSoulForge::new, BloodMagicBlocks.SOUL_FORGE.get()).build(null).setRegistryName("soulforge")); - event.getRegistry().register(TileEntityType.Builder.create(TileMasterRitualStone::new, BloodMagicBlocks.MASTER_RITUAL_STONE.get()).build(null).setRegistryName("masterritualstone")); - event.getRegistry().register(TileEntityType.Builder.create(TileAlchemicalReactionChamber::new, BloodMagicBlocks.ALCHEMICAL_REACTION_CHAMBER.get()).build(null).setRegistryName("alchemicalreactionchamber")); - event.getRegistry().register(TileEntityType.Builder.create(TileAlchemyTable::new, BloodMagicBlocks.ALCHEMY_TABLE.get()).build(null).setRegistryName("alchemytable")); - event.getRegistry().register(TileEntityType.Builder.create(TileDemonCrystal::new, BloodMagicBlocks.RAW_CRYSTAL_BLOCK.get(), BloodMagicBlocks.CORROSIVE_CRYSTAL_BLOCK.get(), BloodMagicBlocks.DESTRUCTIVE_CRYSTAL_BLOCK.get(), BloodMagicBlocks.VENGEFUL_CRYSTAL_BLOCK.get(), BloodMagicBlocks.STEADFAST_CRYSTAL_BLOCK.get()).build(null).setRegistryName("demoncrystal")); - event.getRegistry().register(TileEntityType.Builder.create(TileDemonCrucible::new, BloodMagicBlocks.DEMON_CRUCIBLE.get()).build(null).setRegistryName("demoncrucible")); - event.getRegistry().register(TileEntityType.Builder.create(TileDemonCrystallizer::new, BloodMagicBlocks.DEMON_CRYSTALLIZER.get()).build(null).setRegistryName("demoncrystallizer")); - event.getRegistry().register(TileEntityType.Builder.create(TileIncenseAltar::new, BloodMagicBlocks.INCENSE_ALTAR.get()).build(null).setRegistryName("incensealtar")); - event.getRegistry().register(TileEntityType.Builder.create(TileMimic::new, BloodMagicBlocks.MIMIC.get(), BloodMagicBlocks.ETHEREAL_MIMIC.get()).build(null).setRegistryName("mimic")); - event.getRegistry().register(TileEntityType.Builder.create(TileShapedExplosive::new, BloodMagicBlocks.SHAPED_CHARGE.get()).build(null).setRegistryName("shaped_explosive")); - event.getRegistry().register(TileEntityType.Builder.create(TileDeforesterCharge::new, BloodMagicBlocks.DEFORESTER_CHARGE.get()).build(null).setRegistryName("deforester_charge")); - event.getRegistry().register(TileEntityType.Builder.create(TileVeinMineCharge::new, BloodMagicBlocks.VEINMINE_CHARGE.get()).build(null).setRegistryName("veinmine_charge")); - event.getRegistry().register(TileEntityType.Builder.create(TileFungalCharge::new, BloodMagicBlocks.FUNGAL_CHARGE.get()).build(null).setRegistryName("fungal_charge")); - - } - - @SubscribeEvent - public void gatherData(GatherDataEvent event) - { -// GSON = new GsonBuilder().registerTypeAdapter(Variant.class, new Variant.Deserializer()).registerTypeAdapter(ItemCameraTransforms.class, new ItemCameraTransforms.Deserializer()).registerTypeAdapter(ItemTransformVec3f.class, new ItemTransformVec3f.Deserializer()).create(); - - DataGenerator gen = event.getGenerator(); - -// if(event.includeClient()) - { - ItemModelProvider itemModels = new GeneratorItemModels(gen, event.getExistingFileHelper()); - gen.addProvider(itemModels); - gen.addProvider(new GeneratorBlockStates(gen, itemModels.existingFileHelper)); - gen.addProvider(new GeneratorLanguage(gen)); - gen.addProvider(new BloodMagicRecipeProvider(gen)); - gen.addProvider(new GeneratorBaseRecipes(gen)); - gen.addProvider(new GeneratorLootTable(gen)); - - GeneratorBlockTags bmBlockTags = new GeneratorBlockTags(gen, event.getExistingFileHelper()); - gen.addProvider(bmBlockTags); - gen.addProvider(new GeneratorItemTags(gen, bmBlockTags, event.getExistingFileHelper())); - gen.addProvider(new GeneratorFluidTags(gen, event.getExistingFileHelper())); - - } - } - - private void loadModels(final ModelRegistryEvent event) - { - ModelLoaderRegistry.registerLoader(BloodMagic.rl("mimicloader"), new MimicModelLoader(BloodMagic.rl("block/solidopaquemimic"))); - ModelLoaderRegistry.registerLoader(BloodMagic.rl("mimicloader_ethereal"), new MimicModelLoader(BloodMagic.rl("block/etherealopaquemimic"))); - } - - private void setup(final FMLCommonSetupEvent event) - { - // some preinit code -// LOGGER.info("HELLO FROM PREINIT"); -// LOGGER.info("DIRT BLOCK >> {}", Blocks.DIRT.getRegistryName()); - packetHandler.initialize(); - } - -// @OnlyIn(Dist.CLIENT) - private void doClientStuff(final FMLClientSetupEvent event) - { - // do something that can only be done on the client -// LOGGER.info("Got game settings {}", event.getMinecraftSupplier().get().gameSettings); - - ClientEvents.initClientEvents(event); - Elements.registerElements(); - MinecraftForge.EVENT_BUS.register(new ClientEvents()); - KeyBindings.initializeKeys(); - new BloodMagicKeyHandler(); -// IEventBus modBus = FMLJavaModLoadingContext.get().getModEventBus(); -// - - } - - private void registerColors(final ColorHandlerEvent event) - { - if (event instanceof ColorHandlerEvent.Item) - ClientEvents.colorHandlerEvent((ColorHandlerEvent.Item) event); - } - - private void enqueueIMC(final InterModEnqueueEvent event) - { - // some example code to dispatch IMC to another mod -// InterModComms.sendTo("examplemod", "helloworld", () -> { -// LOGGER.info("Hello world from the MDK"); -// return "Hello world"; -// }); - } - - private void processIMC(final InterModProcessEvent event) - { - // some example code to receive and process InterModComms from other mods -// LOGGER.info("Got IMC {}", event.getIMCStream().map(m -> m.getMessageSupplier().get()).collect(Collectors.toList())); - } - - // You can use SubscribeEvent and let the Event Bus discover methods to call - @SubscribeEvent - public void onServerStarting(FMLServerStartingEvent event) - { - // do something when the server starts -// LOGGER.info("HELLO from server starting"); - } - - // You can use EventBusSubscriber to automatically subscribe events on the - // contained class (this is subscribing to the MOD - // Event bus for receiving Registry Events) - @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) - public static class RegistryEvents - { - @SubscribeEvent - public static void onBlocksRegistry(final RegistryEvent.Register blockRegistryEvent) - { - // register a new block here -// LOGGER.info("HELLO from Register Block"); - } - } - - // Custom ItemGroup TAB - public static final ItemGroup TAB = new ItemGroup("bloodmagictab") - { - @Override - public ItemStack createIcon() - { - return new ItemStack(BloodMagicBlocks.BLOOD_ALTAR.get()); - } - }; - public static final String NAME = "Blood Magic: Alchemical Wizardry"; -} diff --git a/src/main/java/wayoftime/bloodmagic/ConfigHandler.java b/src/main/java/wayoftime/bloodmagic/ConfigHandler.java deleted file mode 100644 index ef072b52..00000000 --- a/src/main/java/wayoftime/bloodmagic/ConfigHandler.java +++ /dev/null @@ -1,135 +0,0 @@ -package wayoftime.bloodmagic; - -import net.minecraftforge.fml.common.Mod; - -@Mod.EventBusSubscriber(modid = BloodMagic.MODID) -public class ConfigHandler -{ - // Most of this stuff is commented out because a proper replacement for the - // ConfigHandler is not yet implemented. - -// @Config.Comment( -// { "General settings" }) -// public static ConfigGeneral general = new ConfigGeneral(); -// @Config.Comment( -// { "Blacklist options for various features" }) -// public static ConfigBlacklist blacklist = new ConfigBlacklist(); -// @Config.Comment( -// { "Value modifiers for various features" }) -// public static ConfigValues values = new ConfigValues(); -// @Config.Comment( -// { "Settings that only pertain to the client" }) -// public static ConfigClient client = new ConfigClient(); -// @Config.Comment( -// { "Compatibility settings" }) -// public static ConfigCompat compat = new ConfigCompat(); -// -// @SubscribeEvent -// public static void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) -// { -// if (event.getModID().equals(BloodMagic.MODID)) -// { -// ConfigManager.sync(event.getModID(), Config.Type.INSTANCE); // Sync config values -// BloodMagic.RITUAL_MANAGER.syncConfig(); -// MeteorConfigHandler.handleMeteors(false); // Reload meteors -// } -// } -// -// public static class ConfigGeneral -// { -// @Config.Comment( -// { "Enables extra information to be printed to the log.", "Warning: May drastically increase log size." }) -// public boolean enableDebugLogging = false; -// @Config.Comment( -// { "Enables extra information to be printed to the log." }) -// public boolean enableAPILogging = false; -// @Config.Comment( -// { "Enables extra information to be printed to the log.", "Warning: May drastically increase log size." }) -// public boolean enableVerboseAPILogging = false; -// @Config.Comment( -// { "Enables tier 6 related registrations. This is for pack makers." }) -// @Config.RequiresMcRestart -// public boolean enableTierSixEvenThoughThereIsNoContent = false; -// } -// -// public static class ConfigBlacklist -// { -// @Config.Comment( -// { "Stops listed blocks and entities from being teleposed.", -// "Use the registry name of the block or entity. Vanilla objects do not require the modid.", -// "If a block is specified, you can list the variants to only blacklist a given state." }) -// public String[] teleposer = -// { "bedrock", "mob_spawner" }; -// @Config.Comment( -// { "Stops listed blocks from being transposed.", -// "Use the registry name of the block. Vanilla blocks do not require the modid." }) -// public String[] transposer = -// { "bedrock", "mob_spawner" }; -// @Config.Comment( -// { "Stops the listed entities from being used in the Well of Suffering.", -// "Use the registry name of the entity. Vanilla entities do not require the modid." }) -// public String[] wellOfSuffering = -// {}; -// } -// -// public static class ConfigValues -// { -// @Config.Comment( -// { "Declares the amount of LP gained per HP sacrificed for the given entity.", -// "Setting the value to 0 will blacklist it.", -// "Use the registry name of the entity followed by a ';' and then the value you want.", -// "Vanilla entities do not require the modid." }) -// public String[] sacrificialValues = -// { "villager;100", "slime;15", "enderman;10", "cow;100", "chicken;100", "horse;100", "sheep;100", "wolf;100", -// "ocelot;100", "pig;100", "rabbit;100" }; -// @Config.Comment( -// { "Amount of LP the Coat of Arms should provide for each damage dealt." }) -// @Config.RangeInt(min = 0, max = 100) -// public int coatOfArmsConversion = 20; -// @Config.Comment( -// { "Amount of LP the Sacrificial Dagger should provide for each damage dealt." }) -// @Config.RangeInt(min = 0, max = 10000) -// public int sacrificialDaggerConversion = 100; -// @Config.Comment( -// { "Will rewrite any default meteor types with new versions.", -// "Disable this if you want any of your changes to stay, or do not want default meteor types regenerated." }) -// public boolean shouldResyncMeteors = true; -// @Config.Comment( -// { "Should mobs that die through the Well of Suffering Ritual drop items?" }) -// public boolean wellOfSufferingDrops = true; -// } -// -// public static class ConfigClient -// { -// @Config.Comment( -// { "Always render the beams between routing nodes.", -// "If disabled, the beams will only render while the Node Router is held." }) -// public boolean alwaysRenderRoutingLines = false; -// @Config.Comment( -// { "Completely hide spectral blocks from view.", "If disabled, a transparent block will be displayed." }) -// public boolean invisibleSpectralBlocks = true; -// @Config.Comment( -// { "When cycling through slots, the Sigil of Holding will skip over empty slots and move to the next occupied one.", -// "If disabled, it will behave identically to the default hotbar." }) -// public boolean sigilHoldingSkipsEmptySlots = false; -// } -// -// public static class ConfigCompat -// { -// @Config.Comment( -// { "The display mode to use when looking at a Blood Altar.", "ALWAYS - Always display information.", -// "SIGIL_HELD - Only display information when a Divination or Seers sigil is held in either hand.", -// "SIGIL_CONTAINED - Only display information when a Divination or Seers sigil is somewhere in the inventory." }) -// public AltarDisplayMode wailaAltarDisplayMode = AltarDisplayMode.SIGIL_HELD; -// -// public enum AltarDisplayMode -// { -// ALWAYS, SIGIL_HELD, SIGIL_CONTAINED,; -// } -// } - - public static class values - { - public static int sacrificialDaggerConversion = 100; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/ConfigManager.java b/src/main/java/wayoftime/bloodmagic/ConfigManager.java deleted file mode 100644 index 6863c46b..00000000 --- a/src/main/java/wayoftime/bloodmagic/ConfigManager.java +++ /dev/null @@ -1,36 +0,0 @@ -package wayoftime.bloodmagic; - -import org.apache.commons.lang3.tuple.Pair; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import net.minecraftforge.common.ForgeConfigSpec; - -public class ConfigManager -{ - private static final Logger LOGGER = LogManager.getLogger(); - - public static final ClientConfig CLIENT; - public static final ForgeConfigSpec CLIENT_SPEC; - - static - { - final Pair specPair = new ForgeConfigSpec.Builder().configure(ClientConfig::new); - CLIENT_SPEC = specPair.getRight(); - CLIENT = specPair.getLeft(); - } - - public static class ClientConfig - { - public final ForgeConfigSpec.DoubleValue demonWillGaugeX; - public final ForgeConfigSpec.DoubleValue demonWillGaugeY; - - ClientConfig(ForgeConfigSpec.Builder builder) - { - builder.comment("Settings for the position of the Demon Will Gauge HUD element.").push("hud"); - demonWillGaugeX = builder.defineInRange("DemonWillGaugePosX", 0.01, 0, 1); - demonWillGaugeY = builder.defineInRange("DemonWillGaugePosY", 0.01, 0, 1); - builder.pop(); - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/altar/AltarComponent.java b/src/main/java/wayoftime/bloodmagic/altar/AltarComponent.java deleted file mode 100644 index bb9b4562..00000000 --- a/src/main/java/wayoftime/bloodmagic/altar/AltarComponent.java +++ /dev/null @@ -1,62 +0,0 @@ -package wayoftime.bloodmagic.altar; - -import net.minecraft.util.math.BlockPos; - -/** - * Used for building the altar structure. - */ -public class AltarComponent -{ - private final BlockPos offset; - private final ComponentType component; - private boolean upgradeSlot; - - /** - * Sets a component location for the altar. - * - * @param offset - Where the block should be in relation to the Altar - * @param component - The type of Component the location should contain - */ - public AltarComponent(BlockPos offset, ComponentType component) - { - this.offset = offset; - this.component = component; - } - - /** - * Use for setting a location at which there must be a block, but the type of - * block does not matter. - * - * @param offset - Where the block should be in relation to the Altar - */ - public AltarComponent(BlockPos offset) - { - this(offset, ComponentType.NOTAIR); - } - - /** - * Sets the location to an upgrade slot. - * - * @return the current instance for further use. - */ - public AltarComponent setUpgradeSlot() - { - this.upgradeSlot = true; - return this; - } - - public BlockPos getOffset() - { - return offset; - } - - public boolean isUpgradeSlot() - { - return upgradeSlot; - } - - public ComponentType getComponent() - { - return component; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/altar/AltarTier.java b/src/main/java/wayoftime/bloodmagic/altar/AltarTier.java deleted file mode 100644 index 7ab6c3ff..00000000 --- a/src/main/java/wayoftime/bloodmagic/altar/AltarTier.java +++ /dev/null @@ -1,172 +0,0 @@ -package wayoftime.bloodmagic.altar; - -import java.util.List; -import java.util.function.Consumer; - -import com.google.common.collect.Lists; - -import net.minecraft.util.math.BlockPos; - -public enum AltarTier -{ - ONE() - { - @Override - public void buildComponents(Consumer components) - { - // Nada - } - }, - TWO() - { - @Override - public void buildComponents(Consumer components) - { - components.accept(new AltarComponent(new BlockPos(-1, -1, -1), ComponentType.BLOODRUNE)); - components.accept(new AltarComponent(new BlockPos(0, -1, -1), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(1, -1, -1), ComponentType.BLOODRUNE)); - components.accept(new AltarComponent(new BlockPos(-1, -1, 0), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(1, -1, 0), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(-1, -1, 1), ComponentType.BLOODRUNE)); - components.accept(new AltarComponent(new BlockPos(0, -1, 1), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(1, -1, 1), ComponentType.BLOODRUNE)); - } - }, - THREE() - { - @Override - public void buildComponents(Consumer components) - { - // Doesn't pull from tier 2 because upgrades slots are different - components.accept(new AltarComponent(new BlockPos(-1, -1, -1), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(0, -1, -1), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(1, -1, -1), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(-1, -1, 0), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(1, -1, 0), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(-1, -1, 1), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(0, -1, 1), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(1, -1, 1), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(-3, -1, -3))); - components.accept(new AltarComponent(new BlockPos(-3, 0, -3))); - components.accept(new AltarComponent(new BlockPos(3, -1, -3))); - components.accept(new AltarComponent(new BlockPos(3, 0, -3))); - components.accept(new AltarComponent(new BlockPos(-3, -1, 3))); - components.accept(new AltarComponent(new BlockPos(-3, 0, 3))); - components.accept(new AltarComponent(new BlockPos(3, -1, 3))); - components.accept(new AltarComponent(new BlockPos(3, 0, 3))); - components.accept(new AltarComponent(new BlockPos(-3, 1, -3), ComponentType.GLOWSTONE)); - components.accept(new AltarComponent(new BlockPos(3, 1, -3), ComponentType.GLOWSTONE)); - components.accept(new AltarComponent(new BlockPos(-3, 1, 3), ComponentType.GLOWSTONE)); - components.accept(new AltarComponent(new BlockPos(3, 1, 3), ComponentType.GLOWSTONE)); - - for (int i = -2; i <= 2; i++) - { - components.accept(new AltarComponent(new BlockPos(3, -2, i), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(-3, -2, i), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(i, -2, 3), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(i, -2, -3), ComponentType.BLOODRUNE).setUpgradeSlot()); - } - } - }, - FOUR() - { - @Override - public void buildComponents(Consumer components) - { - THREE.getAltarComponents().forEach(components); - - for (int i = -3; i <= 3; i++) - { - components.accept(new AltarComponent(new BlockPos(5, -3, i), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(-5, -3, i), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(i, -3, 5), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(i, -3, -5), ComponentType.BLOODRUNE).setUpgradeSlot()); - } - - for (int i = -2; i <= 1; i++) - { - components.accept(new AltarComponent(new BlockPos(5, i, 5))); - components.accept(new AltarComponent(new BlockPos(5, i, -5))); - components.accept(new AltarComponent(new BlockPos(-5, i, -5))); - components.accept(new AltarComponent(new BlockPos(-5, i, 5))); - } - - components.accept(new AltarComponent(new BlockPos(5, 2, 5), ComponentType.BLOODSTONE)); - components.accept(new AltarComponent(new BlockPos(5, 2, -5), ComponentType.BLOODSTONE)); - components.accept(new AltarComponent(new BlockPos(-5, 2, -5), ComponentType.BLOODSTONE)); - components.accept(new AltarComponent(new BlockPos(-5, 2, 5), ComponentType.BLOODSTONE)); - } - }, - FIVE() - { - @Override - public void buildComponents(Consumer components) - { - FOUR.getAltarComponents().forEach(components); - components.accept(new AltarComponent(new BlockPos(-8, -3, 8), ComponentType.BEACON)); - components.accept(new AltarComponent(new BlockPos(-8, -3, -8), ComponentType.BEACON)); - components.accept(new AltarComponent(new BlockPos(8, -3, -8), ComponentType.BEACON)); - components.accept(new AltarComponent(new BlockPos(8, -3, 8), ComponentType.BEACON)); - - for (int i = -6; i <= 6; i++) - { - components.accept(new AltarComponent(new BlockPos(8, -4, i), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(-8, -4, i), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(i, -4, 8), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(i, -4, -8), ComponentType.BLOODRUNE).setUpgradeSlot()); - } - } - }, - SIX() - { - @Override - public void buildComponents(Consumer components) - { - FIVE.getAltarComponents().forEach(components); - - for (int i = -4; i <= 2; i++) - { - components.accept(new AltarComponent(new BlockPos(11, i, 11))); - components.accept(new AltarComponent(new BlockPos(-11, i, -11))); - components.accept(new AltarComponent(new BlockPos(11, i, -11))); - components.accept(new AltarComponent(new BlockPos(-11, i, 11))); - } - - components.accept(new AltarComponent(new BlockPos(11, 3, 11), ComponentType.CRYSTAL)); - components.accept(new AltarComponent(new BlockPos(-11, 3, -11), ComponentType.CRYSTAL)); - components.accept(new AltarComponent(new BlockPos(11, 3, -11), ComponentType.CRYSTAL)); - components.accept(new AltarComponent(new BlockPos(-11, 3, 11), ComponentType.CRYSTAL)); - - for (int i = -9; i <= 9; i++) - { - components.accept(new AltarComponent(new BlockPos(11, -5, i), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(-11, -5, i), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(i, -5, 11), ComponentType.BLOODRUNE).setUpgradeSlot()); - components.accept(new AltarComponent(new BlockPos(i, -5, -11), ComponentType.BLOODRUNE).setUpgradeSlot()); - } - } - }; - - public static final int MAXTIERS = values().length; - - private List altarComponents; - - AltarTier() - { - this.altarComponents = Lists.newArrayList(); - - buildComponents(altarComponents::add); - } - - public abstract void buildComponents(Consumer components); - - public int toInt() - { - return ordinal() + 1; - } - - public List getAltarComponents() - { - return altarComponents; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/altar/AltarUpgrade.java b/src/main/java/wayoftime/bloodmagic/altar/AltarUpgrade.java deleted file mode 100644 index f7d9cc43..00000000 --- a/src/main/java/wayoftime/bloodmagic/altar/AltarUpgrade.java +++ /dev/null @@ -1,29 +0,0 @@ -package wayoftime.bloodmagic.altar; - -import java.util.EnumMap; - -import com.google.common.collect.Maps; - -import wayoftime.bloodmagic.block.enums.BloodRuneType; - -public class AltarUpgrade -{ - - private final EnumMap upgradeLevels; - - public AltarUpgrade() - { - this.upgradeLevels = Maps.newEnumMap(BloodRuneType.class); - } - - public AltarUpgrade upgrade(BloodRuneType rune) - { - upgradeLevels.compute(rune, (r, l) -> l == null ? 1 : l + 1); - return this; - } - - public int getLevel(BloodRuneType rune) - { - return upgradeLevels.getOrDefault(rune, 0); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/altar/AltarUtil.java b/src/main/java/wayoftime/bloodmagic/altar/AltarUtil.java deleted file mode 100644 index b02d469a..00000000 --- a/src/main/java/wayoftime/bloodmagic/altar/AltarUtil.java +++ /dev/null @@ -1,95 +0,0 @@ -package wayoftime.bloodmagic.altar; - -import java.util.List; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.apache.commons.lang3.tuple.Pair; - -import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import wayoftime.bloodmagic.impl.BloodMagicAPI; -import wayoftime.bloodmagic.common.block.BlockBloodRune; -import wayoftime.bloodmagic.tile.TileAltar; - -public class AltarUtil -{ - - @Nonnull - public static AltarTier getTier(World world, BlockPos pos) - { - TileEntity tile = world.getTileEntity(pos); - if (!(tile instanceof TileAltar)) - return AltarTier.ONE; - - AltarTier lastCheck = AltarTier.ONE; - for (AltarTier tier : AltarTier.values()) - { - for (AltarComponent component : tier.getAltarComponents()) - { - BlockPos componentPos = pos.add(component.getOffset()); - BlockState worldState = world.getBlockState(componentPos); - - if (component.getComponent() == ComponentType.NOTAIR && worldState.getMaterial() != Material.AIR - && !worldState.getMaterial().isLiquid()) - continue; - - List validStates = BloodMagicAPI.INSTANCE.getComponentStates(component.getComponent()); - if (!validStates.contains(worldState)) - return lastCheck; - } - - lastCheck = tier; - } - - return lastCheck; - } - - @Nonnull - public static AltarUpgrade getUpgrades(World world, BlockPos pos, AltarTier currentTier) - { - AltarUpgrade upgrades = new AltarUpgrade(); - - for (AltarComponent component : currentTier.getAltarComponents()) - { - if (!component.isUpgradeSlot() || component.getComponent() != ComponentType.BLOODRUNE) - continue; - - BlockPos componentPos = pos.add(component.getOffset()); - BlockState state = world.getBlockState(componentPos); - if (state.getBlock() instanceof BlockBloodRune) - upgrades.upgrade(((BlockBloodRune) state.getBlock()).getBloodRune(world, componentPos)); - } - - return upgrades; - } - - @Nullable - public static Pair getFirstMissingComponent(World world, BlockPos pos, int altarTier) - { - if (altarTier >= AltarTier.MAXTIERS) - return null; - - for (AltarTier tier : AltarTier.values()) - { - for (AltarComponent component : tier.getAltarComponents()) - { - BlockPos componentPos = pos.add(component.getOffset()); - BlockState worldState = world.getBlockState(componentPos); - if (component.getComponent() == ComponentType.NOTAIR && worldState.getMaterial() != Material.AIR - && !worldState.getMaterial().isLiquid()) - continue; - - List validStates = BloodMagicAPI.INSTANCE.getComponentStates(component.getComponent()); - if (!validStates.contains(worldState)) - return Pair.of(componentPos, component.getComponent()); - } - } - - return null; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/altar/BloodAltar.java b/src/main/java/wayoftime/bloodmagic/altar/BloodAltar.java deleted file mode 100644 index 45d0f645..00000000 --- a/src/main/java/wayoftime/bloodmagic/altar/BloodAltar.java +++ /dev/null @@ -1,810 +0,0 @@ -package wayoftime.bloodmagic.altar; - -import com.google.common.base.Enums; - -import net.minecraft.block.BlockState; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.particles.ParticleTypes; -import net.minecraft.particles.RedstoneParticleData; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.fluids.FluidAttributes; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.IFluidHandler; -import net.minecraftforge.fluids.capability.templates.FluidTank; -import net.minecraftforge.items.ItemHandlerHelper; -import wayoftime.bloodmagic.api.event.BloodMagicCraftedEvent; -import wayoftime.bloodmagic.block.enums.BloodRuneType; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.common.item.BloodOrb; -import wayoftime.bloodmagic.common.item.IBindable; -import wayoftime.bloodmagic.common.item.IBloodOrb; -import wayoftime.bloodmagic.core.data.Binding; -import wayoftime.bloodmagic.impl.BloodMagicAPI; -import wayoftime.bloodmagic.recipe.RecipeBloodAltar; -import wayoftime.bloodmagic.tile.TileAltar; -import wayoftime.bloodmagic.util.Constants; -import wayoftime.bloodmagic.util.helper.NetworkHelper; - -public class BloodAltar// implements IFluidHandler -{ - - public boolean isActive; - - protected FluidStack fluidOutput = new FluidStack(BloodMagicBlocks.LIFE_ESSENCE_FLUID.get(), 0); // TODO: Fix - protected FluidStack fluidInput = new FluidStack(BloodMagicBlocks.LIFE_ESSENCE_FLUID.get(), 0); - - protected FluidTank tank = new FluidTank(FluidAttributes.BUCKET_VOLUME); - - private final LazyOptional holder = LazyOptional.of(() -> tank); - - private TileAltar tileAltar; - private int internalCounter = 0; - private AltarTier altarTier = AltarTier.ONE; - private AltarUpgrade upgrade; - private int capacity = FluidAttributes.BUCKET_VOLUME * 10; - private FluidStack fluid = new FluidStack(BloodMagicBlocks.LIFE_ESSENCE_FLUID.get(), 0); - private int liquidRequired; // mB - private boolean canBeFilled; - private int consumptionRate; - private int drainRate; - private float consumptionMultiplier; - private float efficiencyMultiplier; - private float sacrificeEfficiencyMultiplier; - private float selfSacrificeEfficiencyMultiplier; - private float capacityMultiplier = 1; - private float orbCapacityMultiplier; - private float dislocationMultiplier; - private int accelerationUpgrades; - private boolean isUpgraded; - private boolean isResultBlock; - private int bufferCapacity = FluidAttributes.BUCKET_VOLUME; - private int progress; - private int lockdownDuration; - private int demonBloodDuration; - private int totalCharge = 0; // TODO save - private int chargingRate = 0; - private int chargingFrequency = 0; - private int maxCharge = 0; - private int cooldownAfterCrafting = 60; - private RecipeBloodAltar recipe; - private AltarTier currentTierDisplayed = AltarTier.ONE; - - public BloodAltar(TileAltar tileAltar) - { - this.tileAltar = tileAltar; - } - - public void readFromNBT(CompoundNBT tagCompound) - { - if (!tagCompound.contains(Constants.NBT.EMPTY)) - { - FluidStack fluid = FluidStack.loadFluidStackFromNBT(tagCompound); - - if (fluid != null) - { - setMainFluid(new FluidStack(BloodMagicBlocks.LIFE_ESSENCE_FLUID.get(), fluid.getAmount())); -// setMainFluid(fluid); - } else - { -// setMainFluid(new FluidStack(BloodMagicBlocks.LIFE_ESSENCE_FLUID.get(), fluid.getAmount())); - } - - FluidStack fluidOut = new FluidStack(BloodMagicBlocks.LIFE_ESSENCE_FLUID.get(), tagCompound.getInt(Constants.NBT.OUTPUT_AMOUNT)); - setOutputFluid(fluidOut); - - FluidStack fluidIn = new FluidStack(BloodMagicBlocks.LIFE_ESSENCE_FLUID.get(), tagCompound.getInt(Constants.NBT.INPUT_AMOUNT)); - setInputFluid(fluidIn); - } - - internalCounter = tagCompound.getInt("internalCounter"); - altarTier = Enums.getIfPresent(AltarTier.class, tagCompound.getString(Constants.NBT.ALTAR_TIER)).or(AltarTier.ONE); - isActive = tagCompound.getBoolean(Constants.NBT.ALTAR_ACTIVE); - liquidRequired = tagCompound.getInt(Constants.NBT.ALTAR_LIQUID_REQ); - canBeFilled = tagCompound.getBoolean(Constants.NBT.ALTAR_FILLABLE); - isUpgraded = tagCompound.getBoolean(Constants.NBT.ALTAR_UPGRADED); - consumptionRate = tagCompound.getInt(Constants.NBT.ALTAR_CONSUMPTION_RATE); - drainRate = tagCompound.getInt(Constants.NBT.ALTAR_DRAIN_RATE); - consumptionMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_CONSUMPTION_MULTIPLIER); - efficiencyMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_EFFICIENCY_MULTIPLIER); - selfSacrificeEfficiencyMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_SELF_SACRIFICE_MULTIPLIER); - sacrificeEfficiencyMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_SACRIFICE_MULTIPLIER); - capacityMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_CAPACITY_MULTIPLIER); - orbCapacityMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_ORB_CAPACITY_MULTIPLIER); - dislocationMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_DISLOCATION_MULTIPLIER); - capacity = tagCompound.getInt(Constants.NBT.ALTAR_CAPACITY); - bufferCapacity = tagCompound.getInt(Constants.NBT.ALTAR_BUFFER_CAPACITY); - progress = tagCompound.getInt(Constants.NBT.ALTAR_PROGRESS); - isResultBlock = tagCompound.getBoolean(Constants.NBT.ALTAR_IS_RESULT_BLOCK); - lockdownDuration = tagCompound.getInt(Constants.NBT.ALTAR_LOCKDOWN_DURATION); - accelerationUpgrades = tagCompound.getInt(Constants.NBT.ALTAR_ACCELERATION_UPGRADES); - demonBloodDuration = tagCompound.getInt(Constants.NBT.ALTAR_DEMON_BLOOD_DURATION); - cooldownAfterCrafting = tagCompound.getInt(Constants.NBT.ALTAR_COOLDOWN_AFTER_CRAFTING); - chargingRate = tagCompound.getInt(Constants.NBT.ALTAR_CHARGE_RATE); - chargingFrequency = tagCompound.getInt(Constants.NBT.ALTAR_CHARGE_FREQUENCY); - totalCharge = tagCompound.getInt(Constants.NBT.ALTAR_TOTAL_CHARGE); - maxCharge = tagCompound.getInt(Constants.NBT.ALTAR_MAX_CHARGE); - currentTierDisplayed = Enums.getIfPresent(AltarTier.class, tagCompound.getString(Constants.NBT.ALTAR_CURRENT_TIER_DISPLAYED)).or(AltarTier.ONE); - } - - public void writeToNBT(CompoundNBT tagCompound) - { - - if (fluid != null) - fluid.writeToNBT(tagCompound); - else - tagCompound.putString(Constants.NBT.EMPTY, ""); - - if (fluidOutput != null) - tagCompound.putInt(Constants.NBT.OUTPUT_AMOUNT, fluidOutput.getAmount()); - - if (fluidInput != null) - tagCompound.putInt(Constants.NBT.INPUT_AMOUNT, fluidInput.getAmount()); - - tagCompound.putInt("internalCounter", internalCounter); - tagCompound.putString(Constants.NBT.ALTAR_TIER, altarTier.name()); - tagCompound.putBoolean(Constants.NBT.ALTAR_ACTIVE, isActive); - tagCompound.putInt(Constants.NBT.ALTAR_LIQUID_REQ, liquidRequired); - tagCompound.putBoolean(Constants.NBT.ALTAR_FILLABLE, canBeFilled); - tagCompound.putBoolean(Constants.NBT.ALTAR_UPGRADED, isUpgraded); - tagCompound.putInt(Constants.NBT.ALTAR_CONSUMPTION_RATE, consumptionRate); - tagCompound.putInt(Constants.NBT.ALTAR_DRAIN_RATE, drainRate); - tagCompound.putFloat(Constants.NBT.ALTAR_CONSUMPTION_MULTIPLIER, consumptionMultiplier); - tagCompound.putFloat(Constants.NBT.ALTAR_EFFICIENCY_MULTIPLIER, efficiencyMultiplier); - tagCompound.putFloat(Constants.NBT.ALTAR_SACRIFICE_MULTIPLIER, sacrificeEfficiencyMultiplier); - tagCompound.putFloat(Constants.NBT.ALTAR_SELF_SACRIFICE_MULTIPLIER, selfSacrificeEfficiencyMultiplier); - tagCompound.putBoolean(Constants.NBT.ALTAR_IS_RESULT_BLOCK, isResultBlock); - tagCompound.putFloat(Constants.NBT.ALTAR_CAPACITY_MULTIPLIER, capacityMultiplier); - tagCompound.putFloat(Constants.NBT.ALTAR_ORB_CAPACITY_MULTIPLIER, orbCapacityMultiplier); - tagCompound.putFloat(Constants.NBT.ALTAR_DISLOCATION_MULTIPLIER, dislocationMultiplier); - tagCompound.putInt(Constants.NBT.ALTAR_CAPACITY, capacity); - tagCompound.putInt(Constants.NBT.ALTAR_PROGRESS, progress); - tagCompound.putInt(Constants.NBT.ALTAR_BUFFER_CAPACITY, bufferCapacity); - tagCompound.putInt(Constants.NBT.ALTAR_LOCKDOWN_DURATION, lockdownDuration); - tagCompound.putInt(Constants.NBT.ALTAR_ACCELERATION_UPGRADES, accelerationUpgrades); - tagCompound.putInt(Constants.NBT.ALTAR_DEMON_BLOOD_DURATION, demonBloodDuration); - tagCompound.putInt(Constants.NBT.ALTAR_COOLDOWN_AFTER_CRAFTING, cooldownAfterCrafting); - tagCompound.putInt(Constants.NBT.ALTAR_CHARGE_RATE, chargingRate); - tagCompound.putInt(Constants.NBT.ALTAR_CHARGE_FREQUENCY, chargingFrequency); - tagCompound.putInt(Constants.NBT.ALTAR_TOTAL_CHARGE, totalCharge); - tagCompound.putInt(Constants.NBT.ALTAR_MAX_CHARGE, maxCharge); - tagCompound.putString(Constants.NBT.ALTAR_CURRENT_TIER_DISPLAYED, currentTierDisplayed.name()); - } - - public void startCycle() - { - if (tileAltar.getWorld() != null) - tileAltar.getWorld().notifyBlockUpdate(tileAltar.getPos(), tileAltar.getWorld().getBlockState(tileAltar.getPos()), tileAltar.getWorld().getBlockState(tileAltar.getPos()), 3); - - checkTier(); - - // Temporary thing to test the recipes. -// fluid.setAmount(10000); -// this.setMainFluid(new FluidStack(BloodMagicBlocks.LIFE_ESSENCE_FLUID.get(), 10000)); - - if ((fluid == null || fluid.getAmount() <= 0) && totalCharge <= 0) - return; - - if (!isActive) - progress = 0; - - ItemStack input = tileAltar.getStackInSlot(0); - - if (!input.isEmpty()) - { - // Do recipes - RecipeBloodAltar recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getBloodAltar(tileAltar.getWorld(), input); - if (recipe != null) - { - if (recipe.getMinimumTier() <= altarTier.ordinal()) - { - this.isActive = true; - this.recipe = recipe; - this.liquidRequired = recipe.getSyphon(); - this.consumptionRate = recipe.getConsumeRate(); - this.drainRate = recipe.getDrainRate(); - this.canBeFilled = false; - return; - } - } else if (input.getItem() instanceof IBloodOrb) - { - this.isActive = true; - this.canBeFilled = true; - return; - } - } - - isActive = false; - } - - public void update() - { -// World world = tileAltar.getWorld(); -// -// RecipeBloodAltar recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getBloodAltar(world, new ItemStack(Items.DIAMOND)); -// -// if (recipe != null) -// { -// System.out.println("Found a recipe!"); -// } -// -// List altarRecipes = world.getRecipeManager().getRecipesForType(BloodMagicRecipeType.ALTAR); -// -// System.out.println("There are currently " + altarRecipes.size() + " Altar Recipes loaded."); -// -// this.fluidInput = new FluidStack(BloodMagicBlocks.LIFE_ESSENCE_FLUID.get(), 1000); - -// System.out.println(this.fluidOutput.getAmount()); - - World world = tileAltar.getWorld(); - BlockPos pos = tileAltar.getPos(); - - if (world.isRemote) - return; - - // Used instead of the world time for checks that do not happen every tick - internalCounter++; - - if (lockdownDuration > 0) - lockdownDuration--; - - if (internalCounter % 20 == 0) - { - for (Direction facing : Direction.values()) - { - BlockPos newPos = pos.offset(facing); - BlockState block = world.getBlockState(newPos); - block.getBlock().onNeighborChange(block, world, newPos, pos); - } - } - if (internalCounter % (Math.max(20 - this.accelerationUpgrades, 1)) == 0) - { - int syphonMax = (int) (20 * this.dislocationMultiplier); - int fluidInputted; - int fluidOutputted; - fluidInputted = Math.min(syphonMax, -this.fluid.getAmount() + capacity); - fluidInputted = Math.min(this.fluidInput.getAmount(), fluidInputted); - this.fluid.setAmount(this.fluid.getAmount() + fluidInputted); - this.fluidInput.setAmount(this.fluidInput.getAmount() - fluidInputted); - fluidOutputted = Math.min(syphonMax, this.bufferCapacity - this.fluidOutput.getAmount()); - fluidOutputted = Math.min(this.fluid.getAmount(), fluidOutputted); - this.fluidOutput.setAmount(this.fluidOutput.getAmount() + fluidOutputted); - this.fluid.setAmount(this.fluid.getAmount() - fluidOutputted); - tileAltar.getWorld().notifyBlockUpdate(tileAltar.getPos(), tileAltar.getWorld().getBlockState(tileAltar.getPos()), tileAltar.getWorld().getBlockState(tileAltar.getPos()), 3); - } - - if (internalCounter % this.getChargingFrequency() == 0 && !this.isActive) - { - int chargeInputted = Math.min(chargingRate, this.fluid.getAmount()); - chargeInputted = Math.min(chargeInputted, maxCharge - totalCharge); - totalCharge += chargeInputted; - this.fluid.setAmount(this.fluid.getAmount() - chargeInputted); - tileAltar.getWorld().notifyBlockUpdate(tileAltar.getPos(), tileAltar.getWorld().getBlockState(tileAltar.getPos()), tileAltar.getWorld().getBlockState(tileAltar.getPos()), 3); - } - - if (internalCounter % 100 == 0 && (this.isActive || this.cooldownAfterCrafting <= 0)) - startCycle(); - - updateAltar(); - } - - private void updateAltar() - { -// System.out.println("Updating altar."); - if (!isActive) - { - if (cooldownAfterCrafting > 0) - cooldownAfterCrafting--; - return; - } - - if (!canBeFilled && recipe == null) - { - startCycle(); - return; - } - - ItemStack input = tileAltar.getStackInSlot(0); - - if (input.isEmpty()) - return; - - World world = tileAltar.getWorld(); - BlockPos pos = tileAltar.getPos(); - - if (world.isRemote) - return; - - if (!canBeFilled) - { - boolean hasOperated = false; - int stackSize = input.getCount(); - - if (totalCharge > 0) - { - int chargeDrained = Math.min(liquidRequired * stackSize - progress, totalCharge); - - totalCharge -= chargeDrained; - progress += chargeDrained; - hasOperated = true; - } - if (fluid != null && fluid.getAmount() >= 1) - { -// int liquidDrained = Math.min((int) (altarTier.ordinal() >= 1 -// ? consumptionRate * (1 + consumptionMultiplier) -// : consumptionRate), fluid.getAmount()); - int liquidDrained = Math.min((int) (consumptionRate * (1 + consumptionMultiplier)), fluid.getAmount()); - - if (liquidDrained > (liquidRequired * stackSize - progress)) - liquidDrained = liquidRequired * stackSize - progress; - - fluid.setAmount(fluid.getAmount() - liquidDrained); - progress += liquidDrained; - - hasOperated = true; - - if (internalCounter % 4 == 0 && world instanceof ServerWorld) - { - ServerWorld server = (ServerWorld) world; -// server.spawnParticle(ParticleTypes.SPLASH, (double) pos.getX() -// + worldIn.rand.nextDouble(), (double) (pos.getY() + 1), (double) pos.getZ() -// + worldIn.rand.nextDouble(), 1, 0.0D, 0.0D, 0.0D, 1.0D); - server.spawnParticle(RedstoneParticleData.REDSTONE_DUST, pos.getX() + 0.5, pos.getY() + 1.0, pos.getZ() + 0.5, 1, 0.2, 0.0, 0.2, 0.0); - } - - } else if (!hasOperated && progress > 0) - { - progress -= (int) (efficiencyMultiplier * drainRate); - - if (internalCounter % 2 == 0 && world instanceof ServerWorld) - { - ServerWorld server = (ServerWorld) world; - server.spawnParticle(ParticleTypes.LARGE_SMOKE, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 1, 0.1, 0, 0.1, 0); - } - } - - if (hasOperated) - { - if (progress >= liquidRequired * stackSize) - { - ItemStack result = ItemHandlerHelper.copyStackWithSize(recipe.getOutput(), stackSize); - - BloodMagicCraftedEvent.Altar event = new BloodMagicCraftedEvent.Altar(result, input.copy()); - MinecraftForge.EVENT_BUS.post(event); - tileAltar.setInventorySlotContents(0, event.getOutput()); - progress = 0; - - if (world instanceof ServerWorld) - { - ServerWorld server = (ServerWorld) world; - server.spawnParticle(RedstoneParticleData.REDSTONE_DUST, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 40, 0.3, 0, 0.3, 0); - } - - this.cooldownAfterCrafting = 30; - this.isActive = false; - } - } - } else - { - ItemStack contained = tileAltar.getStackInSlot(0); - - if (contained.isEmpty() || !(contained.getItem() instanceof IBloodOrb) || !(contained.getItem() instanceof IBindable)) - return; - - BloodOrb orb = ((IBloodOrb) contained.getItem()).getOrb(contained); - Binding binding = ((IBindable) contained.getItem()).getBinding(contained); - - if (binding == null || orb == null) - return; - - if (fluid != null && fluid.getAmount() >= 1) - { -// int liquidDrained = Math.min((int) (altarTier.ordinal() >= 2 -// ? orb.getFillRate() * (1 + consumptionMultiplier) -// : orb.getFillRate()), fluid.getAmount()); - int liquidDrained = Math.min((int) (orb.getFillRate() * (1 + consumptionMultiplier)), fluid.getAmount()); - int drain = NetworkHelper.getSoulNetwork(binding).add(liquidDrained, (int) (orb.getCapacity() * this.orbCapacityMultiplier)); - fluid.setAmount(fluid.getAmount() - drain); - - if (drain > 0 && internalCounter % 4 == 0 && world instanceof ServerWorld) - { - ServerWorld server = (ServerWorld) world; - server.spawnParticle(ParticleTypes.WITCH, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 1, 0, 0, 0, 0.001); - } - } - } - - tileAltar.getWorld().notifyBlockUpdate(tileAltar.getPos(), tileAltar.getWorld().getBlockState(tileAltar.getPos()), tileAltar.getWorld().getBlockState(tileAltar.getPos()), 3); - } - - public void checkTier() - { - AltarTier tier = AltarUtil.getTier(tileAltar.getWorld(), tileAltar.getPos()); - this.altarTier = tier; - - upgrade = AltarUtil.getUpgrades(tileAltar.getWorld(), tileAltar.getPos(), tier); - - if (tier.equals(currentTierDisplayed)) - currentTierDisplayed = AltarTier.ONE; - - if (tier.equals(AltarTier.ONE)) - { - upgrade = null; - isUpgraded = false; - this.consumptionMultiplier = 0; - this.efficiencyMultiplier = 1; - this.sacrificeEfficiencyMultiplier = 0; - this.selfSacrificeEfficiencyMultiplier = 0; - this.capacityMultiplier = 1; - this.orbCapacityMultiplier = 1; - this.dislocationMultiplier = 1; - this.accelerationUpgrades = 0; - this.chargingFrequency = 20; - this.chargingRate = 0; - this.maxCharge = 0; - this.totalCharge = 0; - return; - } else if (!tier.equals(AltarTier.ONE)) - { - this.isUpgraded = true; - this.accelerationUpgrades = upgrade.getLevel(BloodRuneType.ACCELERATION); - this.consumptionMultiplier = (float) (0.20 * upgrade.getLevel(BloodRuneType.SPEED)); - this.efficiencyMultiplier = (float) Math.pow(0.85, upgrade.getLevel(BloodRuneType.EFFICIENCY)); - this.sacrificeEfficiencyMultiplier = (float) (0.10 * upgrade.getLevel(BloodRuneType.SACRIFICE)); - this.selfSacrificeEfficiencyMultiplier = (float) (0.10 * upgrade.getLevel(BloodRuneType.SELF_SACRIFICE)); - int cap = upgrade.getLevel(BloodRuneType.CAPACITY); - int cap_aug = upgrade.getLevel(BloodRuneType.AUGMENTED_CAPACITY); - this.capacityMultiplier = (float) ((1 + 0.20 * cap) * Math.pow(1.1, cap_aug * Math.pow(0.99, Math.abs(cap_aug - cap)))); - this.dislocationMultiplier = (float) (Math.pow(1.2, upgrade.getLevel(BloodRuneType.DISPLACEMENT))); - this.orbCapacityMultiplier = (float) (1 + 0.02 * upgrade.getLevel(BloodRuneType.ORB)); - this.chargingFrequency = Math.max(20 - accelerationUpgrades, 1); - this.chargingRate = (int) (10 * upgrade.getLevel(BloodRuneType.CHARGING) * (1 + consumptionMultiplier / 2)); - this.maxCharge = (int) (FluidAttributes.BUCKET_VOLUME * Math.max(0.5 * capacityMultiplier, 1) * upgrade.getLevel(BloodRuneType.CHARGING)); - } - - this.capacity = (int) (FluidAttributes.BUCKET_VOLUME * 10 * capacityMultiplier); - this.bufferCapacity = (int) (FluidAttributes.BUCKET_VOLUME * 1 * capacityMultiplier); - - if (this.fluid.getAmount() > this.capacity) - this.fluid.setAmount(this.capacity); - if (this.fluidOutput.getAmount() > this.bufferCapacity) - this.fluidOutput.setAmount(this.bufferCapacity); - if (this.fluidInput.getAmount() > this.bufferCapacity) - this.fluidInput.setAmount(this.bufferCapacity); - if (this.totalCharge > this.maxCharge) - this.totalCharge = this.maxCharge; - - tileAltar.getWorld().notifyBlockUpdate(tileAltar.getPos(), tileAltar.getWorld().getBlockState(tileAltar.getPos()), tileAltar.getWorld().getBlockState(tileAltar.getPos()), 3); - } - - public int fillMainTank(int amount) - { - int filledAmount = Math.min(capacity - fluid.getAmount(), amount); - fluid.setAmount(fluid.getAmount() + filledAmount); - - return filledAmount; - } - - public void sacrificialDaggerCall(int amount, boolean isSacrifice) - { - if (this.lockdownDuration > 0) - { - int amt = (int) Math.min(bufferCapacity - fluidInput.getAmount(), (isSacrifice - ? 1 + sacrificeEfficiencyMultiplier - : 1 + selfSacrificeEfficiencyMultiplier) * amount); - fluidInput.setAmount(fluidInput.getAmount() + amt); - } else - { - fluid.setAmount((int) (fluid.getAmount() + Math.min(capacity - fluid.getAmount(), (isSacrifice - ? 1 + sacrificeEfficiencyMultiplier - : 1 + selfSacrificeEfficiencyMultiplier) * amount))); - } - } - - public void setMainFluid(FluidStack fluid) - { - this.fluid = fluid; - } - - public void setOutputFluid(FluidStack fluid) - { - this.fluidOutput = fluid; - } - - public void setInputFluid(FluidStack fluid) - { - this.fluidInput = fluid; - } - - public AltarUpgrade getUpgrade() - { - return upgrade; - } - - public void setUpgrade(AltarUpgrade upgrade) - { - this.upgrade = upgrade; - } - - public int getCapacity() - { - return capacity; - } - - public FluidStack getFluid() - { - return fluid; - } - - public int getFluidAmount() - { - return fluid.getAmount(); - } - - public int getCurrentBlood() - { - return getFluidAmount(); - } - - public AltarTier getTier() - { - return altarTier; - } - - public void setTier(AltarTier tier) - { - this.altarTier = tier; - } - - public int getProgress() - { - return progress; - } - - public float getSacrificeMultiplier() - { - return sacrificeEfficiencyMultiplier; - } - - public float getSelfSacrificeMultiplier() - { - return selfSacrificeEfficiencyMultiplier; - } - - public float getOrbMultiplier() - { - return orbCapacityMultiplier; - } - - public float getDislocationMultiplier() - { - return dislocationMultiplier; - } - - public float getConsumptionMultiplier() - { - return consumptionMultiplier; - } - - public float getConsumptionRate() - { - return consumptionRate; - } - - public int getLiquidRequired() - { - return liquidRequired; - } - - public int getBufferCapacity() - { - return bufferCapacity; - } - - public boolean setCurrentTierDisplayed(AltarTier altarTier) - { - if (currentTierDisplayed == altarTier) - return false; - else - currentTierDisplayed = altarTier; - return true; - } - - public void addToDemonBloodDuration(int dur) - { - this.demonBloodDuration += dur; - } - - public boolean hasDemonBlood() - { - return this.demonBloodDuration > 0; - } - - public void decrementDemonBlood() - { - this.demonBloodDuration = Math.max(0, this.demonBloodDuration - 1); - } - - public void setActive() - { -// if (tileAltar.getStackInSlot(0).isEmpty()) -// { -// isActive = false; -// } - } - - public boolean isActive() - { - return isActive; - } - - public void requestPauseAfterCrafting(int amount) - { - if (this.isActive) - { - this.cooldownAfterCrafting = amount; - } - } - - public int getChargingRate() - { - return chargingRate; - } - - public int getTotalCharge() - { - return totalCharge; - } - - public int getChargingFrequency() - { - return chargingFrequency == 0 ? 1 : chargingFrequency; - } - - public int fill(FluidStack resource, boolean doFill) - { - if (resource == null || resource.getFluid() != BloodMagicBlocks.LIFE_ESSENCE_FLUID.get()) - { - return 0; - } - - if (!doFill) - { - if (fluidInput == null || fluidInput.isEmpty()) - { - return Math.min(bufferCapacity, resource.getAmount()); - } - - if (!fluidInput.isFluidEqual(resource)) - { - return 0; - } - - return Math.min(bufferCapacity - fluidInput.getAmount(), resource.getAmount()); - } - - if (fluidInput == null || fluidInput.isEmpty()) - { - fluidInput = new FluidStack(resource, Math.min(bufferCapacity, resource.getAmount())); - - return fluidInput.getAmount(); - } - - if (!fluidInput.isFluidEqual(resource)) - { - return 0; - } - int filled = bufferCapacity - fluidInput.getAmount(); - - if (resource.getAmount() < filled) - { - fluidInput.setAmount(fluidInput.getAmount() + resource.getAmount()); - filled = resource.getAmount(); - } else - { - fluidInput.setAmount(bufferCapacity); - } - - return filled; - } - - public FluidStack drain(FluidStack resource, boolean doDrain) - { - if (resource == null || !resource.isFluidEqual(fluidOutput)) - { - return FluidStack.EMPTY; - } - return drain(resource.getAmount(), doDrain); - } - - public FluidStack drain(int maxDrain, boolean doDrain) - { - if (fluidOutput == null) - { - return FluidStack.EMPTY; - } - - int drained = maxDrain; - if (fluidOutput.getAmount() < drained) - { - drained = fluidOutput.getAmount(); - } - - FluidStack stack = new FluidStack(fluidOutput, drained); - if (doDrain) - { - fluidOutput.setAmount(fluidOutput.getAmount() - drained); - } - return stack; - } - -// @Override -// public IFluidTankProperties[] getTankProperties() -// { -// return new IFluidTankProperties[] -// { new FluidTankPropertiesWrapper(new FluidTank(fluid, capacity)) }; -// } - - public AltarTier getCurrentTierDisplayed() - { - return currentTierDisplayed; - } - - public static class VariableSizeFluidHandler implements IFluidHandler - { - BloodAltar altar; - - public VariableSizeFluidHandler(BloodAltar altar) - { - this.altar = altar; - } - - @Override - public int getTanks() - { - // TODO Auto-generated method stub - return 1; - } - - @Override - public FluidStack getFluidInTank(int tank) - { - return altar.fluid; - } - - @Override - public int getTankCapacity(int tank) - { - return altar.getCapacity(); - } - - @Override - public boolean isFluidValid(int tank, FluidStack stack) - { - return stack.getFluid() == BloodMagicBlocks.LIFE_ESSENCE_FLUID.get(); - } - - @Override - public int fill(FluidStack resource, FluidAction action) - { - return altar.fill(resource, action == FluidAction.EXECUTE); - } - - @Override - public FluidStack drain(FluidStack resource, FluidAction action) - { - return altar.drain(resource, action == FluidAction.EXECUTE); - } - - @Override - public FluidStack drain(int maxDrain, FluidAction action) - { - return altar.drain(maxDrain, action == FluidAction.EXECUTE); - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/altar/ComponentType.java b/src/main/java/wayoftime/bloodmagic/altar/ComponentType.java deleted file mode 100644 index 30cae9dc..00000000 --- a/src/main/java/wayoftime/bloodmagic/altar/ComponentType.java +++ /dev/null @@ -1,37 +0,0 @@ -package wayoftime.bloodmagic.altar; - -import java.util.Locale; - -/** - * List of different components used to construct different tiers of altars. - */ -public enum ComponentType -{ - GLOWSTONE, BLOODSTONE, BEACON, BLOODRUNE, CRYSTAL, NOTAIR; - - private static final String BASE = "chat.bloodmagic.altar.comp."; - private String key; - - ComponentType() - { - this.key = BASE + name().toLowerCase(Locale.ENGLISH); - } - - public String getKey() - { - return key; - } - - public static ComponentType getType(String type) - { - for (ComponentType t : values()) - { - if (t.name().equalsIgnoreCase(type)) - { - return t; - } - } - - return null; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/altar/IBloodAltar.java b/src/main/java/wayoftime/bloodmagic/altar/IBloodAltar.java deleted file mode 100644 index 08f8253c..00000000 --- a/src/main/java/wayoftime/bloodmagic/altar/IBloodAltar.java +++ /dev/null @@ -1,61 +0,0 @@ -package wayoftime.bloodmagic.altar; - -/** - * Any Tile that implements this will be considered to be a Blood Altar - */ -public interface IBloodAltar -{ - int getCapacity(); - - int getCurrentBlood(); - - /** - * @return - The actual human-readable tier (ordinal + 1) of the altar - */ - int getTier(); - - int getProgress(); - - float getSacrificeMultiplier(); - - float getSelfSacrificeMultiplier(); - - float getOrbMultiplier(); - - float getDislocationMultiplier(); - - float getConsumptionMultiplier(); - - float getConsumptionRate(); - - int getChargingRate(); - - int getChargingFrequency(); - - int getTotalCharge(); - - int getLiquidRequired(); - - int getBufferCapacity(); - - void sacrificialDaggerCall(int amount, boolean isSacrifice); - - void startCycle(); - - void checkTier(); - - boolean isActive(); - - void setActive(); - - int fillMainTank(int amount); - - /** - * Will set the altar to initiate a cooldown cycle after it crafts before - * starting to craft again, giving the user time to interact with the altar. - * This can only be set while the altar is not active. - * - * @param cooldown - How long the cooldown should last - */ - void requestPauseAfterCrafting(int cooldown); -} diff --git a/src/main/java/wayoftime/bloodmagic/altar/IBloodRune.java b/src/main/java/wayoftime/bloodmagic/altar/IBloodRune.java deleted file mode 100644 index e5cde2ba..00000000 --- a/src/main/java/wayoftime/bloodmagic/altar/IBloodRune.java +++ /dev/null @@ -1,16 +0,0 @@ -package wayoftime.bloodmagic.altar; - -import javax.annotation.Nullable; - -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import wayoftime.bloodmagic.block.enums.BloodRuneType; - -/** - * Any Block that implements this interface wil be considered as Blood Runes for the Blood Altar - */ -public interface IBloodRune -{ - @Nullable - BloodRuneType getBloodRune(World world, BlockPos pos); -} diff --git a/src/main/java/wayoftime/bloodmagic/anointment/Anointment.java b/src/main/java/wayoftime/bloodmagic/anointment/Anointment.java deleted file mode 100644 index 1476eb9c..00000000 --- a/src/main/java/wayoftime/bloodmagic/anointment/Anointment.java +++ /dev/null @@ -1,317 +0,0 @@ -package wayoftime.bloodmagic.anointment; - -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Optional; -import java.util.Set; -import java.util.UUID; -import java.util.function.Consumer; - -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Maps; -import com.google.common.collect.Multimap; -import com.google.common.collect.Sets; -import com.google.common.reflect.TypeToken; -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonDeserializer; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; -import com.google.gson.annotations.JsonAdapter; - -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.attributes.Attribute; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.ListNBT; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Util; -import net.minecraft.util.registry.Registry; -import net.minecraftforge.registries.ForgeRegistryEntry; -import wayoftime.bloodmagic.core.living.LivingUpgrade.Level; - -@JsonAdapter(Anointment.Deserializer.class) -public class Anointment extends ForgeRegistryEntry -{ - public static final Anointment DUMMY = new Anointment(new ResourceLocation("dummy")); - - private final ResourceLocation key; - private final Set incompatible; - private String translationKey = null; - private final Map bonuses; - private IAttributeProvider attributeProvider; - private IDamageProvider damageProvider; - private boolean consumeOnAttack = false; - private boolean consumeOnUseFinish = false; - private boolean consumeOnHarvest = false; - - public Anointment(ResourceLocation key) - { - this.key = key; - this.incompatible = Sets.newHashSet(); - this.bonuses = Maps.newHashMap(); - } - - public Anointment withBonusSet(String id, Consumer> modifiers) - { -// List values = DefaultedList.of(); - - List values = new ArrayList(); - modifiers.accept(values); - - bonuses.put(id, new Bonus(id, values)); - return this; - } - - public Number getBonusValue(String id, int level) - { - List modifiers = bonuses.getOrDefault(id, Bonus.DEFAULT).modifiers; - if (modifiers.isEmpty() || level == 0) - return 0; - - return level <= modifiers.size() ? modifiers.get(level - 1) : modifiers.get(modifiers.size() - 1); - } - - public ResourceLocation getKey() - { - return key; - } - - @Override - public String toString() - { - return key.toString(); - } - - public boolean applyAnointment(AnointmentHolder holder, ItemStack stack, int level) - { - if (level < 0) - { - return false; - } - - IAttributeProvider prov = this.getAttributeProvider(); - if (prov == null) - { - return true; - } - - Multimap modifiers = HashMultimap.create(); - modifiers.putAll(stack.getItem().getAttributeModifiers(EquipmentSlotType.MAINHAND, stack)); - - this.getAttributeProvider().handleAttributes(holder, modifiers, UUID.nameUUIDFromBytes(this.getKey().toString().getBytes()), this, level); - - for (Entry entry : modifiers.entries()) - { - stack.addAttributeModifier(entry.getKey(), entry.getValue(), EquipmentSlotType.MAINHAND); - } - - return true; - } - - public boolean removeAnointment(AnointmentHolder holder, ItemStack stack, EquipmentSlotType slot) - { - IAttributeProvider provider = this.getAttributeProvider(); - if (provider != null) - { - Multimap modifiers = HashMultimap.create(); - this.getAttributeProvider().handleAttributes(holder, modifiers, UUID.nameUUIDFromBytes(this.getKey().toString().getBytes()), this, 1); - - if (stack.hasTag() && stack.getTag().contains("AttributeModifiers", 9)) - { -// multimap = HashMultimap.create(); - ListNBT listnbt = stack.getTag().getList("AttributeModifiers", 10); - List removeList = new ArrayList(); - - for (int i = 0; i < listnbt.size(); i++) - { - CompoundNBT compoundnbt = listnbt.getCompound(i); - if (!compoundnbt.contains("Slot", 8) || compoundnbt.getString("Slot").equals(slot.getName())) - { - Optional optional = Registry.ATTRIBUTE.getOptional(ResourceLocation.tryCreate(compoundnbt.getString("AttributeName"))); - if (optional.isPresent()) - { - AttributeModifier attributemodifier = AttributeModifier.read(compoundnbt); - if (attributemodifier != null && attributemodifier.getID().getLeastSignificantBits() != 0L && attributemodifier.getID().getMostSignificantBits() != 0L) - { - for (Entry entry : modifiers.entries()) - { - if (entry.getKey().equals(optional.get()) && entry.getValue().getID().equals(attributemodifier.getID())) - { - removeList.add(i); - } - } -// multimap.put(optional.get(), attributemodifier); - } - } - } - } - - for (int index : removeList) - { - listnbt.remove(index); - } - - if (removeList.size() >= 1) - { - stack.getTag().put("AttributeModifiers", listnbt); - if (listnbt.isEmpty()) - { - stack.getTag().remove("AttributeModifiers"); - } - } - } - -// for (Entry entry : modifiers.entries()) -// { -// -// } - } - return false; - } - - public boolean isCompatible(ResourceLocation otherUpgrade) - { - return !incompatible.contains(otherUpgrade); - } - - public Anointment addIncompatibility(ResourceLocation key, ResourceLocation... otherKeys) - { - incompatible.add(key); - Collections.addAll(incompatible, otherKeys); - return this; - } - - public String getTranslationKey() - { - return translationKey == null ? translationKey = Util.makeTranslationKey("anointment", key) : translationKey; - } - - public Anointment setConsumeOnAttack() - { - this.consumeOnAttack = true; - return this; - } - - public boolean consumeOnAttack() - { - return this.consumeOnAttack; - } - - public Anointment setConsumeOnUseFinish() - { - this.consumeOnUseFinish = true; - return this; - } - - public boolean consumeOnUseFinish() - { - return this.consumeOnUseFinish; - } - - public Anointment setConsumeOnHarvest() - { - this.consumeOnHarvest = true; - return this; - } - - public boolean consumeOnHarvest() - { - return this.consumeOnHarvest; - } - - public Anointment withAttributeProvider(IAttributeProvider attributeProvider) - { - this.attributeProvider = attributeProvider; - return this; - } - - public IAttributeProvider getAttributeProvider() - { - return attributeProvider; - } - - public Anointment withDamageProvider(IDamageProvider damageProvider) - { - this.damageProvider = damageProvider; - return this; - } - - public IDamageProvider getDamageProvider() - { - return damageProvider; - } - - public interface IAttributeProvider - { - void handleAttributes(AnointmentHolder holder, Multimap modifiers, UUID uuid, Anointment anoint, int level); - } - - public interface IDamageProvider - { - double getAdditionalDamage(PlayerEntity player, ItemStack weapon, double damage, AnointmentHolder holder, LivingEntity attacked, Anointment anoint, int level); - } - - public static class Bonus - { - private static final Bonus DEFAULT = new Bonus("null", Collections.emptyList()); - - private final String id; - private final List modifiers; - - public Bonus(String id, List modifiers) - { - this.id = id; - this.modifiers = modifiers; - } - - public String getId() - { - return id; - } - } - - public static class Deserializer implements JsonDeserializer - { - @Override - public Anointment deserialize(JsonElement element, Type typeOfT, JsonDeserializationContext context) - throws JsonParseException - { - JsonObject json = element.getAsJsonObject(); - ResourceLocation id = new ResourceLocation(json.getAsJsonPrimitive("id").getAsString()); - List levels = context.deserialize(json.getAsJsonArray("levels"), new TypeToken>() - { - }.getType()); - boolean negative = json.has("negative") && json.getAsJsonPrimitive("negative").getAsBoolean(); - - Anointment upgrade = new Anointment(id); -// if (negative) -// upgrade.asDowngrade(); - -// if (json.has("incompatibilities")) -// { -// String[] incompatibilities = context.deserialize(json.getAsJsonArray("incompatibilities"), String[].class); -// for (String incompatible : incompatibilities) -// upgrade.addIncompatibility(new ResourceLocation(incompatible)); -// } - - if (json.has("bonuses")) - { - Map bonuses = context.deserialize(json.getAsJsonObject("bonuses"), new TypeToken>() - { - }.getType()); - bonuses.forEach((k, v) -> upgrade.withBonusSet(k, numbers -> Collections.addAll(numbers, v))); - } - - return upgrade; - } - } - -} diff --git a/src/main/java/wayoftime/bloodmagic/anointment/AnointmentColor.java b/src/main/java/wayoftime/bloodmagic/anointment/AnointmentColor.java deleted file mode 100644 index d8c3c248..00000000 --- a/src/main/java/wayoftime/bloodmagic/anointment/AnointmentColor.java +++ /dev/null @@ -1,19 +0,0 @@ -package wayoftime.bloodmagic.anointment; - -import net.minecraft.client.renderer.color.IItemColor; -import net.minecraft.item.ItemStack; -import wayoftime.bloodmagic.common.item.ItemAnointmentProvider; - -public class AnointmentColor implements IItemColor -{ - @Override - public int getColor(ItemStack stack, int layer) - { - if (layer == 1 && stack.getItem() instanceof ItemAnointmentProvider) - { - return ((ItemAnointmentProvider) stack.getItem()).getColor(); - } - - return 0xFFFFFF; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/anointment/AnointmentData.java b/src/main/java/wayoftime/bloodmagic/anointment/AnointmentData.java deleted file mode 100644 index 5f23678a..00000000 --- a/src/main/java/wayoftime/bloodmagic/anointment/AnointmentData.java +++ /dev/null @@ -1,45 +0,0 @@ -package wayoftime.bloodmagic.anointment; - -public class AnointmentData -{ - private int level; - private int damage; - private int maxDamage; - - public AnointmentData(int level, int damage, int maxDamage) - { - this.level = level; - this.damage = damage; - this.maxDamage = maxDamage; - } - - public int getLevel() - { - return this.level; - } - - public int getDamage() - { - return this.damage; - } - - public int getMaxDamage() - { - return this.maxDamage; - } - - public void damage(int amount) - { - this.damage = Math.min(damage + amount, maxDamage); - } - - public boolean isMaxDamage() - { - return damage >= maxDamage; - } - - public String getDamageString() - { - return "" + (maxDamage - damage) + "/" + maxDamage; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/anointment/AnointmentHolder.java b/src/main/java/wayoftime/bloodmagic/anointment/AnointmentHolder.java deleted file mode 100644 index fe8e19fc..00000000 --- a/src/main/java/wayoftime/bloodmagic/anointment/AnointmentHolder.java +++ /dev/null @@ -1,316 +0,0 @@ -package wayoftime.bloodmagic.anointment; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; - -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.ListNBT; -import net.minecraft.util.Hand; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import wayoftime.bloodmagic.anointment.Anointment.IDamageProvider; -import wayoftime.bloodmagic.core.AnointmentRegistrar; -import wayoftime.bloodmagic.util.Constants; - -public class AnointmentHolder -{ - private final Map anointments; - - public AnointmentHolder(Map anointments) - { - this.anointments = anointments; - } - - public AnointmentHolder() - { - this(Maps.newHashMap()); - } - - public boolean isEmpty() - { - return anointments.isEmpty(); - } - - // Returns true if the anointment is applied successfully. - public boolean applyAnointment(ItemStack stack, Anointment anointment, AnointmentData data) - { - if (canApplyAnointment(stack, anointment, data)) - { - anointments.put(anointment, data); - anointment.applyAnointment(this, stack, data.getLevel()); - return true; - } - - return false; - } - - public boolean canApplyAnointment(ItemStack stack, Anointment anointment, AnointmentData data) - { - ResourceLocation key = anointment.getKey(); - for (Anointment containedAnoint : anointments.keySet()) - { - ResourceLocation containedKey = containedAnoint.getKey(); - if (!anointment.isCompatible(containedKey) || !containedAnoint.isCompatible(key)) - { - return false; - } - } - - if (anointments.containsKey(anointment)) - { - AnointmentData prevData = anointments.get(anointment); - int level = prevData.getLevel(); - int remainingDur = prevData.getMaxDamage() - prevData.getDamage(); - if (level < data.getLevel() || (level == data.getLevel() && remainingDur < (data.getMaxDamage() - data.getDamage()))) - { - return true; - } else - { - return false; - } - } - - return true; - } - - public int getAnointmentLevel(Anointment anointment) - { - if (anointments.containsKey(anointment)) - { - return anointments.get(anointment).getLevel(); - } - - return 0; - } - - public boolean consumeAnointmentDurabilityOnHit(ItemStack weaponStack, EquipmentSlotType type) - { -// System.out.println("Attempting consumption"); - boolean didConsume = false; - List removedAnointments = new ArrayList(); - for (Entry entry : anointments.entrySet()) - { - Anointment annointment = entry.getKey(); - if (annointment.consumeOnAttack()) - { - AnointmentData data = entry.getValue(); - data.damage(1); - didConsume = true; - if (data.isMaxDamage()) - { - removedAnointments.add(annointment); - } - } - } - - for (Anointment anointment : removedAnointments) - { - removeAnointment(weaponStack, type, anointment); - } - - return didConsume; - } - - public boolean consumeAnointmentDurabilityOnUseFinish(ItemStack weaponStack, EquipmentSlotType type) - { - boolean didConsume = false; - List removedAnointments = new ArrayList(); - for (Entry entry : anointments.entrySet()) - { - Anointment annointment = entry.getKey(); - if (annointment.consumeOnUseFinish()) - { - AnointmentData data = entry.getValue(); - data.damage(1); - didConsume = true; - if (data.isMaxDamage()) - { - removedAnointments.add(annointment); - } - } - } - - for (Anointment anointment : removedAnointments) - { - removeAnointment(weaponStack, type, anointment); - } - - return didConsume; - } - - public boolean consumeAnointmentDurabilityOnHarvest(ItemStack weaponStack, EquipmentSlotType type) - { - boolean didConsume = false; - List removedAnointments = new ArrayList(); - for (Entry entry : anointments.entrySet()) - { - Anointment annointment = entry.getKey(); - if (annointment.consumeOnHarvest()) - { - AnointmentData data = entry.getValue(); - data.damage(1); - didConsume = true; - if (data.isMaxDamage()) - { - removedAnointments.add(annointment); - } - } - } - - for (Anointment anointment : removedAnointments) - { - removeAnointment(weaponStack, type, anointment); - } - - return didConsume; - } - - // Called when the specified anointment is to be removed. Occurs if the - // anointment runs out of uses or if removed via another source. - public boolean removeAnointment(ItemStack weaponStack, EquipmentSlotType type, Anointment anointment) - { - anointments.remove(anointment); - anointment.removeAnointment(this, weaponStack, type); - return true; - } - - public Map getAnointments() - { - return ImmutableMap.copyOf(anointments); - } - - public double getAdditionalDamage(PlayerEntity player, ItemStack weapon, double damage, LivingEntity attacked) - { - double additionalDamage = 0; - for (Entry entry : anointments.entrySet()) - { - IDamageProvider prov = entry.getKey().getDamageProvider(); - if (prov != null) - { - additionalDamage += prov.getAdditionalDamage(player, weapon, damage, this, attacked, entry.getKey(), entry.getValue().getLevel()); - } - } - return additionalDamage; - } - - public CompoundNBT serialize() - { - CompoundNBT compound = new CompoundNBT(); - ListNBT statList = new ListNBT(); - anointments.forEach((k, v) -> { - CompoundNBT anoint = new CompoundNBT(); - anoint.putString("key", k.getKey().toString()); - anoint.putInt("level", v.getLevel()); - anoint.putInt("damage", v.getDamage()); - anoint.putInt("max_damage", v.getMaxDamage()); - statList.add(anoint); - }); - compound.put("anointments", statList); -// -// compound.putInt("maxPoints", maxPoints); - - return compound; - } - - public void deserialize(CompoundNBT nbt) - { - ListNBT statList = nbt.getList("anointments", 10); - statList.forEach(tag -> { - if (!(tag instanceof CompoundNBT)) - return; - Anointment anoint = AnointmentRegistrar.ANOINTMENT_MAP.getOrDefault(new ResourceLocation(((CompoundNBT) tag).getString("key")), Anointment.DUMMY); -// LivingUpgrade upgrade = LivingArmorRegistrar.UPGRADE_MAP.getOrDefault(new ResourceLocation(((CompoundNBT) tag).getString("key")), LivingUpgrade.DUMMY); - if (anoint == Anointment.DUMMY) - return; -// double experience = ((CompoundNBT) tag).getDouble("exp"); - AnointmentData data = new AnointmentData(((CompoundNBT) tag).getInt("level"), ((CompoundNBT) tag).getInt("damage"), ((CompoundNBT) tag).getInt("max_damage")); - anointments.put(anoint, data); - }); -// -// maxPoints = nbt.getInt("maxPoints"); - } - - public static AnointmentHolder fromNBT(CompoundNBT holderTag) - { - AnointmentHolder holder = new AnointmentHolder(); - holder.deserialize(holderTag); - return holder; - } - - public static AnointmentHolder fromItemStack(ItemStack stack) - { - CompoundNBT nbtTag = stack.getTag(); - if (nbtTag == null) - { - return null; - } - - CompoundNBT holderTag = nbtTag.getCompound(Constants.NBT.ANOINTMENTS); - if (holderTag != null) - { - return fromNBT(holderTag); - } - - return null; - } - - public void toItemStack(ItemStack stack) - { - CompoundNBT nbtTag = stack.getOrCreateTag(); - CompoundNBT childTag = this.serialize(); - - nbtTag.put(Constants.NBT.ANOINTMENTS, childTag); - } - - public static AnointmentHolder fromPlayer(PlayerEntity player, Hand hand) - { - return fromPlayer(player, hand, false); - } - - public static AnointmentHolder fromPlayer(PlayerEntity player, Hand hand, boolean createNew) - { - ItemStack heldItem = player.getHeldItem(hand); - - AnointmentHolder holder = fromItemStack(heldItem); - return holder == null && createNew ? new AnointmentHolder() : holder; - } - - public static void toPlayer(PlayerEntity player, Hand hand, AnointmentHolder holder) - { - ItemStack heldItem = player.getHeldItem(hand); - holder.toItemStack(heldItem); - } - - public static void appendAnointmentTooltip(AnointmentHolder holder, List tooltip) - { - if (holder != null) - { -// System.out.println("Holder is not null. Size: " + holder.getAnointments().size()); -// if (trainable) -// tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.livingarmour.upgrade.points", stats.getUsedPoints(), stats.getMaxPoints()).mergeStyle(TextFormatting.GOLD)); - - holder.getAnointments().forEach((k, v) -> { - -// if (k.getLevel(v.intValue()) <= 0) -// return; - boolean sneaking = Screen.hasShiftDown(); -// if (!InputUtil.isKeyPressed(MinecraftClient.getInstance().getWindow().getHandle(), 340) || k.getNextRequirement(v) == 0) - if (!sneaking) - tooltip.add(new TranslationTextComponent("%s %s", new TranslationTextComponent(k.getTranslationKey()), new TranslationTextComponent("enchantment.level." + v.getLevel()))); - else - tooltip.add(new TranslationTextComponent("%s %s", new TranslationTextComponent(k.getTranslationKey()), (": (" + v.getDamageString() + ")"))); - }); - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/anointment/AnointmentUtil.java b/src/main/java/wayoftime/bloodmagic/anointment/AnointmentUtil.java deleted file mode 100644 index 71ff1ed1..00000000 --- a/src/main/java/wayoftime/bloodmagic/anointment/AnointmentUtil.java +++ /dev/null @@ -1,6 +0,0 @@ -package wayoftime.bloodmagic.anointment; - -public class AnointmentUtil -{ - -} diff --git a/src/main/java/wayoftime/bloodmagic/api/IBloodMagicAPI.java b/src/main/java/wayoftime/bloodmagic/api/IBloodMagicAPI.java deleted file mode 100644 index d0f85ddb..00000000 --- a/src/main/java/wayoftime/bloodmagic/api/IBloodMagicAPI.java +++ /dev/null @@ -1,143 +0,0 @@ -package wayoftime.bloodmagic.api; - -import java.util.function.Predicate; - -import javax.annotation.Nonnull; - -import org.apache.logging.log4j.LogManager; - -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.LazyValue; - -/** - * The main interface between a plugin and Blood Magic's internals. - * - * This API is intended for compatibility between other mods and Blood - * Magic. More advanced integration is out of the scope of this API and are - * considered "addons". - * - * Use INSTANCE to get an instance of the API without actually implementing - * anything - */ -public interface IBloodMagicAPI -{ - LazyValue INSTANCE = new LazyValue<>(() -> { - try - { - return (IBloodMagicAPI) Class.forName("wayoftime.bloodmagic.impl.BloodMagicAPI").getDeclaredField("INSTANCE").get(null); - } catch (ReflectiveOperationException e) - { - LogManager.getLogger().warn("Unable to find BloodMagicAPI, using a dummy instance instead..."); - return new IBloodMagicAPI() - { - }; - } - }); - - /** - * Retrieves the instance of the blacklist. - * - * @return the active {@link IBloodMagicBlacklist} instance - */ - @Nonnull - default IBloodMagicBlacklist getBlacklist() - { - return new IBloodMagicBlacklist() - { - }; - }; - - /** - * Retrieves the instance of the value manager. - * - * @return the active {@link IBloodMagicValueManager} instance - */ - @Nonnull - default IBloodMagicValueManager getValueManager() - { - return new IBloodMagicValueManager() - { - }; - } - - /** - * Registers a {@link BlockState} as a given component for the Blood Altar. - *

- * Valid component types: - *

    - *
  • GLOWSTONE
  • - *
  • BLOODSTONE
  • - *
  • BEACON
  • - *
  • BLOODRUNE
  • - *
  • CRYSTAL
  • - *
  • NOTAIR
  • - *
- * - * @param state The state to register - * @param componentType The type of Blood Altar component to register as. - */ - default void registerAltarComponent(@Nonnull BlockState state, @Nonnull String componentType) - { - } - - /** - * Removes a {@link BlockState} from the component mappings - *

- * Valid component types: - *

    - *
  • GLOWSTONE
  • - *
  • BLOODSTONE
  • - *
  • BEACON
  • - *
  • BLOODRUNE
  • - *
  • CRYSTAL
  • - *
  • NOTAIR
  • - *
- * - * @param state The state to unregister - * @param componentType The type of Blood Altar component to unregister from. - */ - default void unregisterAltarComponent(@Nonnull BlockState state, @Nonnull String componentType) - { - } - - /** - * Registers a {@link Predicate} for tranquility handling - *

- * Valid tranquility types: - *

    - *
  • PLANT
  • - *
  • CROP
  • - *
  • TREE
  • - *
  • EARTHEN
  • - *
  • WATER
  • - *
  • FIRE
  • - *
  • LAVA
  • - *
- * - * @param predicate Predicate to be used for the handler (goes to - * ITranquilityHandler) - * @param tranquilityType Tranquility type that the handler holds - * @param value The amount of tranquility that the handler has - */ - default void registerTranquilityHandler(Predicate predicate, String tranquilityType, double value) - { - } - - /** - * Gets the total Will that a Player contains - *

- * Valid tranquility types: - *

    - *
  • DEFAULT
  • - *
  • CORROSIVE
  • - *
  • DESTRUCTIVE
  • - *
  • VENGEFUL
  • - *
  • STEADFAST
  • - *
- */ - default double getTotalDemonWill(String willType, PlayerEntity player) - { - return 0; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/api/IBloodMagicBlacklist.java b/src/main/java/wayoftime/bloodmagic/api/IBloodMagicBlacklist.java deleted file mode 100644 index 57ac89b2..00000000 --- a/src/main/java/wayoftime/bloodmagic/api/IBloodMagicBlacklist.java +++ /dev/null @@ -1,61 +0,0 @@ -package wayoftime.bloodmagic.api; - -import javax.annotation.Nonnull; - -import net.minecraft.block.BlockState; -import net.minecraft.util.ResourceLocation; - -/** - * Allows blacklisting of various objects from different Blood Magic systems. - */ -public interface IBloodMagicBlacklist -{ - - /** - * Blacklists a given {@link BlockState} from being teleposed. - * - * @param state The {@link BlockState} to blacklist. - */ - default void addTeleposer(@Nonnull BlockState state) - { - }; - - /** - * Blacklists a {@link net.minecraft.entity.Entity} from being teleposed based - * on the given registry name. - * - * @param entityId The registry name to blacklist. - */ - default void addTeleposer(@Nonnull ResourceLocation entityId) - { - }; - - /** - * Blacklists a given {@link BlockState} from being transposed. - * - * @param state The {@link BlockState} to blacklist. - */ - default void addTransposition(@Nonnull BlockState state) - { - }; - - /** - * Blacklists a given {@link BlockState} from being accelerated by the growth - * enhancement ritual and sigil. - * - * @param state The {@link BlockState} to blacklist. - */ - default void addGreenGrove(@Nonnull BlockState state) - { - }; - - /** - * Blacklists a {@link net.minecraft.entity.Entity} from being sacrificed via - * the Well of Suffering ritual. - * - * @param entityId The registry name to blacklist. - */ - default void addWellOfSuffering(@Nonnull ResourceLocation entityId) - { - }; -} diff --git a/src/main/java/wayoftime/bloodmagic/api/IBloodMagicValueManager.java b/src/main/java/wayoftime/bloodmagic/api/IBloodMagicValueManager.java deleted file mode 100644 index da1676d6..00000000 --- a/src/main/java/wayoftime/bloodmagic/api/IBloodMagicValueManager.java +++ /dev/null @@ -1,45 +0,0 @@ -package wayoftime.bloodmagic.api; - -import javax.annotation.Nonnegative; -import javax.annotation.Nonnull; - -import net.minecraft.block.BlockState; -import net.minecraft.util.ResourceLocation; - -/** - * Allows value modification for various features of Blood Magic such as - * Sacrificial values. - */ -public interface IBloodMagicValueManager -{ - - /** - * Sets the amount of LP received per health point from sacrificing the given - * entity. By default, this is 25. Setting the value to 0 effectively disables - * sacrificing. - * - * @param entityId The registry name of the entity. - * @param value The amount of LP per health point to receive upon sacrifice. - */ - default void setSacrificialValue(@Nonnull ResourceLocation entityId, @Nonnegative int value) {} - - /** - * Sets the Tranquility value of a given {@link BlockState}. - *

- * Valid tranquility types: - *

    - *
  • PLANT
  • - *
  • CROP
  • - *
  • TREE
  • - *
  • EARTHEN
  • - *
  • WATER
  • - *
  • FIRE
  • - *
  • LAVA
  • - *
- * - * @param state The {@link BlockState} to set the value of. - * @param tranquilityType The type of Tranquility this block should provide. - * @param value The amount of tranquility this block should provide. - */ - default void setTranquility(@Nonnull BlockState state, @Nonnull String tranquilityType, double value) {} -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/api/compat/EnumDemonWillType.java b/src/main/java/wayoftime/bloodmagic/api/compat/EnumDemonWillType.java deleted file mode 100644 index 87829daf..00000000 --- a/src/main/java/wayoftime/bloodmagic/api/compat/EnumDemonWillType.java +++ /dev/null @@ -1,46 +0,0 @@ -package wayoftime.bloodmagic.api.compat; - -import net.minecraft.util.IStringSerializable; - -import java.util.Locale; - -public enum EnumDemonWillType implements IStringSerializable -{ - DEFAULT("default"), - CORROSIVE("corrosive"), - DESTRUCTIVE("destructive"), - VENGEFUL("vengeful"), - STEADFAST("steadfast"); - - public final String name; - - EnumDemonWillType(String name) - { - this.name = name; - } - - @Override - public String toString() - { - return name().toLowerCase(Locale.ENGLISH); - } - - @Override - public String getString() - { - return this.toString(); - } - - public static EnumDemonWillType getType(String type) - { - for (EnumDemonWillType t : values()) - { - if (t.name().equalsIgnoreCase(type)) - { - return t; - } - } - - return null; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/api/compat/IAltarReader.java b/src/main/java/wayoftime/bloodmagic/api/compat/IAltarReader.java deleted file mode 100644 index 7eb672fd..00000000 --- a/src/main/java/wayoftime/bloodmagic/api/compat/IAltarReader.java +++ /dev/null @@ -1,10 +0,0 @@ -package wayoftime.bloodmagic.api.compat; - -/** - * Any item that implements this interface will not be pulled into the Altar on - * right click. - */ -public interface IAltarReader -{ - -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/api/compat/ICustomAlchemyConsumable.java b/src/main/java/wayoftime/bloodmagic/api/compat/ICustomAlchemyConsumable.java deleted file mode 100644 index 10822cee..00000000 --- a/src/main/java/wayoftime/bloodmagic/api/compat/ICustomAlchemyConsumable.java +++ /dev/null @@ -1,12 +0,0 @@ -package wayoftime.bloodmagic.api.compat; - -import net.minecraft.item.ItemStack; - -/** - * An interface for items that have custom drainage behaviour when used in - * certain alchemy recipes. - */ -public interface ICustomAlchemyConsumable -{ - ItemStack drainUseOnAlchemyCraft(ItemStack stack); -} diff --git a/src/main/java/wayoftime/bloodmagic/api/compat/IDemonWill.java b/src/main/java/wayoftime/bloodmagic/api/compat/IDemonWill.java deleted file mode 100644 index 0957789f..00000000 --- a/src/main/java/wayoftime/bloodmagic/api/compat/IDemonWill.java +++ /dev/null @@ -1,47 +0,0 @@ -package wayoftime.bloodmagic.api.compat; - -import net.minecraft.item.ItemStack; - -/** - * Interface for Items that contain Will - */ -public interface IDemonWill -{ - /** - * Obtains the amount of Will an ItemStack contains. - * - * @param willStack - The stack to retrieve the Will from - * @return - The amount of Will an ItemStack contains - */ - double getWill(EnumDemonWillType type, ItemStack willStack); - - /** - * Sets the amount of Will in a given ItemStack. - * - * @param willStack - The ItemStack of the Will - * @param will - The amount of will to set the stack to - * @return True if successfully set. - */ - boolean setWill(EnumDemonWillType type, ItemStack willStack, double will); - - /** - * Drains the demonic will from the willStack. If all of the will is drained, - * the willStack will be removed. - * - * @param willStack - The ItemStack of the will - * @param drainAmount - The amount of Will to drain - * @return The amount of will drained. - */ - double drainWill(EnumDemonWillType type, ItemStack willStack, double drainAmount); - - /** - * Creates a new ItemStack with the specified number of will. Implementation - * should respect the number requested. - * - * @param number - The amount of Will to create the Stack with. - * @return - An ItemStack with the set amount of Will - */ - ItemStack createWill(double number); - - EnumDemonWillType getType(ItemStack stack); -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/api/compat/IDemonWillConduit.java b/src/main/java/wayoftime/bloodmagic/api/compat/IDemonWillConduit.java deleted file mode 100644 index b069377b..00000000 --- a/src/main/java/wayoftime/bloodmagic/api/compat/IDemonWillConduit.java +++ /dev/null @@ -1,19 +0,0 @@ -package wayoftime.bloodmagic.api.compat; - -/** - * Implement this interface on a Block that can accept and store Demonic Will. - */ -public interface IDemonWillConduit -{ - int getWeight(); - - double fillDemonWill(EnumDemonWillType type, double amount, boolean doFill); - - double drainDemonWill(EnumDemonWillType type, double amount, boolean doDrain); - - boolean canFill(EnumDemonWillType type); - - boolean canDrain(EnumDemonWillType type); - - double getCurrentWill(EnumDemonWillType type); -} diff --git a/src/main/java/wayoftime/bloodmagic/api/compat/IDemonWillGem.java b/src/main/java/wayoftime/bloodmagic/api/compat/IDemonWillGem.java deleted file mode 100644 index 2e0ef4e9..00000000 --- a/src/main/java/wayoftime/bloodmagic/api/compat/IDemonWillGem.java +++ /dev/null @@ -1,32 +0,0 @@ -package wayoftime.bloodmagic.api.compat; - -import net.minecraft.item.ItemStack; - -/** - * Interface for Items that store Will - */ -public interface IDemonWillGem -{ - /** - * @param willGemStack - The ItemStack for this demon will gem. - * @param willStack - The ItemStack for the will. Item should extend - * IDemonWill - * @return - The remainder willStack after the will has been absorbed into the - * gem. Return null if there is no will left in the stack. - */ - ItemStack fillDemonWillGem(ItemStack willGemStack, ItemStack willStack); - - /** - * Returns the number of souls that are left in the soul gem. Returns a double - * because souls can be fractionally drained. - */ - double getWill(EnumDemonWillType type, ItemStack willGemStack); - - void setWill(EnumDemonWillType type, ItemStack willGemStack, double amount); - - int getMaxWill(EnumDemonWillType type, ItemStack willGemStack); - - double drainWill(EnumDemonWillType type, ItemStack stack, double drainAmount, boolean doDrain); - - double fillWill(EnumDemonWillType type, ItemStack stack, double fillAmount, boolean doFill); -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/api/compat/IDemonWillViewer.java b/src/main/java/wayoftime/bloodmagic/api/compat/IDemonWillViewer.java deleted file mode 100644 index 7f646c72..00000000 --- a/src/main/java/wayoftime/bloodmagic/api/compat/IDemonWillViewer.java +++ /dev/null @@ -1,15 +0,0 @@ -package wayoftime.bloodmagic.api.compat; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -/** - * Interface for Items that allow players to see Will inside of chunks - */ -public interface IDemonWillViewer -{ - boolean canSeeDemonWillAura(World world, ItemStack stack, PlayerEntity player); - - int getDemonWillAuraResolution(World world, ItemStack stack, PlayerEntity player); -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/api/compat/IDemonWillWeapon.java b/src/main/java/wayoftime/bloodmagic/api/compat/IDemonWillWeapon.java deleted file mode 100644 index 95a894c7..00000000 --- a/src/main/java/wayoftime/bloodmagic/api/compat/IDemonWillWeapon.java +++ /dev/null @@ -1,14 +0,0 @@ -package wayoftime.bloodmagic.api.compat; - -import java.util.List; - -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.ItemStack; - -/** - * Interface for weapons that drop will when a LivingEntity is killed - */ -public interface IDemonWillWeapon -{ - List getRandomDemonWillDrop(LivingEntity killedEntity, LivingEntity attackingEntity, ItemStack stack, int looting); -} diff --git a/src/main/java/wayoftime/bloodmagic/api/compat/IDiscreteDemonWill.java b/src/main/java/wayoftime/bloodmagic/api/compat/IDiscreteDemonWill.java deleted file mode 100644 index 2b79fbb4..00000000 --- a/src/main/java/wayoftime/bloodmagic/api/compat/IDiscreteDemonWill.java +++ /dev/null @@ -1,44 +0,0 @@ -package wayoftime.bloodmagic.api.compat; - -import net.minecraft.item.ItemStack; - -/** - * Interface for Items that contain a discrete amount of Will - */ -public interface IDiscreteDemonWill -{ - /** - * Obtains the amount of Will an ItemStack contains. - * - * @param soulStack - The stack to retrieve the Will from - * @return - The amount of Will an ItemStack contains - */ - double getWill(ItemStack soulStack); - - /** - * Drains the demonic will from the willStack. If all of the will is drained, - * the willStack will be removed. Will only drain in discrete amounts, - * determined by getDiscretization. - * - * @param willStack - The ItemStack of the will - * @param drainAmount - The amount of Will to drain - * @return The amount of will drained. - */ - double drainWill(ItemStack willStack, double drainAmount); - - /** - * Gets the discrete number for this demonic will. - * - * @param willStack - The ItemStack of the will - * @return - The discrete number for the given stack. - */ - double getDiscretization(ItemStack willStack); - - /** - * Obtains the type of will this is. - * - * @param willStack - The ItemStack of the will - * @return - The type of will this is. - */ - EnumDemonWillType getType(ItemStack willStack); -} diff --git a/src/main/java/wayoftime/bloodmagic/api/compat/IIncensePath.java b/src/main/java/wayoftime/bloodmagic/api/compat/IIncensePath.java deleted file mode 100644 index 2ba87a7d..00000000 --- a/src/main/java/wayoftime/bloodmagic/api/compat/IIncensePath.java +++ /dev/null @@ -1,18 +0,0 @@ -package wayoftime.bloodmagic.api.compat; - -import net.minecraft.block.BlockState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -/** - * Any Block that implements this will be considered to be a valid path block for the Incense Altar - */ -public interface IIncensePath -{ - /** - * Goes from 0 to however far this path block can be from the altar while still - * functioning. 0 represents a block that can work when it is two blocks - * horizontally away from the altar. - */ - int getLevelOfPath(World world, BlockPos pos, BlockState state); -} diff --git a/src/main/java/wayoftime/bloodmagic/api/compat/IMultiWillTool.java b/src/main/java/wayoftime/bloodmagic/api/compat/IMultiWillTool.java deleted file mode 100644 index 790dbf62..00000000 --- a/src/main/java/wayoftime/bloodmagic/api/compat/IMultiWillTool.java +++ /dev/null @@ -1,11 +0,0 @@ -package wayoftime.bloodmagic.api.compat; - -import net.minecraft.item.ItemStack; - -/** - * Interface for Items that can contain multiple Will types - */ -public interface IMultiWillTool -{ - EnumDemonWillType getCurrentType(ItemStack stack); -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/api/event/BloodMagicCraftedEvent.java b/src/main/java/wayoftime/bloodmagic/api/event/BloodMagicCraftedEvent.java deleted file mode 100644 index 335abe96..00000000 --- a/src/main/java/wayoftime/bloodmagic/api/event/BloodMagicCraftedEvent.java +++ /dev/null @@ -1,84 +0,0 @@ -package wayoftime.bloodmagic.api.event; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.eventbus.api.Event; - -public class BloodMagicCraftedEvent extends Event -{ - - private final boolean modifiable; - private final ItemStack[] inputs; - private ItemStack output; - - public BloodMagicCraftedEvent(ItemStack output, ItemStack[] inputs, boolean modifiable) - { - this.modifiable = modifiable; - this.inputs = inputs; - this.output = output; - } - - public boolean isModifiable() - { - return modifiable; - } - - public ItemStack[] getInputs() - { - return inputs; - } - - public ItemStack getOutput() - { - return output; - } - - public void setOutput(ItemStack output) - { - if (isModifiable()) - this.output = output; - } - - /** - * Fired whenever a craft is completed in a Blood Altar. - * - * It is not cancelable, however you can modify the output stack. - */ - public static class Altar extends BloodMagicCraftedEvent - { - - public Altar(ItemStack output, ItemStack input) - { - super(output, new ItemStack[] - { input }, true); - } - } - - /** - * Fired whenever a craft is completed in a Soul Forge. - * - * It is not cancelable, however you can modify the output stack. - */ - public static class SoulForge extends BloodMagicCraftedEvent - { - - public SoulForge(ItemStack output, ItemStack[] inputs) - { - super(output, inputs, true); - } - } - - /** - * Fired whenever a craft is completed in an Alchemy Table. - * - * It is not cancelable, however you can modify the output stack. - */ - public static class AlchemyTable extends BloodMagicCraftedEvent - { - - public AlchemyTable(ItemStack output, ItemStack[] inputs) - { - super(output, inputs, true); - } - } - -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/block/enums/BloodRuneType.java b/src/main/java/wayoftime/bloodmagic/block/enums/BloodRuneType.java deleted file mode 100644 index cce55391..00000000 --- a/src/main/java/wayoftime/bloodmagic/block/enums/BloodRuneType.java +++ /dev/null @@ -1,37 +0,0 @@ -package wayoftime.bloodmagic.block.enums; - -import java.util.Locale; - -import net.minecraft.util.IStringSerializable; - -public enum BloodRuneType implements IStringSerializable -{ - BLANK, - SPEED, - EFFICIENCY, - SACRIFICE, - SELF_SACRIFICE, - DISPLACEMENT, - CAPACITY, - AUGMENTED_CAPACITY, - ORB, - ACCELERATION, - CHARGING; - - @Override - public String toString() - { - return name().toLowerCase(Locale.ENGLISH); - } - - /** - * getName() - * - * @return - */ - @Override - public String getString() - { - return this.toString(); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/block/enums/EnumRitualController.java b/src/main/java/wayoftime/bloodmagic/block/enums/EnumRitualController.java deleted file mode 100644 index 29948a7a..00000000 --- a/src/main/java/wayoftime/bloodmagic/block/enums/EnumRitualController.java +++ /dev/null @@ -1,23 +0,0 @@ -package wayoftime.bloodmagic.block.enums; - -import java.util.Locale; - -import net.minecraft.util.IStringSerializable; - -//TODO: Will want to probably discontinue this due to The Flattening -public enum EnumRitualController implements IStringSerializable -{ - MASTER, IMPERFECT, INVERTED,; - - @Override - public String toString() - { - return name().toLowerCase(Locale.ENGLISH); - } - - @Override - public String getString() - { - return this.toString(); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/client/ClientEvents.java b/src/main/java/wayoftime/bloodmagic/client/ClientEvents.java deleted file mode 100644 index 06f7c598..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/ClientEvents.java +++ /dev/null @@ -1,240 +0,0 @@ -package wayoftime.bloodmagic.client; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.player.ClientPlayerEntity; -import net.minecraft.client.gui.ScreenManager; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.RenderTypeLookup; -import net.minecraft.client.world.ClientWorld; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.IItemPropertyGetter; -import net.minecraft.item.Item; -import net.minecraft.item.ItemModelsProperties; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.StringTextComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.client.event.ColorHandlerEvent; -import net.minecraftforge.client.event.InputEvent; -import net.minecraftforge.client.event.ModelRegistryEvent; -import net.minecraftforge.event.entity.player.ItemTooltipEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.DeferredWorkQueue; -import net.minecraftforge.fml.client.registry.ClientRegistry; -import net.minecraftforge.fml.client.registry.RenderingRegistry; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.anointment.AnointmentColor; -import wayoftime.bloodmagic.anointment.AnointmentHolder; -import wayoftime.bloodmagic.api.compat.IMultiWillTool; -import wayoftime.bloodmagic.client.model.MimicColor; -import wayoftime.bloodmagic.client.render.alchemyarray.BeaconAlchemyCircleRenderer; -import wayoftime.bloodmagic.client.render.alchemyarray.DayAlchemyCircleRenderer; -import wayoftime.bloodmagic.client.render.alchemyarray.LowStaticAlchemyCircleRenderer; -import wayoftime.bloodmagic.client.render.alchemyarray.NightAlchemyCircleRenderer; -import wayoftime.bloodmagic.client.render.alchemyarray.StaticAlchemyCircleRenderer; -import wayoftime.bloodmagic.client.render.block.RenderAlchemyArray; -import wayoftime.bloodmagic.client.render.block.RenderAltar; -import wayoftime.bloodmagic.client.render.block.RenderDemonCrucible; -import wayoftime.bloodmagic.client.render.entity.BloodLightRenderer; -import wayoftime.bloodmagic.client.render.entity.EntityShapedChargeRenderer; -import wayoftime.bloodmagic.client.render.entity.EntityThrowingDaggerRenderer; -import wayoftime.bloodmagic.client.render.entity.SoulSnareRenderer; -import wayoftime.bloodmagic.client.screens.ScreenAlchemicalReactionChamber; -import wayoftime.bloodmagic.client.screens.ScreenAlchemyTable; -import wayoftime.bloodmagic.client.screens.ScreenHolding; -import wayoftime.bloodmagic.client.screens.ScreenSoulForge; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.common.item.BloodMagicItems; -import wayoftime.bloodmagic.common.item.ItemSacrificialDagger; -import wayoftime.bloodmagic.common.item.sigil.ItemSigilHolding; -import wayoftime.bloodmagic.common.item.sigil.ItemSigilToggleable; -import wayoftime.bloodmagic.common.item.soul.ItemSentientSword; -import wayoftime.bloodmagic.common.registries.BloodMagicEntityTypes; -import wayoftime.bloodmagic.core.registry.AlchemyArrayRendererRegistry; -import wayoftime.bloodmagic.network.BloodMagicPacketHandler; -import wayoftime.bloodmagic.network.SigilHoldingPacket; -import wayoftime.bloodmagic.tile.TileAlchemyArray; -import wayoftime.bloodmagic.tile.TileAltar; -import wayoftime.bloodmagic.tile.TileDemonCrucible; - -@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = BloodMagic.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) -public class ClientEvents -{ - @SubscribeEvent - public static void registerModels(ModelRegistryEvent event) - { - ClientRegistry.bindTileEntityRenderer(TileAltar.TYPE, RenderAltar::new); - ClientRegistry.bindTileEntityRenderer(TileAlchemyArray.TYPE, RenderAlchemyArray::new); - ClientRegistry.bindTileEntityRenderer(TileDemonCrucible.TYPE, RenderDemonCrucible::new); -// ClientRegistry.bindTileEntityRenderer(TileSoulForge.TYPE, RenderAlchemyArray::new); - } - - public static void registerContainerScreens() - { - ScreenManager.registerFactory(BloodMagicBlocks.SOUL_FORGE_CONTAINER.get(), ScreenSoulForge::new); - ScreenManager.registerFactory(BloodMagicBlocks.ARC_CONTAINER.get(), ScreenAlchemicalReactionChamber::new); - ScreenManager.registerFactory(BloodMagicBlocks.ALCHEMY_TABLE_CONTAINER.get(), ScreenAlchemyTable::new); - ScreenManager.registerFactory(BloodMagicBlocks.HOLDING_CONTAINER.get(), ScreenHolding::new); - } - - public static void colorHandlerEvent(ColorHandlerEvent.Item event) - { - event.getItemColors().register(new AnointmentColor(), BloodMagicItems.MELEE_DAMAGE_ANOINTMENT.get(), BloodMagicItems.SILK_TOUCH_ANOINTMENT.get(), BloodMagicItems.FORTUNE_ANOINTMENT.get(), BloodMagicItems.HOLY_WATER_ANOINTMENT.get(), BloodMagicItems.HIDDEN_KNOWLEDGE_ANOINTMENT.get(), BloodMagicItems.QUICK_DRAW_ANOINTMENT.get(), BloodMagicItems.LOOTING_ANOINTMENT.get(), BloodMagicItems.BOW_POWER_ANOINTMENT.get(), BloodMagicItems.WILL_POWER_ANOINTMENT.get(), BloodMagicItems.SMELTING_ANOINTMENT.get()); - } - - public static void cycleSigil(ItemStack stack, PlayerEntity player, int dWheel) - { - int mode = dWheel; - if (true) - { - mode = ItemSigilHolding.getCurrentItemOrdinal(stack); - mode = dWheel < 0 ? ItemSigilHolding.next(mode) : ItemSigilHolding.prev(mode); - } - - ItemSigilHolding.cycleToNextSigil(stack, mode); - BloodMagicPacketHandler.INSTANCE.sendToServer(new SigilHoldingPacket(player.inventory.currentItem, mode)); - ItemStack newStack = ItemSigilHolding.getItemStackInSlot(stack, ItemSigilHolding.getCurrentItemOrdinal(stack)); - player.sendStatusMessage(newStack.isEmpty() ? new StringTextComponent("") : newStack.getTextComponent(), true); - } - - @SubscribeEvent - public void onMouseEvent(InputEvent.MouseScrollEvent event) - { - ClientPlayerEntity player = Minecraft.getInstance().player; - - if (event.getScrollDelta() != 0 && player != null && player.isSneaking()) - { - ItemStack stack = player.getHeldItemMainhand(); - - if (!stack.isEmpty()) - { - Item item = stack.getItem(); - - if (item instanceof ItemSigilHolding) - { - cycleSigil(stack, player, event.getScrollDelta() > 0 ? 1 : -1); - event.setCanceled(true); - } - } - } - } - - @SubscribeEvent - public void appendTooltip(ItemTooltipEvent event) - { - ItemStack stack = event.getItemStack(); - AnointmentHolder holder = AnointmentHolder.fromItemStack(stack); - AnointmentHolder.appendAnointmentTooltip(holder, event.getToolTip()); - } - - @SuppressWarnings("deprecation") - public static void initClientEvents(FMLClientSetupEvent event) - { - RenderingRegistry.registerEntityRenderingHandler(BloodMagicEntityTypes.SNARE.getEntityType(), SoulSnareRenderer::new); - RenderingRegistry.registerEntityRenderingHandler(BloodMagicEntityTypes.THROWING_DAGGER.getEntityType(), EntityThrowingDaggerRenderer::new); - RenderingRegistry.registerEntityRenderingHandler(BloodMagicEntityTypes.BLOOD_LIGHT.getEntityType(), BloodLightRenderer::new); - RenderingRegistry.registerEntityRenderingHandler(BloodMagicEntityTypes.SHAPED_CHARGE.getEntityType(), EntityShapedChargeRenderer::new); - - DeferredWorkQueue.runLater(() -> { - RenderType rendertype = RenderType.getCutoutMipped(); - RenderTypeLookup.setRenderLayer(BloodMagicBlocks.ALCHEMY_TABLE.get(), rendertype); - RenderTypeLookup.setRenderLayer(BloodMagicBlocks.GROWING_DOUBT.get(), rendertype); - - ClientEvents.registerContainerScreens(); - - registerToggleableProperties(BloodMagicItems.GREEN_GROVE_SIGIL.get()); - registerToggleableProperties(BloodMagicItems.FAST_MINER_SIGIL.get()); - registerToggleableProperties(BloodMagicItems.MAGNETISM_SIGIL.get()); - registerToggleableProperties(BloodMagicItems.ICE_SIGIL.get()); - registerMultiWillTool(BloodMagicItems.SENTIENT_SWORD.get()); - registerMultiWillTool(BloodMagicItems.SENTIENT_AXE.get()); - registerMultiWillTool(BloodMagicItems.SENTIENT_PICKAXE.get()); - registerMultiWillTool(BloodMagicItems.SENTIENT_SHOVEL.get()); - registerMultiWillTool(BloodMagicItems.SENTIENT_SCYTHE.get()); - registerMultiWillTool(BloodMagicItems.PETTY_GEM.get()); - registerMultiWillTool(BloodMagicItems.LESSER_GEM.get()); - registerMultiWillTool(BloodMagicItems.COMMON_GEM.get()); - registerMultiWillTool(BloodMagicItems.GREATER_GEM.get()); - registerSacrificialKnife(BloodMagicItems.SACRIFICIAL_DAGGER.get()); - - ItemModelsProperties.registerProperty(BloodMagicItems.SENTIENT_SWORD.get(), BloodMagic.rl("active"), new IItemPropertyGetter() - { - @Override - public float call(ItemStack stack, ClientWorld world, LivingEntity entity) - { - return ((ItemSentientSword) stack.getItem()).getActivated(stack) ? 1 : 0; - } - }); - - Minecraft.getInstance().getBlockColors().register(new MimicColor(), BloodMagicBlocks.MIMIC.get()); - RenderTypeLookup.setRenderLayer(BloodMagicBlocks.MIMIC.get(), (RenderType) -> true); - }); - - AlchemyArrayRendererRegistry.registerRenderer(BloodMagic.rl("array/movement"), new StaticAlchemyCircleRenderer(BloodMagic.rl("textures/models/alchemyarrays/movementarray.png"))); - AlchemyArrayRendererRegistry.registerRenderer(BloodMagic.rl("array/updraft"), new BeaconAlchemyCircleRenderer(BloodMagic.rl("textures/models/alchemyarrays/updraftarray.png"))); - AlchemyArrayRendererRegistry.registerRenderer(BloodMagic.rl("array/spike"), new LowStaticAlchemyCircleRenderer(BloodMagic.rl("textures/models/alchemyarrays/spikearray.png"))); - AlchemyArrayRendererRegistry.registerRenderer(BloodMagic.rl("array/day"), new DayAlchemyCircleRenderer(BloodMagic.rl("textures/models/alchemyarrays/sunarray.png"), BloodMagic.rl("textures/models/alchemyarrays/sunarrayspikes.png"), BloodMagic.rl("textures/models/alchemyarrays/sunarraycircle.png"))); - AlchemyArrayRendererRegistry.registerRenderer(BloodMagic.rl("array/night"), new NightAlchemyCircleRenderer(BloodMagic.rl("textures/models/alchemyarrays/moonarrayoutside.png"), BloodMagic.rl("textures/models/alchemyarrays/moonarraysymbols.png"), BloodMagic.rl("textures/models/alchemyarrays/moonarrayinside.png"))); - AlchemyArrayRendererRegistry.registerRenderer(BloodMagic.rl("array/grove"), new BeaconAlchemyCircleRenderer(BloodMagic.rl("textures/models/alchemyarrays/growthsigil.png"))); - AlchemyArrayRendererRegistry.registerRenderer(BloodMagic.rl("array/bounce"), new LowStaticAlchemyCircleRenderer(BloodMagic.rl("textures/models/alchemyarrays/bouncearray.png"))); - - } - - public static void registerItemModelProperties(FMLClientSetupEvent event) - { - - } - - public static void registerToggleableProperties(Item item) - { - ItemModelsProperties.registerProperty(item, BloodMagic.rl("active"), new IItemPropertyGetter() - { - @Override - public float call(ItemStack stack, ClientWorld world, LivingEntity entity) - { - Item item = stack.getItem(); - if (item instanceof ItemSigilToggleable) - { - return ((ItemSigilToggleable) item).getActivated(stack) ? 1 : 0; - } - return 0; - } - }); - } - - public static void registerMultiWillTool(Item item) - { - ItemModelsProperties.registerProperty(item, BloodMagic.rl("type"), new IItemPropertyGetter() - { - @Override - public float call(ItemStack stack, ClientWorld world, LivingEntity entity) - { - Item item = stack.getItem(); - if (item instanceof IMultiWillTool) - { - return ((IMultiWillTool) item).getCurrentType(stack).ordinal(); - } - return 0; - } - }); - } - - public static void registerSacrificialKnife(Item item) - { - ItemModelsProperties.registerProperty(item, BloodMagic.rl("incense"), new IItemPropertyGetter() - { - @Override - public float call(ItemStack stack, ClientWorld world, LivingEntity entity) - { - Item item = stack.getItem(); - if (item instanceof ItemSacrificialDagger) - { - return ((ItemSacrificialDagger) item).canUseForSacrifice(stack) ? 1 : 0; - } - return 0; - } - }); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/client/Sprite.java b/src/main/java/wayoftime/bloodmagic/client/Sprite.java deleted file mode 100644 index 8b637fe1..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/Sprite.java +++ /dev/null @@ -1,57 +0,0 @@ -package wayoftime.bloodmagic.client; - -import com.mojang.blaze3d.matrix.MatrixStack; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.AbstractGui; -import net.minecraft.util.ResourceLocation; - -public class Sprite -{ - - private final ResourceLocation textureLocation; - private final int textureX; - private final int textureY; - private final int textureWidth; - private final int textureHeight; - - public Sprite(ResourceLocation textureLocation, int textureX, int textureY, int textureWidth, int textureHeight) - { - this.textureLocation = textureLocation; - this.textureX = textureX; - this.textureY = textureY; - this.textureWidth = textureWidth; - this.textureHeight = textureHeight; - } - - public ResourceLocation getTextureLocation() - { - return textureLocation; - } - - public int getTextureX() - { - return textureX; - } - - public int getTextureY() - { - return textureY; - } - - public int getTextureWidth() - { - return textureWidth; - } - - public int getTextureHeight() - { - return textureHeight; - } - - public void draw(MatrixStack matrixStack, int x, int y) - { - Minecraft.getInstance().getTextureManager().bindTexture(getTextureLocation()); - AbstractGui.blit(matrixStack, x, y, 0, getTextureX(), getTextureY(), getTextureWidth(), getTextureHeight(), 256, 256); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/client/hud/ElementInfo.java b/src/main/java/wayoftime/bloodmagic/client/hud/ElementInfo.java deleted file mode 100644 index 1a21439d..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/hud/ElementInfo.java +++ /dev/null @@ -1,45 +0,0 @@ -package wayoftime.bloodmagic.client.hud; - -import net.minecraft.util.math.vector.Vector2f; - -public class ElementInfo -{ - public static final ElementInfo DUMMY = new ElementInfo(new Vector2f(0F, 0F), ElementRegistry.getRandomColor()); - - private final Vector2f defaultPosition; - private final int boxColor; - private Vector2f currentPosition; - - public ElementInfo(Vector2f defaultPosition, int boxColor) - { - this.defaultPosition = defaultPosition; - this.boxColor = boxColor; - this.currentPosition = defaultPosition; - } - - public Vector2f getDefaultPosition() - { - return defaultPosition; - } - - public int getBoxColor() - { - return boxColor; - } - - public ElementInfo setPosition(Vector2f position) - { - this.currentPosition = position; - return this; - } - - public Vector2f getPosition() - { - return currentPosition; - } - - public void resetPosition() - { - this.currentPosition = defaultPosition; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/client/hud/ElementRegistry.java b/src/main/java/wayoftime/bloodmagic/client/hud/ElementRegistry.java deleted file mode 100644 index 427d9505..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/hud/ElementRegistry.java +++ /dev/null @@ -1,185 +0,0 @@ -package wayoftime.bloodmagic.client.hud; - -import java.awt.Color; -import java.io.File; -import java.io.FileReader; -import java.io.FileWriter; -import java.util.List; -import java.util.Map; -import java.util.Random; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Maps; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.reflect.TypeToken; - -import net.minecraft.client.MainWindow; -import net.minecraft.client.Minecraft; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.vector.Vector2f; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.client.event.RenderGameOverlayEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.loading.FMLPaths; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.client.hud.element.HUDElement; - -@Mod.EventBusSubscriber(modid = BloodMagic.MODID, value = Dist.CLIENT) -public class ElementRegistry -{ - -// private static final File CORNFIG = new File(Loader.instance().getConfigDir(), BloodMagic.MODID + "/hud_elements.json"); - private static final File CONFIG = FMLPaths.CONFIGDIR.get().resolve(BloodMagic.MODID).resolve("hud_elements.json").toFile(); - - private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); - private static final Map HUD_ELEMENTS = Maps.newLinkedHashMap(); - private static final Map REVERSE = Maps.newHashMap(); - private static final Map ELEMENT_INFO = Maps.newHashMap(); - - public static void registerHandler(ResourceLocation key, HUDElement element, Vector2f defaultPosition) - { - HUD_ELEMENTS.put(key, element); - REVERSE.put(element, key); - - ELEMENT_INFO.put(key, new ElementInfo(defaultPosition, getRandomColor())); - } - - public static void resetPos() - { - ELEMENT_INFO.values().forEach(ElementInfo::resetPosition); - } - - public static List getElements() - { - return ImmutableList.copyOf(HUD_ELEMENTS.values()); - } - - public static ResourceLocation getKey(HUDElement element) - { - return REVERSE.get(element); - } - - public static int getColor(ResourceLocation element) - { - return ELEMENT_INFO.getOrDefault(element, ElementInfo.DUMMY).getBoxColor(); - } - - public static Vector2f getPosition(ResourceLocation element) - { - return ELEMENT_INFO.get(element).getPosition(); - } - - public static void setPosition(ResourceLocation element, Vector2f point) - { - ELEMENT_INFO.compute(element, (resourceLocation, elementInfo) -> { - if (elementInfo == null) - return new ElementInfo(point, getRandomColor()); - - elementInfo.setPosition(point); - return elementInfo; - }); - } - - public static void save(Map newLocations) - { - newLocations.forEach((k, v) -> { - ElementInfo info = ELEMENT_INFO.get(k); - if (info != null) - info.setPosition(v); - }); - - Map toWrite = Maps.newHashMap(); - for (Map.Entry entry : ELEMENT_INFO.entrySet()) - toWrite.put(entry.getKey().toString(), entry.getValue().getPosition()); - - String json = GSON.toJson(toWrite); - try (FileWriter writer = new FileWriter(CONFIG)) - { - writer.write(json); - } catch (Exception e) - { - e.printStackTrace(); - } - } - - public static void readConfig() - { - if (!CONFIG.exists()) - return; - - try (FileReader reader = new FileReader(CONFIG)) - { - Map toLoad = GSON.fromJson(reader, new TypeToken>() - { - }.getType()); - for (Map.Entry entry : toLoad.entrySet()) - { - ElementInfo info = ELEMENT_INFO.get(new ResourceLocation(entry.getKey())); - if (info != null) - info.setPosition(entry.getValue()); - } - } catch (Exception e) - { - e.printStackTrace(); - } - } - - @OnlyIn(Dist.CLIENT) - @SubscribeEvent - public static void onRenderOverlay(RenderGameOverlayEvent.Pre event) - { - if (event.getType() == RenderGameOverlayEvent.ElementType.HOTBAR) - { - MainWindow window = event.getWindow(); - - for (HUDElement element : HUD_ELEMENTS.values()) - { - if (!element.shouldRender(Minecraft.getInstance())) - continue; - -// Vector2f position = ELEMENT_INFO.get(getKey(element)).getPosition(); -// int xPos = (int) (resolution.getScaledWidth_double() * position.x); -// if (xPos - element.getWidth() < 0) -// xPos *= 2; -// if (xPos + element.getWidth() > resolution.getScaledWidth()) -// xPos -= element.getWidth(); -// -// int yPos = (int) (resolution.getScaledHeight_double() * position.y); -// if (yPos - element.getHeight() < 0) -// yPos *= 2; -// if (yPos + element.getHeight() > resolution.getScaledHeight()) -// yPos -= element.getHeight(); -// -// element.draw(event.getResolution(), event.getPartialTicks(), xPos, yPos); - - Vector2f position = ELEMENT_INFO.get(getKey(element)).getPosition(); - int xPos = (int) (window.getScaledWidth() * position.x); - if (xPos - element.getWidth() < 0) - xPos *= 2; - if (xPos + element.getWidth() > window.getScaledWidth()) - xPos -= element.getWidth(); - - int yPos = (int) (window.getScaledHeight() * position.y); - if (yPos - element.getHeight() < 0) - yPos *= 2; - if (yPos + element.getHeight() > window.getScaledHeight()) - yPos -= element.getHeight(); - - element.draw(event.getMatrixStack(), event.getPartialTicks(), xPos, yPos); - } - } - } - - public static int getRandomColor() - { - Random rand = new Random(); - float r = rand.nextFloat() / 2F + 0.5F; - float g = rand.nextFloat() / 2F + 0.5F; - float b = rand.nextFloat() / 2F + 0.5F; - float a = 0.5F; - return new Color(r, g, b, a).getRGB(); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/client/hud/Elements.java b/src/main/java/wayoftime/bloodmagic/client/hud/Elements.java deleted file mode 100644 index cff7e3a0..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/hud/Elements.java +++ /dev/null @@ -1,93 +0,0 @@ -package wayoftime.bloodmagic.client.hud; - -import java.util.function.Consumer; -import java.util.function.Function; - -import org.apache.commons.lang3.tuple.Pair; - -import net.minecraft.client.resources.I18n; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.vector.Vector2f; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.ConfigManager; -import wayoftime.bloodmagic.client.Sprite; -import wayoftime.bloodmagic.client.hud.element.ElementDemonAura; -import wayoftime.bloodmagic.client.hud.element.ElementDivinedInformation; -import wayoftime.bloodmagic.client.hud.element.ElementHolding; -import wayoftime.bloodmagic.tile.TileAltar; -import wayoftime.bloodmagic.tile.TileIncenseAltar; -import wayoftime.bloodmagic.util.helper.NumeralHelper; - -public class Elements -{ - public static void registerElements() - { - ElementRegistry.registerHandler(new ResourceLocation(BloodMagic.MODID, "demon_will_aura"), new ElementDemonAura(), new Vector2f(ConfigManager.CLIENT.demonWillGaugeX.get().floatValue(), ConfigManager.CLIENT.demonWillGaugeY.get().floatValue())); - - ElementRegistry.registerHandler(BloodMagic.rl("blood_altar"), new ElementDivinedInformation(2, true, TileAltar.class) - { - @Override - public void gatherInformation(Consumer>> information) - { - // Current tier - information.accept(Pair.of(new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 0, 46, 16, 16), altar -> altar == null - ? "IV" - : NumeralHelper.toRoman(altar.getTier()))); - // Stored/Capacity - information.accept(Pair.of(new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 16, 46, 16, 16), altar -> String.format("%d/%d", altar == null - ? 0 - : altar.getCurrentBlood(), altar == null ? 10000 : altar.getCapacity()))); - } - }, new Vector2f(0.01F, 0.01F)); - - ElementRegistry.registerHandler(new ResourceLocation(BloodMagic.MODID, "blood_altar_adv"), new ElementDivinedInformation(5, false, TileAltar.class) - { - @Override - public void gatherInformation(Consumer>> information) - { - // Current tier - information.accept(Pair.of(new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 0, 46, 16, 16), altar -> altar == null - ? "IV" - : NumeralHelper.toRoman(altar.getTier()))); - // Stored/Capacity - information.accept(Pair.of(new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 16, 46, 16, 16), altar -> String.format("%d/%d", altar == null - ? 0 - : altar.getCurrentBlood(), altar == null ? 10000 : altar.getCapacity()))); - // Crafting progress/Crafting requirement - information.accept(Pair.of(new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 32, 46, 16, 16), altar -> { - if (altar == null || !altar.isActive()) - return I18n.format("hud.bloodmagic.inactive"); - int progress = altar.getProgress(); - int totalLiquidRequired = altar.getLiquidRequired() * altar.getStackInSlot(0).getCount(); - return String.format("%d/%d", progress, totalLiquidRequired); - })); - // Consumption rate - information.accept(Pair.of(new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 48, 46, 16, 16), altar -> altar == null - ? "0" - : String.valueOf((int) (altar.getConsumptionRate() * (altar.getConsumptionMultiplier() + 1))))); - // Total charge - information.accept(Pair.of(new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 64, 46, 16, 16), altar -> altar == null - ? "0" - : String.valueOf(altar.getTotalCharge()))); - } - }, new Vector2f(0.01F, 0.01F)); - - ElementRegistry.registerHandler(new ResourceLocation(BloodMagic.MODID, "incense_altar"), new ElementDivinedInformation(2, true, TileIncenseAltar.class) - { - @Override - public void gatherInformation(Consumer>> information) - { - // Current tranquility - information.accept(Pair.of(new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 80, 46, 16, 16), incense -> incense == null - ? "0" - : String.valueOf((int) ((100D * (int) (100 * incense.tranquility)) / 100D)))); - // Sacrifice bonus - information.accept(Pair.of(new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 96, 46, 16, 16), incense -> incense == null - ? "0" - : String.valueOf((int) (100 * incense.incenseAddition)))); - } - }, new Vector2f(0.01F, 0.01F)); - - ElementRegistry.registerHandler(new ResourceLocation(BloodMagic.MODID, "holding"), new ElementHolding(), new Vector2f(0.72F, 1.0F)); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/client/hud/GuiEditHUD.java b/src/main/java/wayoftime/bloodmagic/client/hud/GuiEditHUD.java deleted file mode 100644 index 84756bac..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/hud/GuiEditHUD.java +++ /dev/null @@ -1,239 +0,0 @@ -package wayoftime.bloodmagic.client.hud; - -import java.awt.Point; -import java.util.Map; - -import javax.annotation.Nullable; - -import com.google.common.collect.Maps; -import com.mojang.blaze3d.matrix.MatrixStack; - -import net.minecraft.client.MainWindow; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.vector.Vector2f; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import wayoftime.bloodmagic.client.hud.element.HUDElement; - -public class GuiEditHUD extends Screen -{ - private static final int LINE_COLOR = 0x2D2D2D; - - private final Screen parent; - private final Map currentOverrides = Maps.newHashMap(); - private HUDElement dragged; - public boolean changes; - - public GuiEditHUD(Screen parent) - { - super(new StringTextComponent("Testing GuiEditHUD")); - this.parent = parent; - } - - @Override - public void init() - { - super.init(); - - addButton(new Button(width / 2 - 155, height - 30, 70, 20, new TranslationTextComponent("gui.bloodmagic.toggle"), b -> { - Minecraft.getInstance().displayGuiScreen(parent); - }) - { - { - active = false; - } - }); - addButton(new Button(width / 2 - 75, height - 30, 70, 20, new TranslationTextComponent("gui.bloodmagic.default"), b -> { - currentOverrides.clear(); - ElementRegistry.resetPos(); - changes = false; - })); - addButton(new Button(width / 2 + 5, height - 30, 70, 20, new TranslationTextComponent("gui.bloodmagic.save"), b -> { - ElementRegistry.save(currentOverrides); - Minecraft.getInstance().displayGuiScreen(parent); - })); - addButton(new Button(width / 2 + 90, height - 30, 70, 20, new TranslationTextComponent("gui.bloodmagic.cancel"), b -> { - currentOverrides.clear(); - Minecraft.getInstance().displayGuiScreen(parent); - })); - } - - @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) - { - this.renderBackground(matrixStack); - super.render(matrixStack, mouseX, mouseY, partialTicks); - -// ScaledResolution resolution = new ScaledResolution(Minecraft.getInstance()); - MainWindow window = Minecraft.getInstance().getMainWindow(); - for (HUDElement element : ElementRegistry.getElements()) - { - if (dragged == element) - continue; - - ResourceLocation key = ElementRegistry.getKey(element); - Vector2f position = currentOverrides.getOrDefault(key, ElementRegistry.getPosition(key)); - int xPos = (int) (window.getScaledWidth() * position.x); - int yPos = (int) (window.getScaledHeight() * position.y); - - drawWithBox(matrixStack, element, partialTicks, xPos, yPos); - } - - if (dragged != null) - { - Point bounded = getBoundedDrag(window, mouseX, mouseY); - drawWithBox(matrixStack, dragged, partialTicks, bounded.x, bounded.y); - } - } - - @Override - public boolean isPauseScreen() - { - return true; - } - - @Override -// protected void mouseClickMove(int mouseX, int mouseY, int clickedMouseButton, long timeSinceLastClick) - public boolean mouseDragged(double mouseX, double mouseY, int button, double dragX, double dragY) - { - if (dragged == null) - { - HUDElement element = getHoveredElement(mouseX, mouseY); - if (element != null) - { - if (button == 0) - dragged = element; - } - - } - - return super.mouseDragged(mouseX, mouseY, button, dragX, dragY); -// if (dragged != null) -// return false; -// -// HUDElement element = getHoveredElement(mouseX, mouseY); -// if (element == null) -// return false; -// -// if (button == 0) -// dragged = element; -// -// return super.mouseDragged(mouseX, mouseY, button, dragX, dragY); - } - - @Override - public boolean mouseReleased(double mouseX, double mouseY, int state) - { - if (dragged != null) - { - MainWindow window = Minecraft.getInstance().getMainWindow(); - Point bounded = getBoundedDrag(window, mouseX, mouseY); - float xPos = (float) ((bounded.x) / window.getScaledWidth()); - float yPos = (float) ((bounded.y) / window.getScaledHeight()); - - currentOverrides.put(ElementRegistry.getKey(dragged), new Vector2f(xPos, yPos)); - changes = true; - dragged = null; -// return super; - } - - return super.mouseReleased(mouseX, mouseY, state); - } - -// @Override -// protected void actionPerformed(Button button) -// { -// switch (button.id) -// { -// case 0: -// { -// Minecraft.getInstance().displayGuiScreen(parent); -// break; -// } -// case 1: -// { -// currentOverrides.clear(); -// ElementRegistry.resetPos(); -// changes = false; -// break; -// } -// case 2: -// { -// ElementRegistry.save(currentOverrides); -// Minecraft.getInstance().displayGuiScreen(parent); -// break; -// } -// case 3: -// { -// currentOverrides.clear(); -// Minecraft.getInstance().displayGuiScreen(parent); -// break; -// } -// } -// } - - @Nullable - public HUDElement getHoveredElement(double mouseX, double mouseY) - { - MainWindow window = Minecraft.getInstance().getMainWindow(); - for (HUDElement element : ElementRegistry.getElements()) - { - ResourceLocation key = ElementRegistry.getKey(element); - Vector2f position = currentOverrides.getOrDefault(key, ElementRegistry.getPosition(key)); - - int xPos = (int) (window.getScaledWidth() * position.x); - int yPos = (int) (window.getScaledHeight() * position.y); - - if (mouseX < xPos || mouseX > xPos + element.getWidth()) - continue; - - if (mouseY < yPos || mouseY > yPos + element.getHeight()) - continue; - - return element; - } - - return null; - } - - protected Point getBoundedDrag(MainWindow window, double mouseX, double mouseY) - { - int drawX = (int) (mouseX - dragged.getWidth() / 2); - if (drawX + dragged.getWidth() >= window.getScaledWidth()) - drawX = window.getScaledWidth() - dragged.getWidth(); - if (drawX < 0) - drawX = 0; - - int drawY = (int) (mouseY - dragged.getHeight() / 2); - if (drawY + dragged.getHeight() >= window.getScaledHeight()) - drawY = window.getScaledHeight() - dragged.getHeight(); - if (drawY < 0) - drawY = 0; - - return new Point(drawX, drawY); - } - - protected void drawWithBox(MatrixStack matrixStack, HUDElement element, float partialTicks, int drawX, int drawY) - { - int color = ElementRegistry.getColor(ElementRegistry.getKey(element)); - matrixStack.push(); -// GlStateManager.enableAlpha(); -// GlStateManager.enableBlend(); -// GlStateManager.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA); - - this.vLine(matrixStack, drawX, drawY, drawY + element.getHeight() - 1, color); - this.vLine(matrixStack, drawX + element.getWidth() - 1, drawY, drawY + element.getHeight() - 1, color); - this.hLine(matrixStack, drawX, drawX + element.getWidth() - 1, drawY, color); - this.hLine(matrixStack, drawX, drawX + element.getWidth() - 1, drawY + element.getHeight() - 1, color); -// GlStateManager.disableBlend(); -// GlStateManager.disableAlpha(); - matrixStack.pop(); -// GlStateManager.color(1.0F, 1.0F, 1.0F); -// GlStateManager.enableTexture2D(); - element.draw(matrixStack, partialTicks, drawX, drawY); -// GlStateManager.disableTexture2D(); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/client/hud/element/ElementDemonAura.java b/src/main/java/wayoftime/bloodmagic/client/hud/element/ElementDemonAura.java deleted file mode 100644 index 6f29cf8a..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/hud/element/ElementDemonAura.java +++ /dev/null @@ -1,83 +0,0 @@ -package wayoftime.bloodmagic.client.hud.element; - -import java.util.List; - -import com.google.common.collect.Lists; -import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.systems.RenderSystem; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.ResourceLocation; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.util.Utils; -import wayoftime.bloodmagic.util.handler.event.ClientHandler; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; - -public class ElementDemonAura extends HUDElement -{ - - private static final ResourceLocation BAR_LOCATION = new ResourceLocation(BloodMagic.MODID, "textures/hud/bars.png"); - - private final List orderedTypes = Lists.newArrayList(EnumDemonWillType.DEFAULT, EnumDemonWillType.CORROSIVE, EnumDemonWillType.STEADFAST, EnumDemonWillType.DESTRUCTIVE, EnumDemonWillType.VENGEFUL); - - public ElementDemonAura() - { - super(80, 46); - } - - @Override - public void draw(MatrixStack matrixStack, float partialTicks, int drawX, int drawY) - { - Minecraft minecraft = Minecraft.getInstance(); - PlayerEntity player = minecraft.player; - - minecraft.getTextureManager().bindTexture(BAR_LOCATION); -// GlStateManager.color(1.0F, 1.0F, 1.0F); - this.blit(matrixStack, drawX, drawY, 0, 210, 80, 46); - - double maxAmount = Utils.getDemonWillResolution(player); - - int i = 0; - for (EnumDemonWillType type : orderedTypes) - { - i++; -// GlStateManager.color(1.0F, 1.0F, 1.0F); - minecraft.getTextureManager().bindTexture(BAR_LOCATION); - int textureXOffset = (i > 3) ? (i - 3) : (3 - i); - int maxBarSize = 30 - 2 * textureXOffset; - - double amount = ClientHandler.currentAura == null ? 0 : ClientHandler.currentAura.getWill(type); - double ratio = Math.max(Math.min(amount / maxAmount, 1), 0); - -// double amount = 50; -// double ratio = 0.5; - - double width = maxBarSize * ratio * 2; - double height = 2; - double x = drawX + 2 * textureXOffset + 10; - double y = drawY + 4 * i + 10; - - double textureX = 2 * textureXOffset + 2 * 42; - double textureY = 4 * i + 220; - - this.blit(matrixStack, (int) x, (int) y, (int) textureX, (int) textureY, (int) width, (int) height); - - if (player.isSneaking()) - { - matrixStack.push(); - matrixStack.translate(x - 2 * textureXOffset + 70, (y - 2), 0); - matrixStack.scale(0.5f, 0.5f, 1f); - minecraft.fontRenderer.drawStringWithShadow(matrixStack, String.valueOf((int) amount), 0, 2, 0xffffffff); - RenderSystem.clearTexGen(); - matrixStack.pop(); - } - } - } - - @Override - public boolean shouldRender(Minecraft minecraft) - { - return Utils.canPlayerSeeDemonWill(Minecraft.getInstance().player); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/client/hud/element/ElementDivinedInformation.java b/src/main/java/wayoftime/bloodmagic/client/hud/element/ElementDivinedInformation.java deleted file mode 100644 index d068635b..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/hud/element/ElementDivinedInformation.java +++ /dev/null @@ -1,76 +0,0 @@ -package wayoftime.bloodmagic.client.hud.element; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Hand; -import wayoftime.bloodmagic.common.item.BloodMagicItems; - -public abstract class ElementDivinedInformation extends ElementTileInformation -{ - - private final boolean simple; - - public ElementDivinedInformation(int lines, boolean simple, Class tileClass) - { - super(100, lines, tileClass); - this.simple = simple; - } - - @Override - public boolean shouldRender(Minecraft minecraft) - { - PlayerEntity player = Minecraft.getInstance().player; - ItemStack sigilStack = player.getHeldItem(Hand.MAIN_HAND); - boolean flag = false; - if (simple) - { - if (sigilStack.getItem() == BloodMagicItems.DIVINATION_SIGIL.get() || sigilStack.getItem() == BloodMagicItems.SEER_SIGIL.get()) - flag = true; - else - flag = isFlagSigilHolding(sigilStack, true); - -// if (!flag) -// { -// sigilStack = player.getHeldItem(Hand.OFF_HAND); -// if (sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_DIVINATION || sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_SEER) -// flag = true; -// else -// flag = isFlagSigilHolding(sigilStack, true); -// } - - } else - { - if (sigilStack.getItem() == BloodMagicItems.SEER_SIGIL.get()) - flag = true; - else - flag = isFlagSigilHolding(sigilStack, false); -// -// if (!flag) -// { -// sigilStack = player.getHeldItem(Hand.OFF_HAND); -// if (sigilStack.getItem() == RegistrarBloodMagicItems.SIGIL_SEER) -// flag = true; -// else -// flag = isFlagSigilHolding(sigilStack, false); -// } - } - - return super.shouldRender(minecraft) && flag; - } - - private boolean isFlagSigilHolding(ItemStack sigilStack, boolean simple) - { -// if (sigilStack.getItem() instanceof ItemSigilHolding) -// { -// List internalInv = ItemSigilHolding.getInternalInventory(sigilStack); -// int currentSlot = ItemSigilHolding.getCurrentItemOrdinal(sigilStack); -// if (internalInv != null && !internalInv.get(currentSlot).isEmpty()) -// { -// return (internalInv.get(currentSlot).getItem() == RegistrarBloodMagicItems.SIGIL_SEER && !simple) || (internalInv.get(currentSlot).getItem() == RegistrarBloodMagicItems.SIGIL_DIVINATION && simple); -// } -// } - return false; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/client/hud/element/ElementHolding.java b/src/main/java/wayoftime/bloodmagic/client/hud/element/ElementHolding.java deleted file mode 100644 index 2231907f..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/hud/element/ElementHolding.java +++ /dev/null @@ -1,109 +0,0 @@ -package wayoftime.bloodmagic.client.hud.element; - -import java.util.List; - -import com.mojang.blaze3d.matrix.MatrixStack; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.client.Sprite; -import wayoftime.bloodmagic.common.item.BloodMagicItems; -import wayoftime.bloodmagic.common.item.sigil.ItemSigilHolding; - -public class ElementHolding extends HUDElement -{ - private static final Sprite HOLDING_BAR = new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 0, 0, 102, 22); - private static final Sprite SELECTED_OVERLAY = new Sprite(new ResourceLocation(BloodMagic.MODID, "textures/gui/widgets.png"), 0, 22, 24, 24); - - public ElementHolding() - { - super(HOLDING_BAR.getTextureWidth(), HOLDING_BAR.getTextureHeight()); - } - - @Override - public void draw(MatrixStack matrixStack, float partialTicks, int drawX, int drawY) - { -// GlStateManager.color(1.0F, 1.0F, 1.0F); - matrixStack.push(); - HOLDING_BAR.draw(matrixStack, drawX, drawY); - - Minecraft minecraft = Minecraft.getInstance(); - ItemStack sigilHolding = minecraft.player.getHeldItemMainhand(); - // Check mainhand for Sigil of Holding - if (!(sigilHolding.getItem() == BloodMagicItems.HOLDING_SIGIL.get())) - sigilHolding = minecraft.player.getHeldItemOffhand(); - // Check offhand for Sigil of Holding - if (!(sigilHolding.getItem() == BloodMagicItems.HOLDING_SIGIL.get())) - return; - - int currentSlot = ItemSigilHolding.getCurrentItemOrdinal(sigilHolding); - SELECTED_OVERLAY.draw(matrixStack, drawX - 1 + (currentSlot * 20), drawY - 1); - - RenderHelper.enableStandardItemLighting(); - List inventory = ItemSigilHolding.getInternalInventory(sigilHolding); - int xOffset = 0; - for (ItemStack stack : inventory) - { - renderHotbarItem(matrixStack, drawX + 3 + xOffset, drawY + 3, partialTicks, minecraft.player, stack); - xOffset += 20; - } - matrixStack.pop(); - } - - @Override - public boolean shouldRender(Minecraft minecraft) - { - ItemStack sigilHolding = minecraft.player.getHeldItemMainhand(); - // Check mainhand for Sigil of Holding - if (!(sigilHolding.getItem() == BloodMagicItems.HOLDING_SIGIL.get())) - sigilHolding = minecraft.player.getHeldItemOffhand(); - // Check offhand for Sigil of Holding - if (!(sigilHolding.getItem() == BloodMagicItems.HOLDING_SIGIL.get())) - return false; - - return true; - } - - protected void renderHotbarItem(MatrixStack matrixStack, int x, int y, float partialTicks, PlayerEntity player, ItemStack stack) - { - if (!stack.isEmpty()) - { - float animation = (float) stack.getAnimationsToGo() - partialTicks; - - if (animation > 0.0F) - { - matrixStack.push(); - float f1 = 1.0F + animation / 5.0F; - matrixStack.translate((float) (x + 8), (float) (y + 12), 0.0F); - matrixStack.scale(1.0F / f1, (f1 + 1.0F) / 2.0F, 1.0F); - matrixStack.translate((float) (-(x + 8)), (float) (-(y + 12)), 0.0F); -// RenderSystem.translatef((float) (x + 8), (float) (y + 12), 0.0F); -// RenderSystem.scalef(1.0F / f1, (f1 + 1.0F) / 2.0F, 1.0F); -// RenderSystem.translatef((float) (-(x + 8)), (float) (-(y + 12)), 0.0F); - } - - Minecraft.getInstance().getItemRenderer().renderItemAndEffectIntoGUI(player, stack, x, y); - - if (animation > 0.0F) - matrixStack.pop(); - - Minecraft.getInstance().getItemRenderer().renderItemOverlays(Minecraft.getInstance().fontRenderer, stack, x, y); - } - } - -// private void drawItemStack(ItemStack stack, int x, int y, String altText) { -// RenderSystem.translatef(0.0F, 0.0F, 32.0F); -// this.setBlitOffset(200); -// this.itemRenderer.zLevel = 200.0F; -// net.minecraft.client.gui.FontRenderer font = stack.getItem().getFontRenderer(stack); -// if (font == null) font = this.font; -// this.itemRenderer.renderItemAndEffectIntoGUI(stack, x, y); -// this.itemRenderer.renderItemOverlayIntoGUI(font, stack, x, y - (this.draggedStack.isEmpty() ? 0 : 8), altText); -// this.setBlitOffset(0); -// this.itemRenderer.zLevel = 0.0F; -// } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/client/hud/element/ElementTileInformation.java b/src/main/java/wayoftime/bloodmagic/client/hud/element/ElementTileInformation.java deleted file mode 100644 index 5a5aa20f..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/hud/element/ElementTileInformation.java +++ /dev/null @@ -1,71 +0,0 @@ -package wayoftime.bloodmagic.client.hud.element; - -import java.awt.Color; -import java.util.List; -import java.util.function.Consumer; -import java.util.function.Function; - -import org.apache.commons.lang3.tuple.Pair; - -import com.google.common.collect.Lists; -import com.mojang.blaze3d.matrix.MatrixStack; - -import net.minecraft.client.Minecraft; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.RayTraceResult; -import wayoftime.bloodmagic.client.Sprite; - -public abstract class ElementTileInformation extends HUDElement -{ - - protected final Class tileClass; - private final List>> information; - - public ElementTileInformation(int width, int lines, Class tileClass) - { - super(width, 18 * lines - 2); - - this.tileClass = tileClass; - this.information = Lists.newArrayList(); - gatherInformation(information::add); - } - - public abstract void gatherInformation(Consumer>> information); - - @SuppressWarnings("unchecked") - @Override - public void draw(MatrixStack matrixStack, float partialTicks, int drawX, int drawY) - { - RayTraceResult trace = Minecraft.getInstance().objectMouseOver; - if (trace == null || trace.getType() != RayTraceResult.Type.BLOCK) - return; - - T tile = (T) Minecraft.getInstance().world.getTileEntity(((BlockRayTraceResult) trace).getPos()); - - int yOffset = 0; - for (Pair> sprite : information) - { - sprite.getLeft().draw(matrixStack, drawX, drawY + yOffset); - int textY = drawY + yOffset + (sprite.getLeft().getTextureHeight() / 4); - Minecraft.getInstance().fontRenderer.drawStringWithShadow(matrixStack, (tile != null && tile.getClass() == tileClass) - ? sprite.getRight().apply(tile) - : "?", drawX + sprite.getLeft().getTextureWidth() + 2, textY, Color.WHITE.getRGB()); - yOffset += sprite.getLeft().getTextureHeight() + 2; - } - } - - @Override - public boolean shouldRender(Minecraft minecraft) - { - RayTraceResult trace = Minecraft.getInstance().objectMouseOver; - if (trace == null || trace.getType() != RayTraceResult.Type.BLOCK) - return false; - - TileEntity tile = Minecraft.getInstance().world.getTileEntity(((BlockRayTraceResult) trace).getPos()); - if (tile == null || !tileClass.isAssignableFrom(tile.getClass())) - return false; - - return true; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/client/hud/element/HUDElement.java b/src/main/java/wayoftime/bloodmagic/client/hud/element/HUDElement.java deleted file mode 100644 index fc39c966..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/hud/element/HUDElement.java +++ /dev/null @@ -1,68 +0,0 @@ -package wayoftime.bloodmagic.client.hud.element; - -import com.mojang.blaze3d.matrix.MatrixStack; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.AbstractGui; -import net.minecraft.util.math.vector.Vector2f; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wayoftime.bloodmagic.client.hud.ElementRegistry; - -@OnlyIn(Dist.CLIENT) -public abstract class HUDElement -{ - - private int width; - private int height; - protected int blitOffset = 0; - - public HUDElement(int width, int height) - { - this.width = width; - this.height = height; - } - - public boolean shouldRender(Minecraft minecraft) - { - return true; - } - - public abstract void draw(MatrixStack matrixStack, float partialTicks, int drawX, int drawY); - - public final int getWidth() - { - return width; - } - - public final int getHeight() - { - return height; - } - -// protected void drawTexturedModalRect(double x, double y, double textureX, double textureY, double width, double height) -// { -// float f = 0.00390625F; -// float f1 = 0.00390625F; -// Tessellator tessellator = Tessellator.getInstance(); -// BufferBuilder buffer = tessellator.getBuffer(); -// buffer.begin(7, DefaultVertexFormats.POSITION_TEX); -// buffer.pos(x + 0, y + height, 0).tex((double) ((float) (textureX + 0) * f), (double) ((float) (textureY + height) * f1)).endVertex(); -// buffer.pos(x + width, y + height, 0).tex((double) ((float) (textureX + width) * f), (double) ((float) (textureY + height) * f1)).endVertex(); -// buffer.pos(x + width, y + 0, 0).tex((double) ((float) (textureX + width) * f), (double) ((float) (textureY + 0) * f1)).endVertex(); -// buffer.pos(x + 0, y + 0, 0).tex((double) ((float) (textureX + 0) * f), (double) ((float) (textureY + 0) * f1)).endVertex(); -// tessellator.draw(); -// } - - public void blit(MatrixStack matrixStack, int x, int y, int uOffset, int vOffset, int uWidth, int vHeight) - { - AbstractGui.blit(matrixStack, x, y, this.blitOffset, (float) uOffset, (float) vOffset, uWidth, vHeight, 256, 256); - } - - @Override - public String toString() - { - Vector2f point = ElementRegistry.getPosition(ElementRegistry.getKey(this)); - return ElementRegistry.getKey(this) + "@" + point.x + "," + point.y; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/client/key/BloodMagicKeyHandler.java b/src/main/java/wayoftime/bloodmagic/client/key/BloodMagicKeyHandler.java deleted file mode 100644 index f3b2ab92..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/key/BloodMagicKeyHandler.java +++ /dev/null @@ -1,82 +0,0 @@ -package wayoftime.bloodmagic.client.key; - -import java.util.BitSet; - -import org.lwjgl.glfw.GLFW; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.settings.KeyBinding; -import net.minecraft.client.util.InputMappings; -import net.minecraftforge.client.event.InputEvent; -import net.minecraftforge.common.MinecraftForge; - -public class BloodMagicKeyHandler -{ - - private final BitSet keyDown; - - private final BitSet repeatings; - - public BloodMagicKeyHandler() - { - this.keyDown = new BitSet(); - this.repeatings = new BitSet(); - MinecraftForge.EVENT_BUS.addListener(this::keyTick); - } - - public static boolean isKeyDown(KeyBinding keyBinding) - { - InputMappings.Input key = keyBinding.getKey(); - int keyCode = key.getKeyCode(); - if (keyCode != InputMappings.INPUT_INVALID.getKeyCode()) - { - long windowHandle = Minecraft.getInstance().getMainWindow().getHandle(); - try - { - if (key.getType() == InputMappings.Type.KEYSYM) - { - return InputMappings.isKeyDown(windowHandle, keyCode); - } else if (key.getType() == InputMappings.Type.MOUSE) - { - return GLFW.glfwGetMouseButton(windowHandle, keyCode) == GLFW.GLFW_PRESS; - } - } catch (Exception ignored) - { - } - } - return false; - } - - public void keyTick(InputEvent.KeyInputEvent event) - { -// System.out.println("Pressing the key handlers"); - for (int i = 0; i < KeyBindings.values().length; i++) - { - KeyBindings keyBindings = KeyBindings.values()[i]; - KeyBinding keyBinding = keyBindings.getKey(); - boolean state = keyBinding.isKeyDown(); - boolean lastState = keyDown.get(i); - if (state != lastState || (state && repeatings.get(i))) - { - if (state) - { - keyDown(keyBindings, lastState); - } else - { - keyUp(keyBindings); - } - keyDown.set(i, state); - } - } - } - - public void keyDown(KeyBindings kb, boolean isRepeat) - { - kb.handleKeybind(); - } - - public void keyUp(KeyBindings kb) - { - - } -} diff --git a/src/main/java/wayoftime/bloodmagic/client/key/IKeybindable.java b/src/main/java/wayoftime/bloodmagic/client/key/IKeybindable.java deleted file mode 100644 index 35eddcd0..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/key/IKeybindable.java +++ /dev/null @@ -1,9 +0,0 @@ -package wayoftime.bloodmagic.client.key; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; - -public interface IKeybindable -{ - void onKeyPressed(ItemStack stack, PlayerEntity player, KeyBindings key, boolean showInChat); -} diff --git a/src/main/java/wayoftime/bloodmagic/client/key/KeyBindingBloodMagic.java b/src/main/java/wayoftime/bloodmagic/client/key/KeyBindingBloodMagic.java deleted file mode 100644 index b48666a1..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/key/KeyBindingBloodMagic.java +++ /dev/null @@ -1,17 +0,0 @@ -package wayoftime.bloodmagic.client.key; - -import net.minecraft.client.settings.KeyBinding; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.fml.client.registry.ClientRegistry; - -@OnlyIn(Dist.CLIENT) -public class KeyBindingBloodMagic extends KeyBinding -{ - public KeyBindingBloodMagic(KeyBindings key) - { - super(key.getDescription(), -1, "key.bloodmagic.category"); - - ClientRegistry.registerKeyBinding(this); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/client/key/KeyBindings.java b/src/main/java/wayoftime/bloodmagic/client/key/KeyBindings.java deleted file mode 100644 index e711dad3..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/key/KeyBindings.java +++ /dev/null @@ -1,120 +0,0 @@ -package wayoftime.bloodmagic.client.key; - -import java.util.Locale; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.player.ClientPlayerEntity; -import net.minecraft.client.settings.KeyBinding; -import net.minecraft.item.ItemStack; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.client.settings.IKeyConflictContext; -import net.minecraftforge.client.settings.KeyConflictContext; -import net.minecraftforge.client.settings.KeyModifier; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.client.ClientEvents; -import wayoftime.bloodmagic.common.item.sigil.ItemSigilHolding; -import wayoftime.bloodmagic.network.KeyProcessorPacket; -import wayoftime.bloodmagic.util.handler.event.ClientHandler; - -public enum KeyBindings -{ - // @formatter:off - OPEN_HOLDING(KeyConflictContext.IN_GAME, KeyModifier.NONE, -1) - { - @OnlyIn(Dist.CLIENT) - @Override - public void handleKeybind() - { - ItemStack itemStack = ClientHandler.minecraft.player.getHeldItemMainhand(); - if (itemStack.getItem() instanceof IKeybindable) - BloodMagic.packetHandler.sendToServer(new KeyProcessorPacket(this.ordinal(), false)); -// System.out.println("I is on the client."); -// -// -// BloodMagicPacketHandler.INSTANCE.sendToServer(new KeyProcessorPacket(this, false)); - } - }, - CYCLE_HOLDING_POS(KeyConflictContext.IN_GAME, KeyModifier.SHIFT, -1) - { - @OnlyIn(Dist.CLIENT) - @Override - public void handleKeybind() - { - ClientPlayerEntity player = Minecraft.getInstance().player; - if (player.getHeldItemMainhand().getItem() instanceof ItemSigilHolding) - ClientEvents.cycleSigil(player.getHeldItemMainhand(), player, -1); - } - }, - CYCLE_HOLDING_NEG(KeyConflictContext.IN_GAME, KeyModifier.SHIFT, -1) - { - @OnlyIn(Dist.CLIENT) - @Override - public void handleKeybind() - { - ClientPlayerEntity player = Minecraft.getInstance().player; - if (player.getHeldItemMainhand().getItem() instanceof ItemSigilHolding) - ClientEvents.cycleSigil(player.getHeldItemMainhand(), player, 1); - } - },; - // @formatter:on - - private final IKeyConflictContext keyConflictContext; - private final KeyModifier keyModifier; - private final int keyCode; - - @OnlyIn(Dist.CLIENT) - private KeyBinding key; - - KeyBindings(IKeyConflictContext keyConflictContext, KeyModifier keyModifier, int keyCode) - { - this.keyConflictContext = keyConflictContext; - this.keyModifier = keyModifier; - this.keyCode = keyCode; - } - - @OnlyIn(Dist.CLIENT) - public abstract void handleKeybind(); - - public IKeyConflictContext getKeyConflictContext() - { - return keyConflictContext; - } - - public KeyModifier getKeyModifier() - { - return keyModifier; - } - - public int getKeyCode() - { - return keyCode; - } - - @OnlyIn(Dist.CLIENT) - public KeyBinding getKey() - { - if (key == null) - key = new KeyBindingBloodMagic(this); - - return key; - } - - @OnlyIn(Dist.CLIENT) - public void setKey(KeyBinding key) - { - this.key = key; - } - - public String getDescription() - { - return BloodMagic.MODID + ".keybind." + name().toLowerCase(Locale.ENGLISH); - } - - public static void initializeKeys() - { - OPEN_HOLDING.getKey(); - CYCLE_HOLDING_POS.getKey(); - CYCLE_HOLDING_NEG.getKey(); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/client/model/MimicBakedModel.java b/src/main/java/wayoftime/bloodmagic/client/model/MimicBakedModel.java deleted file mode 100644 index 095bdea8..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/model/MimicBakedModel.java +++ /dev/null @@ -1,195 +0,0 @@ -package wayoftime.bloodmagic.client.model; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Random; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import com.google.common.collect.ImmutableList; - -import net.minecraft.block.BlockState; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.RenderTypeLookup; -import net.minecraft.client.renderer.model.BakedQuad; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.ItemCameraTransforms; -import net.minecraft.client.renderer.model.ItemOverrideList; -import net.minecraft.client.renderer.texture.AtlasTexture; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.vertex.VertexFormatElement; -import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.client.model.data.EmptyModelData; -import net.minecraftforge.client.model.data.IDynamicBakedModel; -import net.minecraftforge.client.model.data.IModelData; -import net.minecraftforge.client.model.pipeline.BakedQuadBuilder; -import wayoftime.bloodmagic.common.block.BlockMimic; -import wayoftime.bloodmagic.tile.TileMimic; - -public class MimicBakedModel implements IDynamicBakedModel -{ - public final ResourceLocation texture; - - public MimicBakedModel(ResourceLocation texture) - { - this.texture = texture; - } - - private TextureAtlasSprite getTexture() - { - return Minecraft.getInstance().getAtlasSpriteGetter(AtlasTexture.LOCATION_BLOCKS_TEXTURE).apply(texture); - } - - @Override - public boolean isSideLit() - { - return false; - } - - private void putVertex(BakedQuadBuilder builder, Vector3d normal, double x, double y, double z, float u, float v, TextureAtlasSprite sprite, float r, float g, float b) - { - ImmutableList elements = builder.getVertexFormat().getElements().asList(); - for (int j = 0; j < elements.size(); j++) - { - VertexFormatElement e = elements.get(j); - switch (e.getUsage()) - { - case POSITION: - builder.put(j, (float) x, (float) y, (float) z, 1.0f); - break; - case COLOR: - builder.put(j, r, g, b, 1.0f); - break; - case UV: - switch (e.getIndex()) - { - case 0: - float iu = sprite.getInterpolatedU(u); - float iv = sprite.getInterpolatedV(v); - builder.put(j, iu, iv); - break; - case 2: - builder.put(j, (short) 0, (short) 0); - break; - default: - builder.put(j); - break; - } - break; - case NORMAL: - builder.put(j, (float) normal.x, (float) normal.y, (float) normal.z); - break; - default: - builder.put(j); - break; - } - } - } - - private BakedQuad createQuad(Vector3d v1, Vector3d v2, Vector3d v3, Vector3d v4, TextureAtlasSprite sprite) - { - Vector3d normal = v3.subtract(v2).crossProduct(v1.subtract(v2)).normalize(); - int tw = sprite.getWidth(); - int th = sprite.getHeight(); - - BakedQuadBuilder builder = new BakedQuadBuilder(sprite); - builder.setQuadOrientation(Direction.getFacingFromVector(normal.x, normal.y, normal.z)); - putVertex(builder, normal, v1.x, v1.y, v1.z, 0, 0, sprite, 1.0f, 1.0f, 1.0f); - putVertex(builder, normal, v2.x, v2.y, v2.z, 0, th, sprite, 1.0f, 1.0f, 1.0f); - putVertex(builder, normal, v3.x, v3.y, v3.z, tw, th, sprite, 1.0f, 1.0f, 1.0f); - putVertex(builder, normal, v4.x, v4.y, v4.z, tw, 0, sprite, 1.0f, 1.0f, 1.0f); - return builder.build(); - } - - private static Vector3d v(double x, double y, double z) - { - return new Vector3d(x, y, z); - } - - @Nonnull - @Override - public List getQuads(@Nullable BlockState state, @Nullable Direction side, @Nonnull Random rand, @Nonnull IModelData extraData) - { - RenderType layer = MinecraftForgeClient.getRenderLayer(); - - BlockState mimic = extraData.getData(TileMimic.MIMIC); - if (mimic != null && !(mimic.getBlock() instanceof BlockMimic)) - { - if (layer == null || RenderTypeLookup.canRenderInLayer(mimic, layer)) - { - IBakedModel model = Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelShapes().getModel(mimic); - try - { - return model.getQuads(mimic, side, rand, EmptyModelData.INSTANCE); - } catch (Exception e) - { - return Collections.emptyList(); - } - } - return Collections.emptyList(); - } - - if (side != null || (layer != null && !layer.equals(RenderType.getSolid()))) - { - return Collections.emptyList(); - } - - TextureAtlasSprite texture = getTexture(); - List quads = new ArrayList<>(); - double l = 0; - double r = 1; -// double l = .2; -// double r = 1 - .2; - quads.add(createQuad(v(l, r, l), v(l, r, r), v(r, r, r), v(r, r, l), texture)); - quads.add(createQuad(v(l, l, l), v(r, l, l), v(r, l, r), v(l, l, r), texture)); - quads.add(createQuad(v(r, r, r), v(r, l, r), v(r, l, l), v(r, r, l), texture)); - quads.add(createQuad(v(l, r, l), v(l, l, l), v(l, l, r), v(l, r, r), texture)); - quads.add(createQuad(v(r, r, l), v(r, l, l), v(l, l, l), v(l, r, l), texture)); - quads.add(createQuad(v(l, r, r), v(l, l, r), v(r, l, r), v(r, r, r), texture)); - - return quads; - } - - @Override - public boolean isAmbientOcclusion() - { - return true; - } - - @Override - public boolean isGui3d() - { - return false; - } - - @Override - public boolean isBuiltInRenderer() - { - return false; - } - - @Override - public TextureAtlasSprite getParticleTexture() - { - return getTexture(); - } - - @Override - public ItemOverrideList getOverrides() - { - return ItemOverrideList.EMPTY; - } - - @Override - public ItemCameraTransforms getItemCameraTransforms() - { - return ItemCameraTransforms.DEFAULT; - } - -} diff --git a/src/main/java/wayoftime/bloodmagic/client/model/MimicColor.java b/src/main/java/wayoftime/bloodmagic/client/model/MimicColor.java deleted file mode 100644 index 8ee567e7..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/model/MimicColor.java +++ /dev/null @@ -1,32 +0,0 @@ -package wayoftime.bloodmagic.client.model; - -import javax.annotation.Nullable; - -import net.minecraft.block.BlockState; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.color.IBlockColor; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockDisplayReader; -import wayoftime.bloodmagic.tile.TileMimic; - -public class MimicColor implements IBlockColor -{ - @Override - public int getColor(BlockState blockState, @Nullable IBlockDisplayReader world, @Nullable BlockPos pos, int tint) - { - TileEntity te = world.getTileEntity(pos); - if (te instanceof TileMimic) - { - TileMimic fancy = (TileMimic) te; - BlockState mimic = fancy.getMimic(); - if (mimic != null) - { - return Minecraft.getInstance().getBlockColors().getColor(mimic, world, pos, tint); - } - } - - return -1; - } - -} diff --git a/src/main/java/wayoftime/bloodmagic/client/model/MimicModelGeometry.java b/src/main/java/wayoftime/bloodmagic/client/model/MimicModelGeometry.java deleted file mode 100644 index 4324be2f..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/model/MimicModelGeometry.java +++ /dev/null @@ -1,39 +0,0 @@ -package wayoftime.bloodmagic.client.model; - -import java.util.Collection; -import java.util.Collections; -import java.util.Set; - -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.IModelTransform; -import net.minecraft.client.renderer.model.IUnbakedModel; -import net.minecraft.client.renderer.model.ItemOverrideList; -import net.minecraft.client.renderer.model.ModelBakery; -import net.minecraft.client.renderer.model.RenderMaterial; -import net.minecraft.client.renderer.texture.AtlasTexture; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.IModelConfiguration; -import net.minecraftforge.client.model.geometry.IModelGeometry; - -public class MimicModelGeometry implements IModelGeometry -{ - public final ResourceLocation texture; - - public MimicModelGeometry(ResourceLocation texture) - { - this.texture = texture; - } - - @Override - public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, java.util.function.Function spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation) - { - return new MimicBakedModel(texture); - } - - @Override - public Collection getTextures(IModelConfiguration owner, java.util.function.Function modelGetter, Set> missingTextureErrors) - { - return Collections.singletonList(new RenderMaterial(AtlasTexture.LOCATION_BLOCKS_TEXTURE, texture)); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/client/model/MimicModelLoader.java b/src/main/java/wayoftime/bloodmagic/client/model/MimicModelLoader.java deleted file mode 100644 index 6c14dfd1..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/model/MimicModelLoader.java +++ /dev/null @@ -1,30 +0,0 @@ -package wayoftime.bloodmagic.client.model; - -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonObject; - -import net.minecraft.resources.IResourceManager; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.IModelLoader; - -public class MimicModelLoader implements IModelLoader -{ - public final ResourceLocation texture; - - public MimicModelLoader(ResourceLocation texture) - { - this.texture = texture; - } - - @Override - public void onResourceManagerReload(IResourceManager resourceManager) - { - - } - - @Override - public MimicModelGeometry read(JsonDeserializationContext deserializationContext, JsonObject modelContents) - { - return new MimicModelGeometry(texture); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/client/render/BloodMagicRenderer.java b/src/main/java/wayoftime/bloodmagic/client/render/BloodMagicRenderer.java deleted file mode 100644 index 2948f554..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/render/BloodMagicRenderer.java +++ /dev/null @@ -1,104 +0,0 @@ -package wayoftime.bloodmagic.client.render; - -import java.util.Arrays; - -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; - -public class BloodMagicRenderer -{ - public static float getRed(int color) - { - return (color >> 16 & 0xFF) / 255.0F; - } - - public static float getGreen(int color) - { - return (color >> 8 & 0xFF) / 255.0F; - } - - public static float getBlue(int color) - { - return (color & 0xFF) / 255.0F; - } - - public static float getAlpha(int color) - { - return (color >> 24 & 0xFF) / 255.0F; - } - - public static class Model3D - { - public double minX, minY, minZ; - public double maxX, maxY, maxZ; - - public final TextureAtlasSprite[] textures = new TextureAtlasSprite[6]; - - public final boolean[] renderSides = new boolean[] - { true, true, true, true, true, true, false }; - - public double sizeX() - { - return maxX - minX; - } - - public double sizeY() - { - return maxY - minY; - } - - public double sizeZ() - { - return maxZ - minZ; - } - - public void setSideRender(Direction side, boolean value) - { - renderSides[side.ordinal()] = value; - } - - public boolean shouldSideRender(Direction side) - { - return renderSides[side.ordinal()]; - } - - public void setTexture(TextureAtlasSprite tex) - { - Arrays.fill(textures, tex); - } - - public void setTextures(TextureAtlasSprite down, TextureAtlasSprite up, TextureAtlasSprite north, TextureAtlasSprite south, TextureAtlasSprite west, TextureAtlasSprite east) - { - textures[0] = down; - textures[1] = up; - textures[2] = north; - textures[3] = south; - textures[4] = west; - textures[5] = east; - } - } - - public static class Model2D - { - public double minX, minY; - public double maxX, maxY; - - public ResourceLocation resource; - - public double sizeX() - { - return maxX - minX; - } - - public double sizeY() - { - return maxY - minY; - } - - public void setTexture(ResourceLocation resource) - { - this.resource = resource; - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/client/render/RenderResizableCuboid.java b/src/main/java/wayoftime/bloodmagic/client/render/RenderResizableCuboid.java deleted file mode 100644 index fbdb2e52..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/render/RenderResizableCuboid.java +++ /dev/null @@ -1,162 +0,0 @@ -package wayoftime.bloodmagic.client.render; - -import java.util.Arrays; - -import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.vertex.IVertexBuilder; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.entity.EntityRendererManager; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.Direction; -import net.minecraft.util.Direction.Axis; -import net.minecraft.util.Direction.AxisDirection; -import net.minecraft.util.math.vector.Matrix3f; -import net.minecraft.util.math.vector.Matrix4f; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.util.math.vector.Vector3f; -import net.minecraft.util.math.vector.Vector3i; -import wayoftime.bloodmagic.client.render.BloodMagicRenderer.Model3D; - -/** - * Adapted from BuildCraft - */ -public class RenderResizableCuboid -{ - public static final RenderResizableCuboid INSTANCE = new RenderResizableCuboid(); - private static final Vector3f VEC_ZERO = new Vector3f(0, 0, 0); - private static final int U_MIN = 0; - private static final int U_MAX = 1; - private static final int V_MIN = 2; - private static final int V_MAX = 3; - - protected EntityRendererManager manager = Minecraft.getInstance().getRenderManager(); - - private static Vector3f withValue(Vector3f vector, Axis axis, float value) - { - if (axis == Axis.X) - { - return new Vector3f(value, vector.getY(), vector.getZ()); - } else if (axis == Axis.Y) - { - return new Vector3f(vector.getX(), value, vector.getZ()); - } else if (axis == Axis.Z) - { - return new Vector3f(vector.getX(), vector.getY(), value); - } - throw new RuntimeException("Was given a null axis! That was probably not intentional, consider this a bug! (Vector = " + vector + ")"); - } - - public static double getValue(Vector3d vector, Axis axis) - { - if (axis == Axis.X) - { - return vector.x; - } else if (axis == Axis.Y) - { - return vector.y; - } else if (axis == Axis.Z) - { - return vector.z; - } - throw new RuntimeException("Was given a null axis! That was probably not intentional, consider this a bug! (Vector = " + vector + ")"); - } - - public void renderCube(Model3D cube, MatrixStack matrix, IVertexBuilder buffer, int argb, int light, int overlay) - { - float red = BloodMagicRenderer.getRed(argb); - float green = BloodMagicRenderer.getGreen(argb); - float blue = BloodMagicRenderer.getBlue(argb); - float alpha = BloodMagicRenderer.getAlpha(argb); - Vector3d size = new Vector3d(cube.sizeX(), cube.sizeY(), cube.sizeZ()); - matrix.push(); - matrix.translate(cube.minX, cube.minY, cube.minZ); - MatrixStack.Entry lastMatrix = matrix.getLast(); - Matrix4f matrix4f = lastMatrix.getMatrix(); - Matrix3f normal = lastMatrix.getNormal(); - for (Direction face : Direction.values()) - { - if (cube.shouldSideRender(face)) - { - int ordinal = face.ordinal(); - TextureAtlasSprite sprite = cube.textures[ordinal]; - if (sprite != null) - { - Axis u = face.getAxis() == Axis.X ? Axis.Z : Axis.X; - Axis v = face.getAxis() == Axis.Y ? Axis.Z : Axis.Y; - float other = face.getAxisDirection() == AxisDirection.POSITIVE - ? (float) getValue(size, face.getAxis()) - : 0; - - // Swap the face if this is positive: the renderer returns indexes that ALWAYS - // are for the negative face, so light it properly this way - face = face.getAxisDirection() == AxisDirection.NEGATIVE ? face : face.getOpposite(); - Direction opposite = face.getOpposite(); - - float minU = sprite.getMinU(); - float maxU = sprite.getMaxU(); - // Flip the v - float minV = sprite.getMaxV(); - float maxV = sprite.getMinV(); - double sizeU = getValue(size, u); - double sizeV = getValue(size, v); - // TODO: Look into this more, as it makes tiling of multiple objects not render - // properly if they don't fit the full texture. - // Example: Mechanical pipes rendering water or lava, makes it relatively easy - // to see the texture artifacts - for (int uIndex = 0; uIndex < sizeU; uIndex++) - { - float[] baseUV = new float[] { minU, maxU, minV, maxV }; - double addU = 1; - // If the size of the texture is greater than the cuboid goes on for then make - // sure the texture positions are lowered - if (uIndex + addU > sizeU) - { - addU = sizeU - uIndex; - baseUV[U_MAX] = baseUV[U_MIN] + (baseUV[U_MAX] - baseUV[U_MIN]) * (float) addU; - } - for (int vIndex = 0; vIndex < sizeV; vIndex++) - { - float[] uv = Arrays.copyOf(baseUV, 4); - double addV = 1; - if (vIndex + addV > sizeV) - { - addV = sizeV - vIndex; - uv[V_MAX] = uv[V_MIN] + (uv[V_MAX] - uv[V_MIN]) * (float) addV; - } - float[] xyz = new float[] { uIndex, (float) (uIndex + addU), vIndex, - (float) (vIndex + addV) }; - - renderPoint(matrix4f, normal, buffer, face, u, v, other, uv, xyz, true, false, red, green, blue, alpha, light, overlay); - renderPoint(matrix4f, normal, buffer, face, u, v, other, uv, xyz, true, true, red, green, blue, alpha, light, overlay); - renderPoint(matrix4f, normal, buffer, face, u, v, other, uv, xyz, false, true, red, green, blue, alpha, light, overlay); - renderPoint(matrix4f, normal, buffer, face, u, v, other, uv, xyz, false, false, red, green, blue, alpha, light, overlay); - - renderPoint(matrix4f, normal, buffer, opposite, u, v, other, uv, xyz, false, false, red, green, blue, alpha, light, overlay); - renderPoint(matrix4f, normal, buffer, opposite, u, v, other, uv, xyz, false, true, red, green, blue, alpha, light, overlay); - renderPoint(matrix4f, normal, buffer, opposite, u, v, other, uv, xyz, true, true, red, green, blue, alpha, light, overlay); - renderPoint(matrix4f, normal, buffer, opposite, u, v, other, uv, xyz, true, false, red, green, blue, alpha, light, overlay); - } - } - } - } - } - matrix.pop(); - } - - private void renderPoint(Matrix4f matrix4f, Matrix3f normal, IVertexBuilder buffer, Direction face, Axis u, Axis v, float other, float[] uv, float[] xyz, boolean minU, boolean minV, float red, float green, float blue, float alpha, int light, int overlay) - { - int U_ARRAY = minU ? U_MIN : U_MAX; - int V_ARRAY = minV ? V_MIN : V_MAX; - Vector3f vertex = withValue(VEC_ZERO, u, xyz[U_ARRAY]); - vertex = withValue(vertex, v, xyz[V_ARRAY]); - vertex = withValue(vertex, face.getAxis(), other); - Vector3i normalForFace = face.getDirectionVec(); - // TODO: Figure out how and why this works, it gives about the same brightness - // as we used to have but I don't understand why/how - float adjustment = 2.5F; - Vector3f norm = new Vector3f(normalForFace.getX() + adjustment, normalForFace.getY() + adjustment, normalForFace.getZ() + adjustment); - norm.normalize(); - buffer.pos(matrix4f, vertex.getX(), vertex.getY(), vertex.getZ()).color(red, green, blue, alpha).tex(uv[U_ARRAY], uv[V_ARRAY]).overlay(overlay).lightmap(light).normal(normal, norm.getX(), norm.getY(), norm.getZ()).endVertex(); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/client/render/RenderResizableQuadrilateral.java b/src/main/java/wayoftime/bloodmagic/client/render/RenderResizableQuadrilateral.java deleted file mode 100644 index 006b7f4f..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/render/RenderResizableQuadrilateral.java +++ /dev/null @@ -1,167 +0,0 @@ -package wayoftime.bloodmagic.client.render; - -import java.util.Arrays; - -import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.vertex.IVertexBuilder; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.entity.EntityRendererManager; -import net.minecraft.util.Direction; -import net.minecraft.util.Direction.Axis; -import net.minecraft.util.Direction.AxisDirection; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.vector.Matrix3f; -import net.minecraft.util.math.vector.Matrix4f; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.util.math.vector.Vector3f; -import net.minecraft.util.math.vector.Vector3i; -import wayoftime.bloodmagic.client.render.BloodMagicRenderer.Model2D; - -public class RenderResizableQuadrilateral -{ - public static final RenderResizableQuadrilateral INSTANCE = new RenderResizableQuadrilateral(); - private static final Vector3f VEC_ZERO = new Vector3f(0, 0, 0); - private static final int U_MIN = 0; - private static final int U_MAX = 1; - private static final int V_MIN = 2; - private static final int V_MAX = 3; - - protected EntityRendererManager manager = Minecraft.getInstance().getRenderManager(); - - private static Vector3f withValue(Vector3f vector, Axis axis, float value) - { - if (axis == Axis.X) - { - return new Vector3f(value, vector.getY(), vector.getZ()); - } else if (axis == Axis.Y) - { - return new Vector3f(vector.getX(), value, vector.getZ()); - } else if (axis == Axis.Z) - { - return new Vector3f(vector.getX(), vector.getY(), value); - } - throw new RuntimeException("Was given a null axis! That was probably not intentional, consider this a bug! (Vector = " - + vector + ")"); - } - - public static double getValue(Vector3d vector, Axis axis) - { - if (axis == Axis.X) - { - return vector.x; - } else if (axis == Axis.Y) - { - return vector.y; - } else if (axis == Axis.Z) - { - return vector.z; - } - throw new RuntimeException("Was given a null axis! That was probably not intentional, consider this a bug! (Vector = " - + vector + ")"); - } - - public void renderSquare(Model2D square, MatrixStack matrix, IVertexBuilder buffer, int argb, int light, int overlay) - { - float red = BloodMagicRenderer.getRed(argb); - float green = BloodMagicRenderer.getGreen(argb); - float blue = BloodMagicRenderer.getBlue(argb); - float alpha = BloodMagicRenderer.getAlpha(argb); - Vector3d size = new Vector3d(square.sizeX(), 0, square.sizeY()); - matrix.push(); - matrix.translate(square.minX, 0, square.minY); - MatrixStack.Entry lastMatrix = matrix.getLast(); - Matrix4f matrix4f = lastMatrix.getMatrix(); - Matrix3f normal = lastMatrix.getNormal(); - Direction face = Direction.UP; -// for (Direction face : Direction.values()) - - int ordinal = face.ordinal(); -// TextureAtlasSprite sprite = cube.textures[ordinal]; - ResourceLocation rl = square.resource; - if (rl != null) - { -// Minecraft.getInstance().textureManager.bindTexture(rl); - Axis u = face.getAxis() == Axis.X ? Axis.Z : Axis.X; - Axis v = face.getAxis() == Axis.Y ? Axis.Z : Axis.Y; - float other = face.getAxisDirection() == AxisDirection.POSITIVE ? (float) getValue(size, face.getAxis()) - : 0; - - // Swap the face if this is positive: the renderer returns indexes that ALWAYS - // are for the negative face, so light it properly this way - face = face.getAxisDirection() == AxisDirection.NEGATIVE ? face : face.getOpposite(); -// Direction opposite = face.getOpposite(); - - float minU = 0; - float maxU = 1; - // Flip the v - float minV = 1; - float maxV = 0; -// float minU = sprite.getMinU(); -// float maxU = sprite.getMaxU(); -// // Flip the v -// float minV = sprite.getMaxV(); -// float maxV = sprite.getMinV(); - double sizeU = getValue(size, u); - double sizeV = getValue(size, v); - // TODO: Look into this more, as it makes tiling of multiple objects not render - // properly if they don't fit the full texture. - // Example: Mechanical pipes rendering water or lava, makes it relatively easy - // to see the texture artifacts - for (int uIndex = 0; uIndex < sizeU; uIndex++) - { - float[] baseUV = new float[] - { minU, maxU, minV, maxV }; - double addU = 1; - // If the size of the texture is greater than the cuboid goes on for then make - // sure the texture positions are lowered - if (uIndex + addU > sizeU) - { -// addU = sizeU - uIndex; - baseUV[U_MAX] = baseUV[U_MIN] + (baseUV[U_MAX] - baseUV[U_MIN]) * (float) addU; - } - for (int vIndex = 0; vIndex < sizeV; vIndex++) - { - float[] uv = Arrays.copyOf(baseUV, 4); - double addV = 1; - if (vIndex + addV > sizeV) - { -// addV = sizeV - vIndex; - uv[V_MAX] = uv[V_MIN] + (uv[V_MAX] - uv[V_MIN]) * (float) addV; - } - float[] xyz = new float[] - { uIndex, (float) (uIndex + addU), vIndex, (float) (vIndex + addV) }; - - renderPoint(matrix4f, normal, buffer, face, u, v, other, uv, xyz, true, false, red, green, blue, alpha, light, overlay); - renderPoint(matrix4f, normal, buffer, face, u, v, other, uv, xyz, true, true, red, green, blue, alpha, light, overlay); - renderPoint(matrix4f, normal, buffer, face, u, v, other, uv, xyz, false, true, red, green, blue, alpha, light, overlay); - renderPoint(matrix4f, normal, buffer, face, u, v, other, uv, xyz, false, false, red, green, blue, alpha, light, overlay); - -// renderPoint(matrix4f, normal, buffer, opposite, u, v, other, uv, xyz, false, false, red, green, blue, alpha, light, overlay); -// renderPoint(matrix4f, normal, buffer, opposite, u, v, other, uv, xyz, false, true, red, green, blue, alpha, light, overlay); -// renderPoint(matrix4f, normal, buffer, opposite, u, v, other, uv, xyz, true, true, red, green, blue, alpha, light, overlay); -// renderPoint(matrix4f, normal, buffer, opposite, u, v, other, uv, xyz, true, false, red, green, blue, alpha, light, overlay); - } - - } - } - matrix.pop(); - } - - private void renderPoint(Matrix4f matrix4f, Matrix3f normal, IVertexBuilder buffer, Direction face, Axis u, Axis v, float other, float[] uv, float[] xyz, boolean minU, boolean minV, float red, float green, float blue, float alpha, int light, int overlay) - { - int U_ARRAY = minU ? U_MIN : U_MAX; - int V_ARRAY = minV ? V_MIN : V_MAX; - Vector3f vertex = withValue(VEC_ZERO, u, xyz[U_ARRAY]); - vertex = withValue(vertex, v, xyz[V_ARRAY]); - vertex = withValue(vertex, face.getAxis(), other); - Vector3i normalForFace = face.getDirectionVec(); - // TODO: Figure out how and why this works, it gives about the same brightness - // as we used to have but I don't understand why/how - float adjustment = 2.5F; - Vector3f norm = new Vector3f(normalForFace.getX() + adjustment, normalForFace.getY() - + adjustment, normalForFace.getZ() + adjustment); - norm.normalize(); - buffer.pos(matrix4f, vertex.getX(), vertex.getY(), vertex.getZ()).color(red, green, blue, alpha).tex(uv[U_ARRAY], uv[V_ARRAY]).overlay(overlay).lightmap(light).normal(normal, norm.getX(), norm.getY(), norm.getZ()).endVertex(); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/AlchemyArrayRenderer.java b/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/AlchemyArrayRenderer.java deleted file mode 100644 index 3557df32..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/AlchemyArrayRenderer.java +++ /dev/null @@ -1,115 +0,0 @@ -package wayoftime.bloodmagic.client.render.alchemyarray; - -import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.vertex.IVertexBuilder; - -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.texture.OverlayTexture; -import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.vector.Quaternion; -import wayoftime.bloodmagic.client.render.BloodMagicRenderer; -import wayoftime.bloodmagic.client.render.BloodMagicRenderer.Model2D; -import wayoftime.bloodmagic.client.render.RenderResizableQuadrilateral; -import wayoftime.bloodmagic.tile.TileAlchemyArray; - -public class AlchemyArrayRenderer -{ - public final ResourceLocation arrayResource; - - public AlchemyArrayRenderer() - { - this(new ResourceLocation("bloodmagic", "textures/models/alchemyarrays/sightsigil.png")); - } - - public AlchemyArrayRenderer(ResourceLocation arrayResource) - { - this.arrayResource = arrayResource; - } - - public float getRotation(float craftTime) - { - float offset = 2; - if (craftTime >= offset) - { - float modifier = (float) Math.pow(craftTime - offset, 1.5); - return modifier * 1f; - } - return 0; - } - - public float getSecondaryRotation(float craftTime) - { - float offset = 50; - if (craftTime >= offset) - { - float modifier = (float) Math.pow(craftTime - offset, 1.7); - return modifier * 0.5f; - } - return 0; - } - - public float getSizeModifier(float craftTime) - { - if (craftTime >= 150 && craftTime <= 250) - { - return (200 - craftTime) / 50f; - } - return 1.0f; - } - - public float getVerticalOffset(float craftTime) - { - if (craftTime >= 5) - { - if (craftTime <= 40) - { - return (float) (-0.4 + (0.4) * Math.pow((craftTime - 5) / 35f, 3)); - } else - { - return 0; - } - } - return -0.4f; - } - - public void renderAt(TileAlchemyArray tileArray, double x, double y, double z, float craftTime, MatrixStack matrixStack, IRenderTypeBuffer renderer, int combinedLightIn, int combinedOverlayIn) - { - matrixStack.push(); - - matrixStack.translate(0.5, 0.5, 0.5); - - float rot = getRotation(craftTime); - float secondaryRot = getSecondaryRotation(craftTime); - - float size = 1.0F * getSizeModifier(craftTime); - Direction rotation = tileArray.getRotation(); - - matrixStack.push(); - matrixStack.translate(0, getVerticalOffset(craftTime), 0); - matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), -rotation.getHorizontalAngle(), true)); - - matrixStack.push(); - - matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), rot, true)); - matrixStack.rotate(new Quaternion(Direction.NORTH.toVector3f(), secondaryRot, true)); - matrixStack.rotate(new Quaternion(Direction.EAST.toVector3f(), secondaryRot * 0.45812f, true)); - - IVertexBuilder twoDBuffer = renderer.getBuffer(RenderType.getEntityTranslucent(arrayResource)); - Model2D arrayModel = new BloodMagicRenderer.Model2D(); - arrayModel.minX = -0.5; - arrayModel.maxX = +0.5; - arrayModel.minY = -0.5; - arrayModel.maxY = +0.5; - arrayModel.resource = arrayResource; - - matrixStack.scale(size, size, size); - - RenderResizableQuadrilateral.INSTANCE.renderSquare(arrayModel, matrixStack, twoDBuffer, 0xFFFFFFFF, 0x00F000F0, OverlayTexture.NO_OVERLAY); - - matrixStack.pop(); - matrixStack.pop(); - matrixStack.pop(); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/BeaconAlchemyCircleRenderer.java b/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/BeaconAlchemyCircleRenderer.java deleted file mode 100644 index b5021539..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/BeaconAlchemyCircleRenderer.java +++ /dev/null @@ -1,113 +0,0 @@ -package wayoftime.bloodmagic.client.render.alchemyarray; - -import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.vertex.IVertexBuilder; - -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.vector.Quaternion; -import wayoftime.bloodmagic.client.render.BloodMagicRenderer; -import wayoftime.bloodmagic.client.render.BloodMagicRenderer.Model2D; -import wayoftime.bloodmagic.client.render.RenderResizableQuadrilateral; -import wayoftime.bloodmagic.tile.TileAlchemyArray; - -public class BeaconAlchemyCircleRenderer extends AlchemyArrayRenderer -{ - public BeaconAlchemyCircleRenderer(ResourceLocation arrayResource) - { - super(arrayResource); - } - - @Override - public float getRotation(float craftTime) - { - float offset = 2; - if (craftTime >= offset) - { - float modifier = (craftTime - offset) * 5f; - return modifier * 1f; - } - return 0; - } - - @Override - public float getSecondaryRotation(float craftTime) - { - float offset = 50; - float secondaryOffset = 150; - if (craftTime >= offset) - { - if (craftTime < secondaryOffset) - { - float modifier = 90 * (craftTime - offset) / (secondaryOffset - offset); - return modifier; - } else - { - return 90; - } - } - return 0; - } - - public float getSizeModifier(float craftTime) - { - return 1.0f; - } - -// public float getVerticalOffset(float craftTime) -// { -// if (craftTime >= 5) -// { -// if (craftTime <= 40) -// { -// return (float) (-0.4 + (0.4) * Math.pow((craftTime - 5) / 35f, 3)); -// } else -// { -// return 0; -// } -// } -// return -0.4f; -// } - - public void renderAt(TileAlchemyArray tileArray, double x, double y, double z, float craftTime, MatrixStack matrixStack, IRenderTypeBuffer renderer, int combinedLightIn, int combinedOverlayIn) - { - matrixStack.push(); - - matrixStack.translate(0.5, 0.5, 0.5); - - float rot = getRotation(craftTime); - float secondaryRot = getSecondaryRotation(craftTime); - - float size = 1.0F * getSizeModifier(craftTime); - Direction rotation = tileArray.getRotation(); - - matrixStack.push(); - matrixStack.translate(0, getVerticalOffset(craftTime), 0); - matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), -rotation.getHorizontalAngle(), true)); - - matrixStack.push(); - - matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), rot, true)); - matrixStack.rotate(new Quaternion(Direction.EAST.toVector3f(), -secondaryRot, true)); -// matrixStack.rotate(new Quaternion(Direction.EAST.toVector3f(), secondaryRot * 0.45812f, true)); - - IVertexBuilder twoDBuffer = renderer.getBuffer(RenderType.getEntityTranslucent(arrayResource)); - Model2D arrayModel = new BloodMagicRenderer.Model2D(); - arrayModel.minX = -0.5; - arrayModel.maxX = +0.5; - arrayModel.minY = -0.5; - arrayModel.maxY = +0.5; - arrayModel.resource = arrayResource; - - matrixStack.scale(size, size, size); - -// RenderResizableQuadrilateral.INSTANCE.renderSquare(arrayModel, matrixStack, twoDBuffer, 0x000000FF, 0xFFFFFFFF, OverlayTexture.NO_OVERLAY); - RenderResizableQuadrilateral.INSTANCE.renderSquare(arrayModel, matrixStack, twoDBuffer, 0xFFFFFFFF, 0x00F000F0, combinedOverlayIn); - - matrixStack.pop(); - matrixStack.pop(); - matrixStack.pop(); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/BindingAlchemyCircleRenderer.java b/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/BindingAlchemyCircleRenderer.java deleted file mode 100644 index 1a79c19c..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/BindingAlchemyCircleRenderer.java +++ /dev/null @@ -1,229 +0,0 @@ -package wayoftime.bloodmagic.client.render.alchemyarray; - -import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.vertex.IVertexBuilder; - -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.vector.Quaternion; -import wayoftime.bloodmagic.client.render.BloodMagicRenderer; -import wayoftime.bloodmagic.client.render.BloodMagicRenderer.Model2D; -import wayoftime.bloodmagic.client.render.RenderResizableQuadrilateral; -import wayoftime.bloodmagic.tile.TileAlchemyArray; - -public class BindingAlchemyCircleRenderer extends AlchemyArrayRenderer -{ - public static final int numberOfSweeps = 5; - public static final int startTime = 50; - public static final int sweepTime = 40; - public static final int inwardRotationTime = 50; - public static final float arcLength = (float) Math.sqrt(2 * (2 * 2) - 2 * 2 * 2 * Math.cos(2 * Math.PI * 2 / 5)); - public static final float theta2 = (float) (18f * Math.PI / 180f); - public static final int endTime = 300; - public final ResourceLocation[] arraysResources; - public float offsetFromFace = -0.9f; - - public BindingAlchemyCircleRenderer() - { - super(new ResourceLocation("bloodmagic", "textures/models/alchemyarrays/bindingarray.png")); - arraysResources = new ResourceLocation[5]; - arraysResources[0] = new ResourceLocation("bloodmagic", "textures/models/alchemyarrays/bindinglightningarray.png"); - arraysResources[1] = new ResourceLocation("bloodmagic", "textures/models/alchemyarrays/bindinglightningarray.png"); - arraysResources[2] = new ResourceLocation("bloodmagic", "textures/models/alchemyarrays/bindinglightningarray.png"); - arraysResources[3] = new ResourceLocation("bloodmagic", "textures/models/alchemyarrays/bindinglightningarray.png"); - arraysResources[4] = new ResourceLocation("bloodmagic", "textures/models/alchemyarrays/bindinglightningarray.png"); - } - - public float getRotation(int circle, float craftTime) - { - float offset = 2; - if (circle == -1 && craftTime >= offset) - { - return (craftTime - offset) * 360 * 2 / 5 / sweepTime; - } - if (craftTime >= offset) - { - float modifier = (float) Math.pow(craftTime - offset, 1.5); - return modifier * 0.5f; - } - return 0; - } - - public float getSecondaryRotation(int circle, float craftTime) - { - float offset = 50; - if (craftTime >= offset) - { - float modifier = (float) Math.pow(craftTime - offset, 1.7); - return modifier * 0.5f; - } - return 0; - } - - public float getVerticalOffset(int circle, float craftTime) - { - if (circle >= 0 && circle <= 4) - { - if (craftTime >= 5) - { - if (craftTime <= 40) - { - return (float) ((0.4) * Math.pow((craftTime - 5) / 35f, 3)); - } else - { - return 0.4f; - } - } - - return 0; - } - - if (craftTime >= 5) - { - if (craftTime <= 40) - { - return (float) ((0.4) * Math.pow((craftTime - 5) / 35f, 3)); - } else - { - return 0.4f; - } - } - return 0; - } - - public float getInwardRotation(int circle, float craftTime) - { - float offset = startTime + numberOfSweeps * sweepTime; - if (craftTime >= offset) - { - if (craftTime <= offset + inwardRotationTime) - { - return 90f / inwardRotationTime * (craftTime - offset); - } else - { - return 90; - } - } - - return 0; - } - - public void renderAt(TileAlchemyArray tileArray, double x, double y, double z, float craftTime, MatrixStack matrixStack, IRenderTypeBuffer renderer, int combinedLightIn, int combinedOverlayIn) - { - matrixStack.push(); - - matrixStack.translate(0.5, 0.5, 0.5); - - float rot = getRotation(-1, craftTime); - float secondaryRot = getSecondaryRotation(craftTime); - - float size = 3; - Direction dirRotation = tileArray.getRotation(); - - matrixStack.push(); - matrixStack.translate(0, getVerticalOffset(craftTime), 0); - matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), -dirRotation.getHorizontalAngle(), true)); - - matrixStack.push(); - - matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), rot, true)); -// matrixStack.rotate(new Quaternion(Direction.NORTH.toVector3f(), secondaryRot, true)); -// matrixStack.rotate(new Quaternion(Direction.EAST.toVector3f(), secondaryRot * 0.45812f, true)); - - IVertexBuilder twoDBuffer = renderer.getBuffer(RenderType.getEntityTranslucent(arrayResource)); - Model2D arrayModel = new BloodMagicRenderer.Model2D(); - arrayModel.minX = -0.5; - arrayModel.maxX = +0.5; - arrayModel.minY = -0.5; - arrayModel.maxY = +0.5; - arrayModel.resource = arrayResource; - - matrixStack.scale(size, size, size); - - RenderResizableQuadrilateral.INSTANCE.renderSquare(arrayModel, matrixStack, twoDBuffer, 0xFFFFFFFF, combinedLightIn, combinedOverlayIn); - - matrixStack.pop(); - - for (int i = 0; i < 5; i++) - { - matrixStack.push(); - - float newSize = 1; - float distance = BindingAlchemyCircleRenderer.getDistanceOfCircle(i, craftTime); - float angle = BindingAlchemyCircleRenderer.getAngleOfCircle(i, craftTime); - float rotation = this.getRotation(i, craftTime); - - matrixStack.translate(distance * Math.sin(angle), this.getVerticalOffset(i, craftTime), -distance * Math.cos(angle)); - matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), i * 360 / 5, true)); - matrixStack.rotate(new Quaternion(Direction.NORTH.toVector3f(), getInwardRotation(i, craftTime), true)); - matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), rotation, true)); - twoDBuffer = renderer.getBuffer(RenderType.getEntityTranslucent(arraysResources[i])); - arrayModel.resource = arraysResources[i]; - - matrixStack.scale(newSize, newSize, newSize); - - RenderResizableQuadrilateral.INSTANCE.renderSquare(arrayModel, matrixStack, twoDBuffer, 0xFFFFFFFF, combinedLightIn, combinedOverlayIn); - - matrixStack.pop(); - } - - matrixStack.pop(); - matrixStack.pop(); - } - - public static float getAngleOfCircle(int circle, float craftTime) - { - if (circle >= 0 && circle <= 4) - { - float originalAngle = (float) (circle * 2 * Math.PI / 5d); - - double sweep = (craftTime - startTime) / sweepTime; - if (sweep >= 0 && sweep < numberOfSweeps) - { - float offset = ((int) sweep) * sweepTime + startTime; - originalAngle += 2 * Math.PI * 2 / 5 * (int) sweep + getAngle(craftTime - offset, (int) sweep); - } else if (sweep >= numberOfSweeps) - { - originalAngle += 2 * Math.PI * 2 / 5 * numberOfSweeps + (craftTime - 5 * sweepTime - startTime) * 2 * Math.PI * 2 / 5 / sweepTime; - } - - return originalAngle; - } - - return 0; - } - - public static float getAngle(float craftTime, int sweep) - { - float rDP = craftTime / sweepTime * arcLength; - float rEnd = (float) Math.sqrt(rDP * rDP + 2 * 2 - 2 * rDP * 2 * Math.cos(theta2)); - return (float) (Math.acos((2 * 2 + rEnd * rEnd - rDP * rDP) / (2 * rEnd * 2))); - } - - /** - * Returns the center-to-center distance of this circle. - */ - public static float getDistanceOfCircle(int circle, float craftTime) - { // TODO Change this so it doesn't use angle, since it is a constant speed. - double sweep = (craftTime - startTime) / sweepTime; - if (sweep >= 0 && sweep < numberOfSweeps) - { - float offset = ((int) sweep) * sweepTime + startTime; - float angle = getAngle(craftTime - offset, (int) sweep); - float thetaPrime = (float) (Math.PI - theta2 - angle); - // if(thetaPrime > 0 && thetaPrime < Math.PI) { - return (float) (2 * Math.sin(theta2) / Math.sin(thetaPrime)); - // } - } else if (sweep >= numberOfSweeps && craftTime < endTime) - { - return 2 - 2 * (craftTime - startTime - numberOfSweeps * sweepTime) / (endTime - startTime - numberOfSweeps * sweepTime); - } else if (craftTime >= endTime) - { - return 0; - } - - return 2; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/DayAlchemyCircleRenderer.java b/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/DayAlchemyCircleRenderer.java deleted file mode 100644 index 4a2d37ec..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/DayAlchemyCircleRenderer.java +++ /dev/null @@ -1,229 +0,0 @@ -package wayoftime.bloodmagic.client.render.alchemyarray; - -import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.vertex.IVertexBuilder; - -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.vector.Quaternion; -import wayoftime.bloodmagic.client.render.BloodMagicRenderer; -import wayoftime.bloodmagic.client.render.BloodMagicRenderer.Model2D; -import wayoftime.bloodmagic.client.render.RenderResizableQuadrilateral; -import wayoftime.bloodmagic.tile.TileAlchemyArray; - -public class DayAlchemyCircleRenderer extends AlchemyArrayRenderer -{ - private final ResourceLocation spikesResource; - private final ResourceLocation circleResource; - - public DayAlchemyCircleRenderer(ResourceLocation arrayResource, ResourceLocation spikesResource, ResourceLocation circleResource) - { - super(arrayResource); - this.spikesResource = spikesResource; - this.circleResource = circleResource; - } - - @Override - public float getRotation(float craftTime) - { - return 0; - } - - public float getSecondaryRotation(float craftTime) - { - float offset = 2; - if (craftTime >= offset) - { - float modifier = (craftTime - offset) * (craftTime - offset) * 0.05f; - return modifier * 1f; - } - return 0; - } - - public float getVerticalOffset(float craftTime) - { - if (craftTime >= 40) - { - if (craftTime <= 100) - { - return (float) (-0.4 + (0.4) * Math.pow((craftTime - 40) / 60f, 3)); - } else - { - return 0; - } - } - return -0.4f; - } - - public float getSizeModifier(float craftTime) - { - return 1.0f; - } - - public float getSecondarySizeModifier(float craftTime) - { - if (craftTime >= 40) - { - if (craftTime <= 160) - { - return (float) ((2f) * Math.pow((craftTime - 40) / 120f, 3)); - } else - { - return 2; - } - } - - return 0; - } - - public float getTertiarySizeModifier(float craftTime) - { - if (craftTime >= 40) - { - if (craftTime <= 100) - { - return (float) ((1f) * Math.pow((craftTime - 40) / 60f, 3)); - } else - { - return 1; - } - } - - return 0; - } - - public float getSpikeVerticalOffset(float craftTime) - { - if (craftTime >= 40) - { - if (craftTime <= 100) - { - return (float) (-0.4 + (0.4) * Math.pow((craftTime - 40) / 60f, 3)); - } else if (craftTime <= 140) - { - return -0.01f * (craftTime - 100); - } else - { - return -0.4f; - } - } - return -0.4f; - } - - public float getCentralCircleOffset(float craftTime) - { - if (craftTime >= 40) - { - if (craftTime <= 100) - { - return (float) (-0.4 + (0.4) * Math.pow((craftTime - 40) / 60f, 3)); - } else if (craftTime <= 140) - { - return 0.01f * (craftTime - 100); - } else - { - return 0.4f; - } - } - return -0.4f; - } - - public void renderAt(TileAlchemyArray tileArray, double x, double y, double z, float craftTime, MatrixStack matrixStack, IRenderTypeBuffer renderer, int combinedLightIn, int combinedOverlayIn) - { - matrixStack.push(); - - matrixStack.translate(0.5, 0.5, 0.5); - - float rot = getRotation(craftTime); - float secondaryRot = getSecondaryRotation(craftTime); - - float size = 1.0F * getSizeModifier(craftTime); - Direction rotation = tileArray.getRotation(); - - matrixStack.push(); - matrixStack.translate(0, getVerticalOffset(craftTime), 0); - matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), -rotation.getHorizontalAngle(), true)); - - matrixStack.push(); - - matrixStack.rotate(new Quaternion(Direction.NORTH.toVector3f(), rot, true)); - matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), secondaryRot, true)); -// matrixStack.rotate(new Quaternion(Direction.EAST.toVector3f(), secondaryRot * 0.45812f, true)); - - IVertexBuilder twoDBuffer = renderer.getBuffer(RenderType.getEntityTranslucent(arrayResource)); - Model2D arrayModel = new BloodMagicRenderer.Model2D(); - arrayModel.minX = -0.5; - arrayModel.maxX = +0.5; - arrayModel.minY = -0.5; - arrayModel.maxY = +0.5; - arrayModel.resource = arrayResource; - - matrixStack.scale(size, size, size); - - RenderResizableQuadrilateral.INSTANCE.renderSquare(arrayModel, matrixStack, twoDBuffer, 0xFFFFFFFF, 0x00F000F0, combinedOverlayIn); - - matrixStack.pop(); - matrixStack.pop(); - - matrixStack.push(); - matrixStack.translate(0, getSpikeVerticalOffset(craftTime), 0); - matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), -rotation.getHorizontalAngle(), true)); - - matrixStack.push(); - - matrixStack.rotate(new Quaternion(Direction.NORTH.toVector3f(), rot, true)); - matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), -secondaryRot, true)); -// matrixStack.rotate(new Quaternion(Direction.EAST.toVector3f(), secondaryRot * 0.45812f, true)); - - twoDBuffer = renderer.getBuffer(RenderType.getEntityTranslucent(spikesResource)); - arrayModel = new BloodMagicRenderer.Model2D(); - arrayModel.minX = -0.5; - arrayModel.maxX = +0.5; - arrayModel.minY = -0.5; - arrayModel.maxY = +0.5; - arrayModel.resource = spikesResource; - - float secondarySize = 1.0F * getSecondarySizeModifier(craftTime); - - matrixStack.scale(secondarySize, secondarySize, secondarySize); - - int colorWanted = 0xFFFFFFFF; - - RenderResizableQuadrilateral.INSTANCE.renderSquare(arrayModel, matrixStack, twoDBuffer, colorWanted, 0x00F000F0, combinedOverlayIn); - - matrixStack.pop(); - matrixStack.pop(); - - matrixStack.push(); - matrixStack.translate(0, getCentralCircleOffset(craftTime), 0); - matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), -rotation.getHorizontalAngle(), true)); - - matrixStack.push(); - - matrixStack.rotate(new Quaternion(Direction.NORTH.toVector3f(), rot, true)); - matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), -secondaryRot, true)); -// matrixStack.rotate(new Quaternion(Direction.EAST.toVector3f(), secondaryRot * 0.45812f, true)); - - twoDBuffer = renderer.getBuffer(RenderType.getEntityTranslucent(circleResource)); - arrayModel = new BloodMagicRenderer.Model2D(); - arrayModel.minX = -0.5; - arrayModel.maxX = +0.5; - arrayModel.minY = -0.5; - arrayModel.maxY = +0.5; - arrayModel.resource = circleResource; - - float tertiarySize = 1.0F * getTertiarySizeModifier(craftTime); - - matrixStack.scale(tertiarySize, tertiarySize, tertiarySize); - - colorWanted = 0xFFFFFFFF; - - RenderResizableQuadrilateral.INSTANCE.renderSquare(arrayModel, matrixStack, twoDBuffer, colorWanted, 0x00F000F0, combinedOverlayIn); - - matrixStack.pop(); - matrixStack.pop(); - matrixStack.pop(); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/LowAlchemyCircleRenderer.java b/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/LowAlchemyCircleRenderer.java deleted file mode 100644 index 5e7e4724..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/LowAlchemyCircleRenderer.java +++ /dev/null @@ -1,23 +0,0 @@ -package wayoftime.bloodmagic.client.render.alchemyarray; - -import net.minecraft.util.ResourceLocation; -import wayoftime.bloodmagic.BloodMagic; - -public class LowAlchemyCircleRenderer extends SingleAlchemyCircleRenderer -{ - public LowAlchemyCircleRenderer() - { - this(BloodMagic.rl("textures/models/AlchemyArrays/SkeletonTurret1.png")); - } - - public LowAlchemyCircleRenderer(ResourceLocation arrayResource) - { - super(arrayResource); - } - - @Override - public float getVerticalOffset(float craftTime) - { - return -0.4f; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/LowStaticAlchemyCircleRenderer.java b/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/LowStaticAlchemyCircleRenderer.java deleted file mode 100644 index ce9c1668..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/LowStaticAlchemyCircleRenderer.java +++ /dev/null @@ -1,36 +0,0 @@ -package wayoftime.bloodmagic.client.render.alchemyarray; - -import net.minecraft.util.ResourceLocation; -import wayoftime.bloodmagic.BloodMagic; - -public class LowStaticAlchemyCircleRenderer extends LowAlchemyCircleRenderer -{ - public LowStaticAlchemyCircleRenderer() - { - this(BloodMagic.rl("textures/models/AlchemyArrays/SkeletonTurret1.png")); - } - - public LowStaticAlchemyCircleRenderer(ResourceLocation arrayResource) - { - super(arrayResource); - } - - @Override - public float getRotation(float craftTime) - { - - return 0; - } - - public float getSecondaryRotation(float craftTime) - { - float offset = 2; - float duration = 180; - if (craftTime >= offset && craftTime < offset + duration) - { - float modifier = (craftTime - offset) * 2f; - return modifier * 1f; - } - return 0; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/NightAlchemyCircleRenderer.java b/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/NightAlchemyCircleRenderer.java deleted file mode 100644 index 64f59611..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/NightAlchemyCircleRenderer.java +++ /dev/null @@ -1,327 +0,0 @@ -package wayoftime.bloodmagic.client.render.alchemyarray; - -import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.vertex.IVertexBuilder; - -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.vector.Quaternion; -import wayoftime.bloodmagic.client.render.BloodMagicRenderer; -import wayoftime.bloodmagic.client.render.BloodMagicRenderer.Model2D; -import wayoftime.bloodmagic.client.render.RenderResizableQuadrilateral; -import wayoftime.bloodmagic.tile.TileAlchemyArray; - -public class NightAlchemyCircleRenderer extends AlchemyArrayRenderer -{ - private final ResourceLocation symbolResource; - private final ResourceLocation circleResource; - - public NightAlchemyCircleRenderer(ResourceLocation arrayResource, ResourceLocation symbolResource, ResourceLocation circleResource) - { - super(arrayResource); - this.symbolResource = symbolResource; - this.circleResource = circleResource; - } - - @Override - public float getRotation(float craftTime) - { - return 0; - } - - public float getSecondaryRotation(float craftTime) - { - float offset = 2; - if (craftTime >= offset) - { - float modifier = (craftTime - offset) * (craftTime - offset) * 0.05f; - return modifier * 1f; - } - return 0; - } - - public float getTertiaryRotation(float craftTime) - { - float offset = 60; - if (craftTime >= offset) - { - float modifier = (craftTime - offset) * (craftTime - offset) * 0.15f; - return modifier * 1f; - } - return 0; - } - - public float getVerticalOffset(float craftTime) - { -// if (craftTime >= 40) -// { -// if (craftTime <= 100) -// { -// return (float) (-0.4 + (0.4) * Math.pow((craftTime - 40) / 60f, 3)); -// } else -// { -// return 0; -// } -// } - return -0.4f; - } - - public float getSizeModifier(float craftTime) - { - return 1.0f; - } - - public float getSecondarySizeModifier(float craftTime) - { - if (craftTime >= 100) - { - if (craftTime <= 160) - { - return (float) ((1f) * Math.pow((craftTime - 100) / 60f, 3)) + 1f; - } else - { - return 2; - } - } - return 1.0f; - } - - public float getTertiarySizeModifier(float craftTime) - { - return 1; - } - - public float getSymbolVerticaloffset(float craftTime) - { - if (craftTime >= 40) - { - if (craftTime <= 100) - { - return (float) (-0.4 + (0.4) * Math.pow((craftTime - 40) / 60f, 3)); - } else if (craftTime <= 140) - { - return 0.01f * (craftTime - 100); - } else - { - return 0.4f; - } - } - - return -0.4f; - } - - public float getCentralCircleOffset(float craftTime) - { - if (craftTime >= 40) - { - if (craftTime <= 100) - { - return (float) (-0.4 + (0.4) * Math.pow((craftTime - 40) / 60f, 3)); - } else - { - return 0; - } - } - - return -0.4f; - } - - public float getSymbolPitch(float craftTime) - { - if (craftTime > 70) - { - if (craftTime <= 100) - { - return 90 * (craftTime - 70) / 30f; - } else - { - return 90; - } - } - return 0; - } - - public float getCentralCirclePitch(float craftTime) - { - if (craftTime > 70) - { - if (craftTime <= 150) - { - return 360 * (craftTime - 70) / 80f; - } else - { - return 360; - } - } - return 0; - } - - public float moonDisplacement(float craftTime) - { - if (craftTime > 40) - { - if (craftTime <= 100) - { - return (float) (2 * Math.pow((craftTime - 40) / 60f, 3)); - } else - { - return 2; - } - } - return 0; - } - - public float moonArc(float craftTime) - { - if (craftTime > 100) - { - if (craftTime <= 200) - { - return 180 * (craftTime - 100) / 100f; - } else - { - return 180; - } - } - - return 0; - } - - public void renderAt(TileAlchemyArray tileArray, double x, double y, double z, float craftTime, MatrixStack matrixStack, IRenderTypeBuffer renderer, int combinedLightIn, int combinedOverlayIn) - { - matrixStack.push(); - - matrixStack.translate(0.5, 0.5, 0.5); - - float rot = getRotation(craftTime); - float secondaryRot = getSecondaryRotation(craftTime); - float tertiaryRot = getTertiaryRotation(craftTime); - - float size = 1.0F * getSizeModifier(craftTime); - Direction rotation = tileArray.getRotation(); - - matrixStack.push(); - matrixStack.translate(0, getVerticalOffset(craftTime), 0); - matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), -rotation.getHorizontalAngle(), true)); - - matrixStack.push(); - - matrixStack.rotate(new Quaternion(Direction.NORTH.toVector3f(), rot, true)); - matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), secondaryRot, true)); -// matrixStack.rotate(new Quaternion(Direction.EAST.toVector3f(), secondaryRot * 0.45812f, true)); - - IVertexBuilder twoDBuffer = renderer.getBuffer(RenderType.getEntityTranslucent(arrayResource)); - Model2D arrayModel = new BloodMagicRenderer.Model2D(); - arrayModel.minX = -0.5; - arrayModel.maxX = +0.5; - arrayModel.minY = -0.5; - arrayModel.maxY = +0.5; - arrayModel.resource = arrayResource; - - matrixStack.scale(size, size, size); - - RenderResizableQuadrilateral.INSTANCE.renderSquare(arrayModel, matrixStack, twoDBuffer, 0xFFFFFFFF, 0x00F000F0, combinedOverlayIn); - - matrixStack.pop(); - matrixStack.pop(); - -// matrixStack.push(); -// matrixStack.translate(0, getSymbolVerticaloffset(craftTime), 0); -// matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), -rotation.getHorizontalAngle(), true)); -// -// matrixStack.push(); -// - float pitch = getSymbolPitch(craftTime); -// matrixStack.rotate(new Quaternion(Direction.WEST.toVector3f(), pitch, true)); -// matrixStack.rotate(new Quaternion(Direction.NORTH.toVector3f(), tertiaryRot, true)); -//// matrixStack.rotate(new Quaternion(Direction.EAST.toVector3f(), secondaryRot * 0.45812f, true)); -// -// twoDBuffer = renderer.getBuffer(RenderType.getEntityTranslucent(symbolResource)); -// arrayModel = new BloodMagicRenderer.Model2D(); -// arrayModel.minX = -0.5; -// arrayModel.maxX = +0.5; -// arrayModel.minY = -0.5; -// arrayModel.maxY = +0.5; -// arrayModel.resource = symbolResource; -// - float secondarySize = 1.0F * getSecondarySizeModifier(craftTime); -// -// matrixStack.scale(secondarySize, secondarySize, secondarySize); -// - int colorWanted = 0xFFFFFFFF; -// -// RenderResizableQuadrilateral.INSTANCE.renderSquare(arrayModel, matrixStack, twoDBuffer, colorWanted, 0x00F000F0, combinedOverlayIn); -// -// matrixStack.pop(); -// matrixStack.pop(); - - matrixStack.push(); - matrixStack.translate(0, getCentralCircleOffset(craftTime), 0); - matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), -rotation.getHorizontalAngle(), true)); - - matrixStack.push(); - - pitch = getCentralCirclePitch(craftTime); - matrixStack.rotate(new Quaternion(Direction.WEST.toVector3f(), pitch, true)); - matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), -secondaryRot, true)); -// matrixStack.rotate(new Quaternion(Direction.EAST.toVector3f(), secondaryRot * 0.45812f, true)); - - twoDBuffer = renderer.getBuffer(RenderType.getEntityTranslucent(circleResource)); - arrayModel = new BloodMagicRenderer.Model2D(); - arrayModel.minX = -0.5; - arrayModel.maxX = +0.5; - arrayModel.minY = -0.5; - arrayModel.maxY = +0.5; - arrayModel.resource = circleResource; - - float tertiarySize = 1.0F * getTertiarySizeModifier(craftTime); - - matrixStack.scale(tertiarySize, tertiarySize, tertiarySize); - - colorWanted = 0xFFFFFFFF; - - RenderResizableQuadrilateral.INSTANCE.renderSquare(arrayModel, matrixStack, twoDBuffer, colorWanted, 0x00F000F0, combinedOverlayIn); - - matrixStack.pop(); - matrixStack.pop(); - - // Moon going over the array - - matrixStack.push(); - matrixStack.translate(0, getCentralCircleOffset(craftTime), 0); - matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), -rotation.getHorizontalAngle(), true)); - matrixStack.rotate(new Quaternion(Direction.SOUTH.toVector3f(), moonArc(craftTime), true)); - matrixStack.translate(moonDisplacement(craftTime), 0, 0); - - matrixStack.push(); - - pitch = getSymbolPitch(craftTime); - - matrixStack.rotate(new Quaternion(Direction.WEST.toVector3f(), pitch, true)); - matrixStack.rotate(new Quaternion(Direction.NORTH.toVector3f(), tertiaryRot, true)); -// matrixStack.rotate(new Quaternion(Direction.EAST.toVector3f(), secondaryRot * 0.45812f, true)); - - twoDBuffer = renderer.getBuffer(RenderType.getEntityTranslucent(symbolResource)); - arrayModel = new BloodMagicRenderer.Model2D(); - arrayModel.minX = -0.5; - arrayModel.maxX = +0.5; - arrayModel.minY = -0.5; - arrayModel.maxY = +0.5; - arrayModel.resource = symbolResource; - - secondarySize = 1.0F; - - matrixStack.scale(secondarySize, secondarySize, secondarySize); - - colorWanted = 0xFFFFFFFF; - - RenderResizableQuadrilateral.INSTANCE.renderSquare(arrayModel, matrixStack, twoDBuffer, colorWanted, 0x00F000F0, combinedOverlayIn); - - matrixStack.pop(); - matrixStack.pop(); - - matrixStack.pop(); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/SingleAlchemyCircleRenderer.java b/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/SingleAlchemyCircleRenderer.java deleted file mode 100644 index ff6ff63a..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/SingleAlchemyCircleRenderer.java +++ /dev/null @@ -1,83 +0,0 @@ -package wayoftime.bloodmagic.client.render.alchemyarray; - -import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.vertex.IVertexBuilder; - -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.vector.Quaternion; -import wayoftime.bloodmagic.client.render.BloodMagicRenderer; -import wayoftime.bloodmagic.client.render.BloodMagicRenderer.Model2D; -import wayoftime.bloodmagic.client.render.RenderResizableQuadrilateral; -import wayoftime.bloodmagic.tile.TileAlchemyArray; - -public class SingleAlchemyCircleRenderer extends AlchemyArrayRenderer -{ - public SingleAlchemyCircleRenderer(ResourceLocation arrayResource) - { - super(arrayResource); - } - - @Override - public float getRotation(float craftTime) - { - float offset = 2; - if (craftTime >= offset) - { - float modifier = (craftTime - offset) * 2f; - return modifier * 1f; - } - return 0; - } - - public float getSecondaryRotation(float craftTime) - { - return 0; - } - - public float getSizeModifier(float craftTime) - { - return 1.0f; - } - - public void renderAt(TileAlchemyArray tileArray, double x, double y, double z, float craftTime, MatrixStack matrixStack, IRenderTypeBuffer renderer, int combinedLightIn, int combinedOverlayIn) - { - matrixStack.push(); - - matrixStack.translate(0.5, 0.5, 0.5); - - float rot = getRotation(craftTime); - float secondaryRot = getSecondaryRotation(craftTime); - - float size = 1.0F * getSizeModifier(craftTime); - Direction rotation = tileArray.getRotation(); - - matrixStack.push(); - matrixStack.translate(0, getVerticalOffset(craftTime), 0); - matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), -rotation.getHorizontalAngle(), true)); - - matrixStack.push(); - - matrixStack.rotate(new Quaternion(Direction.NORTH.toVector3f(), rot, true)); - matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), secondaryRot, true)); -// matrixStack.rotate(new Quaternion(Direction.EAST.toVector3f(), secondaryRot * 0.45812f, true)); - - IVertexBuilder twoDBuffer = renderer.getBuffer(RenderType.getEntityTranslucent(arrayResource)); - Model2D arrayModel = new BloodMagicRenderer.Model2D(); - arrayModel.minX = -0.5; - arrayModel.maxX = +0.5; - arrayModel.minY = -0.5; - arrayModel.maxY = +0.5; - arrayModel.resource = arrayResource; - - matrixStack.scale(size, size, size); - - RenderResizableQuadrilateral.INSTANCE.renderSquare(arrayModel, matrixStack, twoDBuffer, 0xFFFFFFFF, 0x00F000F0, combinedOverlayIn); - - matrixStack.pop(); - matrixStack.pop(); - matrixStack.pop(); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/StaticAlchemyCircleRenderer.java b/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/StaticAlchemyCircleRenderer.java deleted file mode 100644 index a7650134..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/render/alchemyarray/StaticAlchemyCircleRenderer.java +++ /dev/null @@ -1,98 +0,0 @@ -package wayoftime.bloodmagic.client.render.alchemyarray; - -import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.vertex.IVertexBuilder; - -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.texture.OverlayTexture; -import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.vector.Quaternion; -import wayoftime.bloodmagic.client.render.BloodMagicRenderer; -import wayoftime.bloodmagic.client.render.BloodMagicRenderer.Model2D; -import wayoftime.bloodmagic.client.render.RenderResizableQuadrilateral; -import wayoftime.bloodmagic.tile.TileAlchemyArray; - -public class StaticAlchemyCircleRenderer extends AlchemyArrayRenderer -{ - public StaticAlchemyCircleRenderer(ResourceLocation arrayResource) - { - super(arrayResource); - } - - public float getRotation(float craftTime) - { - float offset = 50; - if (craftTime >= offset) - { - float modifier = (float) (craftTime - offset) * 5f; - return modifier * 1f; - } - return 0; - } - - public float getSecondaryRotation(float craftTime) - { - return 0; - } - - public float getSizeModifier(float craftTime) - { - return 1.0f; - } - -// public float getVerticalOffset(float craftTime) -// { -// if (craftTime >= 5) -// { -// if (craftTime <= 40) -// { -// return (float) (-0.4 + (0.4) * Math.pow((craftTime - 5) / 35f, 3)); -// } else -// { -// return 0; -// } -// } -// return -0.4f; -// } - - public void renderAt(TileAlchemyArray tileArray, double x, double y, double z, float craftTime, MatrixStack matrixStack, IRenderTypeBuffer renderer, int combinedLightIn, int combinedOverlayIn) - { - matrixStack.push(); - - matrixStack.translate(0.5, 0.5, 0.5); - - float rot = getRotation(craftTime); - float secondaryRot = getSecondaryRotation(craftTime); - - float size = 1.0F * getSizeModifier(craftTime); - Direction rotation = tileArray.getRotation(); - - matrixStack.push(); - matrixStack.translate(0, getVerticalOffset(craftTime), 0); - matrixStack.rotate(new Quaternion(Direction.UP.toVector3f(), -rotation.getHorizontalAngle(), true)); - - matrixStack.push(); - - matrixStack.rotate(new Quaternion(Direction.NORTH.toVector3f(), rot, true)); -// matrixStack.rotate(new Quaternion(Direction.NORTH.toVector3f(), secondaryRot, true)); -// matrixStack.rotate(new Quaternion(Direction.EAST.toVector3f(), secondaryRot * 0.45812f, true)); - - IVertexBuilder twoDBuffer = renderer.getBuffer(RenderType.getEntityTranslucent(arrayResource)); - Model2D arrayModel = new BloodMagicRenderer.Model2D(); - arrayModel.minX = -0.5; - arrayModel.maxX = +0.5; - arrayModel.minY = -0.5; - arrayModel.maxY = +0.5; - arrayModel.resource = arrayResource; - - matrixStack.scale(size, size, size); - - RenderResizableQuadrilateral.INSTANCE.renderSquare(arrayModel, matrixStack, twoDBuffer, 0xFFFFFFFF, 0x00F000F0, OverlayTexture.NO_OVERLAY); - - matrixStack.pop(); - matrixStack.pop(); - matrixStack.pop(); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/client/render/block/RenderAlchemyArray.java b/src/main/java/wayoftime/bloodmagic/client/render/block/RenderAlchemyArray.java deleted file mode 100644 index 83a9e972..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/render/block/RenderAlchemyArray.java +++ /dev/null @@ -1,43 +0,0 @@ -package wayoftime.bloodmagic.client.render.block; - -import com.mojang.blaze3d.matrix.MatrixStack; - -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.tileentity.TileEntityRenderer; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.item.ItemStack; -import wayoftime.bloodmagic.client.render.alchemyarray.AlchemyArrayRenderer; -import wayoftime.bloodmagic.core.registry.AlchemyArrayRendererRegistry; -import wayoftime.bloodmagic.tile.TileAlchemyArray; - -public class RenderAlchemyArray extends TileEntityRenderer -{ - public static final AlchemyArrayRenderer arrayRenderer = new AlchemyArrayRenderer(); - - public RenderAlchemyArray(TileEntityRendererDispatcher rendererDispatcherIn) - { - super(rendererDispatcherIn); - } - - @Override - public void render(TileAlchemyArray tileArray, float partialTicks, MatrixStack matrixStack, IRenderTypeBuffer buffer, int combinedLightIn, int combinedOverlayIn) - { - ItemStack inputStack = tileArray.getStackInSlot(0); - ItemStack catalystStack = tileArray.getStackInSlot(1); -// arrayRenderer.renderAt(tileArray, 0, 0, 0, tileArray.activeCounter -// + partialTicks, matrixStack, buffer, combinedLightIn, combinedOverlayIn); - - AlchemyArrayRenderer renderer = AlchemyArrayRendererRegistry.getRenderer(tileArray.getWorld(), inputStack, catalystStack); - if (renderer == null) - { - renderer = AlchemyArrayRendererRegistry.DEFAULT_RENDERER; - } - - renderer.renderAt(tileArray, 0, 0, 0, tileArray.activeCounter - + partialTicks, matrixStack, buffer, combinedLightIn, combinedOverlayIn); -// arrayRenderer.renderAt(tileArray, 0, 0, 0, 0, matrixStack, buffer, combinedLightIn, combinedOverlayIn); - -// if (tileAltar.getCurrentTierDisplayed() != AltarTier.ONE) -// renderHologram(tileAltar, tileAltar.getCurrentTierDisplayed(), partialTicks); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/client/render/block/RenderAltar.java b/src/main/java/wayoftime/bloodmagic/client/render/block/RenderAltar.java deleted file mode 100644 index 10aca891..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/render/block/RenderAltar.java +++ /dev/null @@ -1,233 +0,0 @@ -package wayoftime.bloodmagic.client.render.block; - -import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.vertex.IVertexBuilder; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.Atlases; -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.ItemCameraTransforms; -import net.minecraft.client.renderer.texture.AtlasTexture; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.tileentity.TileEntityRenderer; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.entity.LivingEntity; -import net.minecraft.fluid.Fluid; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3f; -import net.minecraftforge.fluids.FluidStack; -import wayoftime.bloodmagic.client.render.BloodMagicRenderer; -import wayoftime.bloodmagic.client.render.BloodMagicRenderer.Model3D; -import wayoftime.bloodmagic.client.render.RenderResizableCuboid; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.tile.TileAltar; - -public class RenderAltar extends TileEntityRenderer -{ - public RenderAltar(TileEntityRendererDispatcher rendererDispatcherIn) - { - super(rendererDispatcherIn); - } - - private static final float MIN_HEIGHT = 0.499f; - private static final float MAX_HEIGHT = 0.745f; - - @Override - public void render(TileAltar tileAltar, float partialTicks, MatrixStack matrixStack, IRenderTypeBuffer buffer, int combinedLightIn, int combinedOverlayIn) - { - ItemStack inputStack = tileAltar.getStackInSlot(0); - - float level = ((float) tileAltar.getCurrentBlood()) / (float) tileAltar.getCapacity(); - - this.renderItem(inputStack, tileAltar, matrixStack, buffer, combinedLightIn, combinedOverlayIn); - - renderFluid(level, matrixStack, buffer, combinedLightIn, combinedOverlayIn); - -// if (tileAltar.getCurrentTierDisplayed() != AltarTier.ONE) -// renderHologram(tileAltar, tileAltar.getCurrentTierDisplayed(), partialTicks); - } - - private void renderFluid(float fluidLevel, MatrixStack matrixStack, IRenderTypeBuffer renderer, int combinedLightIn, int combinedOverlayIn) - { - Fluid fluid = BloodMagicBlocks.LIFE_ESSENCE_FLUID.get(); - FluidStack fluidStack = new FluidStack(fluid, 1000); - - FluidRenderData data = new FluidRenderData(fluidStack); - matrixStack.push(); - - Model3D model = getFluidModel(fluidLevel, data); - IVertexBuilder buffer = renderer.getBuffer(Atlases.getTranslucentCullBlockType()); - -// matrixStack.translate(data.loca, y, z); -// int glow = data.calculateGlowLight(0); - RenderResizableCuboid.INSTANCE.renderCube(model, matrixStack, buffer, data.getColorARGB(1), combinedLightIn, combinedOverlayIn); - - matrixStack.pop(); - } - - private void renderItem(ItemStack stack, TileAltar tileAltar, MatrixStack matrixStack, IRenderTypeBuffer buffer, int combinedLightIn, int combinedOverlayIn) - { - matrixStack.push(); - Minecraft mc = Minecraft.getInstance(); - ItemRenderer itemRenderer = mc.getItemRenderer(); - if (!stack.isEmpty()) - { - matrixStack.translate(0.5, 1, 0.5); - matrixStack.push(); - - float rotation = (float) (720.0 * (System.currentTimeMillis() & 0x3FFFL) / 0x3FFFL); - - matrixStack.rotate(Vector3f.YP.rotationDegrees(rotation)); - matrixStack.scale(0.5F, 0.5F, 0.5F); - RenderHelper.enableStandardItemLighting(); - IBakedModel ibakedmodel = itemRenderer.getItemModelWithOverrides(stack, tileAltar.getWorld(), (LivingEntity) null); - itemRenderer.renderItem(stack, ItemCameraTransforms.TransformType.FIXED, true, matrixStack, buffer, combinedLightIn, combinedOverlayIn, ibakedmodel); // renderItem - RenderHelper.disableStandardItemLighting(); - - matrixStack.pop(); - } - - matrixStack.pop(); - } - - private Model3D getFluidModel(float fluidLevel, FluidRenderData data) - { - Model3D model = new BloodMagicRenderer.Model3D(); - model.setTexture(data.getTexture()); - model.minX = 0.1; - model.minY = MIN_HEIGHT; - model.minZ = 0.1; - model.maxX = 0.9; - model.maxY = (MAX_HEIGHT - MIN_HEIGHT) * fluidLevel + MIN_HEIGHT; - model.maxZ = 0.9; - - return model; - } - - public class FluidRenderData - { - public BlockPos location; - - public int height; - public int length; - public int width; - - public final FluidStack fluidType; - - public FluidRenderData(FluidStack fluidType) - { - this.fluidType = fluidType; - } - - public TextureAtlasSprite getTexture() - { - return Minecraft.getInstance().getAtlasSpriteGetter(AtlasTexture.LOCATION_BLOCKS_TEXTURE).apply(fluidType.getFluid().getAttributes().getStillTexture()); - } - - public boolean isGaseous() - { - return fluidType.getFluid().getAttributes().isGaseous(fluidType); - } - - public int getColorARGB(float scale) - { - return fluidType.getFluid().getAttributes().getColor(fluidType); - } - - public int calculateGlowLight(int light) - { - return light; - } - - @Override - public int hashCode() - { - int code = super.hashCode(); - code = 31 * code + fluidType.getFluid().getRegistryName().hashCode(); - if (fluidType.hasTag()) - { - code = 31 * code + fluidType.getTag().hashCode(); - } - return code; - } - - @Override - public boolean equals(Object data) - { - return super.equals(data) && data instanceof FluidRenderData - && fluidType.isFluidEqual(((FluidRenderData) data).fluidType); - } - } -// -// private void renderHologram(TileAltar altar, AltarTier tier, float partialTicks) -// { -// EntityPlayerSP player = Minecraft.getMinecraft().player; -// World world = player.world; -// -// if (tier == AltarTier.ONE) -// return; -// -// GlStateManager.pushMatrix(); -// GlStateManager.enableBlend(); -// GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); -// GlStateManager.color(1F, 1F, 1F, 0.6125F); -// -// BlockPos vec3, vX; -// vec3 = altar.getPos(); -// double posX = player.lastTickPosX + (player.posX - player.lastTickPosX) * partialTicks; -// double posY = player.lastTickPosY + (player.posY - player.lastTickPosY) * partialTicks; -// double posZ = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * partialTicks; -// -// for (AltarComponent altarComponent : tier.getAltarComponents()) -// { -// vX = vec3.add(altarComponent.getOffset()); -// double minX = vX.getX() - posX; -// double minY = vX.getY() - posY; -// double minZ = vX.getZ() - posZ; -// -// if (!world.getBlockState(vX).isOpaqueCube()) -// { -// TextureAtlasSprite texture = null; -// -// switch (altarComponent.getComponent()) -// { -// case BLOODRUNE: -// texture = ClientHandler.blankBloodRune; -// break; -// case NOTAIR: -// texture = ClientHandler.stoneBrick; -// break; -// case GLOWSTONE: -// texture = ClientHandler.glowstone; -// break; -// case BLOODSTONE: -// texture = ClientHandler.bloodStoneBrick; -// break; -// case BEACON: -// texture = ClientHandler.beacon; -// break; -// case CRYSTAL: -// texture = ClientHandler.crystalCluster; -// break; -// } -// -// RenderFakeBlocks.drawFakeBlock(texture, minX, minY, minZ); -// } -// } -// -// GlStateManager.popMatrix(); -// } - -// private static void setGLColorFromInt(int color) -// { -// float red = (color >> 16 & 0xFF) / 255.0F; -// float green = (color >> 8 & 0xFF) / 255.0F; -// float blue = (color & 0xFF) / 255.0F; -// -// GlStateManager.color(red, green, blue, 1.0F); -// } -} diff --git a/src/main/java/wayoftime/bloodmagic/client/render/block/RenderDemonCrucible.java b/src/main/java/wayoftime/bloodmagic/client/render/block/RenderDemonCrucible.java deleted file mode 100644 index 6e5c4f1c..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/render/block/RenderDemonCrucible.java +++ /dev/null @@ -1,57 +0,0 @@ -package wayoftime.bloodmagic.client.render.block; - -import com.mojang.blaze3d.matrix.MatrixStack; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.ItemCameraTransforms; -import net.minecraft.client.renderer.tileentity.TileEntityRenderer; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.vector.Vector3f; -import wayoftime.bloodmagic.tile.TileDemonCrucible; - -public class RenderDemonCrucible extends TileEntityRenderer -{ - public RenderDemonCrucible(TileEntityRendererDispatcher rendererDispatcherIn) - { - super(rendererDispatcherIn); - } - - @Override - public void render(TileDemonCrucible tileAltar, float partialTicks, MatrixStack matrixStack, IRenderTypeBuffer buffer, int combinedLightIn, int combinedOverlayIn) - { - ItemStack inputStack = tileAltar.getStackInSlot(0); - - this.renderItem(inputStack, tileAltar, matrixStack, buffer, combinedLightIn, combinedOverlayIn); - } - - private void renderItem(ItemStack stack, TileDemonCrucible tileAltar, MatrixStack matrixStack, IRenderTypeBuffer buffer, int combinedLightIn, int combinedOverlayIn) - { - matrixStack.push(); - Minecraft mc = Minecraft.getInstance(); - ItemRenderer itemRenderer = mc.getItemRenderer(); - if (!stack.isEmpty()) - { - matrixStack.translate(0.5, 1.5, 0.5); - matrixStack.push(); - - float rotation = (float) (720.0 * (System.currentTimeMillis() & 0x3FFFL) / 0x3FFFL); - - matrixStack.rotate(Vector3f.YP.rotationDegrees(rotation)); - matrixStack.scale(0.5F, 0.5F, 0.5F); - RenderHelper.enableStandardItemLighting(); - IBakedModel ibakedmodel = itemRenderer.getItemModelWithOverrides(stack, tileAltar.getWorld(), (LivingEntity) null); - itemRenderer.renderItem(stack, ItemCameraTransforms.TransformType.FIXED, true, matrixStack, buffer, combinedLightIn, combinedOverlayIn, ibakedmodel); // renderItem - RenderHelper.disableStandardItemLighting(); - - matrixStack.pop(); - } - - matrixStack.pop(); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/client/render/block/RenderFakeBlocks.java b/src/main/java/wayoftime/bloodmagic/client/render/block/RenderFakeBlocks.java deleted file mode 100644 index 50f5a5f2..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/render/block/RenderFakeBlocks.java +++ /dev/null @@ -1,66 +0,0 @@ -package wayoftime.bloodmagic.client.render.block; - -import org.lwjgl.opengl.GL11; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.AtlasTexture; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; - -public class RenderFakeBlocks -{ - public static void drawFakeBlock(TextureAtlasSprite texture, double minX, double minY, double minZ) - { - if (texture == null) - return; - - double maxX = minX + 1; - double maxY = minY + 1; - double maxZ = minZ + 1; - Tessellator tessellator = Tessellator.getInstance(); - BufferBuilder wr = tessellator.getBuffer(); - - Minecraft.getInstance().getAtlasSpriteGetter(AtlasTexture.LOCATION_BLOCKS_TEXTURE).apply(texture.getName()); - - wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); - - float texMinU = texture.getMinU(); - float texMinV = texture.getMinV(); - float texMaxU = texture.getMaxU(); - float texMaxV = texture.getMaxV(); - - wr.pos(minX, minY, minZ).tex(texMinU, texMinV).endVertex(); - wr.pos(maxX, minY, minZ).tex(texMaxU, texMinV).endVertex(); - wr.pos(maxX, minY, maxZ).tex(texMaxU, texMaxV).endVertex(); - wr.pos(minX, minY, maxZ).tex(texMinU, texMaxV).endVertex(); - - wr.pos(minX, maxY, maxZ).tex(texMinU, texMaxV).endVertex(); - wr.pos(maxX, maxY, maxZ).tex(texMaxU, texMaxV).endVertex(); - wr.pos(maxX, maxY, minZ).tex(texMaxU, texMinV).endVertex(); - wr.pos(minX, maxY, minZ).tex(texMinU, texMinV).endVertex(); - - wr.pos(maxX, minY, minZ).tex(texMinU, texMaxV).endVertex(); - wr.pos(minX, minY, minZ).tex(texMaxU, texMaxV).endVertex(); - wr.pos(minX, maxY, minZ).tex(texMaxU, texMinV).endVertex(); - wr.pos(maxX, maxY, minZ).tex(texMinU, texMinV).endVertex(); - - wr.pos(minX, minY, maxZ).tex(texMinU, texMaxV).endVertex(); - wr.pos(maxX, minY, maxZ).tex(texMaxU, texMaxV).endVertex(); - wr.pos(maxX, maxY, maxZ).tex(texMaxU, texMinV).endVertex(); - wr.pos(minX, maxY, maxZ).tex(texMinU, texMinV).endVertex(); - - wr.pos(minX, minY, minZ).tex(texMinU, texMaxV).endVertex(); - wr.pos(minX, minY, maxZ).tex(texMaxU, texMaxV).endVertex(); - wr.pos(minX, maxY, maxZ).tex(texMaxU, texMinV).endVertex(); - wr.pos(minX, maxY, minZ).tex(texMinU, texMinV).endVertex(); - - wr.pos(maxX, minY, maxZ).tex(texMinU, texMaxV).endVertex(); - wr.pos(maxX, minY, minZ).tex(texMaxU, texMaxV).endVertex(); - wr.pos(maxX, maxY, minZ).tex(texMaxU, texMinV).endVertex(); - wr.pos(maxX, maxY, maxZ).tex(texMinU, texMinV).endVertex(); - - tessellator.draw(); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/client/render/entity/BloodLightRenderer.java b/src/main/java/wayoftime/bloodmagic/client/render/entity/BloodLightRenderer.java deleted file mode 100644 index 23609445..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/render/entity/BloodLightRenderer.java +++ /dev/null @@ -1,24 +0,0 @@ -package wayoftime.bloodmagic.client.render.entity; - -import com.mojang.blaze3d.matrix.MatrixStack; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.entity.EntityRendererManager; -import net.minecraft.client.renderer.entity.SpriteRenderer; -import net.minecraft.entity.Entity; -import net.minecraft.entity.IRendersAsItem; - -public class BloodLightRenderer extends SpriteRenderer -{ - public BloodLightRenderer(EntityRendererManager renderManagerIn) - { - super(renderManagerIn, Minecraft.getInstance().getItemRenderer()); - } - - @Override - public void render(T entityIn, float entityYaw, float partialTicks, MatrixStack matrixStackIn, IRenderTypeBuffer bufferIn, int packedLightIn) - { - super.render(entityIn, entityYaw, partialTicks, matrixStackIn, bufferIn, packedLightIn); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/client/render/entity/EntityShapedChargeRenderer.java b/src/main/java/wayoftime/bloodmagic/client/render/entity/EntityShapedChargeRenderer.java deleted file mode 100644 index c27ad2ec..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/render/entity/EntityShapedChargeRenderer.java +++ /dev/null @@ -1,68 +0,0 @@ -package wayoftime.bloodmagic.client.render.entity; - -import java.util.Random; - -import com.mojang.blaze3d.matrix.MatrixStack; - -import net.minecraft.block.BlockRenderType; -import net.minecraft.block.BlockState; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.BlockRendererDispatcher; -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.RenderTypeLookup; -import net.minecraft.client.renderer.entity.EntityRenderer; -import net.minecraft.client.renderer.entity.EntityRendererManager; -import net.minecraft.client.renderer.texture.AtlasTexture; -import net.minecraft.client.renderer.texture.OverlayTexture; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wayoftime.bloodmagic.entity.projectile.EntityShapedCharge; - -@OnlyIn(Dist.CLIENT) -public class EntityShapedChargeRenderer extends EntityRenderer -{ - public EntityShapedChargeRenderer(EntityRendererManager renderManagerIn) - { - super(renderManagerIn); - this.shadowSize = 0.5F; - } - - public void render(EntityShapedCharge entityIn, float entityYaw, float partialTicks, MatrixStack matrixStackIn, IRenderTypeBuffer bufferIn, int packedLightIn) - { -// System.out.println("Testing~"); - BlockState blockstate = entityIn.getBlockState(); - if (blockstate.getRenderType() == BlockRenderType.MODEL) - { - World world = entityIn.getWorldObj(); - if (blockstate != world.getBlockState(entityIn.getPosition()) && blockstate.getRenderType() != BlockRenderType.INVISIBLE) - { - matrixStackIn.push(); - BlockPos blockpos = new BlockPos(entityIn.getPosX(), entityIn.getBoundingBox().maxY, entityIn.getPosZ()); - matrixStackIn.translate(-0.5D, 0.0D, -0.5D); - BlockRendererDispatcher blockrendererdispatcher = Minecraft.getInstance().getBlockRendererDispatcher(); - for (net.minecraft.client.renderer.RenderType type : net.minecraft.client.renderer.RenderType.getBlockRenderTypes()) - { - if (RenderTypeLookup.canRenderInLayer(blockstate, type)) - { - net.minecraftforge.client.ForgeHooksClient.setRenderLayer(type); - blockrendererdispatcher.getBlockModelRenderer().renderModel(world, blockrendererdispatcher.getModelForState(blockstate), blockstate, blockpos, matrixStackIn, bufferIn.getBuffer(type), false, new Random(), 0, OverlayTexture.NO_OVERLAY); - } - } - net.minecraftforge.client.ForgeHooksClient.setRenderLayer(null); - matrixStackIn.pop(); - super.render(entityIn, entityYaw, partialTicks, matrixStackIn, bufferIn, packedLightIn); - } - } - } - - /** - * Returns the location of an entity's texture. - */ - public ResourceLocation getEntityTexture(EntityShapedCharge entity) - { - return AtlasTexture.LOCATION_BLOCKS_TEXTURE; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/client/render/entity/EntityThrowingDaggerRenderer.java b/src/main/java/wayoftime/bloodmagic/client/render/entity/EntityThrowingDaggerRenderer.java deleted file mode 100644 index 62ec2118..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/render/entity/EntityThrowingDaggerRenderer.java +++ /dev/null @@ -1,67 +0,0 @@ -package wayoftime.bloodmagic.client.render.entity; - -import com.mojang.blaze3d.matrix.MatrixStack; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.entity.EntityRenderer; -import net.minecraft.client.renderer.entity.EntityRendererManager; -import net.minecraft.client.renderer.model.ItemCameraTransforms; -import net.minecraft.client.renderer.texture.AtlasTexture; -import net.minecraft.client.renderer.texture.OverlayTexture; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.vector.Vector3f; -import wayoftime.bloodmagic.entity.projectile.AbstractEntityThrowingDagger; - -public class EntityThrowingDaggerRenderer extends EntityRenderer -{ - private final net.minecraft.client.renderer.ItemRenderer itemRenderer; - private final float scale; - private final boolean field_229126_f_; - - public EntityThrowingDaggerRenderer(EntityRendererManager p_i226035_1_, net.minecraft.client.renderer.ItemRenderer p_i226035_2_, float p_i226035_3_, boolean p_i226035_4_) - { - super(p_i226035_1_); - this.itemRenderer = p_i226035_2_; - this.scale = p_i226035_3_; - this.field_229126_f_ = p_i226035_4_; - } - - public EntityThrowingDaggerRenderer(EntityRendererManager renderManagerIn) - { - this(renderManagerIn, Minecraft.getInstance().getItemRenderer(), 1.0F, false); - } - - protected int getBlockLight(T entityIn, BlockPos partialTicks) - { - return this.field_229126_f_ ? 15 : super.getBlockLight(entityIn, partialTicks); - } - - public void render(T entityIn, float entityYaw, float partialTicks, MatrixStack matrixStackIn, IRenderTypeBuffer bufferIn, int packedLightIn) - { -// System.out.println("Rendering dagger"); -// if (entityIn.ticksExisted >= 2 || !(this.renderManager.info.getRenderViewEntity().getDistanceSq(entityIn) < 12.25D)) - { -// ArrowRenderer d; - matrixStackIn.push(); - matrixStackIn.scale(this.scale, this.scale, this.scale); - matrixStackIn.rotate(Vector3f.YP.rotationDegrees(MathHelper.lerp(partialTicks, entityIn.prevRotationYaw, entityIn.rotationYaw) - 90.0F)); - matrixStackIn.rotate(Vector3f.ZP.rotationDegrees(MathHelper.lerp(partialTicks, entityIn.prevRotationPitch, entityIn.rotationPitch) - 45F)); - - this.itemRenderer.renderItem(entityIn.getItem(), ItemCameraTransforms.TransformType.GROUND, packedLightIn, OverlayTexture.NO_OVERLAY, matrixStackIn, bufferIn); - matrixStackIn.pop(); - super.render(entityIn, entityYaw, partialTicks, matrixStackIn, bufferIn, packedLightIn); - } - } - - /** - * Returns the location of an entity's texture. - */ - public ResourceLocation getEntityTexture(T entity) - { - return AtlasTexture.LOCATION_BLOCKS_TEXTURE; - } - -} diff --git a/src/main/java/wayoftime/bloodmagic/client/render/entity/SoulSnareRenderer.java b/src/main/java/wayoftime/bloodmagic/client/render/entity/SoulSnareRenderer.java deleted file mode 100644 index f2084b34..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/render/entity/SoulSnareRenderer.java +++ /dev/null @@ -1,24 +0,0 @@ -package wayoftime.bloodmagic.client.render.entity; - -import com.mojang.blaze3d.matrix.MatrixStack; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.entity.EntityRendererManager; -import net.minecraft.client.renderer.entity.SpriteRenderer; -import net.minecraft.entity.Entity; -import net.minecraft.entity.IRendersAsItem; - -public class SoulSnareRenderer extends SpriteRenderer -{ - public SoulSnareRenderer(EntityRendererManager renderManagerIn) - { - super(renderManagerIn, Minecraft.getInstance().getItemRenderer()); - } - - @Override - public void render(T entityIn, float entityYaw, float partialTicks, MatrixStack matrixStackIn, IRenderTypeBuffer bufferIn, int packedLightIn) - { - super.render(entityIn, entityYaw, partialTicks, matrixStackIn, bufferIn, packedLightIn); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/client/screens/ScreenAlchemicalReactionChamber.java b/src/main/java/wayoftime/bloodmagic/client/screens/ScreenAlchemicalReactionChamber.java deleted file mode 100644 index eb26c582..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/screens/ScreenAlchemicalReactionChamber.java +++ /dev/null @@ -1,108 +0,0 @@ -package wayoftime.bloodmagic.client.screens; - -import java.util.ArrayList; -import java.util.List; - -import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.systems.RenderSystem; - -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraftforge.fml.client.gui.GuiUtils; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.tile.TileAlchemicalReactionChamber; -import wayoftime.bloodmagic.tile.container.ContainerAlchemicalReactionChamber; -import wayoftime.bloodmagic.util.handler.event.ClientHandler; - -public class ScreenAlchemicalReactionChamber extends ScreenBase -{ - private static final ResourceLocation background = new ResourceLocation(BloodMagic.MODID, "textures/gui/arc_gui.png"); - public TileAlchemicalReactionChamber tileARC; - - public ScreenAlchemicalReactionChamber(ContainerAlchemicalReactionChamber container, PlayerInventory playerInventory, ITextComponent title) - { - super(container, playerInventory, title); - tileARC = container.tileARC; - this.xSize = 176; - this.ySize = 205; - } - - @Override - public ResourceLocation getBackground() - { - return background; - } - -// public - -// public ScreenSoulForge(InventoryPlayer playerInventory, IInventory tileSoulForge) -// { -// super(new ContainerSoulForge(playerInventory, tileSoulForge)); -// this.tileSoulForge = tileSoulForge; -// this.xSize = 176; -// this.ySize = 205; -// } -// - @Override - public void render(MatrixStack stack, int mouseX, int mouseY, float partialTicks) - { - super.render(stack, mouseX, mouseY, partialTicks); - List tooltip = new ArrayList<>(); -// FluidTank inputTank = new FluidTank(FluidAttributes.BUCKET_VOLUME * 2); -// inputTank.fill(new FluidStack(Fluids.WATER, 1000), FluidAction.EXECUTE); - - ClientHandler.handleGuiTank(stack, tileARC.inputTank, this.guiLeft + 8, this.guiTop - + 40, 16, 63, 194, 1, 16, 63, mouseX, mouseY, background.toString(), tooltip); - ClientHandler.handleGuiTank(stack, tileARC.outputTank, this.guiLeft + 152, this.guiTop - + 15, 16, 63, 194, 1, 16, 63, mouseX, mouseY, background.toString(), tooltip); - - if (!tooltip.isEmpty()) - GuiUtils.drawHoveringText(stack, tooltip, mouseX, mouseY, width, height, -1, font); - } - -// - @Override - protected void drawGuiContainerForegroundLayer(MatrixStack stack, int mouseX, int mouseY) - { - this.font.func_243248_b(stack, new TranslationTextComponent("tile.bloodmagic.arc.name"), 8, 5, 4210752); - this.font.func_243248_b(stack, new TranslationTextComponent("container.inventory"), 8, 111, 4210752); - } - -// - @Override - protected void drawGuiContainerBackgroundLayer(MatrixStack stack, float partialTicks, int mouseX, int mouseY) - { - RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); - getMinecraft().getTextureManager().bindTexture(background); - int i = (this.width - this.xSize) / 2; - int j = (this.height - this.ySize) / 2; - this.blit(stack, i, j, 0, 0, this.xSize, this.ySize); - -// FluidTank inputTank = new FluidTank(FluidAttributes.BUCKET_VOLUME * 2); -// inputTank.fill(new FluidStack(Fluids.WATER, 1000), FluidAction.EXECUTE); - - ClientHandler.handleGuiTank(stack, tileARC.inputTank, this.guiLeft + 8, this.guiTop - + 40, 16, 63, 194, 1, 16, 63, mouseX, mouseY, background.toString(), null); - ClientHandler.handleGuiTank(stack, tileARC.outputTank, this.guiLeft + 152, this.guiTop - + 15, 16, 63, 194, 1, 16, 63, mouseX, mouseY, background.toString(), null); - - int w = this.getCookProgressScaled(38); -// FurnaceTileEntity d; - this.blit(stack, i + 63, j + 44, 176, 90, w, 23); - } - -//// - public int getCookProgressScaled(int scale) - { - double progress = ((TileAlchemicalReactionChamber) tileARC).getProgressForGui(); -// if (tileSoulForge != null) -// { -// System.out.println("Tile is NOT null"); -// } -// double progress = ((float) this.container.data.get(0)) / ((float) this.container.data.get(1)); -// System.out.println(this.container.data.get(0)); - return (int) (progress * scale); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/client/screens/ScreenAlchemyTable.java b/src/main/java/wayoftime/bloodmagic/client/screens/ScreenAlchemyTable.java deleted file mode 100644 index ccaa7574..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/screens/ScreenAlchemyTable.java +++ /dev/null @@ -1,228 +0,0 @@ -package wayoftime.bloodmagic.client.screens; - -import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.platform.GlStateManager.DestFactor; -import com.mojang.blaze3d.platform.GlStateManager.SourceFactor; -import com.mojang.blaze3d.systems.RenderSystem; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.container.Slot; -import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.network.AlchemyTableButtonPacket; -import wayoftime.bloodmagic.network.BloodMagicPacketHandler; -import wayoftime.bloodmagic.tile.TileAlchemyTable; -import wayoftime.bloodmagic.tile.container.ContainerAlchemyTable; - -public class ScreenAlchemyTable extends ScreenBase -{ - private static final ResourceLocation background = new ResourceLocation(BloodMagic.MODID, "textures/gui/alchemytable.png"); - public TileAlchemyTable tileTable; - - private int left, top; - - public ScreenAlchemyTable(ContainerAlchemyTable container, PlayerInventory playerInventory, ITextComponent title) - { - super(container, playerInventory, title); - tileTable = container.tileTable; - this.xSize = 176; - this.ySize = 205; - } - - @Override - public ResourceLocation getBackground() - { - return background; - } - - @Override - protected void drawGuiContainerForegroundLayer(MatrixStack stack, int mouseX, int mouseY) - { - this.font.func_243248_b(stack, new TranslationTextComponent("tile.bloodmagic.alchemytable.name"), 8, 5, 4210752); - this.font.func_243248_b(stack, new TranslationTextComponent("container.inventory"), 8, 111, 4210752); - } - - @Override - public void init() - { - super.init(); - left = (this.width - this.xSize) / 2; - top = (this.height - this.ySize) / 2; - - this.buttons.clear(); -// this.buttons.add(); - this.addButton(new Button(left + 135, top + 52, 14, 14, new StringTextComponent("D"), new DirectionalPress(tileTable, Direction.DOWN))); - this.addButton(new Button(left + 153, top + 52, 14, 14, new StringTextComponent("U"), new DirectionalPress(tileTable, Direction.UP))); - this.addButton(new Button(left + 135, top + 70, 14, 14, new StringTextComponent("N"), new DirectionalPress(tileTable, Direction.NORTH))); - this.addButton(new Button(left + 153, top + 70, 14, 14, new StringTextComponent("S"), new DirectionalPress(tileTable, Direction.SOUTH))); - this.addButton(new Button(left + 135, top + 88, 14, 14, new StringTextComponent("W"), new DirectionalPress(tileTable, Direction.WEST))); - this.addButton(new Button(left + 153, top + 88, 14, 14, new StringTextComponent("E"), new DirectionalPress(tileTable, Direction.EAST))); - } - - @Override - protected void drawGuiContainerBackgroundLayer(MatrixStack stack, float partialTicks, int mouseX, int mouseY) - { - RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); - getMinecraft().getTextureManager().bindTexture(background); - int i = (this.width - this.xSize) / 2; - int j = (this.height - this.ySize) / 2; - this.blit(stack, i, j, 0, 0, this.xSize, this.ySize); - - int l = this.getCookProgressScaled(90); - this.blit(stack, i + 106, j + 14 + 90 - l, 176, 90 - l, 18, l); - - int slotId = tileTable.activeSlot; - if (slotId != -1) - { - Slot slot = this.getContainer().getSlot(slotId); - - if (slotId == TileAlchemyTable.outputSlot) - { - this.blit(stack, i + slot.xPos, j + slot.yPos, 195, 37, 16, 16); - } else - { - this.blit(stack, i + slot.xPos, j + slot.yPos, 195, 19, 16, 16); - } - - for (int buttonId = 0; buttonId < 6; buttonId++) - { - int xOffset = (buttonId % 2) * 18 + 133; - int yOffset = (buttonId / 2) * 18 + 50; - if (tileTable.isSlotEnabled(slotId, Direction.byIndex(buttonId))) - { - this.blit(stack, i + xOffset, j + yOffset, 212, 18, 18, 18); - } else - { - this.blit(stack, i + xOffset, j + yOffset, 212, 0, 18, 18); - } - } - } - -// for (int slotId = 0; slotId < 6; slotId++) -// { -// if (!((TileAlchemyTable) tileTable).isInputSlotAccessible(slotId)) -// { -// Slot slot = this.getContainer().getSlot(slotId); -// -// this.blit(stack, i + slot.xPos, j + slot.yPos, 195, 1, 16, 16); -// } -// } - } - -// @Override -// public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) -// { -// boolean superMouse = super.mouseClicked(mouseX, mouseY, mouseButton); -// System.out.println("Last button clicked: " + mouseButton); -// return superMouse; -// } - -// - public int getCookProgressScaled(int scale) - { - double progress = ((TileAlchemyTable) tileTable).getProgressForGui(); -// if (tileSoulForge != null) -// { -// System.out.println("Tile is NOT null"); -// } -// double progress = ((float) this.container.data.get(0)) / ((float) this.container.data.get(1)); -// System.out.println(this.container.data.get(0)); - return (int) (progress * scale); - } - - public class DirectionalButton extends Button - { - private static final int BUTTON_TEX_X = 200, BUTTON_TEX_Y = 60; - - public DirectionalButton(int x, int y, int width, int height, ITextComponent title, IPressable pressedAction) - { - super(x, y, width, height, title, pressedAction); - } - - @Override - public void renderButton(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) - { - Minecraft minecraft = Minecraft.getInstance(); - FontRenderer fontrenderer = minecraft.fontRenderer; - minecraft.getTextureManager().bindTexture(WIDGETS_LOCATION); - - // Vanilla's method -// RenderSystem.color4f(1.0F, 1.0F, 1.0F, this.alpha); -// int i = this.getYImage(this.isHovered()); -// RenderSystem.enableBlend(); -// RenderSystem.defaultBlendFunc(); -// RenderSystem.enableDepthTest(); -// this.blit(matrixStack, this.x, this.y, 0, 46 + i * 20, this.width / 2, this.height); -// this.blit(matrixStack, this.x + this.width / 2, this.y, 200 - this.width / 2, 46 + i * 20, this.width / 2, this.height); -// this.renderBg(matrixStack, minecraft, mouseX, mouseY); -// int j = getFGColor(); -// drawCenteredString(matrixStack, fontrenderer, this.getMessage(), this.x + this.width / 2, this.y + (this.height - 8) / 2, j | MathHelper.ceil(this.alpha * 255.0F) << 24); - - // Mekanism's method - int i = this.getYImage(this.isHovered()); - RenderSystem.enableBlend(); - RenderSystem.blendFuncSeparate(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA, SourceFactor.ONE, DestFactor.ZERO); - RenderSystem.blendFunc(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA); - - int width = this.width; - int height = this.height; - int halfWidthLeft = width / 2; - int halfWidthRight = width % 2 == 0 ? halfWidthLeft : halfWidthLeft + 1; - int halfHeightTop = height / 2; - int halfHeightBottom = height % 2 == 0 ? halfHeightTop : halfHeightTop + 1; - int position = i * 20; - - // Left Top Corner - blit(matrixStack, x, y, 0, position, halfWidthLeft, halfHeightTop, BUTTON_TEX_X, BUTTON_TEX_Y); - // Left Bottom Corner - blit(matrixStack, x, y + halfHeightTop, 0, position + 20 - halfHeightBottom, halfWidthLeft, halfHeightBottom, BUTTON_TEX_X, BUTTON_TEX_Y); - // Right Top Corner - blit(matrixStack, x + halfWidthLeft, y, 200 - halfWidthRight, position, halfWidthRight, halfHeightTop, BUTTON_TEX_X, BUTTON_TEX_Y); - // Right Bottom Corner - blit(matrixStack, x + halfWidthLeft, y + halfHeightTop, 200 - halfWidthRight, position + 20 - halfHeightBottom, halfWidthRight, halfHeightBottom, BUTTON_TEX_X, BUTTON_TEX_Y); - renderBg(matrixStack, minecraft, mouseX, mouseY); - RenderSystem.disableBlend(); - - if (this.isHovered()) - { - this.renderToolTip(matrixStack, mouseX, mouseY); - } - } - } - - public class DirectionalPress implements Button.IPressable - { - private final TileAlchemyTable table; - private final Direction direction; - - public DirectionalPress(TileAlchemyTable table, Direction direction) - { - this.table = table; - this.direction = direction; - } - - @Override - public void onPress(Button button) - { -// System.out.println("Pressing le " + direction.toString() + " button, beign oui!"); - int activeSlot = table.activeSlot; - if (activeSlot != -1) - { - boolean enabled = table.isSlotEnabled(activeSlot, direction); - table.setSlotEnabled(!enabled, activeSlot, direction); - BloodMagicPacketHandler.INSTANCE.sendToServer(new AlchemyTableButtonPacket(table.getPos(), activeSlot, direction, !enabled)); - } -//// if (button.visible) -// { -// button.visible = !button.visible; -// } - } - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/client/screens/ScreenBase.java b/src/main/java/wayoftime/bloodmagic/client/screens/ScreenBase.java deleted file mode 100644 index c1d8091a..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/screens/ScreenBase.java +++ /dev/null @@ -1,68 +0,0 @@ -package wayoftime.bloodmagic.client.screens; - -import com.mojang.blaze3d.matrix.MatrixStack; - -import net.minecraft.client.gui.screen.inventory.ContainerScreen; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.container.Container; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import wayoftime.bloodmagic.BloodMagic; - -public abstract class ScreenBase extends ContainerScreen -{ - private static final ResourceLocation background = new ResourceLocation(BloodMagic.MODID, "textures/gui/soulforge.png"); - - protected final T container; - - public ScreenBase(T container, PlayerInventory playerInventory, ITextComponent title) - { - super(container, playerInventory, title); - this.container = container; - } - - public ResourceLocation getBackground() - { - return background; - } - - @Override - public void render(MatrixStack stack, int mouseX, int mouseY, float partialTicks) - { - this.renderBackground(stack); - super.render(stack, mouseX, mouseY, partialTicks); - - this.renderHoveredTooltip(stack, mouseX, mouseY); // @mcp: func_230459_a_ = renderHoveredToolTip -// if (mouseX > (guiLeft + 7) && mouseX < (guiLeft + 7) + 18 && mouseY > (guiTop + 7) -// && mouseY < (guiTop + 7) + 73) -// this.renderTooltip(stack, LanguageMap.getInstance().func_244260_a(Arrays.asList(new TranslationTextComponent("screen.diregoo.energy", MagicHelpers.withSuffix(this.container.getEnergy()), MagicHelpers.withSuffix(this.container.getMaxPower())))), mouseX, mouseY); - } - - @Override - public void init() - { - super.init(); - } - - @Override - protected void drawGuiContainerBackgroundLayer(MatrixStack stack, float partialTicks, int mouseX, int mouseY) - { -// RenderSystem.color4f(1, 1, 1, 1); -// getMinecraft().getTextureManager().bindTexture(getBackground()); -// this.blit(stack, guiLeft, guiTop, 0, 0, xSize, ySize); - -// int maxEnergy = this.container.getMaxPower(), height = 70; -// if (maxEnergy > 0) -// { -// int remaining = (this.container.getEnergy() * height) / maxEnergy; -// this.blit(stack, guiLeft + 8, guiTop + 78 - remaining, 176, 84 - remaining, 16, remaining + 1); -// } - } - -// - protected static TranslationTextComponent getTrans(String key, Object... args) - { - return new TranslationTextComponent(BloodMagic.MODID + "." + key, args); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/client/screens/ScreenHolding.java b/src/main/java/wayoftime/bloodmagic/client/screens/ScreenHolding.java deleted file mode 100644 index a7147cdd..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/screens/ScreenHolding.java +++ /dev/null @@ -1,87 +0,0 @@ -package wayoftime.bloodmagic.client.screens; - -import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.systems.RenderSystem; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Hand; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.common.item.BloodMagicItems; -import wayoftime.bloodmagic.common.item.inventory.ContainerHolding; -import wayoftime.bloodmagic.common.item.sigil.ItemSigilHolding; - -public class ScreenHolding extends ScreenBase -{ - private static final ResourceLocation background = BloodMagic.rl("gui/sigilholding.png"); - public IInventory tileTable; - private PlayerEntity player; - - public ScreenHolding(ContainerHolding container, PlayerInventory playerInventory, ITextComponent title) - { - super(container, playerInventory, title); - tileTable = container.inventoryHolding; - xSize = 176; - ySize = 121; - this.player = playerInventory.player; - } - - @Override - public ResourceLocation getBackground() - { - return background; - } - - @Override - protected void drawGuiContainerForegroundLayer(MatrixStack stack, int mouseX, int mouseY) - { -// this.font.func_243248_b(stack, new TranslationTextComponent("tile.bloodmagic.alchemytable.name"), 8, 5, 4210752); -// this.font.func_243248_b(stack, new TranslationTextComponent("container.inventory"), 8, 111, 4210752); - this.font.func_243248_b(stack, new TranslationTextComponent("item.bloodmagic.sigilofholding"), 53, 4, 4210752); - } - - @Override - protected void drawGuiContainerBackgroundLayer(MatrixStack stack, float partialTicks, int mouseX, int mouseY) - { - RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); - getMinecraft().getTextureManager().bindTexture(background); -// int i = (this.width - this.xSize) / 2; -// int j = (this.height - this.ySize) / 2; -// this.blit(stack, i, j, 0, 0, this.xSize, this.ySize); -// -// int l = this.getCookProgressScaled(90); -// this.blit(stack, i + 115, j + 14 + 90 - l, 176, 90 - l, 18, l); -// -// for (int slotId = 0; slotId < 6; slotId++) -// { -// if (!((TileAlchemyTable) tileTable).isInputSlotAccessible(slotId)) -// { -// Slot slot = this.getContainer().getSlot(slotId); -// -// this.blit(stack, i + slot.xPos, j + slot.yPos, 195, 1, 16, 16); -// } -// } - - // draw your Gui here, only thing you need to change is the path -// GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); -// this.mc.getTextureManager().bindTexture(texture); - int x = (width - xSize) / 2; - int y = (height - ySize) / 2; - this.blit(stack, x, y, 0, 0, xSize, ySize); - ItemStack held = player.getHeldItem(Hand.MAIN_HAND); - if (!held.isEmpty() && held.getItem() == BloodMagicItems.HOLDING_SIGIL.get()) - { -// GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); - this.blit(stack, 4 + x + 36 * ItemSigilHolding.getCurrentItemOrdinal(player.getHeldItemMainhand()), y + 13, 0, 123, 24, 24); - } - } - -// - -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/client/screens/ScreenSoulForge.java b/src/main/java/wayoftime/bloodmagic/client/screens/ScreenSoulForge.java deleted file mode 100644 index f146ecae..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/screens/ScreenSoulForge.java +++ /dev/null @@ -1,85 +0,0 @@ -package wayoftime.bloodmagic.client.screens; - -import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.systems.RenderSystem; - -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.IInventory; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.tile.TileSoulForge; -import wayoftime.bloodmagic.tile.container.ContainerSoulForge; - -public class ScreenSoulForge extends ScreenBase -{ - private static final ResourceLocation background = new ResourceLocation(BloodMagic.MODID, "textures/gui/soulforge.png"); - public IInventory tileSoulForge; - - public ScreenSoulForge(ContainerSoulForge container, PlayerInventory playerInventory, ITextComponent title) - { - super(container, playerInventory, title); - tileSoulForge = container.tileForge; - this.xSize = 176; - this.ySize = 205; - } - - @Override - public ResourceLocation getBackground() - { - return background; - } - -// public - -// public ScreenSoulForge(InventoryPlayer playerInventory, IInventory tileSoulForge) -// { -// super(new ContainerSoulForge(playerInventory, tileSoulForge)); -// this.tileSoulForge = tileSoulForge; -// this.xSize = 176; -// this.ySize = 205; -// } -// -// @Override -// public void render(MatrixStack stack, int mouseX, int mouseY, float partialTicks) -// { -// this.drawDefaultBackground(); -// super.drawScreen(mouseX, mouseY, partialTicks); -// this.renderHoveredToolTip(mouseX, mouseY); -// } -// - @Override - protected void drawGuiContainerForegroundLayer(MatrixStack stack, int mouseX, int mouseY) - { - this.font.func_243248_b(stack, new TranslationTextComponent("tile.bloodmagic.soulforge.name"), 8, 5, 4210752); - this.font.func_243248_b(stack, new TranslationTextComponent("container.inventory"), 8, 111, 4210752); - } - -// - @Override - protected void drawGuiContainerBackgroundLayer(MatrixStack stack, float partialTicks, int mouseX, int mouseY) - { - RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); - getMinecraft().getTextureManager().bindTexture(background); - int i = (this.width - this.xSize) / 2; - int j = (this.height - this.ySize) / 2; - this.blit(stack, i, j, 0, 0, this.xSize, this.ySize); - - int l = this.getCookProgressScaled(90); - this.blit(stack, i + 115, j + 14 + 90 - l, 176, 90 - l, 18, l); - } - -// - public int getCookProgressScaled(int scale) - { - double progress = ((TileSoulForge) tileSoulForge).getProgressForGui(); -// if (tileSoulForge != null) -// { -// System.out.println("Tile is NOT null"); -// } -// double progress = ((float) this.container.data.get(0)) / ((float) this.container.data.get(1)); -// System.out.println(this.container.data.get(0)); - return (int) (progress * scale); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/client/utils/BMRenderTypes.java b/src/main/java/wayoftime/bloodmagic/client/utils/BMRenderTypes.java deleted file mode 100644 index 9ea90a92..00000000 --- a/src/main/java/wayoftime/bloodmagic/client/utils/BMRenderTypes.java +++ /dev/null @@ -1,153 +0,0 @@ -package wayoftime.bloodmagic.client.utils; - -import java.util.OptionalDouble; -import java.util.function.Consumer; - -import org.lwjgl.opengl.GL11; - -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.IVertexBuilder; - -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.RenderState; -import net.minecraft.client.renderer.RenderState.AlphaState; -import net.minecraft.client.renderer.RenderState.CullState; -import net.minecraft.client.renderer.RenderState.FogState; -import net.minecraft.client.renderer.RenderState.LightmapState; -import net.minecraft.client.renderer.RenderState.LineState; -import net.minecraft.client.renderer.RenderState.ShadeModelState; -import net.minecraft.client.renderer.RenderState.TextureState; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.AtlasTexture; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.inventory.container.PlayerContainer; -import net.minecraft.util.ResourceLocation; -import wayoftime.bloodmagic.BloodMagic; - -public class BMRenderTypes -{ - public static final RenderType SOLID_FULLBRIGHT; - public static final RenderType TRANSLUCENT_LINES; - public static final RenderType LINES; - public static final RenderType TRANSLUCENT_TRIANGLES; - public static final RenderType TRANSLUCENT_POSITION_COLOR; - public static final RenderType TRANSLUCENT_NO_DEPTH; - public static final RenderType CHUNK_MARKER; - public static final RenderType VEIN_MARKER; - public static final RenderType POSITION_COLOR_TEX_LIGHTMAP; - public static final RenderType POSITION_COLOR_LIGHTMAP; - public static final RenderType ITEM_DAMAGE_BAR; - protected static final RenderState.ShadeModelState SHADE_ENABLED = new RenderState.ShadeModelState(true); - protected static final RenderState.TextureState BLOCK_SHEET_MIPPED = new RenderState.TextureState(AtlasTexture.LOCATION_BLOCKS_TEXTURE, false, true); - protected static final RenderState.LightmapState LIGHTMAP_DISABLED = new RenderState.LightmapState(false); - protected static final RenderState.TransparencyState TRANSLUCENT_TRANSPARENCY = new RenderState.TransparencyState("translucent_transparency", () -> { - RenderSystem.enableBlend(); - RenderSystem.defaultBlendFunc(); - }, RenderSystem::disableBlend); - protected static final RenderState.TransparencyState NO_TRANSPARENCY = new RenderState.TransparencyState("no_transparency", RenderSystem::disableBlend, () -> { - }); - protected static final RenderState.DepthTestState DEPTH_ALWAYS = new RenderState.DepthTestState("", GL11.GL_ALWAYS); - - static - { - RenderType.State fullbrightSolidState = RenderType.State.getBuilder().shadeModel(SHADE_ENABLED).lightmap(LIGHTMAP_DISABLED).texture(BLOCK_SHEET_MIPPED).build(true); - SOLID_FULLBRIGHT = RenderType.makeType(BloodMagic.MODID + ":block_fullbright", DefaultVertexFormats.BLOCK, GL11.GL_QUADS, 256, fullbrightSolidState); - RenderType.State translucentNoDepthState = RenderType.State.getBuilder().transparency(TRANSLUCENT_TRANSPARENCY).line(new LineState(OptionalDouble.of(2))).texture(new TextureState()).depthTest(DEPTH_ALWAYS).build(false); - RenderType.State translucentNoTextureState = RenderType.State.getBuilder().transparency(TRANSLUCENT_TRANSPARENCY).texture(new TextureState()).build(false); - TRANSLUCENT_LINES = RenderType.makeType(BloodMagic.MODID + ":translucent_lines", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 256, translucentNoDepthState); - LINES = RenderType.makeType(BloodMagic.MODID + ":lines", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 256, RenderType.State.getBuilder().build(false)); - TRANSLUCENT_TRIANGLES = RenderType.makeType(BloodMagic.MODID + ":translucent_triangle_fan", DefaultVertexFormats.POSITION_COLOR, GL11.GL_TRIANGLES, 256, translucentNoDepthState); - TRANSLUCENT_POSITION_COLOR = RenderType.makeType(BloodMagic.MODID + ":translucent_pos_color", DefaultVertexFormats.POSITION_COLOR, GL11.GL_QUADS, 256, translucentNoTextureState); - TRANSLUCENT_NO_DEPTH = RenderType.makeType(BloodMagic.MODID + ":translucent_no_depth", DefaultVertexFormats.POSITION_COLOR, GL11.GL_QUADS, 256, translucentNoDepthState); - RenderType.State chunkMarkerState = RenderType.State.getBuilder().texture(new TextureState()).transparency(TRANSLUCENT_TRANSPARENCY).cull(new CullState(false)).shadeModel(new ShadeModelState(true)).line(new LineState(OptionalDouble.of(5))).build(false); - CHUNK_MARKER = RenderType.makeType(BloodMagic.MODID + ":chunk_marker", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 256, chunkMarkerState); - VEIN_MARKER = RenderType.makeType(BloodMagic.MODID + ":vein_marker", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINE_LOOP, 256, chunkMarkerState); - POSITION_COLOR_TEX_LIGHTMAP = RenderType.makeType(BloodMagic.MODID + ":pos_color_tex_lightmap", DefaultVertexFormats.POSITION_COLOR_TEX_LIGHTMAP, GL11.GL_QUADS, 256, RenderType.State.getBuilder().texture(new TextureState(PlayerContainer.LOCATION_BLOCKS_TEXTURE, false, false)).lightmap(new LightmapState(true)).build(false)); - POSITION_COLOR_LIGHTMAP = RenderType.makeType(BloodMagic.MODID + ":pos_color_lightmap", DefaultVertexFormats.POSITION_COLOR_LIGHTMAP, GL11.GL_QUADS, 256, RenderType.State.getBuilder().texture(new TextureState()).lightmap(new LightmapState(true)).build(false)); - ITEM_DAMAGE_BAR = RenderType.makeType(BloodMagic.MODID + ":item_damage_bar", DefaultVertexFormats.POSITION_COLOR, GL11.GL_QUADS, 256, RenderType.State.getBuilder().depthTest(DEPTH_ALWAYS).texture(new TextureState()).alpha(new AlphaState(0)).transparency(NO_TRANSPARENCY).build(false)); - } - - public static RenderType getGui(ResourceLocation texture) - { - return RenderType.makeType("gui_" + texture, DefaultVertexFormats.POSITION_COLOR_TEX, GL11.GL_QUADS, 256, RenderType.State.getBuilder().texture(new TextureState(texture, false, false)).alpha(new AlphaState(0.5F)).build(false)); - } - - public static RenderType getLines(float lineWidth) - { - return RenderType.makeType("lines_color_pos_" + lineWidth, DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 256, RenderType.State.getBuilder().line(new LineState(OptionalDouble.of(lineWidth))).texture(new TextureState()).build(false)); - } - - public static RenderType getPoints(float pointSize) - { - // Not really a fog state, but using it like this makes using RenderType.State - // with custom states possible - FogState setPointSize = new FogState(BloodMagic.MODID + ":pointsize_" + pointSize, () -> GL11.glPointSize(pointSize), () -> { - GL11.glPointSize(1); - }); - return RenderType.makeType("point_pos_color_" + pointSize, DefaultVertexFormats.POSITION_COLOR, GL11.GL_POINTS, 256, RenderType.State.getBuilder().fog(setPointSize).texture(new TextureState()).build(false)); - } - - public static RenderType getPositionTex(ResourceLocation texture) - { - return RenderType.makeType(BloodMagic.MODID + ":pos_tex_" + texture, DefaultVertexFormats.POSITION_TEX, GL11.GL_QUADS, 256, RenderType.State.getBuilder().texture(new TextureState(texture, false, false)).build(false)); - } - - public static RenderType getFullbrightTranslucent(ResourceLocation resourceLocation) - { - RenderType.State glState = RenderType.State.getBuilder().transparency(TRANSLUCENT_TRANSPARENCY).texture(new TextureState(resourceLocation, false, false)).lightmap(new LightmapState(false)).build(false); - return RenderType.makeType("BloodMagic:fullbright_translucent_" + resourceLocation, DefaultVertexFormats.BLOCK, GL11.GL_QUADS, 256, glState); - } - - public static IRenderTypeBuffer wrapWithStencil(IRenderTypeBuffer in, Consumer setupStencilArea, String name, int ref) - { - return wrapWithAdditional(in, "stencil_" + name + "_" + ref, () -> { - GL11.glEnable(GL11.GL_STENCIL_TEST); - RenderSystem.colorMask(false, false, false, false); - RenderSystem.depthMask(false); - GL11.glStencilFunc(GL11.GL_NEVER, 1, 0xFF); - GL11.glStencilOp(GL11.GL_REPLACE, GL11.GL_KEEP, GL11.GL_KEEP); - - GL11.glStencilMask(0xFF); - RenderSystem.clear(GL11.GL_STENCIL_BUFFER_BIT, true); - RenderSystem.disableTexture(); - Tessellator tes = Tessellator.getInstance(); - BufferBuilder bb = tes.getBuffer(); - bb.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION); - setupStencilArea.accept(bb); - tes.draw(); - RenderSystem.enableTexture(); - RenderSystem.colorMask(true, true, true, true); - RenderSystem.depthMask(true); - GL11.glStencilMask(0x00); - GL11.glStencilFunc(GL11.GL_EQUAL, ref, 0xFF); - }, () -> GL11.glDisable(GL11.GL_STENCIL_TEST)); - } - - public static IRenderTypeBuffer disableLighting(IRenderTypeBuffer in) - { - return wrapWithAdditional(in, "no_lighting", RenderSystem::disableLighting, () -> { - }); - } - - public static IRenderTypeBuffer disableCull(IRenderTypeBuffer in) - { - return wrapWithAdditional(in, "no_cull", RenderSystem::disableCull, RenderSystem::enableCull); - } - - private static IRenderTypeBuffer wrapWithAdditional(IRenderTypeBuffer in, String name, Runnable setup, Runnable teardown) - { - return type -> { - return in.getBuffer(new RenderType(BloodMagic.MODID + ":" + type + "_" + name, type.getVertexFormat(), type.getDrawMode(), type.getBufferSize(), type.isUseDelegate(), false, () -> { - type.setupRenderState(); - setup.run(); - }, () -> { - teardown.run(); - type.clearRenderState(); - }) - { - }); - }; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/command/CommandBloodMagic.java b/src/main/java/wayoftime/bloodmagic/command/CommandBloodMagic.java deleted file mode 100644 index c24d195f..00000000 --- a/src/main/java/wayoftime/bloodmagic/command/CommandBloodMagic.java +++ /dev/null @@ -1,14 +0,0 @@ -package wayoftime.bloodmagic.command; - -import com.mojang.brigadier.CommandDispatcher; -import com.mojang.brigadier.builder.LiteralArgumentBuilder; - -import net.minecraft.command.CommandSource; - -public class CommandBloodMagic -{ - public CommandBloodMagic(CommandDispatcher dispatcher) - { - dispatcher.register(LiteralArgumentBuilder.literal("bloodmagic")); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/command/sub/SubCommandBind.java b/src/main/java/wayoftime/bloodmagic/command/sub/SubCommandBind.java deleted file mode 100644 index c71d3d82..00000000 --- a/src/main/java/wayoftime/bloodmagic/command/sub/SubCommandBind.java +++ /dev/null @@ -1,111 +0,0 @@ -package wayoftime.bloodmagic.command.sub; - -import net.minecraft.command.CommandException; -import net.minecraft.command.CommandSource; -import net.minecraft.entity.player.ServerPlayerEntity; - -public class SubCommandBind -{ - public ServerPlayerEntity player; - -// static ArgumentBuilder register() -// { -// return Commands.literal("generate") -// .requires(cs->cs.hasPermissionLevel(4)) //permission -// .then(Commands.argument("pos", BlockPosArgument.blockPos()) -// .then(Commands.argument("count", IntegerArgumentType.integer(1)) -// .then(Commands.argument("dim", DimensionArgument.getDimension()) -// .then(Commands.argument("interval", IntegerArgumentType.integer()) -// .executes(ctx -> execute(ctx.getSource(), BlockPosArgument.getBlockPos(ctx, "pos"), getInt(ctx, "count"), DimensionArgument.getDimensionArgument(ctx, "dim"), getInt(ctx, "interval"))) -// ) -// .executes(ctx -> execute(ctx.getSource(), BlockPosArgument.getBlockPos(ctx, "pos"), getInt(ctx, "count"), DimensionArgument.getDimensionArgument(ctx, "dim"), -1)) -// ) -// .executes(ctx -> execute(ctx.getSource(), BlockPosArgument.getBlockPos(ctx, "pos"), getInt(ctx, "count"), ctx.getSource().getWorld(), -1)) -// ) -// ); -// } - -// public ITextComponent getInfo() -// { -// return player.getName(); -// } -// -// @Override -// public String getName() -// { -// return "bind"; -// } -// -// @Override -// public String getUsage(ICommandSender commandSender) -// { -// return "commands.bloodmagic.bind.usage"; -// } -// -// public String getHelp() -// { -// return "commands.bloodmagic.bind.help"; -// } -// -// @Override -// public int getRequiredPermissionLevel() -// { -// return 2; -// } - - public static int execute(CommandSource source, String[] args) - throws CommandException - { -// if (args.length == 1 && (args[0].equals("?") || args[0].equals("help"))) -// { -// sender.sendMessage(new TranslationTextComponent(getHelp())); -// return; -// } -// if (sender.getEntityWorld().isRemote) -// return; -// ServerPlayerEntity player = args.length < 2 ? getCommandSenderAsPlayer(sender) -// : getPlayer(server, sender, args[0]); -// ItemStack held = player.getHeldItemMainhand(); -// boolean bind = true; -// if (held.getItem() instanceof IBindable) -// { -// Binding binding = ((IBindable) held.getItem()).getBinding(held); -// if (binding != null) -// bind = false; -// if (args.length < 2) -// if (args.length == 1) -// if (isBoolean(args[0])) -// bind = Boolean.parseBoolean(args[0]); -// else -// player = getPlayer(server, sender, args[0]); -// if (bind) -// { -// if (binding.getOwnerName().equals(player.getName())) -// { -// sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.bind.error.ownerEqualsTarget")); -// return; -// } -// binding = new Binding(player.getGameProfile().getId(), player.getGameProfile().getName()); -// BindableHelper.applyBinding(held, binding); -// this.player = player; -// sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.bind.success", getInfo())); -// } else -// { -// if (binding == null) -// { -// sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.bind.error.notBound")); -// } -// held.getTagCompound().removeTag("binding"); -// sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.bind.remove.success")); -// } -// } else -// sender.sendMessage(new TranslationTextComponent("commands.bloodmagic.bind.error.notBindable")); - - return 1; - } - - private boolean isBoolean(String string) - { - return string.equalsIgnoreCase("true") || string.equalsIgnoreCase("false"); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffect.java b/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffect.java deleted file mode 100644 index 2219ea52..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffect.java +++ /dev/null @@ -1,23 +0,0 @@ -package wayoftime.bloodmagic.common.alchemyarray; - -import net.minecraft.block.BlockState; -import net.minecraft.entity.Entity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import wayoftime.bloodmagic.tile.TileAlchemyArray; - -public abstract class AlchemyArrayEffect -{ - public abstract AlchemyArrayEffect getNewCopy(); - - public abstract void readFromNBT(CompoundNBT compound); - - public abstract void writeToNBT(CompoundNBT compound); - - public abstract boolean update(TileAlchemyArray array, int activeCounter); - - public void onEntityCollidedWithBlock(TileAlchemyArray tileAlchemyArray, World world, BlockPos pos, BlockState state, Entity entity) - { - }; -} diff --git a/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectBinding.java b/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectBinding.java deleted file mode 100644 index a1519163..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectBinding.java +++ /dev/null @@ -1,78 +0,0 @@ -package wayoftime.bloodmagic.common.alchemyarray; - -import net.minecraft.entity.EntityType; -import net.minecraft.entity.effect.LightningBoltEntity; -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import wayoftime.bloodmagic.client.render.alchemyarray.BindingAlchemyCircleRenderer; -import wayoftime.bloodmagic.tile.TileAlchemyArray; - -public class AlchemyArrayEffectBinding extends AlchemyArrayEffectCrafting -{ - public AlchemyArrayEffectBinding(ItemStack outputStack, int tickLimit) - { - super(outputStack, tickLimit); - } - - public AlchemyArrayEffectBinding(ItemStack outputStack) - { - this(outputStack, 300); - } - - @Override - public boolean update(TileAlchemyArray tile, int ticksActive) - { - // TODO: Add recipe rechecking to verify nothing screwy is going on. - if (tile.getWorld().isRemote) - { - return false; - } - - if (ticksActive >= 50 && ticksActive <= 250) - { - this.spawnLightningOnCircle(tile.getWorld(), tile.getPos(), ticksActive); - } - - if (ticksActive >= tickLimit) - { - BlockPos pos = tile.getPos(); - - ItemStack output = outputStack.copy(); - - ItemEntity outputEntity = new ItemEntity(tile.getWorld(), pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, output); - - tile.getWorld().addEntity(outputEntity); - - return true; - } - - return false; - } - - public void spawnLightningOnCircle(World world, BlockPos pos, int ticksActive) - { - if (ticksActive % 50 == 0) - { - int circle = ticksActive / 50 - 1; - float distance = BindingAlchemyCircleRenderer.getDistanceOfCircle(circle, ticksActive); - float angle = BindingAlchemyCircleRenderer.getAngleOfCircle(circle, ticksActive); - - double dispX = distance * Math.sin(angle); - double dispZ = -distance * Math.cos(angle); - - LightningBoltEntity lightningboltentity = EntityType.LIGHTNING_BOLT.create(world); -// LightningBoltEntity lightning = new LightningBoltEntity(world, pos.getX() + dispX, pos.getY(), pos.getZ() + dispZ); - lightningboltentity.setPosition(pos.getX() + dispX, pos.getY(), pos.getZ() + dispZ); - lightningboltentity.setEffectOnly(true); - world.addEntity(lightningboltentity); - } - } - - @Override - public AlchemyArrayEffect getNewCopy() - { - return new AlchemyArrayEffectBinding(outputStack, tickLimit); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectBounce.java b/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectBounce.java deleted file mode 100644 index 7a316e04..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectBounce.java +++ /dev/null @@ -1,66 +0,0 @@ -package wayoftime.bloodmagic.common.alchemyarray; - -import net.minecraft.block.BlockState; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.world.World; -import wayoftime.bloodmagic.tile.TileAlchemyArray; - -public class AlchemyArrayEffectBounce extends AlchemyArrayEffect -{ - public AlchemyArrayEffectBounce() - { - super(); - } - - @Override - public boolean update(TileAlchemyArray tile, int ticksActive) - { - return false; - } - - @Override - public void onEntityCollidedWithBlock(TileAlchemyArray array, World world, BlockPos pos, BlockState state, Entity entity) - { - if (entity.isSneaking()) - { - entity.fallDistance = 0; - } else if (entity.getMotion().y < 0.0D) - { - Vector3d motion = entity.getMotion(); - motion = motion.mul(1, -1, 1); - - if (!(entity instanceof LivingEntity)) - { - motion = motion.mul(1, 0.8, 1); - } - - entity.setMotion(motion); - - entity.fallDistance = 0; - } - } - - @Override - public AlchemyArrayEffect getNewCopy() - { - return new AlchemyArrayEffectBounce(); - } - - @Override - public void readFromNBT(CompoundNBT compound) - { - // TODO Auto-generated method stub - - } - - @Override - public void writeToNBT(CompoundNBT compound) - { - // TODO Auto-generated method stub - - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectCrafting.java b/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectCrafting.java deleted file mode 100644 index eebde533..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectCrafting.java +++ /dev/null @@ -1,69 +0,0 @@ -package wayoftime.bloodmagic.common.alchemyarray; - -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.math.BlockPos; -import wayoftime.bloodmagic.tile.TileAlchemyArray; - -public class AlchemyArrayEffectCrafting extends AlchemyArrayEffect -{ - public final ItemStack outputStack; - public int tickLimit; - - public AlchemyArrayEffectCrafting(ItemStack outputStack) - { - this(outputStack, 200); - } - - public AlchemyArrayEffectCrafting(ItemStack outputStack, int tickLimit) - { - this.outputStack = outputStack; - this.tickLimit = tickLimit; - } - - @Override - public boolean update(TileAlchemyArray tile, int ticksActive) - { - // TODO: Add recipe rechecking to verify nothing screwy is going on. - if (tile.getWorld().isRemote) - { - return false; - } - - if (ticksActive >= tickLimit) - { - BlockPos pos = tile.getPos(); - - ItemStack output = outputStack.copy(); - - ItemEntity outputEntity = new ItemEntity(tile.getWorld(), pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() - + 0.5, output); - - tile.getWorld().addEntity(outputEntity); -// tile.getWorld().spawnEntity(outputEntity); - - return true; - } - - return false; - } - - @Override - public void writeToNBT(CompoundNBT tag) - { - - } - - @Override - public void readFromNBT(CompoundNBT tag) - { - - } - - @Override - public AlchemyArrayEffect getNewCopy() - { - return new AlchemyArrayEffectCrafting(outputStack, tickLimit); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectDay.java b/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectDay.java deleted file mode 100644 index ea94e748..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectDay.java +++ /dev/null @@ -1,97 +0,0 @@ -package wayoftime.bloodmagic.common.alchemyarray; - -import net.minecraft.client.world.ClientWorld; -import net.minecraft.entity.EntityType; -import net.minecraft.entity.effect.LightningBoltEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; -import wayoftime.bloodmagic.tile.TileAlchemyArray; - -public class AlchemyArrayEffectDay extends AlchemyArrayEffect -{ - private long startingTime = 0; - - public AlchemyArrayEffectDay() - { - - } - - @Override - public boolean update(TileAlchemyArray tile, int ticksActive) - { -// if (ticksActive < 200) -// { -// return false; -// } - - World world = tile.getWorld(); - - if (ticksActive == 100) - { - startingTime = world.getDayTime(); - tile.doDropIngredients(false); - } - - if (ticksActive <= 100) - { - return false; - } - - // TODO: Add recipe rechecking to verify nothing screwy is going on. - if (world.isRemote && world instanceof ClientWorld) - { - long finalTime = ((world.getDayTime() + 24000) / 24000) * 24000; - long time = (finalTime - startingTime) * (ticksActive - 100) / 100 + startingTime; - - ((ClientWorld) world).getWorldInfo().setDayTime(time); - - return false; - } - - if (world instanceof ServerWorld) - { -// world.getDayTime() - long finalTime = ((world.getDayTime() + 24000) / 24000) * 24000; - long time = (finalTime - startingTime) * (ticksActive - 100) / 100 + startingTime; - for (ServerWorld serverworld : world.getServer().getWorlds()) - { - serverworld.func_241114_a_((long) time); - } - - if (ticksActive >= 200) - { - BlockPos pos = tile.getPos(); - LightningBoltEntity lightningboltentity = EntityType.LIGHTNING_BOLT.create(world); -// LightningBoltEntity lightning = new LightningBoltEntity(world, pos.getX() + dispX, pos.getY(), pos.getZ() + dispZ); - lightningboltentity.setPosition(pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5); - lightningboltentity.setEffectOnly(true); - world.addEntity(lightningboltentity); - - return true; - } - - return false; - } - return false; - } - - @Override - public void writeToNBT(CompoundNBT tag) - { - - } - - @Override - public void readFromNBT(CompoundNBT tag) - { - - } - - @Override - public AlchemyArrayEffect getNewCopy() - { - return new AlchemyArrayEffectDay(); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectMovement.java b/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectMovement.java deleted file mode 100644 index 8037b5b4..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectMovement.java +++ /dev/null @@ -1,96 +0,0 @@ -package wayoftime.bloodmagic.common.alchemyarray; - -import net.minecraft.block.BlockState; -import net.minecraft.entity.Entity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.world.World; -import wayoftime.bloodmagic.tile.TileAlchemyArray; - -public class AlchemyArrayEffectMovement extends AlchemyArrayEffect -{ - public AlchemyArrayEffectMovement() - { - super(); - } - - @Override - public boolean update(TileAlchemyArray tile, int ticksActive) - { - - return false; - } - - @Override - public void onEntityCollidedWithBlock(TileAlchemyArray array, World world, BlockPos pos, BlockState state, Entity entity) - { - double motionY = 0.5; - double motionYGlowstoneMod = 0.05; - double speed = 1.5; - double speedRedstoneMod = 0.15; - - Direction direction = array.getRotation(); - TileAlchemyArray tileArray = (TileAlchemyArray) array; - - motionY += motionYGlowstoneMod * (tileArray.getStackInSlot(0).getCount() - 1); - speed += speedRedstoneMod * (tileArray.getStackInSlot(1).getCount() - 1); - -// entity.getMotion().y = motionY; - entity.fallDistance = 0; - - switch (direction) - { - case NORTH: -// entity.motionX = 0; -// entity.motionY = motionY; -// entity.motionZ = -speed; - entity.setMotion(new Vector3d(0, motionY, -speed)); - break; - - case SOUTH: -// entity.motionX = 0; -// entity.motionY = motionY; -// entity.motionZ = speed; - entity.setMotion(new Vector3d(0, motionY, speed)); - break; - - case WEST: -// entity.motionX = -speed; -// entity.motionY = motionY; -// entity.motionZ = 0; - entity.setMotion(new Vector3d(-speed, motionY, 0)); - break; - - case EAST: -// entity.motionX = speed; -// entity.motionY = motionY; -// entity.motionZ = 0; - entity.setMotion(new Vector3d(speed, motionY, 0)); - break; - default: - break; - } - } - - @Override - public AlchemyArrayEffect getNewCopy() - { - return new AlchemyArrayEffectMovement(); - } - - @Override - public void readFromNBT(CompoundNBT compound) - { - // TODO Auto-generated method stub - - } - - @Override - public void writeToNBT(CompoundNBT compound) - { - // TODO Auto-generated method stub - - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectNight.java b/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectNight.java deleted file mode 100644 index 5d322081..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectNight.java +++ /dev/null @@ -1,97 +0,0 @@ -package wayoftime.bloodmagic.common.alchemyarray; - -import net.minecraft.client.world.ClientWorld; -import net.minecraft.entity.EntityType; -import net.minecraft.entity.effect.LightningBoltEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; -import wayoftime.bloodmagic.tile.TileAlchemyArray; - -public class AlchemyArrayEffectNight extends AlchemyArrayEffect -{ - private long startingTime = 0; - - public AlchemyArrayEffectNight() - { - - } - - @Override - public boolean update(TileAlchemyArray tile, int ticksActive) - { -// if (ticksActive < 200) -// { -// return false; -// } - - World world = tile.getWorld(); - if (ticksActive == 100) - { - startingTime = world.getDayTime(); - tile.doDropIngredients(false); - } - - if (ticksActive <= 100) - { - return false; - } - - // TODO: Add recipe rechecking to verify nothing screwy is going on. - - if (world.isRemote && world instanceof ClientWorld) - { - long finalTime = ((world.getDayTime() + 11000) / 24000) * 24000 + 13000; - long time = (finalTime - startingTime) * (ticksActive - 100) / 100 + startingTime; - - ((ClientWorld) world).getWorldInfo().setDayTime(time); - - return false; - } - - if (world instanceof ServerWorld) - { -// world.getDayTime() - long finalTime = ((world.getDayTime() + 11000) / 24000) * 24000 + 13000; - long time = (finalTime - startingTime) * (ticksActive - 100) / 100 + startingTime; - for (ServerWorld serverworld : world.getServer().getWorlds()) - { - serverworld.func_241114_a_((long) time); - } - - if (ticksActive >= 200) - { - BlockPos pos = tile.getPos(); - LightningBoltEntity lightningboltentity = EntityType.LIGHTNING_BOLT.create(world); -// LightningBoltEntity lightning = new LightningBoltEntity(world, pos.getX() + dispX, pos.getY(), pos.getZ() + dispZ); - lightningboltentity.setPosition(pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5); - lightningboltentity.setEffectOnly(true); - world.addEntity(lightningboltentity); - - return true; - } - - return false; - } - return false; - } - - @Override - public void writeToNBT(CompoundNBT tag) - { - - } - - @Override - public void readFromNBT(CompoundNBT tag) - { - - } - - @Override - public AlchemyArrayEffect getNewCopy() - { - return new AlchemyArrayEffectNight(); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectSpike.java b/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectSpike.java deleted file mode 100644 index 585c0f8a..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectSpike.java +++ /dev/null @@ -1,53 +0,0 @@ -package wayoftime.bloodmagic.common.alchemyarray; - -import net.minecraft.block.BlockState; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.DamageSource; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import wayoftime.bloodmagic.tile.TileAlchemyArray; - -public class AlchemyArrayEffectSpike extends AlchemyArrayEffect -{ - public AlchemyArrayEffectSpike() - { - super(); - } - - @Override - public boolean update(TileAlchemyArray tile, int ticksActive) - { - return false; - } - - @Override - public void onEntityCollidedWithBlock(TileAlchemyArray array, World world, BlockPos pos, BlockState state, Entity entity) - { - if (entity instanceof LivingEntity) - { - entity.attackEntityFrom(DamageSource.CACTUS, 2); - } - } - - @Override - public AlchemyArrayEffect getNewCopy() - { - return new AlchemyArrayEffectSpike(); - } - - @Override - public void readFromNBT(CompoundNBT compound) - { - // TODO Auto-generated method stub - - } - - @Override - public void writeToNBT(CompoundNBT compound) - { - // TODO Auto-generated method stub - - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectUpdraft.java b/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectUpdraft.java deleted file mode 100644 index 62831113..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/alchemyarray/AlchemyArrayEffectUpdraft.java +++ /dev/null @@ -1,63 +0,0 @@ -package wayoftime.bloodmagic.common.alchemyarray; - -import net.minecraft.block.BlockState; -import net.minecraft.entity.Entity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.world.World; -import wayoftime.bloodmagic.tile.TileAlchemyArray; - -public class AlchemyArrayEffectUpdraft extends AlchemyArrayEffect -{ - public AlchemyArrayEffectUpdraft() - { - super(); - } - - @Override - public boolean update(TileAlchemyArray tile, int ticksActive) - { - - return false; - } - - @Override - public void onEntityCollidedWithBlock(TileAlchemyArray array, World world, BlockPos pos, BlockState state, Entity entity) - { - double motionY = 1; - double motionYGlowstoneMod = 0.1; - double motionYFeatherMod = 0.05; - - TileAlchemyArray tileArray = (TileAlchemyArray) array; - - motionY += motionYGlowstoneMod * (tileArray.getStackInSlot(0).getCount() - 1); // Glowstone Dust - motionY += motionYFeatherMod * (tileArray.getStackInSlot(1).getCount() - 1); // Feathers - -// entity.getMotion().y = motionY; - entity.fallDistance = 0; - - entity.setMotion(new Vector3d(0, motionY, 0)); - - } - - @Override - public AlchemyArrayEffect getNewCopy() - { - return new AlchemyArrayEffectUpdraft(); - } - - @Override - public void readFromNBT(CompoundNBT compound) - { - // TODO Auto-generated method stub - - } - - @Override - public void writeToNBT(CompoundNBT compound) - { - // TODO Auto-generated method stub - - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockAlchemicalReactionChamber.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockAlchemicalReactionChamber.java deleted file mode 100644 index da151b5c..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/block/BlockAlchemicalReactionChamber.java +++ /dev/null @@ -1,162 +0,0 @@ -package wayoftime.bloodmagic.common.block; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.HorizontalBlock; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.inventory.container.INamedContainerProvider; -import net.minecraft.item.BlockItemUseContext; -import net.minecraft.item.ItemStack; -import net.minecraft.state.BooleanProperty; -import net.minecraft.state.DirectionProperty; -import net.minecraft.state.StateContainer; -import net.minecraft.state.properties.BlockStateProperties; -import net.minecraft.tileentity.AbstractFurnaceTileEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.Mirror; -import net.minecraft.util.Rotation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorld; -import net.minecraft.world.World; -import net.minecraftforge.common.ToolType; -import net.minecraftforge.fml.network.NetworkHooks; -import wayoftime.bloodmagic.tile.TileAlchemicalReactionChamber; - -public class BlockAlchemicalReactionChamber extends Block -{ - public static final DirectionProperty FACING = HorizontalBlock.HORIZONTAL_FACING; - public static final BooleanProperty LIT = BlockStateProperties.LIT; - - public BlockAlchemicalReactionChamber() - { - super(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).harvestTool(ToolType.PICKAXE).harvestLevel(2).sound(SoundType.STONE)); - this.setDefaultState(this.stateContainer.getBaseState().with(FACING, Direction.NORTH).with(LIT, Boolean.valueOf(false))); - } - - @Override - public boolean hasTileEntity(BlockState state) - { - return true; - } - - @Override - public TileEntity createTileEntity(BlockState state, IBlockReader world) - { - return new TileAlchemicalReactionChamber(); - } - - @Override - public void onPlayerDestroy(IWorld world, BlockPos blockPos, BlockState blockState) - { - TileAlchemicalReactionChamber arc = (TileAlchemicalReactionChamber) world.getTileEntity(blockPos); - if (arc != null) - arc.dropItems(); - - super.onPlayerDestroy(world, blockPos, blockState); - } - - @Override - public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) - { - if (!state.isIn(newState.getBlock())) - { - TileEntity tileentity = worldIn.getTileEntity(pos); - if (tileentity instanceof TileAlchemicalReactionChamber) - { - ((TileAlchemicalReactionChamber) tileentity).dropItems(); - worldIn.updateComparatorOutputLevel(pos, this); - } - - super.onReplaced(state, worldIn, pos, newState, isMoving); - } - } - - @Override - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult blockRayTraceResult) - { - if (world.isRemote) - return ActionResultType.SUCCESS; - - TileEntity tile = world.getTileEntity(pos); - if (!(tile instanceof TileAlchemicalReactionChamber)) - return ActionResultType.FAIL; - - NetworkHooks.openGui((ServerPlayerEntity) player, (INamedContainerProvider) tile, pos); -// player.openGui(BloodMagic.instance, Constants.Gui.SOUL_FORGE_GUI, world, pos.getX(), pos.getY(), pos.getZ()); - - return ActionResultType.SUCCESS; - } - - @Override - public BlockState getStateForPlacement(BlockItemUseContext context) - { - return this.getDefaultState().with(FACING, context.getPlacementHorizontalFacing().getOpposite()); - } - - /** - * Called by ItemBlocks after a block is set in the world, to allow post-place - * logic - */ - @Override - public void onBlockPlacedBy(World worldIn, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) - { - if (stack.hasDisplayName()) - { - TileEntity tileentity = worldIn.getTileEntity(pos); - if (tileentity instanceof AbstractFurnaceTileEntity) - { - ((AbstractFurnaceTileEntity) tileentity).setCustomName(stack.getDisplayName()); - } - } - - } - - /** - * Returns the blockstate with the given rotation from the passed blockstate. If - * inapplicable, returns the passed blockstate. - * - * @deprecated call via {@link IBlockState#withRotation(Rotation)} whenever - * possible. Implementing/overriding is fine. - */ - @Override - public BlockState rotate(BlockState state, Rotation rot) - { - return state.with(FACING, rot.rotate(state.get(FACING))); - } - - /** - * Returns the blockstate with the given mirror of the passed blockstate. If - * inapplicable, returns the passed blockstate. - * - * @deprecated call via {@link IBlockState#withMirror(Mirror)} whenever - * possible. Implementing/overriding is fine. - */ - @Override - public BlockState mirror(BlockState state, Mirror mirrorIn) - { - return state.rotate(mirrorIn.toRotation(state.get(FACING))); - } - - @Override - protected void fillStateContainer(StateContainer.Builder builder) - { - builder.add(FACING, LIT); - } - - public boolean eventReceived(BlockState state, World worldIn, BlockPos pos, int id, int param) - { - super.eventReceived(state, worldIn, pos, id, param); - TileEntity tileentity = worldIn.getTileEntity(pos); - return tileentity == null ? false : tileentity.receiveClientEvent(id, param); - } - -} diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockAlchemyArray.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockAlchemyArray.java deleted file mode 100644 index a554ed0a..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/block/BlockAlchemyArray.java +++ /dev/null @@ -1,123 +0,0 @@ -package wayoftime.bloodmagic.common.block; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockRenderType; -import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.shapes.ISelectionContext; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorld; -import net.minecraft.world.World; -import wayoftime.bloodmagic.tile.TileAlchemyArray; -import wayoftime.bloodmagic.util.Utils; - -public class BlockAlchemyArray extends Block -{ - protected static final VoxelShape BODY = Block.makeCuboidShape(1, 0, 1, 15, 1, 15); - - public BlockAlchemyArray() - { - super(Properties.create(Material.WOOL).hardnessAndResistance(1.0F, 0).doesNotBlockMovement()); - } - - @Override - public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) - { - return BODY; - } - - @Override - public boolean hasTileEntity(BlockState state) - { - return true; - } - - @Override - public TileEntity createTileEntity(BlockState state, IBlockReader world) - { - return new TileAlchemyArray(); - } - - @Override - public BlockRenderType getRenderType(BlockState state) - { - return BlockRenderType.ENTITYBLOCK_ANIMATED; - } - - @Override - public void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity) - { - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileAlchemyArray) - { - ((TileAlchemyArray) tile).onEntityCollidedWithBlock(state, entity); - } - } - - @Override - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult blockRayTraceResult) - { - TileAlchemyArray array = (TileAlchemyArray) world.getTileEntity(pos); - - if (array == null || player.isSneaking()) - return ActionResultType.FAIL; - - ItemStack playerItem = player.getHeldItem(hand); - - if (!playerItem.isEmpty()) - { - if (array.getStackInSlot(0).isEmpty()) - { - Utils.insertItemToTile(array, player, 0); - world.notifyBlockUpdate(pos, state, state, 3); - } else if (!array.getStackInSlot(0).isEmpty()) - { - Utils.insertItemToTile(array, player, 1); - array.attemptCraft(); - world.notifyBlockUpdate(pos, state, state, 3); - } else - { - return ActionResultType.SUCCESS; - } - } - - world.notifyBlockUpdate(pos, state, state, 3); - return ActionResultType.SUCCESS; - } - - @Override - public void onPlayerDestroy(IWorld world, BlockPos blockPos, BlockState blockState) - { - TileAlchemyArray alchemyArray = (TileAlchemyArray) world.getTileEntity(blockPos); - if (alchemyArray != null) - alchemyArray.dropItems(); - - super.onPlayerDestroy(world, blockPos, blockState); - } - - @Override - public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) - { - if (!state.isIn(newState.getBlock())) - { - TileEntity tileentity = worldIn.getTileEntity(pos); - if (tileentity instanceof TileAlchemyArray) - { - ((TileAlchemyArray) tileentity).dropItems(); - worldIn.updateComparatorOutputLevel(pos, this); - } - - super.onReplaced(state, worldIn, pos, newState, isMoving); - } - } - -} diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockAlchemyTable.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockAlchemyTable.java deleted file mode 100644 index 210cce1d..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/block/BlockAlchemyTable.java +++ /dev/null @@ -1,183 +0,0 @@ -package wayoftime.bloodmagic.common.block; - -import net.minecraft.block.AbstractBlock; -import net.minecraft.block.Block; -import net.minecraft.block.BlockRenderType; -import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.inventory.container.INamedContainerProvider; -import net.minecraft.item.BlockItemUseContext; -import net.minecraft.item.Item; -import net.minecraft.state.BooleanProperty; -import net.minecraft.state.DirectionProperty; -import net.minecraft.state.StateContainer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.shapes.ISelectionContext; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.shapes.VoxelShapes; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorld; -import net.minecraft.world.IWorldReader; -import net.minecraft.world.World; -import net.minecraftforge.common.ToolType; -import net.minecraftforge.fml.network.NetworkHooks; -import wayoftime.bloodmagic.common.item.BloodMagicItems; -import wayoftime.bloodmagic.tile.TileAlchemyTable; - -public class BlockAlchemyTable extends Block// implements IBMBlock -{ - public static final DirectionProperty DIRECTION = DirectionProperty.create("direction", Direction.Plane.HORIZONTAL); - public static final BooleanProperty INVISIBLE = BooleanProperty.create("invisible"); - protected static final VoxelShape BODY = Block.makeCuboidShape(1, 0, 1, 15, 15, 15); - - public BlockAlchemyTable() - { - super(AbstractBlock.Properties.create(Material.IRON).hardnessAndResistance(2.0F, 5.0F).harvestTool(ToolType.PICKAXE).harvestLevel(1).notSolid().setOpaque(BlockAlchemyTable::isntSolid).setBlocksVision(BlockAlchemyTable::isntSolid)); - } - - private static boolean isntSolid(BlockState state, IBlockReader reader, BlockPos pos) - { - return false; - } - - @Override - public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) - { - return BODY; - } - - public VoxelShape getRayTraceShape(BlockState state, IBlockReader reader, BlockPos pos, ISelectionContext context) - { - return VoxelShapes.empty(); - } - - @Override - public boolean hasTileEntity(BlockState state) - { - return true; - } - - @Override - public TileEntity createTileEntity(BlockState state, IBlockReader world) - { - return new TileAlchemyTable(); - } - - @Override - public BlockRenderType getRenderType(BlockState state) - { - return BlockRenderType.MODEL; - } - - @Override - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult blockRayTraceResult) - { - if (world.isRemote) - return ActionResultType.SUCCESS; - - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileAlchemyTable) - { - if (((TileAlchemyTable) tile).isSlave()) - { - NetworkHooks.openGui((ServerPlayerEntity) player, (INamedContainerProvider) world.getTileEntity(((TileAlchemyTable) tile).getConnectedPos()), ((TileAlchemyTable) tile).getConnectedPos()); - } else - { - NetworkHooks.openGui((ServerPlayerEntity) player, (INamedContainerProvider) tile, pos); - } - - return ActionResultType.SUCCESS; - } - -// player.openGui(BloodMagic.instance, Constants.Gui.SOUL_FORGE_GUI, world, pos.getX(), pos.getY(), pos.getZ()); - - return ActionResultType.FAIL; - } - - @Override - public BlockState getStateForPlacement(BlockItemUseContext context) - { - return this.getDefaultState().with(DIRECTION, context.getPlacementHorizontalFacing()); - } - - @Override - protected void fillStateContainer(StateContainer.Builder builder) - { - builder.add(DIRECTION, INVISIBLE); - } - - @Override - public void onNeighborChange(BlockState state, IWorldReader world, BlockPos pos, BlockPos neighbor) - { - TileAlchemyTable tile = (TileAlchemyTable) world.getTileEntity(pos); - if (tile != null) - { - BlockPos connectedPos = tile.getConnectedPos(); - TileEntity connectedTile = world.getTileEntity(connectedPos); - if (!(connectedTile instanceof TileAlchemyTable - && ((TileAlchemyTable) connectedTile).getConnectedPos().equals(pos))) - { - this.onPlayerDestroy(tile.getWorld(), pos, state); - this.removedByPlayer(state, tile.getWorld(), pos, null, true, this.getFluidState(state)); - } - } - } - - @Override - public void onPlayerDestroy(IWorld world, BlockPos blockPos, BlockState blockState) - { - TileAlchemyTable forge = (TileAlchemyTable) world.getTileEntity(blockPos); - - if (forge != null && !forge.isSlave()) - { - forge.dropItems(); - } - - super.onPlayerDestroy(world, blockPos, blockState); - } - - @Override - public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) - { - if (!state.isIn(newState.getBlock())) - { - TileEntity tileentity = worldIn.getTileEntity(pos); - if (tileentity instanceof TileAlchemyTable && !((TileAlchemyTable) tileentity).isSlave()) - { - ((TileAlchemyTable) tileentity).dropItems(); - worldIn.updateComparatorOutputLevel(pos, this); - } - - super.onReplaced(state, worldIn, pos, newState, isMoving); - } - } - -// @Override -// public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) -// { -// if (!state.isIn(newState.getBlock())) -// { -// TileEntity tileentity = worldIn.getTileEntity(pos); -// if (tileentity instanceof TileSoulForge) -// { -// ((TileSoulForge) tileentity).dropItems(); -// worldIn.updateComparatorOutputLevel(pos, this); -// } -// -// super.onReplaced(state, worldIn, pos, newState, isMoving); -// } -// } - - @Override - public Item asItem() - { - return BloodMagicItems.ALCHEMY_TABLE_ITEM.get(); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockAltar.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockAltar.java deleted file mode 100644 index af1908e3..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/block/BlockAltar.java +++ /dev/null @@ -1,100 +0,0 @@ -package wayoftime.bloodmagic.common.block; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.shapes.ISelectionContext; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorld; -import net.minecraft.world.World; -import net.minecraftforge.common.ToolType; -import wayoftime.bloodmagic.api.compat.IAltarReader; -import wayoftime.bloodmagic.tile.TileAltar; -import wayoftime.bloodmagic.util.Utils; - -public class BlockAltar extends Block -{ - protected static final VoxelShape BODY = Block.makeCuboidShape(0, 0, 0, 16, 12, 16); - - public BlockAltar() - { - super(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).harvestTool(ToolType.PICKAXE).harvestLevel(1)); - } - - @Override - public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) - { - return BODY; - } - - @Override - public boolean hasTileEntity(BlockState state) - { - return true; - } - - @Override - public TileEntity createTileEntity(BlockState state, IBlockReader world) - { - return new TileAltar(); - } - - @Override - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult blockRayTraceResult) - { - TileAltar altar = (TileAltar) world.getTileEntity(pos); - - if (altar == null || player.isSneaking()) - return ActionResultType.FAIL; - - ItemStack playerItem = player.getHeldItem(hand); - - if (playerItem.getItem() instanceof IAltarReader)// || playerItem.getItem() instanceof IAltarManipulator) - { - playerItem.getItem().onItemRightClick(world, player, hand); - return ActionResultType.SUCCESS; - } - - if (Utils.insertItemToTile(altar, player)) - altar.startCycle(); - else - altar.setActive(); - - world.notifyBlockUpdate(pos, state, state, 3); - return ActionResultType.SUCCESS; - } - - @Override - public void onPlayerDestroy(IWorld world, BlockPos blockPos, BlockState blockState) - { - TileAltar altar = (TileAltar) world.getTileEntity(blockPos); - if (altar != null) - altar.dropItems(); - - super.onPlayerDestroy(world, blockPos, blockState); - } - - @Override - public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) - { - if (!state.isIn(newState.getBlock())) - { - TileEntity tileentity = worldIn.getTileEntity(pos); - if (tileentity instanceof TileAltar) - { - ((TileAltar) tileentity).dropItems(); - worldIn.updateComparatorOutputLevel(pos, this); - } - - super.onReplaced(state, worldIn, pos, newState, isMoving); - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockBloodLight.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockBloodLight.java deleted file mode 100644 index 4f3ad3f0..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/block/BlockBloodLight.java +++ /dev/null @@ -1,64 +0,0 @@ -package wayoftime.bloodmagic.common.block; - -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockRenderType; -import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.player.ClientPlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.particles.RedstoneParticleData; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.shapes.ISelectionContext; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -public class BlockBloodLight extends Block -{ - protected static final VoxelShape BODY = Block.makeCuboidShape(7, 7, 7, 9, 9, 9); - - public BlockBloodLight() - { - super(Properties.create(Material.WOOL).doesNotBlockMovement().setLightLevel((state) -> { - return 15; - })); - } - - @Override - public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) - { - return BODY; - } - - @Override - public BlockRenderType getRenderType(BlockState state) - { - return BlockRenderType.ENTITYBLOCK_ANIMATED; - } - - @Override - @OnlyIn(Dist.CLIENT) - public void animateTick(BlockState stateIn, World world, BlockPos pos, Random rand) - { - ClientPlayerEntity player = Minecraft.getInstance().player; - - if (rand.nextInt(3) != 0) - { - world.addParticle(RedstoneParticleData.REDSTONE_DUST, pos.getX() + 0.5D - + rand.nextGaussian() / 8, pos.getY() + 0.5D, pos.getZ() + 0.5D + rand.nextGaussian() / 8, 0, 0, 0); - ItemStack heldItem = player.getHeldItem(Hand.MAIN_HAND); - -// if (heldItem.isEmpty() || heldItem.getItem() != RegistrarBloodMagicItems.SIGIL_BLOOD_LIGHT) -// return; -// -// for (int i = 0; i < 8; i++) world.addParticle(RedstoneParticleData.REDSTONE_DUST, pos.getX() + 0.5D -// + rand.nextGaussian() / 8, pos.getY() + 0.5D, pos.getZ() + 0.5D + rand.nextGaussian() / 8, 0, 0, 0); - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockBloodRune.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockBloodRune.java deleted file mode 100644 index fc5f537b..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/block/BlockBloodRune.java +++ /dev/null @@ -1,46 +0,0 @@ -package wayoftime.bloodmagic.common.block; - -import java.util.List; - -import javax.annotation.Nullable; - -import net.minecraft.block.Block; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.World; -import net.minecraftforge.common.ToolType; -import wayoftime.bloodmagic.block.enums.BloodRuneType; -import wayoftime.bloodmagic.altar.IBloodRune; - -public class BlockBloodRune extends Block implements IBloodRune -{ - private final BloodRuneType type; - - public BlockBloodRune(BloodRuneType type) - { - super(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).harvestTool(ToolType.PICKAXE).harvestLevel(2).sound(SoundType.STONE)); - this.type = type; - } - - @Nullable - @Override - public BloodRuneType getBloodRune(World world, BlockPos pos) - { - return type; - } - - @Override - public void addInformation(ItemStack stack, @Nullable IBlockReader world, List tooltip, - ITooltipFlag flag) - { - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.decoration.safe").mergeStyle(TextFormatting.GRAY)); - super.addInformation(stack, world, tooltip, flag); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockDeforesterCharge.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockDeforesterCharge.java deleted file mode 100644 index beefd606..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/block/BlockDeforesterCharge.java +++ /dev/null @@ -1,20 +0,0 @@ -package wayoftime.bloodmagic.common.block; - -import net.minecraft.block.BlockState; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.IBlockReader; -import wayoftime.bloodmagic.tile.TileDeforesterCharge; - -public class BlockDeforesterCharge extends BlockShapedExplosive -{ - public BlockDeforesterCharge(int explosionSize, Properties properties) - { - super(explosionSize, properties); - } - - @Override - public TileEntity createTileEntity(BlockState state, IBlockReader world) - { - return new TileDeforesterCharge(); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockDemonCrucible.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockDemonCrucible.java deleted file mode 100644 index 41a302a7..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/block/BlockDemonCrucible.java +++ /dev/null @@ -1,101 +0,0 @@ -package wayoftime.bloodmagic.common.block; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.shapes.ISelectionContext; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorld; -import net.minecraft.world.World; -import net.minecraftforge.common.ToolType; -import wayoftime.bloodmagic.tile.TileDemonCrucible; -import wayoftime.bloodmagic.util.Utils; -import wayoftime.bloodmagic.api.compat.IDemonWillGem; -import wayoftime.bloodmagic.api.compat.IDiscreteDemonWill; - -public class BlockDemonCrucible extends Block -{ - protected static final VoxelShape BODY = Block.makeCuboidShape(1, 0, 1, 15, 12, 15); - - public BlockDemonCrucible() - { - super(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).harvestTool(ToolType.PICKAXE).harvestLevel(1)); - } - - @Override - public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) - { - return BODY; - } - - @Override - public boolean hasTileEntity(BlockState state) - { - return true; - } - - @Override - public TileEntity createTileEntity(BlockState state, IBlockReader world) - { - return new TileDemonCrucible(); - } - - @Override - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult blockRayTraceResult) - { - TileDemonCrucible crucible = (TileDemonCrucible) world.getTileEntity(pos); - - if (crucible == null || player.isSneaking()) - return ActionResultType.FAIL; - - ItemStack playerItem = player.getHeldItem(hand); - - if (!playerItem.isEmpty()) - { - if (!(playerItem.getItem() instanceof IDiscreteDemonWill) - && !(playerItem.getItem() instanceof IDemonWillGem)) - { - return ActionResultType.SUCCESS; - } - } - - Utils.insertItemToTile(crucible, player); - - world.notifyBlockUpdate(pos, state, state, 3); - return ActionResultType.SUCCESS; - } - - @Override - public void onPlayerDestroy(IWorld world, BlockPos blockPos, BlockState blockState) - { - TileDemonCrucible altar = (TileDemonCrucible) world.getTileEntity(blockPos); - if (altar != null) - altar.dropItems(); - - super.onPlayerDestroy(world, blockPos, blockState); - } - - @Override - public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) - { - if (!state.isIn(newState.getBlock())) - { - TileEntity tileentity = worldIn.getTileEntity(pos); - if (tileentity instanceof TileDemonCrucible) - { - ((TileDemonCrucible) tileentity).dropItems(); - worldIn.updateComparatorOutputLevel(pos, this); - } - - super.onReplaced(state, worldIn, pos, newState, isMoving); - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockDemonCrystal.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockDemonCrystal.java deleted file mode 100644 index 291b6e69..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/block/BlockDemonCrystal.java +++ /dev/null @@ -1,258 +0,0 @@ -package wayoftime.bloodmagic.common.block; - -import java.util.EnumMap; - -import javax.annotation.Nullable; - -import net.minecraft.block.AbstractBlock; -import net.minecraft.block.Block; -import net.minecraft.block.BlockRenderType; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.BlockItemUseContext; -import net.minecraft.item.ItemStack; -import net.minecraft.state.EnumProperty; -import net.minecraft.state.IntegerProperty; -import net.minecraft.state.StateContainer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.shapes.ISelectionContext; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorld; -import net.minecraft.world.IWorldReader; -import net.minecraft.world.World; -import net.minecraftforge.common.ToolType; -import wayoftime.bloodmagic.common.item.BloodMagicItems; -import wayoftime.bloodmagic.common.item.ItemDemonCrystal; -import wayoftime.bloodmagic.tile.TileDemonCrystal; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; -import wayoftime.bloodmagic.will.PlayerDemonWillHandler; - -public class BlockDemonCrystal extends Block -{ - public static final IntegerProperty AGE = IntegerProperty.create("age", 0, 6); -// public static final EnumProperty TYPE = EnumProperty.create("type", EnumDemonWillType.class); - public static final EnumProperty ATTACHED = EnumProperty.create("attached", Direction.class); - private static final EnumMap bounds = new EnumMap<>(Direction.class); - - public final EnumDemonWillType type; - - // Bounding / Collision boxes - private static final VoxelShape[] UP = - { Block.makeCuboidShape(6, 0, 5, 10, 13, 9), Block.makeCuboidShape(7, 0, 0, 13, 6, 5), - Block.makeCuboidShape(9, 0, 9, 13, 5, 14), Block.makeCuboidShape(2, 0, 1, 7, 6, 7), - Block.makeCuboidShape(5, 0, 9, 9, 7, 15), Block.makeCuboidShape(0, 0, 7, 6, 6, 10), - Block.makeCuboidShape(10, 0, 6, 15, 6, 9) }; - private static final VoxelShape[] DOWN = - { Block.makeCuboidShape(6, 3, 7, 10, 16, 11), Block.makeCuboidShape(7, 10, 11, 13, 16, 16), - Block.makeCuboidShape(9, 11, 2, 13, 16, 7), Block.makeCuboidShape(2, 9, 11, 7, 16, 15), - Block.makeCuboidShape(5, 9, 1, 9, 16, 7), Block.makeCuboidShape(0, 10, 6, 6, 16, 9), - Block.makeCuboidShape(10, 11, 7, 15, 16, 10) }; - private static final VoxelShape[] NORTH = - { Block.makeCuboidShape(6, 5, 3, 10, 9, 16), Block.makeCuboidShape(9, 0, 6, 13, 5, 16), - Block.makeCuboidShape(8, 9, 11, 13, 14, 16), Block.makeCuboidShape(2, 1, 9, 7, 7, 16), - Block.makeCuboidShape(5, 9, 9, 9, 15, 16), Block.makeCuboidShape(0, 7, 10, 6, 10, 16), - Block.makeCuboidShape(10, 7, 10, 15, 9, 15), }; - private static final VoxelShape[] SOUTH = - { Block.makeCuboidShape(6, 7, 0, 10, 11, 13), Block.makeCuboidShape(7, 11, 0, 13, 16, 6), - Block.makeCuboidShape(8, 2, 9, 13, 7, 14), Block.makeCuboidShape(2, 9, 1, 7, 14, 7), - Block.makeCuboidShape(5, 1, 9, 9, 7, 9), Block.makeCuboidShape(0, 6, 1, 6, 9, 7), - Block.makeCuboidShape(10, 8, 1, 15, 10, 6) }; - private static final VoxelShape[] EAST = - { Block.makeCuboidShape(0, 6, 5, 13, 10, 9), Block.makeCuboidShape(0, 3, 0, 6, 9, 5), - Block.makeCuboidShape(0, 3, 9, 5, 8, 14), Block.makeCuboidShape(1, 9, 1, 7, 13, 7), - Block.makeCuboidShape(1, 0, 9, 7, 11, 15), Block.makeCuboidShape(0, 10, 7, 6, 16, 10), - Block.makeCuboidShape(0, 1, 6, 5, 6, 9) }; - private static final VoxelShape[] WEST = - { Block.makeCuboidShape(3, 6, 5, 16, 10, 9), Block.makeCuboidShape(9, 7, 0, 16, 12, 5), - Block.makeCuboidShape(11, 4, 9, 16, 13, 14), Block.makeCuboidShape(9, 3, 1, 16, 8, 7), - Block.makeCuboidShape(9, 6, 9, 16, 8, 15), Block.makeCuboidShape(10, 1, 7, 16, 6, 10), - Block.makeCuboidShape(10, 6, 6, 15, 15, 9) }; - - public BlockDemonCrystal(EnumDemonWillType type) - { - super(AbstractBlock.Properties.create(Material.IRON).hardnessAndResistance(2.0F, 5.0F).harvestTool(ToolType.PICKAXE).harvestLevel(2)); - this.type = type; - - this.setDefaultState(this.stateContainer.getBaseState().with(ATTACHED, Direction.UP).with(AGE, Integer.valueOf(0))); -// this.setDefaultState(this.blockState.getBaseState().withProperty(TYPE, EnumDemonWillType.DEFAULT).withProperty(ATTACHED, Direction.UP)); - -// setTranslationKey(BloodMagic.MODID + ".demonCrystal."); -// setCreativeTab(BloodMagic.TAB_BM); -// setHardness(2.0F); -// setResistance(5.0F); -// setHarvestLevel("pickaxe", 2); - } - - public static ItemStack getItemStackDropped(EnumDemonWillType type, int crystalNumber) - { - ItemStack stack = ItemStack.EMPTY; - switch (type) - { - case CORROSIVE: - stack = new ItemStack(BloodMagicItems.CORROSIVE_CRYSTAL.get()); - break; - case DEFAULT: - stack = new ItemStack(BloodMagicItems.RAW_CRYSTAL.get()); - break; - case DESTRUCTIVE: - stack = new ItemStack(BloodMagicItems.DESTRUCTIVE_CRYSTAL.get()); - break; - case STEADFAST: - stack = new ItemStack(BloodMagicItems.STEADFAST_CRYSTAL.get()); - break; - case VENGEFUL: - stack = new ItemStack(BloodMagicItems.VENGEFUL_CRYSTAL.get()); - break; - } - - stack.setCount(crystalNumber); - return stack; - } - - @Override - public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) - { - switch (state.get(ATTACHED)) - { - case DOWN: - return DOWN[0]; - case NORTH: - return NORTH[0]; - case SOUTH: - return SOUTH[0]; - case EAST: - return EAST[0]; - case WEST: - return WEST[0]; - case UP: - default: - return UP[0]; - } - } - - @Override - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult blockRayTraceResult) - { - if (!world.isRemote) - { - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileDemonCrystal) - { - TileDemonCrystal crystal = (TileDemonCrystal) tile; - boolean isCreative = player.isCreative(); - boolean holdsCrystal = player.getHeldItem(hand).getItem() instanceof ItemDemonCrystal; - - if (PlayerDemonWillHandler.getTotalDemonWill(EnumDemonWillType.DEFAULT, player) > 1024 - && !(holdsCrystal && isCreative)) - { - crystal.dropSingleCrystal(); - - } - if (!crystal.getWorld().isRemote && isCreative && holdsCrystal) - { - if (crystal.getCrystalCount() < 7) - { - crystal.internalCounter = 0; - if (crystal.progressToNextCrystal > 0) - crystal.progressToNextCrystal--; - crystal.setCrystalCount(crystal.getCrystalCount() + 1); - crystal.markDirty(); - crystal.notifyUpdate(); - } - } - } - } - - return ActionResultType.SUCCESS; - } - - public boolean isValidPosition(BlockState state, IWorldReader worldIn, BlockPos pos) - { - Direction direction = state.get(ATTACHED); - BlockPos blockpos = pos.offset(direction.getOpposite()); - BlockState blockstate = worldIn.getBlockState(blockpos); - return blockstate.isSolidSide(worldIn, blockpos, direction); - } - - @Nullable - public BlockState getStateForPlacement(BlockItemUseContext context) - { - BlockState blockstate = this.getDefaultState(); - IWorldReader iworldreader = context.getWorld(); - BlockPos blockpos = context.getPos(); - Direction[] adirection = context.getNearestLookingDirections(); - - for (Direction direction : adirection) - { -// if (direction.getAxis().isHorizontal()) - { - Direction direction1 = direction.getOpposite(); - blockstate = blockstate.with(ATTACHED, direction1); - if (blockstate.isValidPosition(iworldreader, blockpos)) - { - return blockstate; - } - } - } - - return null; - } - - public BlockState updatePostPlacement(BlockState stateIn, Direction facing, BlockState facingState, IWorld worldIn, BlockPos currentPos, BlockPos facingPos) - { - return facing.getOpposite() == stateIn.get(ATTACHED) && !stateIn.isValidPosition(worldIn, currentPos) - ? Blocks.AIR.getDefaultState() - : stateIn; - } - - @Override - public BlockRenderType getRenderType(BlockState state) - { - return BlockRenderType.MODEL; - } - - @Override - protected void fillStateContainer(StateContainer.Builder builder) - { - builder.add(ATTACHED, AGE); - } - -// @Override -// public void onPlayerDestroy(IWorld world, BlockPos blockPos, BlockState blockState) -// { -// -// super.onPlayerDestroy(world, blockPos, blockState); -// } -// -// @Override -// public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) -// { -// TorchBlock d; -// if (!state.isIn(newState.getBlock())) -// { -// -// super.onReplaced(state, worldIn, pos, newState, isMoving); -// } -// } - - @Override - public boolean hasTileEntity(BlockState state) - { - return true; - } - - @Nullable - @Override - public TileEntity createTileEntity(BlockState state, IBlockReader world) - { - return new TileDemonCrystal(type); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockDemonCrystallizer.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockDemonCrystallizer.java deleted file mode 100644 index a7178f08..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/block/BlockDemonCrystallizer.java +++ /dev/null @@ -1,47 +0,0 @@ -package wayoftime.bloodmagic.common.block; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockRenderType; -import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.shapes.ISelectionContext; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.world.IBlockReader; -import net.minecraftforge.common.ToolType; -import wayoftime.bloodmagic.tile.TileDemonCrystallizer; - -public class BlockDemonCrystallizer extends Block -{ - protected static final VoxelShape BODY = Block.makeCuboidShape(2, 2, 2, 14, 16, 14); - - public BlockDemonCrystallizer() - { - super(Properties.create(Material.IRON).hardnessAndResistance(2.0F, 5.0F).harvestTool(ToolType.PICKAXE).harvestLevel(1)); - } - - @Override - public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) - { - return BODY; - } - - @Override - public boolean hasTileEntity(BlockState state) - { - return true; - } - - @Override - public TileEntity createTileEntity(BlockState state, IBlockReader world) - { - return new TileDemonCrystallizer(); - } - - @Override - public BlockRenderType getRenderType(BlockState state) - { - return BlockRenderType.MODEL; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockFungalCharge.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockFungalCharge.java deleted file mode 100644 index 9552dccf..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/block/BlockFungalCharge.java +++ /dev/null @@ -1,20 +0,0 @@ -package wayoftime.bloodmagic.common.block; - -import net.minecraft.block.BlockState; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.IBlockReader; -import wayoftime.bloodmagic.tile.TileFungalCharge; - -public class BlockFungalCharge extends BlockShapedExplosive -{ - public BlockFungalCharge(int explosionSize, Properties properties) - { - super(explosionSize, properties); - } - - @Override - public TileEntity createTileEntity(BlockState state, IBlockReader world) - { - return new TileFungalCharge(); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockGrowingDoubt.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockGrowingDoubt.java deleted file mode 100644 index a56760c5..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/block/BlockGrowingDoubt.java +++ /dev/null @@ -1,45 +0,0 @@ -package wayoftime.bloodmagic.common.block; - -import net.minecraft.block.AbstractBlock; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.CropsBlock; -import net.minecraft.item.Items; -import net.minecraft.util.IItemProvider; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.shapes.ISelectionContext; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.world.IBlockReader; - -public class BlockGrowingDoubt extends CropsBlock -{ - private static final VoxelShape[] SHAPES = new VoxelShape[] { - Block.makeCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 4.0D, 16.0D), - Block.makeCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 6.0D, 16.0D), - Block.makeCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 7.0D, 16.0D), - Block.makeCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 9.0D, 16.0D), - Block.makeCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 10.0D, 16.0D), - Block.makeCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 11.0D, 16.0D), - Block.makeCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 14.0D, 16.0D), - Block.makeCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 16.0D, 16.0D) }; - - public BlockGrowingDoubt(AbstractBlock.Properties properties) - { - super(properties); - } - - protected boolean isValidGround(BlockState state, IBlockReader worldIn, BlockPos pos) - { - return state.isIn(BloodMagicBlocks.NETHER_SOIL.get()); - } - - protected IItemProvider getSeedsItem() - { - return Items.POTATO; - } - - public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) - { - return SHAPES[state.get(this.getAgeProperty())]; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockIncenseAltar.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockIncenseAltar.java deleted file mode 100644 index 2d64b98c..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/block/BlockIncenseAltar.java +++ /dev/null @@ -1,77 +0,0 @@ -package wayoftime.bloodmagic.common.block; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockRenderType; -import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.shapes.ISelectionContext; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorld; -import net.minecraft.world.World; -import net.minecraftforge.common.ToolType; -import wayoftime.bloodmagic.tile.TileIncenseAltar; -import wayoftime.bloodmagic.tile.TileSoulForge; - -public class BlockIncenseAltar extends Block -{ - protected static final VoxelShape BODY = Block.makeCuboidShape(5, 0, 5, 12, 16, 12); - - public BlockIncenseAltar() - { - super(Properties.create(Material.IRON).hardnessAndResistance(2.0F, 5.0F).harvestTool(ToolType.PICKAXE).harvestLevel(0)); - } - - @Override - public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) - { - return BODY; - } - - @Override - public void onPlayerDestroy(IWorld world, BlockPos blockPos, BlockState blockState) - { - TileSoulForge forge = (TileSoulForge) world.getTileEntity(blockPos); - if (forge != null) - forge.dropItems(); - - super.onPlayerDestroy(world, blockPos, blockState); - } - - @Override - public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) - { - if (!state.isIn(newState.getBlock())) - { - TileEntity tileentity = worldIn.getTileEntity(pos); - if (tileentity instanceof TileSoulForge) - { - ((TileSoulForge) tileentity).dropItems(); - worldIn.updateComparatorOutputLevel(pos, this); - } - - super.onReplaced(state, worldIn, pos, newState, isMoving); - } - } - - @Override - public boolean hasTileEntity(BlockState state) - { - return true; - } - - @Override - public TileEntity createTileEntity(BlockState state, IBlockReader world) - { - return new TileIncenseAltar(); - } - - @Override - public BlockRenderType getRenderType(BlockState state) - { - return BlockRenderType.MODEL; - } - -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockMasterRitualStone.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockMasterRitualStone.java deleted file mode 100644 index 360118bb..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/block/BlockMasterRitualStone.java +++ /dev/null @@ -1,130 +0,0 @@ -package wayoftime.bloodmagic.common.block; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.Explosion; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorld; -import net.minecraft.world.World; -import net.minecraftforge.common.ToolType; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.common.item.ItemActivationCrystal; -import wayoftime.bloodmagic.common.item.IBindable; -import wayoftime.bloodmagic.ritual.Ritual; -import wayoftime.bloodmagic.tile.TileMasterRitualStone; -import wayoftime.bloodmagic.util.helper.RitualHelper; - -public class BlockMasterRitualStone extends Block -{ - public final boolean isInverted; - - public BlockMasterRitualStone(boolean isInverted) - { - super(Properties.create(Material.ROCK).sound(SoundType.STONE).hardnessAndResistance(2.0F, 5.0F).harvestTool(ToolType.PICKAXE).harvestLevel(2)); - this.isInverted = isInverted; - } - - @Override - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult blockRayTraceResult) - { - ItemStack heldItem = player.getHeldItem(hand); - TileEntity tile = world.getTileEntity(pos); - - if (tile instanceof TileMasterRitualStone) - { - if (heldItem.getItem() instanceof ItemActivationCrystal) - { - if (((IBindable) heldItem.getItem()).getBinding(heldItem) == null) - return ActionResultType.FAIL; - - String key = RitualHelper.getValidRitual(world, pos); - if (!key.isEmpty()) - { - Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(key); - if (ritual != null) - { - Direction direction = RitualHelper.getDirectionOfRitual(world, pos, ritual); - // TODO: Give a message stating that this ritual is not a valid ritual. - if (direction != null && RitualHelper.checkValidRitual(world, pos, ritual, direction)) - { - if (((TileMasterRitualStone) tile).activateRitual(heldItem, player, BloodMagic.RITUAL_MANAGER.getRitual(key))) - { - ((TileMasterRitualStone) tile).setDirection(direction); - if (isInverted) - ((TileMasterRitualStone) tile).setInverted(true); - } - } else - { - player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.notvalid"), true); - } - } else - { - player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.notvalid"), true); - } - } else - { - player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.notvalid"), true); - } - } - } - - return ActionResultType.FAIL; - } - - @Override - public void onPlayerDestroy(IWorld world, BlockPos blockPos, BlockState blockState) - { - TileMasterRitualStone tile = (TileMasterRitualStone) world.getTileEntity(blockPos); - if (tile != null) - ((TileMasterRitualStone) tile).stopRitual(Ritual.BreakType.BREAK_MRS); - - super.onPlayerDestroy(world, blockPos, blockState); - } - - @Override - public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) - { - if (!state.isIn(newState.getBlock())) - { - TileEntity tile = worldIn.getTileEntity(pos); - if (tile instanceof TileMasterRitualStone) - { - ((TileMasterRitualStone) tile).stopRitual(Ritual.BreakType.BREAK_MRS); - } - - super.onReplaced(state, worldIn, pos, newState, isMoving); - } - } - - @Override - public void onExplosionDestroy(World world, BlockPos pos, Explosion explosion) - { - TileEntity tile = world.getTileEntity(pos); - - if (tile instanceof TileMasterRitualStone) - ((TileMasterRitualStone) tile).stopRitual(Ritual.BreakType.EXPLOSION); - } - - @Override - public boolean hasTileEntity(BlockState state) - { - return true; - } - - @Override - public TileEntity createTileEntity(BlockState state, IBlockReader world) - { - return new TileMasterRitualStone(); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockMimic.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockMimic.java deleted file mode 100644 index 231685d0..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/block/BlockMimic.java +++ /dev/null @@ -1,133 +0,0 @@ -package wayoftime.bloodmagic.common.block; - -import javax.annotation.Nullable; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.shapes.ISelectionContext; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.shapes.VoxelShapes; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorld; -import net.minecraft.world.World; -import wayoftime.bloodmagic.tile.TileMimic; - -public class BlockMimic extends Block -{ - private static final VoxelShape SHAPE = VoxelShapes.create(0.01, 0, 0.01, 0.99, 1, 0.99); - - public BlockMimic(Properties prop) - { - super(prop); - } - -// @Override -// public void addInformation(ItemStack stack, @Nullable IBlockReader reader, List list, ITooltipFlag flags) -// { -// list.add(new TranslationTextComponent("message.fancyblock")); -// } - -// @Override -// public int getLightValue(BlockState state, IBlockReader world, BlockPos pos) -// { -// TileEntity te = world.getTileEntity(pos); -// if (te instanceof TileMimic) -// { -// BlockState mimic = ((TileMimic) te).getMimic(); -// if (mimic != null && !(mimic.getBlock() instanceof BlockMimic)) -// { -// return mimic.getLightValue(world, pos); -// } -// } -// return super.getLightValue(state, world, pos); -// } - - @Override - public VoxelShape getShape(BlockState state, IBlockReader reader, BlockPos pos, ISelectionContext context) - { - TileEntity te = reader.getTileEntity(pos); - if (te instanceof TileMimic) - { - BlockState mimic = ((TileMimic) te).getMimic(); - if (mimic != null && !(mimic.getBlock() instanceof BlockMimic)) - { - return mimic.getShape(reader, pos, context); - } - } - return SHAPE; - } - - @Override - public boolean hasTileEntity(BlockState state) - { - return true; - } - - @Nullable - @Override - public TileEntity createTileEntity(BlockState state, IBlockReader world) - { - return new TileMimic(); - } - - @Override - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult trace) - { - TileMimic mimic = (TileMimic) world.getTileEntity(pos); - - return (mimic != null && mimic.onBlockActivated(world, pos, state, player, hand, player.getHeldItem(hand), trace.getFace())) - ? ActionResultType.SUCCESS - : ActionResultType.FAIL; -// ItemStack item = player.getHeldItem(hand); -// if (!item.isEmpty() && item.getItem() instanceof BlockItem) -// { -// if (!world.isRemote) -// { -// TileEntity te = world.getTileEntity(pos); -// if (te instanceof TileMimic) -// { -// BlockState mimicState = ((BlockItem) item.getItem()).getBlock().getDefaultState(); -// ((TileMimic) te).setMimic(mimicState); -// } -// } -// return ActionResultType.SUCCESS; -// } -// return super.onBlockActivated(state, world, pos, player, hand, trace); - } - -// public boolean canMimicBlock(World world, BlockPos pos, BlockState state) -// { -// return state.getBlock() -// } - - @Override - public void onPlayerDestroy(IWorld world, BlockPos blockPos, BlockState blockState) - { - TileMimic altar = (TileMimic) world.getTileEntity(blockPos); - if (altar != null) - altar.dropItems(); - - super.onPlayerDestroy(world, blockPos, blockState); - } - - @Override - public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) - { - if (!state.isIn(newState.getBlock())) - { - TileEntity tileentity = worldIn.getTileEntity(pos); - if (tileentity instanceof TileMimic) - { - ((TileMimic) tileentity).dropItems(); - } - - super.onReplaced(state, worldIn, pos, newState, isMoving); - } - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockNetherrackSoil.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockNetherrackSoil.java deleted file mode 100644 index 57efc20b..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/block/BlockNetherrackSoil.java +++ /dev/null @@ -1,156 +0,0 @@ -package wayoftime.bloodmagic.common.block; - -import java.util.Random; - -import net.minecraft.block.AbstractBlock; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.FenceGateBlock; -import net.minecraft.block.MovingPistonBlock; -import net.minecraft.item.BlockItemUseContext; -import net.minecraft.pathfinding.PathType; -import net.minecraft.state.IntegerProperty; -import net.minecraft.state.StateContainer; -import net.minecraft.state.properties.BlockStateProperties; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.shapes.ISelectionContext; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorld; -import net.minecraft.world.IWorldReader; -import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; -import wayoftime.bloodmagic.common.tags.BloodMagicTags; - -public class BlockNetherrackSoil extends Block -{ - public static final IntegerProperty MOISTURE = BlockStateProperties.MOISTURE_0_7; - protected static final VoxelShape SHAPE = Block.makeCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 15.0D, 16.0D); - - public BlockNetherrackSoil(AbstractBlock.Properties builder) - { - super(builder); - this.setDefaultState(this.stateContainer.getBaseState().with(MOISTURE, Integer.valueOf(0))); - } - - /** - * Update the provided state given the provided neighbor facing and neighbor - * state, returning a new state. For example, fences make their connections to - * the passed in state if possible, and wet concrete powder immediately returns - * its solidified counterpart. Note that this method should ideally consider - * only the specific face passed in. - */ - public BlockState updatePostPlacement(BlockState stateIn, Direction facing, BlockState facingState, IWorld worldIn, BlockPos currentPos, BlockPos facingPos) - { - if (facing == Direction.UP && !stateIn.isValidPosition(worldIn, currentPos)) - { - worldIn.getPendingBlockTicks().scheduleTick(currentPos, this, 1); - } - - return super.updatePostPlacement(stateIn, facing, facingState, worldIn, currentPos, facingPos); - } - - public boolean isValidPosition(BlockState state, IWorldReader worldIn, BlockPos pos) - { - BlockState blockstate = worldIn.getBlockState(pos.up()); - return !blockstate.getMaterial().isSolid() || blockstate.getBlock() instanceof FenceGateBlock || blockstate.getBlock() instanceof MovingPistonBlock; - } - - public BlockState getStateForPlacement(BlockItemUseContext context) - { - return !this.getDefaultState().isValidPosition(context.getWorld(), context.getPos()) - ? Blocks.NETHERRACK.getDefaultState() - : super.getStateForPlacement(context); - } - - public boolean isTransparent(BlockState state) - { - return true; - } - - public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) - { - return SHAPE; - } - - public void tick(BlockState state, ServerWorld worldIn, BlockPos pos, Random rand) - { - if (!state.isValidPosition(worldIn, pos)) - { - turnToDirt(state, worldIn, pos); - } - - } - - /** - * Performs a random tick on a block. - */ - public void randomTick(BlockState state, ServerWorld worldIn, BlockPos pos, Random random) - { - int i = state.get(MOISTURE); - if (!hasLifeEssence(worldIn, pos) && !worldIn.isRainingAt(pos.up())) - { - if (i > 0) - { - worldIn.setBlockState(pos, state.with(MOISTURE, Integer.valueOf(i - 1)), 2); - } else if (!hasCrops(worldIn, pos)) - { - turnToDirt(state, worldIn, pos); - } - } else if (i < 7) - { - worldIn.setBlockState(pos, state.with(MOISTURE, Integer.valueOf(7)), 2); - } - - } - -// /** -// * Block's chance to react to a living entity falling on it. -// */ -// public void onFallenUpon(World worldIn, BlockPos pos, Entity entityIn, float fallDistance) -// { -// if (!worldIn.isRemote && net.minecraftforge.common.ForgeHooks.onFarmlandTrample(worldIn, pos, Blocks.NETHERRACK.getDefaultState(), fallDistance, entityIn)) -// { // Forge: Move logic to Entity#canTrample -// turnToDirt(worldIn.getBlockState(pos), worldIn, pos); -// } -// -// super.onFallenUpon(worldIn, pos, entityIn, fallDistance); -// } - - public static void turnToDirt(BlockState state, World worldIn, BlockPos pos) - { - worldIn.setBlockState(pos, nudgeEntitiesWithNewState(state, Blocks.NETHERRACK.getDefaultState(), worldIn, pos)); - } - - private boolean hasCrops(IBlockReader worldIn, BlockPos pos) - { - BlockState plant = worldIn.getBlockState(pos.up()); - BlockState state = worldIn.getBlockState(pos); - return plant.getBlock() instanceof net.minecraftforge.common.IPlantable && state.canSustainPlant(worldIn, pos, Direction.UP, (net.minecraftforge.common.IPlantable) plant.getBlock()); - } - - private static boolean hasLifeEssence(IWorldReader worldIn, BlockPos pos) - { - for (BlockPos blockpos : BlockPos.getAllInBoxMutable(pos.add(-4, 0, -4), pos.add(4, 1, 4))) - { - if (worldIn.getFluidState(blockpos).isTagged(BloodMagicTags.LIFE_ESSENCE)) - { - return true; - } - } - - return false; - } - - protected void fillStateContainer(StateContainer.Builder builder) - { - builder.add(MOISTURE); - } - - public boolean allowsMovement(BlockState state, IBlockReader worldIn, BlockPos pos, PathType type) - { - return false; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockPath.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockPath.java deleted file mode 100644 index d0888152..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/block/BlockPath.java +++ /dev/null @@ -1,24 +0,0 @@ -package wayoftime.bloodmagic.common.block; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import wayoftime.bloodmagic.api.compat.IIncensePath; - -public class BlockPath extends Block implements IIncensePath -{ - protected final int pathLevel; - - public BlockPath(int pathLevel, Properties properties) - { - super(properties); - this.pathLevel = pathLevel; - } - - @Override - public int getLevelOfPath(World world, BlockPos pos, BlockState state) - { - return pathLevel; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockRitualStone.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockRitualStone.java deleted file mode 100644 index 8a806c55..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/block/BlockRitualStone.java +++ /dev/null @@ -1,89 +0,0 @@ -package wayoftime.bloodmagic.common.block; - -import java.util.List; - -import javax.annotation.Nullable; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.World; -import net.minecraftforge.common.ToolType; -import wayoftime.bloodmagic.ritual.EnumRuneType; -import wayoftime.bloodmagic.ritual.IRitualStone; - -public class BlockRitualStone extends Block implements IRitualStone -{ - private final EnumRuneType type; - - public BlockRitualStone(EnumRuneType type) - { - super(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool()); - this.type = type; - } - - @Override - public void addInformation(ItemStack stack, @Nullable IBlockReader world, List tooltip, ITooltipFlag flag) - { - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.decoration.safe")); - super.addInformation(stack, world, tooltip, flag); - } - -// @Override -// public int damageDropped(BlockState state) -// { -// return 0; -// } -// -// @Override -// public boolean canSilkHarvest(World world, BlockPos pos, BlockState state, PlayerEntity player) -// { -// return false; -// } - - @Override - public boolean isRuneType(World world, BlockPos pos, EnumRuneType runeType) - { - return type.equals(runeType); - } - - @Override - public void setRuneType(World world, BlockPos pos, EnumRuneType runeType) - { - Block runeBlock = this; - switch (runeType) - { - case AIR: - runeBlock = BloodMagicBlocks.AIR_RITUAL_STONE.get(); - break; - case BLANK: - runeBlock = BloodMagicBlocks.BLANK_RITUAL_STONE.get(); - break; - case DAWN: - runeBlock = BloodMagicBlocks.DAWN_RITUAL_STONE.get(); - break; - case DUSK: - runeBlock = BloodMagicBlocks.DUSK_RITUAL_STONE.get(); - break; - case EARTH: - runeBlock = BloodMagicBlocks.EARTH_RITUAL_STONE.get(); - break; - case FIRE: - runeBlock = BloodMagicBlocks.FIRE_RITUAL_STONE.get(); - break; - case WATER: - runeBlock = BloodMagicBlocks.WATER_RITUAL_STONE.get(); - break; - } - - BlockState newState = runeBlock.getDefaultState(); - world.setBlockState(pos, newState); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockShapedExplosive.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockShapedExplosive.java deleted file mode 100644 index 84019156..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/block/BlockShapedExplosive.java +++ /dev/null @@ -1,135 +0,0 @@ -package wayoftime.bloodmagic.common.block; - -import javax.annotation.Nullable; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.BlockItemUseContext; -import net.minecraft.state.EnumProperty; -import net.minecraft.state.StateContainer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.shapes.ISelectionContext; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorld; -import net.minecraft.world.IWorldReader; -import net.minecraft.world.World; -import wayoftime.bloodmagic.tile.TileExplosiveCharge; -import wayoftime.bloodmagic.tile.TileShapedExplosive; - -public class BlockShapedExplosive extends Block -{ - private static final VoxelShape UP = Block.makeCuboidShape(2, 0, 2, 14, 7, 14); - private static final VoxelShape DOWN = Block.makeCuboidShape(2, 9, 2, 14, 16, 14); - private static final VoxelShape NORTH = Block.makeCuboidShape(2, 2, 7, 14, 14, 16); - private static final VoxelShape SOUTH = Block.makeCuboidShape(2, 2, 0, 14, 14, 7); - private static final VoxelShape EAST = Block.makeCuboidShape(0, 2, 2, 7, 14, 14); - private static final VoxelShape WEST = Block.makeCuboidShape(16, 2, 2, 9, 14, 14); - - public static final EnumProperty ATTACHED = EnumProperty.create("attached", Direction.class); - protected final int explosionSize; - - public BlockShapedExplosive(int explosionSize, Properties properties) - { - super(properties); - this.explosionSize = explosionSize; - - this.setDefaultState(this.stateContainer.getBaseState().with(ATTACHED, Direction.UP)); - } - - public BlockState updatePostPlacement(BlockState stateIn, Direction facing, BlockState facingState, IWorld worldIn, BlockPos currentPos, BlockPos facingPos) - { - return facing.getOpposite() == stateIn.get(ATTACHED) && !stateIn.isValidPosition(worldIn, currentPos) - ? Blocks.AIR.getDefaultState() - : stateIn; - } - - @Nullable - public BlockState getStateForPlacement(BlockItemUseContext context) - { - BlockState blockstate = this.getDefaultState(); - IWorldReader iworldreader = context.getWorld(); - BlockPos blockpos = context.getPos(); - Direction[] adirection = context.getNearestLookingDirections(); - - for (Direction direction : adirection) - { - Direction direction1 = direction.getOpposite(); - blockstate = blockstate.with(ATTACHED, direction1); - if (blockstate.isValidPosition(iworldreader, blockpos)) - { - return blockstate; - } - } - - return null; - } - - @Override - protected void fillStateContainer(StateContainer.Builder builder) - { - builder.add(ATTACHED); - } - - @Override - public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) - { - switch (state.get(ATTACHED)) - { - case DOWN: - return DOWN; - case NORTH: - return NORTH; - case SOUTH: - return SOUTH; - case EAST: - return EAST; - case WEST: - return WEST; - case UP: - default: - return UP; - } - } - - @Override - public boolean hasTileEntity(BlockState state) - { - return true; - } - - @Override - public TileEntity createTileEntity(BlockState state, IBlockReader world) - { - return new TileShapedExplosive(); - } - - @Override - public void onBlockHarvested(World world, BlockPos blockPos, BlockState blockState, PlayerEntity player) - { - TileExplosiveCharge tile = (TileExplosiveCharge) world.getTileEntity(blockPos); - if (tile != null && !world.isRemote) - tile.dropSelf(); - - super.onBlockHarvested(world, blockPos, blockState, player); - } - -// @Override -// public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) -// { -// if (!state.isIn(newState.getBlock())) -// { -// TileEntity tileentity = worldIn.getTileEntity(pos); -// if (tileentity instanceof TileShapedExplosive) -// { -// ((TileShapedExplosive) tileentity).dropSelf(); -// } -// -// super.onReplaced(state, worldIn, pos, newState, isMoving); -// } -// } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockSoulForge.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockSoulForge.java deleted file mode 100644 index dba36a9a..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/block/BlockSoulForge.java +++ /dev/null @@ -1,98 +0,0 @@ -package wayoftime.bloodmagic.common.block; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockRenderType; -import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.inventory.container.INamedContainerProvider; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.shapes.ISelectionContext; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorld; -import net.minecraft.world.World; -import net.minecraftforge.common.ToolType; -import net.minecraftforge.fml.network.NetworkHooks; -import wayoftime.bloodmagic.tile.TileSoulForge; - -public class BlockSoulForge extends Block// implements IBMBlock -{ - protected static final VoxelShape BODY = Block.makeCuboidShape(1, 0, 1, 15, 12, 15); - - public BlockSoulForge() - { - super(Properties.create(Material.IRON).hardnessAndResistance(2.0F, 5.0F).harvestTool(ToolType.PICKAXE).harvestLevel(1)); - } - - @Override - public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) - { - return BODY; - } - - @Override - public boolean hasTileEntity(BlockState state) - { - return true; - } - - @Override - public TileEntity createTileEntity(BlockState state, IBlockReader world) - { - return new TileSoulForge(); - } - - @Override - public BlockRenderType getRenderType(BlockState state) - { - return BlockRenderType.MODEL; - } - - @Override - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult blockRayTraceResult) - { - if (world.isRemote) - return ActionResultType.SUCCESS; - - TileEntity tile = world.getTileEntity(pos); - if (!(tile instanceof TileSoulForge)) - return ActionResultType.FAIL; - - NetworkHooks.openGui((ServerPlayerEntity) player, (INamedContainerProvider) tile, pos); -// player.openGui(BloodMagic.instance, Constants.Gui.SOUL_FORGE_GUI, world, pos.getX(), pos.getY(), pos.getZ()); - - return ActionResultType.SUCCESS; - } - - @Override - public void onPlayerDestroy(IWorld world, BlockPos blockPos, BlockState blockState) - { - TileSoulForge forge = (TileSoulForge) world.getTileEntity(blockPos); - if (forge != null) - forge.dropItems(); - - super.onPlayerDestroy(world, blockPos, blockState); - } - - @Override - public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) - { - if (!state.isIn(newState.getBlock())) - { - TileEntity tileentity = worldIn.getTileEntity(pos); - if (tileentity instanceof TileSoulForge) - { - ((TileSoulForge) tileentity).dropItems(); - worldIn.updateComparatorOutputLevel(pos, this); - } - - super.onReplaced(state, worldIn, pos, newState, isMoving); - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockVeinMineCharge.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockVeinMineCharge.java deleted file mode 100644 index dc3e8f04..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/block/BlockVeinMineCharge.java +++ /dev/null @@ -1,20 +0,0 @@ -package wayoftime.bloodmagic.common.block; - -import net.minecraft.block.BlockState; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.IBlockReader; -import wayoftime.bloodmagic.tile.TileVeinMineCharge; - -public class BlockVeinMineCharge extends BlockShapedExplosive -{ - public BlockVeinMineCharge(int explosionSize, Properties properties) - { - super(explosionSize, properties); - } - - @Override - public TileEntity createTileEntity(BlockState state, IBlockReader world) - { - return new TileVeinMineCharge(); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BloodMagicBlocks.java b/src/main/java/wayoftime/bloodmagic/common/block/BloodMagicBlocks.java deleted file mode 100644 index 0b74f6c0..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/block/BloodMagicBlocks.java +++ /dev/null @@ -1,206 +0,0 @@ -package wayoftime.bloodmagic.common.block; - -import net.minecraft.block.AbstractBlock; -import net.minecraft.block.AbstractBlock.Properties; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.FenceGateBlock; -import net.minecraft.block.FlowingFluidBlock; -import net.minecraft.block.RotatedPillarBlock; -import net.minecraft.block.SoundType; -import net.minecraft.block.StairsBlock; -import net.minecraft.block.WallBlock; -import net.minecraft.block.material.Material; -import net.minecraft.fluid.FlowingFluid; -import net.minecraft.fluid.Fluid; -import net.minecraft.inventory.container.ContainerType; -import net.minecraft.item.BucketItem; -import net.minecraft.item.Item; -import net.minecraft.item.Items; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.SoundEvents; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; -import net.minecraftforge.common.ToolType; -import net.minecraftforge.common.extensions.IForgeContainerType; -import net.minecraftforge.fluids.FluidAttributes; -import net.minecraftforge.fluids.ForgeFlowingFluid; -import net.minecraftforge.fml.RegistryObject; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; -import wayoftime.bloodmagic.block.enums.BloodRuneType; -import wayoftime.bloodmagic.common.block.base.BlockPillarCap; -import wayoftime.bloodmagic.common.item.BloodMagicItems; -import wayoftime.bloodmagic.common.item.inventory.ContainerHolding; -import wayoftime.bloodmagic.ritual.EnumRuneType; -import wayoftime.bloodmagic.tile.container.ContainerAlchemicalReactionChamber; -import wayoftime.bloodmagic.tile.container.ContainerAlchemyTable; -import wayoftime.bloodmagic.tile.container.ContainerSoulForge; - -public class BloodMagicBlocks -{ - public static final ResourceLocation FLUID_STILL = new ResourceLocation("bloodmagic:block/lifeessencestill"); - public static final ResourceLocation FLUID_FLOWING = new ResourceLocation("bloodmagic:block/lifeessenceflowing"); - - public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, BloodMagic.MODID); - public static final DeferredRegister BASICBLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, BloodMagic.MODID); - public static final DeferredRegister DUNGEONBLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, BloodMagic.MODID); - public static final DeferredRegister ITEMS = BloodMagicItems.ITEMS; - public static final DeferredRegister FLUIDS = DeferredRegister.create(ForgeRegistries.FLUIDS, BloodMagic.MODID); - public static final DeferredRegister> CONTAINERS = DeferredRegister.create(ForgeRegistries.CONTAINERS, BloodMagic.MODID); - -// public static final RegistryObject BLOODSTONE = BASICBLOCKS.register("ruby_block", BloodstoneBlock::new); - public static final RegistryObject SOUL_FORGE = BLOCKS.register("soulforge", BlockSoulForge::new); - public static final RegistryObject INCENSE_ALTAR = BLOCKS.register("incensealtar", BlockIncenseAltar::new); - public static final RegistryObject ALCHEMY_ARRAY = BLOCKS.register("alchemyarray", BlockAlchemyArray::new); - public static final RegistryObject BLANK_RUNE = BASICBLOCKS.register("blankrune", () -> new BlockBloodRune(BloodRuneType.BLANK)); - public static final RegistryObject SPEED_RUNE = BASICBLOCKS.register("speedrune", () -> new BlockBloodRune(BloodRuneType.SPEED)); - public static final RegistryObject SACRIFICE_RUNE = BASICBLOCKS.register("sacrificerune", () -> new BlockBloodRune(BloodRuneType.SACRIFICE)); - public static final RegistryObject SELF_SACRIFICE_RUNE = BASICBLOCKS.register("selfsacrificerune", () -> new BlockBloodRune(BloodRuneType.SELF_SACRIFICE)); - public static final RegistryObject DISPLACEMENT_RUNE = BASICBLOCKS.register("dislocationrune", () -> new BlockBloodRune(BloodRuneType.DISPLACEMENT)); - public static final RegistryObject CAPACITY_RUNE = BASICBLOCKS.register("altarcapacityrune", () -> new BlockBloodRune(BloodRuneType.CAPACITY)); - public static final RegistryObject AUGMENTED_CAPACITY_RUNE = BASICBLOCKS.register("bettercapacityrune", () -> new BlockBloodRune(BloodRuneType.AUGMENTED_CAPACITY)); - public static final RegistryObject ORB_RUNE = BASICBLOCKS.register("orbcapacityrune", () -> new BlockBloodRune(BloodRuneType.ORB)); - public static final RegistryObject ACCELERATION_RUNE = BASICBLOCKS.register("accelerationrune", () -> new BlockBloodRune(BloodRuneType.ACCELERATION)); - public static final RegistryObject CHARGING_RUNE = BASICBLOCKS.register("chargingrune", () -> new BlockBloodRune(BloodRuneType.CHARGING)); - - public static final RegistryObject BLOOD_ALTAR = BLOCKS.register("altar", () -> new BlockAltar()); - public static final RegistryObject BLOOD_LIGHT = BLOCKS.register("bloodlight", () -> new BlockBloodLight()); - - public static final RegistryObject BLANK_RITUAL_STONE = BLOCKS.register("ritualstone", () -> new BlockRitualStone(EnumRuneType.BLANK)); - public static final RegistryObject AIR_RITUAL_STONE = BLOCKS.register("airritualstone", () -> new BlockRitualStone(EnumRuneType.AIR)); - public static final RegistryObject WATER_RITUAL_STONE = BLOCKS.register("waterritualstone", () -> new BlockRitualStone(EnumRuneType.WATER)); - public static final RegistryObject FIRE_RITUAL_STONE = BLOCKS.register("fireritualstone", () -> new BlockRitualStone(EnumRuneType.FIRE)); - public static final RegistryObject EARTH_RITUAL_STONE = BLOCKS.register("earthritualstone", () -> new BlockRitualStone(EnumRuneType.EARTH)); - public static final RegistryObject DUSK_RITUAL_STONE = BLOCKS.register("duskritualstone", () -> new BlockRitualStone(EnumRuneType.DUSK)); - public static final RegistryObject DAWN_RITUAL_STONE = BLOCKS.register("lightritualstone", () -> new BlockRitualStone(EnumRuneType.DAWN)); - - public static final RegistryObject BLOODSTONE = BASICBLOCKS.register("largebloodstonebrick", () -> new Block(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(1))); - public static final RegistryObject BLOODSTONE_BRICK = BASICBLOCKS.register("bloodstonebrick", () -> new Block(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(1))); - - public static final RegistryObject MASTER_RITUAL_STONE = BASICBLOCKS.register("masterritualstone", () -> new BlockMasterRitualStone(false)); - - public static final RegistryObject ALCHEMICAL_REACTION_CHAMBER = BLOCKS.register("alchemicalreactionchamber", () -> new BlockAlchemicalReactionChamber()); - public static final RegistryObject ALCHEMY_TABLE = BLOCKS.register("alchemytable", () -> new BlockAlchemyTable()); - - public static final RegistryObject DEMON_CRUCIBLE = BLOCKS.register("demoncrucible", () -> new BlockDemonCrucible()); - public static final RegistryObject DEMON_CRYSTALLIZER = BLOCKS.register("demoncrystallizer", () -> new BlockDemonCrystallizer()); - - public static final RegistryObject RAW_CRYSTAL_BLOCK = BLOCKS.register("rawdemoncrystal", () -> new BlockDemonCrystal(EnumDemonWillType.DEFAULT)); - public static final RegistryObject CORROSIVE_CRYSTAL_BLOCK = BLOCKS.register("corrosivedemoncrystal", () -> new BlockDemonCrystal(EnumDemonWillType.CORROSIVE)); - public static final RegistryObject DESTRUCTIVE_CRYSTAL_BLOCK = BLOCKS.register("destructivedemoncrystal", () -> new BlockDemonCrystal(EnumDemonWillType.DESTRUCTIVE)); - public static final RegistryObject VENGEFUL_CRYSTAL_BLOCK = BLOCKS.register("vengefuldemoncrystal", () -> new BlockDemonCrystal(EnumDemonWillType.VENGEFUL)); - public static final RegistryObject STEADFAST_CRYSTAL_BLOCK = BLOCKS.register("steadfastdemoncrystal", () -> new BlockDemonCrystal(EnumDemonWillType.STEADFAST)); - - public static final RegistryObject WOOD_PATH = BASICBLOCKS.register("woodbrickpath", () -> new BlockPath(2, AbstractBlock.Properties.create(Material.WOOD).hardnessAndResistance(2.0F, 5.0F).harvestTool(ToolType.AXE).harvestLevel(0))); - public static final RegistryObject WOOD_TILE_PATH = BASICBLOCKS.register("woodtilepath", () -> new BlockPath(2, AbstractBlock.Properties.create(Material.WOOD).hardnessAndResistance(2.0F, 5.0F).harvestTool(ToolType.AXE).harvestLevel(0))); - public static final RegistryObject STONE_PATH = BASICBLOCKS.register("stonebrickpath", () -> new BlockPath(4, AbstractBlock.Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).harvestTool(ToolType.PICKAXE).harvestLevel(0))); - public static final RegistryObject STONE_TILE_PATH = BASICBLOCKS.register("stonetilepath", () -> new BlockPath(4, AbstractBlock.Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).harvestTool(ToolType.PICKAXE).harvestLevel(0))); - public static final RegistryObject WORN_STONE_PATH = BASICBLOCKS.register("wornstonebrickpath", () -> new BlockPath(6, AbstractBlock.Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).harvestTool(ToolType.PICKAXE).harvestLevel(0))); - public static final RegistryObject WORN_STONE_TILE_PATH = BASICBLOCKS.register("wornstonetilepath", () -> new BlockPath(6, AbstractBlock.Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).harvestTool(ToolType.PICKAXE).harvestLevel(0))); - public static final RegistryObject OBSIDIAN_PATH = BASICBLOCKS.register("obsidianbrickpath", () -> new BlockPath(8, AbstractBlock.Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).harvestTool(ToolType.PICKAXE).harvestLevel(3))); - public static final RegistryObject OBSIDIAN_TILE_PATH = BASICBLOCKS.register("obsidiantilepath", () -> new BlockPath(8, AbstractBlock.Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).harvestTool(ToolType.PICKAXE).harvestLevel(3))); - - public static final RegistryObject MIMIC = BLOCKS.register("mimic", () -> new BlockMimic(Properties.create(Material.IRON).sound(SoundType.METAL).hardnessAndResistance(2.0f).setOpaque(BloodMagicBlocks::isntSolid).setSuffocates(BloodMagicBlocks::isntSolid).setBlocksVision(BloodMagicBlocks::isntSolid).notSolid())); - public static final RegistryObject ETHEREAL_MIMIC = BLOCKS.register("ethereal_mimic", () -> new BlockMimic(Properties.create(Material.IRON).sound(SoundType.METAL).hardnessAndResistance(2.0f).setOpaque(BloodMagicBlocks::isntSolid).setSuffocates(BloodMagicBlocks::isntSolid).setBlocksVision(BloodMagicBlocks::isntSolid).notSolid().doesNotBlockMovement())); - - private static ForgeFlowingFluid.Properties makeLifeEssenceProperties() - { - return new ForgeFlowingFluid.Properties(LIFE_ESSENCE_FLUID, LIFE_ESSENCE_FLUID_FLOWING, FluidAttributes.builder(FLUID_STILL, FLUID_FLOWING).overlay(new ResourceLocation("block/water_overlay")).viscosity(1).sound(SoundEvents.ITEM_BUCKET_FILL, SoundEvents.ITEM_BUCKET_EMPTY)).bucket(LIFE_ESSENCE_BUCKET).block(LIFE_ESSENCE_BLOCK); - } - - public static final ResourceLocation DOUBT_STILL_RESOURCE = new ResourceLocation("bloodmagic:block/liquid_doubt_still"); - public static final ResourceLocation DOUBT_FLOWING_RESOURCE = new ResourceLocation("bloodmagic:block/liquid_doubt_flowing"); - - private static ForgeFlowingFluid.Properties makeDoubtProperties() - { - return new ForgeFlowingFluid.Properties(DOUBT_FLUID, DOUBT_FLUID_FLOWING, FluidAttributes.builder(DOUBT_STILL_RESOURCE, DOUBT_FLOWING_RESOURCE).overlay(new ResourceLocation("block/water_overlay")).viscosity(1).sound(SoundEvents.ITEM_BUCKET_FILL, SoundEvents.ITEM_BUCKET_EMPTY)).bucket(DOUBT_BUCKET).block(DOUBT_BLOCK); - } - - public static RegistryObject LIFE_ESSENCE_FLUID = FLUIDS.register("life_essence_fluid", () -> new ForgeFlowingFluid.Source(makeLifeEssenceProperties())); - public static RegistryObject LIFE_ESSENCE_FLUID_FLOWING = FLUIDS.register("life_essence_fluid_flowing", () -> new ForgeFlowingFluid.Flowing(makeLifeEssenceProperties())); - public static RegistryObject DOUBT_FLUID = FLUIDS.register("doubt_fluid", () -> new ForgeFlowingFluid.Source(makeDoubtProperties())); - public static RegistryObject DOUBT_FLUID_FLOWING = FLUIDS.register("doubt_fluid_flowing", () -> new ForgeFlowingFluid.Flowing(makeDoubtProperties())); - - public static RegistryObject LIFE_ESSENCE_BLOCK = BLOCKS.register("life_essence_block", () -> new FlowingFluidBlock(LIFE_ESSENCE_FLUID, Block.Properties.create(net.minecraft.block.material.Material.WATER).doesNotBlockMovement().hardnessAndResistance(100.0F).noDrops())); - public static RegistryObject DOUBT_BLOCK = BLOCKS.register("doubt_block", () -> new FlowingFluidBlock(DOUBT_FLUID, Block.Properties.create(net.minecraft.block.material.Material.WATER).doesNotBlockMovement().hardnessAndResistance(100.0F).noDrops())); - public static RegistryObject LIFE_ESSENCE_BUCKET = ITEMS.register("life_essence_bucket", () -> new BucketItem(LIFE_ESSENCE_FLUID, new Item.Properties().containerItem(Items.BUCKET).maxStackSize(1).group(BloodMagic.TAB))); - public static RegistryObject DOUBT_BUCKET = ITEMS.register("doubt_bucket", () -> new BucketItem(DOUBT_FLUID, new Item.Properties().containerItem(Items.BUCKET).maxStackSize(1).group(BloodMagic.TAB))); - - public static final RegistryObject> SOUL_FORGE_CONTAINER = CONTAINERS.register("soul_forge_container", () -> IForgeContainerType.create(ContainerSoulForge::new)); - public static final RegistryObject> ARC_CONTAINER = CONTAINERS.register("arc_container", () -> IForgeContainerType.create(ContainerAlchemicalReactionChamber::new)); - public static final RegistryObject> ALCHEMY_TABLE_CONTAINER = CONTAINERS.register("alchemy_table_container", () -> IForgeContainerType.create(ContainerAlchemyTable::new)); - public static final RegistryObject> HOLDING_CONTAINER = CONTAINERS.register("holding_container", () -> IForgeContainerType.create(ContainerHolding::new)); - - // Dungeon Blocks - public static final RegistryObject DUNGEON_BRICK_1 = DUNGEONBLOCKS.register("dungeon_brick1", () -> new Block(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); - public static final RegistryObject DUNGEON_BRICK_2 = DUNGEONBLOCKS.register("dungeon_brick2", () -> new Block(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); - public static final RegistryObject DUNGEON_BRICK_3 = DUNGEONBLOCKS.register("dungeon_brick3", () -> new Block(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); - public static final RegistryObject DUNGEON_ORE = DUNGEONBLOCKS.register("dungeon_ore", () -> new Block(Properties.create(Material.ROCK).hardnessAndResistance(3.0F, 3.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); - - public static final RegistryObject DUNGEON_STONE = BLOCKS.register("dungeon_stone", () -> new Block(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); - public static final RegistryObject DUNGEON_EYE = DUNGEONBLOCKS.register("dungeon_eye", () -> new Block(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool().setLightLevel((state) -> { - return 15; - }))); - public static final RegistryObject DUNGEON_POLISHED_STONE = DUNGEONBLOCKS.register("dungeon_polished", () -> new Block(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); - public static final RegistryObject DUNGEON_TILE = DUNGEONBLOCKS.register("dungeon_tile", () -> new Block(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); - public static final RegistryObject DUNGEON_SMALL_BRICK = DUNGEONBLOCKS.register("dungeon_smallbrick", () -> new Block(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); - public static final RegistryObject DUNGEON_TILE_SPECIAL = DUNGEONBLOCKS.register("dungeon_tilespecial", () -> new Block(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); - - public static final RegistryObject DUNGEON_BRICK_ASSORTED = BLOCKS.register("dungeon_brick_assorted", () -> new Block(Properties.create(Material.ROCK).hardnessAndResistance(20.0F, 50.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(3).setRequiresTool())); - - public static final RegistryObject DUNGEON_BRICK_STAIRS = BLOCKS.register("dungeon_brick_stairs", () -> new StairsBlock(() -> DUNGEON_BRICK_1.get().getDefaultState(), Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); - public static final RegistryObject DUNGEON_POLISHED_STAIRS = BLOCKS.register("dungeon_polished_stairs", () -> new StairsBlock(() -> DUNGEON_POLISHED_STONE.get().getDefaultState(), Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); - - public static final RegistryObject DUNGEON_PILLAR_CENTER = BLOCKS.register("dungeon_pillar_center", () -> new RotatedPillarBlock(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); - public static final RegistryObject DUNGEON_PILLAR_SPECIAL = BLOCKS.register("dungeon_pillar_special", () -> new RotatedPillarBlock(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); - public static final RegistryObject DUNGEON_PILLAR_CAP = BLOCKS.register("dungeon_pillar_cap", () -> new BlockPillarCap(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); - - public static final RegistryObject DUNGEON_BRICK_WALL = BLOCKS.register("dungeon_brick_wall", () -> new WallBlock(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); - public static final RegistryObject DUNGEON_POLISHED_WALL = BLOCKS.register("dungeon_polished_wall", () -> new WallBlock(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); - public static final RegistryObject DUNGEON_BRICK_GATE = BLOCKS.register("dungeon_brick_gate", () -> new FenceGateBlock(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); - public static final RegistryObject DUNGEON_POLISHED_GATE = BLOCKS.register("dungeon_polished_gate", () -> new FenceGateBlock(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); - - public static final RegistryObject HELLFORGED_BLOCK = DUNGEONBLOCKS.register("dungeon_metal", () -> new Block(Properties.create(Material.IRON).hardnessAndResistance(5.0F, 6.0F).sound(SoundType.METAL).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); - - public static final RegistryObject NETHER_SOIL = BLOCKS.register("nether_soil", () -> new BlockNetherrackSoil(Properties.create(Material.EARTH).hardnessAndResistance(0.4F, 0.4F).sound(SoundType.NETHERRACK).harvestTool(ToolType.PICKAXE).tickRandomly())); - - public static final RegistryObject GROWING_DOUBT = BLOCKS.register("creeping_doubt", () -> new BlockGrowingDoubt(Properties.create(Material.PLANTS).doesNotBlockMovement().tickRandomly().zeroHardnessAndResistance().sound(SoundType.CROP))); - - private static boolean isntSolid(BlockState state, IBlockReader reader, BlockPos pos) - { - return false; - } - - public static final RegistryObject SHAPED_CHARGE = BLOCKS.register("shaped_charge", () -> new BlockShapedExplosive(3, Properties.create(Material.IRON).hardnessAndResistance(5.0F, 6.0F).sound(SoundType.METAL).harvestTool(ToolType.PICKAXE).harvestLevel(1).setRequiresTool())); - public static final RegistryObject DEFORESTER_CHARGE = BLOCKS.register("deforester_charge", () -> new BlockDeforesterCharge(3, Properties.create(Material.IRON).hardnessAndResistance(5.0F, 6.0F).sound(SoundType.METAL).harvestTool(ToolType.PICKAXE).harvestLevel(1).setRequiresTool())); - public static final RegistryObject VEINMINE_CHARGE = BLOCKS.register("veinmine_charge", () -> new BlockVeinMineCharge(3, Properties.create(Material.IRON).hardnessAndResistance(5.0F, 6.0F).sound(SoundType.METAL).harvestTool(ToolType.PICKAXE).harvestLevel(1).setRequiresTool())); - public static final RegistryObject FUNGAL_CHARGE = BLOCKS.register("fungal_charge", () -> new BlockFungalCharge(3, Properties.create(Material.IRON).hardnessAndResistance(5.0F, 6.0F).sound(SoundType.METAL).harvestTool(ToolType.PICKAXE).harvestLevel(1).setRequiresTool())); - - // -//// private static RegistryObject register(String name, Supplier sup, Function, Supplier> itemCreator) -//// { -//// RegistryObject ret = registerNoItem(name, sup); -//// ITEMS.register(name, itemCreator.apply(ret)); -//// return ret; -//// } -// -// private static RegistryObject register(String name, Supplier sup, Function, Supplier> itemCreator) -// { -// RegistryObject ret = registerNoItem(name, sup); -// ITEMS.register(name, itemCreator.apply(ret)); -// return ret; -// } -// -// private static RegistryObject registerNoItem(String name, Supplier sup) -// { -// return BLOCKS.register(name, sup); -// } - -// private static Supplier item(final RegistryObject block, final Supplier> renderMethod) -// { -// return () -> new BlockItem(block.get(), new Item.Properties().group(IronChests.IRONCHESTS_ITEM_GROUP).setISTER(renderMethod)); -// } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BloodstoneBlock.java b/src/main/java/wayoftime/bloodmagic/common/block/BloodstoneBlock.java deleted file mode 100644 index ad4a9a4e..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/block/BloodstoneBlock.java +++ /dev/null @@ -1,13 +0,0 @@ -package wayoftime.bloodmagic.common.block; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; - -public class BloodstoneBlock extends Block -{ - public BloodstoneBlock() - { - super(Properties.create(Material.ROCK)); - // TODO Auto-generated constructor stub - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/block/base/BlockPillarCap.java b/src/main/java/wayoftime/bloodmagic/common/block/base/BlockPillarCap.java deleted file mode 100644 index f82a16af..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/block/base/BlockPillarCap.java +++ /dev/null @@ -1,58 +0,0 @@ -package wayoftime.bloodmagic.common.block.base; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.item.BlockItemUseContext; -import net.minecraft.state.DirectionProperty; -import net.minecraft.state.StateContainer; -import net.minecraft.state.properties.BlockStateProperties; -import net.minecraft.util.Mirror; -import net.minecraft.util.Rotation; - -public class BlockPillarCap extends Block -{ - public static final DirectionProperty FACING = BlockStateProperties.FACING; - - public BlockPillarCap(Properties prop) - { - super(prop); - } - - @Override - public BlockState getStateForPlacement(BlockItemUseContext context) - { - return this.getDefaultState().with(FACING, context.getFace()); - } - - /** - * Returns the blockstate with the given rotation from the passed blockstate. If - * inapplicable, returns the passed blockstate. - * - * @deprecated call via {@link IBlockState#withRotation(Rotation)} whenever - * possible. Implementing/overriding is fine. - */ - @Override - public BlockState rotate(BlockState state, Rotation rot) - { - return state.with(FACING, rot.rotate(state.get(FACING))); - } - - /** - * Returns the blockstate with the given mirror of the passed blockstate. If - * inapplicable, returns the passed blockstate. - * - * @deprecated call via {@link IBlockState#withMirror(Mirror)} whenever - * possible. Implementing/overriding is fine. - */ - @Override - public BlockState mirror(BlockState state, Mirror mirrorIn) - { - return state.rotate(mirrorIn.toRotation(state.get(FACING))); - } - - @Override - protected void fillStateContainer(StateContainer.Builder builder) - { - builder.add(FACING); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBaseRecipes.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBaseRecipes.java deleted file mode 100644 index aa6df377..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBaseRecipes.java +++ /dev/null @@ -1,119 +0,0 @@ -package wayoftime.bloodmagic.common.data; - -import java.util.function.Consumer; - -import net.minecraft.block.Blocks; -import net.minecraft.data.CookingRecipeBuilder; -import net.minecraft.data.DataGenerator; -import net.minecraft.data.IFinishedRecipe; -import net.minecraft.data.ShapedRecipeBuilder; -import net.minecraft.data.ShapelessRecipeBuilder; -import net.minecraft.item.Items; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.tags.ItemTags; -import net.minecraftforge.common.Tags; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.common.data.recipe.BaseRecipeProvider; -import wayoftime.bloodmagic.common.item.BloodMagicItems; -import wayoftime.bloodmagic.common.tags.BloodMagicTags; -import wayoftime.bloodmagic.core.recipe.IngredientBloodOrb; - -public class GeneratorBaseRecipes extends BaseRecipeProvider -{ - public GeneratorBaseRecipes(DataGenerator gen) - { - super(gen, BloodMagic.MODID); - } - - @Override - protected void registerRecipes(Consumer consumer) - { - addVanillaRecipes(consumer); - addVanillaSmithingRecipes(consumer); - addBloodOrbRecipes(consumer); - } - - private void addVanillaRecipes(Consumer consumer) - { -// ConditionalRecipe.builder().addRecipe(ShapedRecipeBuilder.shapedRecipe(BloodMagicItems.SACRIFICIAL_DAGGER.get()).key('g', Tags.Items.GLASS).key('G', Tags.Items.INGOTS_GOLD).key('i', Tags.Items.INGOTS_IRON).patternLine("ggg").patternLine(" Gg").patternLine("i g").addCriterion("has_glass", hasItem(Items.GLASS))::build); - ShapedRecipeBuilder.shapedRecipe(BloodMagicItems.CORRUPTED_DUST.get()).key('s', BloodMagicTags.TINYDUST_CORRUPTED).patternLine("sss").patternLine("sss").patternLine("sss").addCriterion("has_tiny", hasItem(BloodMagicItems.CORRUPTED_DUST_TINY.get())).build(consumer, BloodMagic.rl("corrupted_dust")); - ShapedRecipeBuilder.shapedRecipe(BloodMagicItems.HELLFORGED_BLOCK.get()).key('s', BloodMagicTags.INGOT_HELLFORGED).patternLine("sss").patternLine("sss").patternLine("sss").addCriterion("has_hellforged", hasItem(BloodMagicItems.HELLFORGED_INGOT.get())).build(consumer, BloodMagic.rl("hellforged_block")); - ShapedRecipeBuilder.shapedRecipe(BloodMagicItems.SACRIFICIAL_DAGGER.get()).key('g', Tags.Items.GLASS).key('G', Tags.Items.INGOTS_GOLD).key('i', Tags.Items.INGOTS_IRON).patternLine("ggg").patternLine(" Gg").patternLine("i g").addCriterion("has_glass", hasItem(Items.GLASS)).build(consumer, BloodMagic.rl("sacrificial_dagger")); - ShapedRecipeBuilder.shapedRecipe(BloodMagicItems.BASE_RITUAL_DIVINER.get()).key('a', BloodMagicItems.AIR_INSCRIPTION_TOOL.get()).key('s', Tags.Items.RODS_WOODEN).key('d', Tags.Items.GEMS_DIAMOND).key('e', BloodMagicItems.EARTH_INSCRIPTION_TOOL.get()).key('f', BloodMagicItems.FIRE_INSCRIPTION_TOOL.get()).key('w', BloodMagicItems.WATER_INSCRIPTION_TOOL.get()).patternLine("dfd").patternLine("ase").patternLine("dwd").addCriterion("has_scribe", hasItem(BloodMagicItems.AIR_INSCRIPTION_TOOL.get())).build(consumer, BloodMagic.rl("ritual_diviner_0")); - ShapedRecipeBuilder.shapedRecipe(BloodMagicItems.DUSK_RITUAL_DIVINER.get()).key('S', BloodMagicItems.DEMONIC_SLATE.get()).key('t', BloodMagicItems.DUSK_INSCRIPTION_TOOL.get()).key('d', BloodMagicItems.BASE_RITUAL_DIVINER.get()).patternLine(" S ").patternLine("tdt").patternLine(" S ").addCriterion("has_demon_slate", hasItem(BloodMagicItems.DEMONIC_SLATE.get())).build(consumer, BloodMagic.rl("ritual_diviner_1")); - ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.BLOODSTONE_BRICK.get(), 4).key('s', BloodMagicBlocks.BLOODSTONE.get()).patternLine("ss").patternLine("ss").addCriterion("has_weak_shard", hasItem(BloodMagicItems.WEAK_BLOOD_SHARD.get())).build(consumer, BloodMagic.rl("bloodstonebrick")); - ShapelessRecipeBuilder.shapelessRecipe(BloodMagicBlocks.BLOODSTONE.get(), 8).addIngredient(Tags.Items.STONE).addIngredient(BloodMagicItems.WEAK_BLOOD_SHARD.get()).addCriterion("has_weak_shard", hasItem(BloodMagicItems.WEAK_BLOOD_SHARD.get())).build(consumer, BloodMagic.rl("largebloodstonebrick")); - - ShapelessRecipeBuilder.shapelessRecipe(BloodMagicBlocks.WOOD_TILE_PATH.get(), 4).addIngredient(BloodMagicBlocks.WOOD_PATH.get()).addIngredient(BloodMagicBlocks.WOOD_PATH.get()).addIngredient(BloodMagicBlocks.WOOD_PATH.get()).addIngredient(BloodMagicBlocks.WOOD_PATH.get()).addCriterion("has_apprentice_orb", hasItem(BloodMagicItems.APPRENTICE_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("path/path_woodtile")); - ShapelessRecipeBuilder.shapelessRecipe(BloodMagicBlocks.STONE_TILE_PATH.get(), 4).addIngredient(BloodMagicBlocks.STONE_PATH.get()).addIngredient(BloodMagicBlocks.STONE_PATH.get()).addIngredient(BloodMagicBlocks.STONE_PATH.get()).addIngredient(BloodMagicBlocks.STONE_PATH.get()).addCriterion("has_magician_orb", hasItem(BloodMagicItems.MAGICIAN_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("path/path_stonetile")); - ShapelessRecipeBuilder.shapelessRecipe(BloodMagicBlocks.WORN_STONE_TILE_PATH.get(), 4).addIngredient(BloodMagicBlocks.WORN_STONE_PATH.get()).addIngredient(BloodMagicBlocks.WORN_STONE_PATH.get()).addIngredient(BloodMagicBlocks.WORN_STONE_PATH.get()).addIngredient(BloodMagicBlocks.WORN_STONE_PATH.get()).addCriterion("has_master_orb", hasItem(BloodMagicItems.MASTER_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("path/path_wornstonetile")); - - // Changed Recipes - { -// ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.BLOOD_ALTAR.get()).key('a', Tags.Items.STONE).key('b', Items.FURNACE).key('c', Tags.Items.INGOTS_GOLD).key('d', BloodMagicItems.MONSTER_SOUL_RAW.get()).patternLine("a a").patternLine("aba").patternLine("cdc").addCriterion("has_will", hasItem(BloodMagicItems.MONSTER_SOUL_RAW.get())).build(consumer, BloodMagic.rl("blood_altar")); -// ShapedRecipeBuilder.shapedRecipe(BloodMagicItems.SOUL_SNARE.get(), 4).key('r', Tags.Items.DUSTS_REDSTONE).key('s', Tags.Items.STRING).key('i', Tags.Items.INGOTS_IRON).patternLine("sis").patternLine("iri").patternLine("sis").addCriterion("has_redstone", hasItem(Items.REDSTONE)).build(consumer, BloodMagic.rl("soul_snare")); -// ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.SOUL_FORGE.get()).key('s', Tags.Items.STONE).key('g', Tags.Items.INGOTS_GOLD).key('i', Tags.Items.INGOTS_IRON).key('o', Tags.Items.STORAGE_BLOCKS_IRON).patternLine("i i").patternLine("sgs").patternLine("sos").addCriterion("has_gold", hasItem(Items.GOLD_INGOT)).build(consumer, BloodMagic.rl("soul_forge")); - } - { - ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.BLOOD_ALTAR.get()).key('a', Tags.Items.STONE).key('b', Items.FURNACE).key('c', Tags.Items.INGOTS_GOLD).key('d', Items.GOLD_INGOT).patternLine("a a").patternLine("aba").patternLine("cdc").addCriterion("has_gold", hasItem(Items.GOLD_INGOT)).build(consumer, BloodMagic.rl("blood_altar")); - ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.ALCHEMY_TABLE.get()).key('b', Tags.Items.INGOTS_IRON).key('s', Tags.Items.STONE).key('w', ItemTags.PLANKS).key('g', Tags.Items.INGOTS_GOLD).key('o', BloodMagicItems.SLATE.get()).patternLine("sss").patternLine("wbw").patternLine("gog").addCriterion("has_blank_slate", hasItem(BloodMagicItems.SLATE.get())).build(consumer, BloodMagic.rl("alchemy_table")); - ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.SOUL_FORGE.get()).key('s', Tags.Items.STONE).key('S', BloodMagicItems.SLATE.get()).key('i', Tags.Items.INGOTS_IRON).key('o', Tags.Items.STORAGE_BLOCKS_IRON).patternLine("i i").patternLine("sSs").patternLine("sos").addCriterion("has_blank_slate", hasItem(BloodMagicItems.SLATE.get())).build(consumer, BloodMagic.rl("soul_forge")); - } - } - - private void addVanillaSmithingRecipes(Consumer consumer) - { - String basePath = "smelting/"; - CookingRecipeBuilder.smeltingRecipe(Ingredient.fromTag(BloodMagicTags.DUST_IRON), Items.IRON_INGOT, 0, 200).addCriterion("has_iron_sand", hasItem(BloodMagicItems.IRON_SAND.get())).build(consumer, BloodMagic.rl(basePath + "ingot_iron")); - CookingRecipeBuilder.smeltingRecipe(Ingredient.fromTag(BloodMagicTags.DUST_GOLD), Items.GOLD_INGOT, 0, 200).addCriterion("has_gold_sand", hasItem(BloodMagicItems.GOLD_SAND.get())).build(consumer, BloodMagic.rl(basePath + "ingot_gold")); - CookingRecipeBuilder.smeltingRecipe(Ingredient.fromTag(BloodMagicTags.DUST_NETHERITE_SCRAP), Items.NETHERITE_SCRAP, 0, 200).addCriterion("has_netherite_dust", hasItem(BloodMagicItems.NETHERITE_SCRAP_SAND.get())).build(consumer, BloodMagic.rl(basePath + "ingot_netherite_scrap")); - CookingRecipeBuilder.smeltingRecipe(Ingredient.fromTag(BloodMagicTags.DUST_HELLFORGED), BloodMagicItems.HELLFORGED_INGOT.get(), 0, 200).addCriterion("has_hellforged_dust", hasItem(BloodMagicItems.HELLFORGED_SAND.get())).build(consumer, BloodMagic.rl(basePath + "ingot_hellforged")); - } - - private void addBloodOrbRecipes(Consumer consumer) - { - ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.INCENSE_ALTAR.get()).key('s', Tags.Items.STONE).key('c', Tags.Items.COBBLESTONE).key('h', Items.CHARCOAL).key('o', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_WEAK.get())).patternLine("s s").patternLine("shs").patternLine("coc").addCriterion("has_weak_orb", hasItem(BloodMagicItems.WEAK_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("incense_altar")); - - ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.BLANK_RUNE.get()).key('a', Tags.Items.STONE).key('s', Ingredient.fromItems(BloodMagicItems.SLATE.get())).key('o', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_WEAK.get())).patternLine("asa").patternLine("aoa").patternLine("aaa").addCriterion("has_weak_orb", hasItem(BloodMagicItems.WEAK_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("blood_rune_blank")); - ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.SPEED_RUNE.get()).key('a', Tags.Items.STONE).key('b', Ingredient.fromItems(BloodMagicItems.SLATE.get())).key('c', Ingredient.fromItems(Items.SUGAR)).key('d', BloodMagicBlocks.BLANK_RUNE.get()).patternLine("aba").patternLine("cdc").patternLine("aba").addCriterion("has_blank_rune", hasItem(BloodMagicItems.BLANK_RUNE_ITEM.get())).build(consumer, BloodMagic.rl("blood_rune_speed")); - ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.SACRIFICE_RUNE.get()).key('a', Tags.Items.STONE).key('b', BloodMagicItems.REINFORCED_SLATE.get()).key('c', Tags.Items.INGOTS_GOLD).key('d', BloodMagicBlocks.BLANK_RUNE.get()).key('e', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_APPRENTICE.get())).patternLine("aba").patternLine("cdc").patternLine("aea").addCriterion("has_apprentice_orb", hasItem(BloodMagicItems.APPRENTICE_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("blood_rune_sacrifice")); - ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.SELF_SACRIFICE_RUNE.get()).key('a', Tags.Items.STONE).key('b', Ingredient.fromItems(BloodMagicItems.REINFORCED_SLATE.get())).key('c', Ingredient.fromItems(Items.GLOWSTONE_DUST)).key('d', Ingredient.fromItems(BloodMagicItems.BLANK_RUNE_ITEM.get())).key('e', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_APPRENTICE.get())).patternLine("aba").patternLine("cdc").patternLine("aea").addCriterion("has_apprentice_orb", hasItem(BloodMagicItems.APPRENTICE_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("blood_rune_self_sacrifice")); - ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.CAPACITY_RUNE.get()).key('a', Tags.Items.STONE).key('b', Items.BUCKET).key('c', BloodMagicBlocks.BLANK_RUNE.get()).key('d', BloodMagicItems.IMBUED_SLATE.get()).patternLine("aba").patternLine("bcb").patternLine("ada").addCriterion("has_imbued_slate", hasItem(BloodMagicItems.IMBUED_SLATE.get())).build(consumer, BloodMagic.rl("blood_rune_capacity")); - ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.ORB_RUNE.get()).key('a', Tags.Items.STONE).key('b', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_WEAK.get())).key('c', BloodMagicBlocks.BLANK_RUNE.get()).key('d', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_MASTER.get())).patternLine("aba").patternLine("cdc").patternLine("aba").addCriterion("has_master_orb", hasItem(BloodMagicItems.MASTER_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("blood_rune_orb")); - ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.CHARGING_RUNE.get()).key('R', Tags.Items.DUSTS_REDSTONE).key('r', BloodMagicBlocks.BLANK_RUNE.get()).key('s', BloodMagicItems.DEMONIC_SLATE.get()).key('e', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_MASTER.get())).key('G', Tags.Items.DUSTS_GLOWSTONE).patternLine("RsR").patternLine("GrG").patternLine("ReR").addCriterion("has_master_orb", hasItem(BloodMagicItems.MASTER_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("blood_rune_charging")); - ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.DISPLACEMENT_RUNE.get()).key('a', Tags.Items.STONE).key('b', Items.WATER_BUCKET).key('c', BloodMagicBlocks.BLANK_RUNE.get()).key('d', BloodMagicItems.IMBUED_SLATE.get()).patternLine("aba").patternLine("bcb").patternLine("ada").addCriterion("has_imbued_slate", hasItem(BloodMagicItems.IMBUED_SLATE.get())).build(consumer, BloodMagic.rl("blood_rune_displacement")); - ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.AUGMENTED_CAPACITY_RUNE.get()).key('a', Tags.Items.OBSIDIAN).key('b', BloodMagicItems.DEMONIC_SLATE.get()).key('c', Items.BUCKET).key('d', BloodMagicBlocks.CAPACITY_RUNE.get()).key('e', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_MASTER.get())).patternLine("aba").patternLine("cdc").patternLine("aea").addCriterion("has_master_orb", hasItem(BloodMagicItems.MASTER_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("blood_rune_aug_capacity")); - ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.ACCELERATION_RUNE.get()).key('a', Items.BUCKET).key('b', BloodMagicItems.DEMONIC_SLATE.get()).key('c', Tags.Items.INGOTS_GOLD).key('d', BloodMagicBlocks.SPEED_RUNE.get()).key('e', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_MASTER.get())).patternLine("aba").patternLine("cdc").patternLine("aea").addCriterion("has_master_orb", hasItem(BloodMagicItems.MASTER_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("blood_rune_acceleration")); - - ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.BLANK_RITUAL_STONE.get(), 4).key('a', Tags.Items.OBSIDIAN).key('b', BloodMagicItems.REINFORCED_SLATE.get()).key('c', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_APPRENTICE.get())).patternLine("aba").patternLine("bcb").patternLine("aba").addCriterion("has_apprentice_orb", hasItem(BloodMagicItems.APPRENTICE_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("ritual_stone_blank")); - ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.MASTER_RITUAL_STONE.get()).key('a', Tags.Items.OBSIDIAN).key('b', BloodMagicBlocks.BLANK_RITUAL_STONE.get()).key('c', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_MAGICIAN.get())).patternLine("aba").patternLine("bcb").patternLine("aba").addCriterion("has_magician_orb", hasItem(BloodMagicItems.MAGICIAN_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("ritual_stone_master")); - - ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.ALCHEMICAL_REACTION_CHAMBER.get()).key('s', Tags.Items.STONE).key('f', Blocks.FURNACE).key('o', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_MAGICIAN.get())).key('I', Tags.Items.STORAGE_BLOCKS_IRON).key('S', BloodMagicItems.IMBUED_SLATE.get()).patternLine("sss").patternLine("SoS").patternLine("IfI").addCriterion("has_magician_orb", hasItem(BloodMagicItems.MAGICIAN_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("arc")); - - ShapedRecipeBuilder.shapedRecipe(BloodMagicItems.PRIMITIVE_FURNACE_CELL.get()).key('c', Tags.Items.COBBLESTONE).key('f', Tags.Items.STORAGE_BLOCKS_COAL).key('s', Ingredient.fromItems(BloodMagicItems.SLATE.get())).key('o', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_MAGICIAN.get())).patternLine("csc").patternLine("cfc").patternLine("coc").addCriterion("has_magician_orb", hasItem(BloodMagicItems.MAGICIAN_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("primitive_furnace_cell")); - ShapedRecipeBuilder.shapedRecipe(BloodMagicItems.LAVA_CRYSTAL.get()).key('a', Tags.Items.GLASS).key('b', Items.LAVA_BUCKET).key('c', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_WEAK.get())).key('d', Tags.Items.OBSIDIAN).key('e', Tags.Items.GEMS_DIAMOND).patternLine("aba").patternLine("bcb").patternLine("ded").addCriterion("has_weak_orb", hasItem(BloodMagicItems.WEAK_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("lava_crystal")); - - ShapedRecipeBuilder.shapedRecipe(BloodMagicItems.PRIMITIVE_HYDRATION_CELL.get()).key('B', Items.WATER_BUCKET).key('c', Tags.Items.COBBLESTONE).key('o', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_MAGICIAN.get())).key('s', BloodMagicItems.SLATE.get()).patternLine("csc").patternLine("cBc").patternLine("coc").addCriterion("has_magician_orb", hasItem(BloodMagicItems.MAGICIAN_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("primitive_hydration_cell")); - - ShapelessRecipeBuilder.shapelessRecipe(BloodMagicBlocks.WOOD_PATH.get(), 4).addIngredient(ItemTags.PLANKS).addIngredient(ItemTags.PLANKS).addIngredient(ItemTags.PLANKS).addIngredient(ItemTags.PLANKS).addIngredient(IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_APPRENTICE.get())).addCriterion("has_apprentice_orb", hasItem(BloodMagicItems.APPRENTICE_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("path/path_wood")); - ShapelessRecipeBuilder.shapelessRecipe(BloodMagicBlocks.STONE_PATH.get(), 4).addIngredient(Tags.Items.STONE).addIngredient(Tags.Items.STONE).addIngredient(Tags.Items.STONE).addIngredient(Tags.Items.STONE).addIngredient(IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_MAGICIAN.get())).addCriterion("has_magician_orb", hasItem(BloodMagicItems.MAGICIAN_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("path/path_stone")); - ShapelessRecipeBuilder.shapelessRecipe(BloodMagicBlocks.WORN_STONE_PATH.get(), 4).addIngredient(BloodMagicBlocks.STONE_PATH.get()).addIngredient(BloodMagicBlocks.STONE_PATH.get()).addIngredient(BloodMagicBlocks.STONE_PATH.get()).addIngredient(BloodMagicBlocks.STONE_PATH.get()).addIngredient(IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_MASTER.get())).addCriterion("has_master_orb", hasItem(BloodMagicItems.MASTER_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("path/path_wornstone")); - - ShapedRecipeBuilder.shapedRecipe(BloodMagicItems.RITUAL_READER.get()).key('s', BloodMagicItems.DEMONIC_SLATE.get()).key('g', Tags.Items.GLASS).key('i', Tags.Items.INGOTS_GOLD).key('o', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_MASTER.get())).patternLine("gog").patternLine("isi").patternLine(" s ").addCriterion("has_master_orb", hasItem(BloodMagicItems.MASTER_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("ritual_reader")); - - ShapedRecipeBuilder.shapedRecipe(BloodMagicItems.EXPERIENCE_TOME.get()).key('b', Items.ENCHANTED_BOOK).key('s', Tags.Items.STRING).key('e', Tags.Items.STORAGE_BLOCKS_LAPIS).key('g', Tags.Items.INGOTS_GOLD).key('l', BloodMagicItems.IMBUED_SLATE.get()).key('o', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_MAGICIAN.get())).patternLine("ses").patternLine("lbl").patternLine("gog").addCriterion("has_magician_orb", hasItem(BloodMagicItems.MAGICIAN_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("experience_tome")); -// ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.MIMIC.get()).key('b', itemIn) -// ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.SPEED_RUNE.get()).key('s', Items.GLASS).key('o', Ingredient.fromItems(Items.DIAMOND)).patternLine("sss").patternLine("sos").patternLine("sss").addCriterion("has_diamond", hasItem(Items.DIAMOND)).build(consumer, new ResourceLocation(BloodMagic.MODID, "speed_rune_from_standard")); -// ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.SPEED_RUNE.get()).key('s', Items.GLASS).key('o', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_WEAK.get())).patternLine("sss").patternLine("sos").patternLine("sss").addCriterion("has_diamond", hasItem(Items.DIAMOND)).build(consumer, new ResourceLocation(BloodMagic.MODID, "speed_rune_from_orb")); - - // Changed Recipes - { -// ShapedRecipeBuilder.shapedRecipe(BloodMagicBlocks.ALCHEMY_TABLE.get()).key('b', Tags.Items.RODS_BLAZE).key('s', Tags.Items.STONE).key('w', ItemTags.PLANKS).key('g', Tags.Items.INGOTS_GOLD).key('o', IngredientBloodOrb.fromOrb(BloodMagicItems.ORB_WEAK.get())).patternLine("sss").patternLine("wbw").patternLine("gog").addCriterion("has_weak_orb", hasItem(BloodMagicItems.WEAK_BLOOD_ORB.get())).build(consumer, BloodMagic.rl("alchemy_table")); - - } - { - - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockStates.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockStates.java deleted file mode 100644 index 3e2ee25f..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockStates.java +++ /dev/null @@ -1,357 +0,0 @@ -package wayoftime.bloodmagic.common.data; - -import net.minecraft.block.Block; -import net.minecraft.block.CropsBlock; -import net.minecraft.block.FenceGateBlock; -import net.minecraft.block.RotatedPillarBlock; -import net.minecraft.block.StairsBlock; -import net.minecraft.block.WallBlock; -import net.minecraft.data.DataGenerator; -import net.minecraft.state.IntegerProperty; -import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.generators.BlockModelBuilder; -import net.minecraftforge.client.model.generators.BlockStateProvider; -import net.minecraftforge.client.model.generators.ConfiguredModel; -import net.minecraftforge.client.model.generators.ConfiguredModel.Builder; -import net.minecraftforge.client.model.generators.ModelBuilder.ElementBuilder; -import net.minecraftforge.client.model.generators.ModelBuilder.FaceRotation; -import net.minecraftforge.client.model.generators.ModelFile; -import net.minecraftforge.client.model.generators.MultiPartBlockStateBuilder; -import net.minecraftforge.client.model.generators.MultiPartBlockStateBuilder.PartBuilder; -import net.minecraftforge.client.model.generators.VariantBlockStateBuilder; -import net.minecraftforge.common.data.ExistingFileHelper; -import net.minecraftforge.fml.RegistryObject; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.common.block.BlockAlchemicalReactionChamber; -import wayoftime.bloodmagic.common.block.BlockDemonCrystal; -import wayoftime.bloodmagic.common.block.BlockShapedExplosive; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.common.block.base.BlockPillarCap; - -public class GeneratorBlockStates extends BlockStateProvider -{ - public GeneratorBlockStates(DataGenerator gen, ExistingFileHelper exFileHelper) - { - super(gen, BloodMagic.MODID, exFileHelper); - } - - @Override - protected void registerStatesAndModels() - { -// buildCubeAll(BloodMagicBlocks.TARTARICFORGE.get()); -// buildCubeAll(BloodMagicBlocks.SPEED_RUNE.get()); - - for (RegistryObject block : BloodMagicBlocks.BASICBLOCKS.getEntries()) - { - buildCubeAll(block.get()); - } - - for (RegistryObject block : BloodMagicBlocks.DUNGEONBLOCKS.getEntries()) - { - buildDungeonBlock(block.get()); - } - - buildCubeAll(BloodMagicBlocks.BLOOD_LIGHT.get()); - buildCubeAll(BloodMagicBlocks.BLANK_RITUAL_STONE.get()); - buildCubeAll(BloodMagicBlocks.AIR_RITUAL_STONE.get()); - buildCubeAll(BloodMagicBlocks.WATER_RITUAL_STONE.get()); - buildCubeAll(BloodMagicBlocks.FIRE_RITUAL_STONE.get()); - buildCubeAll(BloodMagicBlocks.EARTH_RITUAL_STONE.get()); - buildCubeAll(BloodMagicBlocks.DUSK_RITUAL_STONE.get()); - buildCubeAll(BloodMagicBlocks.DAWN_RITUAL_STONE.get()); - buildFarmland(BloodMagicBlocks.NETHER_SOIL.get(), BloodMagic.rl("block/nether_soil"), new ResourceLocation("block/netherrack")); - - buildFurnace(BloodMagicBlocks.ALCHEMICAL_REACTION_CHAMBER.get()); - - buildCrystal(BloodMagicBlocks.RAW_CRYSTAL_BLOCK.get(), "defaultcrystal"); - buildCrystal(BloodMagicBlocks.CORROSIVE_CRYSTAL_BLOCK.get(), "corrosivecrystal"); - buildCrystal(BloodMagicBlocks.DESTRUCTIVE_CRYSTAL_BLOCK.get(), "destructivecrystal"); - buildCrystal(BloodMagicBlocks.VENGEFUL_CRYSTAL_BLOCK.get(), "vengefulcrystal"); - buildCrystal(BloodMagicBlocks.STEADFAST_CRYSTAL_BLOCK.get(), "steadfastcrystal"); - - buildRandomStone(BloodMagicBlocks.DUNGEON_STONE.get(), BloodMagic.rl("block/dungeon/dungeon_stone")); - stairsBlock((StairsBlock) BloodMagicBlocks.DUNGEON_BRICK_STAIRS.get(), BloodMagic.rl("block/dungeon/dungeon_brick1")); - stairsBlock((StairsBlock) BloodMagicBlocks.DUNGEON_POLISHED_STAIRS.get(), BloodMagic.rl("block/dungeon/dungeon_polished")); - buildPillarCenter(BloodMagicBlocks.DUNGEON_PILLAR_CENTER.get(), BloodMagic.rl("block/dungeon/dungeon_pillar"), BloodMagic.rl("block/dungeon/dungeon_pillarheart")); - buildPillarCenter(BloodMagicBlocks.DUNGEON_PILLAR_SPECIAL.get(), BloodMagic.rl("block/dungeon/dungeon_pillarspecial"), BloodMagic.rl("block/dungeon/dungeon_pillarheart")); - buildWallInventory((WallBlock) BloodMagicBlocks.DUNGEON_BRICK_WALL.get(), BloodMagic.rl("block/dungeon/dungeon_brick1")); - buildWallInventory((WallBlock) BloodMagicBlocks.DUNGEON_POLISHED_WALL.get(), BloodMagic.rl("block/dungeon/dungeon_polished")); - fenceGateBlock((FenceGateBlock) BloodMagicBlocks.DUNGEON_BRICK_GATE.get(), BloodMagic.rl("block/dungeon/dungeon_brick1")); - fenceGateBlock((FenceGateBlock) BloodMagicBlocks.DUNGEON_POLISHED_GATE.get(), BloodMagic.rl("block/dungeon/dungeon_polished")); - - buildPillarCap(BloodMagicBlocks.DUNGEON_PILLAR_CAP.get(), BloodMagic.rl("block/dungeon/dungeon_pillarheart"), BloodMagic.rl("block/dungeon/dungeon_pillarbottom"), BloodMagic.rl("block/dungeon/dungeon_pillartop")); - - buildAssortedBlock(BloodMagicBlocks.DUNGEON_BRICK_ASSORTED.get(), modLoc("dungeon_brick1"), modLoc("dungeon_brick2"), modLoc("dungeon_brick3")); - - buildCubeAllWithTextureName("etherealopaquemimic"); - buildCubeAllWithTextureName("sentientmimic"); - buildCubeAllWithTextureName("solidclearmimic"); - buildCubeAllWithTextureName("solidlightmimic"); - buildCubeAllWithTextureName("solidopaquemimic"); - - buildCrop(BloodMagicBlocks.GROWING_DOUBT.get(), CropsBlock.AGE, 7, BloodMagic.rl("block/creeping_doubt_1"), BloodMagic.rl("block/creeping_doubt_2"), BloodMagic.rl("block/creeping_doubt_3"), BloodMagic.rl("block/creeping_doubt_4"), BloodMagic.rl("block/creeping_doubt_5"), BloodMagic.rl("block/creeping_doubt_6"), BloodMagic.rl("block/creeping_doubt_7"), BloodMagic.rl("block/creeping_doubt_8")); - - buildOrientable(BloodMagicBlocks.SHAPED_CHARGE.get(), "shaped_charge", modLoc("block/sub/shaped_charge"), modLoc("block/dungeon/dungeon_stone"), modLoc("block/dungeon/dungeon_tile"), modLoc("block/blankrune"), modLoc("block/largebloodstonebrick"), modLoc("models/defaultcrystal")); - buildOrientable(BloodMagicBlocks.DEFORESTER_CHARGE.get(), "deforester_charge", modLoc("block/sub/shaped_charge"), new ResourceLocation("block/oak_log_top"), new ResourceLocation("block/oak_log_top"), modLoc("block/blankrune"), new ResourceLocation("block/oak_planks"), modLoc("models/defaultcrystal")); - buildOrientable(BloodMagicBlocks.VEINMINE_CHARGE.get(), "veinmine_charge", modLoc("block/sub/shaped_charge"), new ResourceLocation("block/sandstone_bottom"), new ResourceLocation("block/sandstone_bottom"), modLoc("block/blankrune"), new ResourceLocation("block/sand"), modLoc("models/defaultcrystal")); - buildOrientable(BloodMagicBlocks.FUNGAL_CHARGE.get(), "fungal_charge", modLoc("block/sub/shaped_charge"), new ResourceLocation("block/nether_wart_block"), new ResourceLocation("block/crimson_planks"), modLoc("block/blankrune"), new ResourceLocation("block/crimson_stem"), modLoc("models/defaultcrystal")); - } - - private void buildOrientable(Block block, String name, ResourceLocation modelPath, ResourceLocation base, ResourceLocation edges, ResourceLocation centerCap, ResourceLocation binding, ResourceLocation core) - { -// ModelFile furnace_off = models().orientableWithBottom("alchemicalreactionchamber", BloodMagic.rl("block/arc_side"), BloodMagic.rl("block/arc_front"), BloodMagic.rl("block/arc_bottom"), BloodMagic.rl("block/arc_top")); -// getVariantBuilder(block).addModels(block.getDefaultState().with(BlockAlchemicalReactionChamber.FACING, Direction.NORTH).with(BlockAlchemicalReactionChamber.LIT, false), furnaceModel); - ModelFile model = models().withExistingParent(name, modelPath).texture("1", edges).texture("3", base).texture("4", centerCap).texture("5", binding).texture("6", core).texture("particle", core); - - VariantBlockStateBuilder builder = getVariantBuilder(block); - - builder.partialState().with(BlockShapedExplosive.ATTACHED, Direction.UP).modelForState().modelFile(model).addModel(); - builder.partialState().with(BlockShapedExplosive.ATTACHED, Direction.DOWN).modelForState().modelFile(model).rotationX(180).addModel(); - builder.partialState().with(BlockShapedExplosive.ATTACHED, Direction.EAST).modelForState().modelFile(model).rotationX(90).rotationY(90).addModel(); - builder.partialState().with(BlockShapedExplosive.ATTACHED, Direction.WEST).modelForState().modelFile(model).rotationX(90).rotationY(270).addModel(); - builder.partialState().with(BlockShapedExplosive.ATTACHED, Direction.NORTH).modelForState().modelFile(model).rotationX(90).addModel(); - builder.partialState().with(BlockShapedExplosive.ATTACHED, Direction.SOUTH).modelForState().modelFile(model).rotationX(270).addModel(); - } - - private void buildCrop(Block block, IntegerProperty prop, int maxAge, ResourceLocation... textures) - { - String basePath = block.getRegistryName().getPath(); - VariantBlockStateBuilder builder = getVariantBuilder(block); - - for (int i = 0; i <= maxAge; i++) - { - ModelFile modelFile = models().crop(basePath + "_" + (i + 1), textures[i]); - builder.partialState().with(prop, i).modelForState().modelFile(modelFile).addModel(); - } - } - - private void buildFarmland(Block block, ResourceLocation top, ResourceLocation side) - { - String basePath = block.getRegistryName().getPath(); - getVariantBuilder(block).forAllStates(state -> { - Builder builder = ConfiguredModel.builder(); - - ModelFile file = models().withExistingParent(basePath, "template_farmland").texture("top", top).texture("dirt", side); - - return builder.modelFile(file).build(); - }); - } - - private void buildCubeAllWithTextureName(String texture) - { - models().cubeAll(texture, BloodMagic.rl("block/" + texture)).assertExistence(); - } - - private void buildAssortedBlock(Block block, ResourceLocation... modelResources) - { - getVariantBuilder(block).forAllStates(state -> { - Builder builder = ConfiguredModel.builder(); - - for (int i = 0; i < modelResources.length; i++) - { - ResourceLocation location = modelResources[i]; - ModelFile file = models().getExistingFile(location); - if (i < modelResources.length - 1) - { - builder = builder.modelFile(file).nextModel(); - } else - { - builder = builder.modelFile(file); - } - } - - return builder.build(); - }); - } - - private void buildRandomStone(Block block, ResourceLocation texture) - { - String basePath = block.getRegistryName().getPath(); - ModelFile modelFile = models().cubeAll(basePath, texture); - ModelFile modelFile_mirrored = models().withExistingParent(basePath + "_mirrored", "cube_mirrored_all").texture("all", texture); - getVariantBuilder(block).forAllStates(state -> ConfiguredModel.builder().modelFile(modelFile).nextModel().modelFile(modelFile_mirrored).nextModel().modelFile(modelFile).rotationY(180).nextModel().modelFile(modelFile_mirrored).rotationY(180).build()); - } - - private void buildWallInventory(WallBlock block, ResourceLocation texture) - { - String basePath = block.getRegistryName().getPath(); - wallBlock(block, texture); - ModelFile file = models().wallInventory(basePath + "_inventory", texture); - file.assertExistence(); - } - - private void buildDungeonBlock(Block block) - { - String basePath = block.getRegistryName().getPath(); - ModelFile modelFile = models().cubeAll(basePath, BloodMagic.rl("block/dungeon/" + basePath)); - getVariantBuilder(block).forAllStates(state -> ConfiguredModel.builder().modelFile(modelFile).build()); -// ModelFile furnace_off = models().cubeAll(block.getRegistryName().toString(), texture)\ - } - - private void buildPillarCenter(Block block, ResourceLocation side, ResourceLocation pillarEnd) - { - String basePath = block.getRegistryName().getPath(); - ModelFile yModel = models().cubeColumn(basePath, side, pillarEnd); - - ElementBuilder xElementBuilder = models().withExistingParent(basePath + "_x", "cube").texture("particle", side).texture("end", pillarEnd).texture("side", side).element(); - xElementBuilder.face(Direction.UP).uvs(0, 0, 16, 16).texture("#side").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); - xElementBuilder.face(Direction.DOWN).uvs(0, 0, 16, 16).texture("#side").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); - xElementBuilder.face(Direction.NORTH).uvs(0, 0, 16, 16).texture("#side").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); - xElementBuilder.face(Direction.SOUTH).uvs(0, 0, 16, 16).texture("#side").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); - xElementBuilder.face(Direction.WEST).uvs(16, 0, 0, 16).texture("#end").end(); - xElementBuilder.face(Direction.EAST).uvs(16, 0, 0, 16).texture("#end").end(); - ModelFile xModel = xElementBuilder.end(); - - ElementBuilder zElementBuilder = models().withExistingParent(basePath + "_z", "cube").texture("particle", side).texture("end", pillarEnd).texture("side", side).element(); - zElementBuilder.face(Direction.UP).uvs(0, 0, 16, 16).texture("#side").end(); - zElementBuilder.face(Direction.DOWN).uvs(0, 0, 16, 16).texture("#side").end(); - zElementBuilder.face(Direction.NORTH).uvs(0, 0, 16, 16).texture("#end").end(); - zElementBuilder.face(Direction.SOUTH).uvs(0, 0, 16, 16).texture("#end").end(); - zElementBuilder.face(Direction.WEST).uvs(16, 0, 0, 16).texture("#side").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); - zElementBuilder.face(Direction.EAST).uvs(16, 0, 0, 16).texture("#side").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); - ModelFile zModel = zElementBuilder.end(); - - VariantBlockStateBuilder builder = getVariantBuilder(block); - builder.partialState().with(RotatedPillarBlock.AXIS, Direction.Axis.X).modelForState().modelFile(xModel).addModel(); - builder.partialState().with(RotatedPillarBlock.AXIS, Direction.Axis.Y).modelForState().modelFile(yModel).addModel(); - builder.partialState().with(RotatedPillarBlock.AXIS, Direction.Axis.Z).modelForState().modelFile(zModel).addModel(); - } - - private void buildPillarCap(Block block, ResourceLocation pillarEnd, ResourceLocation sideBottom, ResourceLocation sideTop) - { - String basePath = block.getRegistryName().getPath(); - ModelFile upModel = models().cubeBottomTop(basePath, sideTop, pillarEnd, pillarEnd); - ModelFile downModel = models().cubeBottomTop(basePath + "_down", sideBottom, pillarEnd, pillarEnd); - - ElementBuilder northElementBuilder = models().withExistingParent(basePath + "_north", "cube").texture("particle", pillarEnd).texture("sideBottom", sideBottom).texture("end", pillarEnd).texture("sideTop", sideTop).element(); - northElementBuilder.face(Direction.UP).uvs(0, 0, 16, 16).texture("#sideTop").end(); - northElementBuilder.face(Direction.DOWN).uvs(0, 0, 16, 16).texture("#sideBottom").end(); - northElementBuilder.face(Direction.NORTH).uvs(0, 0, 16, 16).texture("#end").end(); - northElementBuilder.face(Direction.SOUTH).uvs(0, 0, 16, 16).texture("#end").end(); - northElementBuilder.face(Direction.WEST).uvs(16, 0, 0, 16).texture("#sideTop").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); - northElementBuilder.face(Direction.EAST).uvs(16, 0, 0, 16).texture("#sideBottom").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); - ModelFile northModel = northElementBuilder.end(); - - ElementBuilder southElementBuilder = models().withExistingParent(basePath + "_south", "cube").texture("particle", pillarEnd).texture("sideBottom", sideBottom).texture("end", pillarEnd).texture("sideTop", sideTop).element(); - southElementBuilder.face(Direction.UP).uvs(0, 0, 16, 16).texture("#sideBottom").end(); - southElementBuilder.face(Direction.DOWN).uvs(0, 0, 16, 16).texture("#sideTop").end(); - southElementBuilder.face(Direction.NORTH).uvs(0, 0, 16, 16).texture("#end").end(); - southElementBuilder.face(Direction.SOUTH).uvs(0, 0, 16, 16).texture("#end").end(); - southElementBuilder.face(Direction.WEST).uvs(16, 0, 0, 16).texture("#sideBottom").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); - southElementBuilder.face(Direction.EAST).uvs(16, 0, 0, 16).texture("#sideTop").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); - ModelFile southModel = southElementBuilder.end(); - - ElementBuilder westElementBuilder = models().withExistingParent(basePath + "_west", "cube").texture("particle", pillarEnd).texture("sideBottom", sideBottom).texture("end", pillarEnd).texture("sideTop", sideTop).element(); - westElementBuilder.face(Direction.UP).uvs(0, 0, 16, 16).texture("#sideTop").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); - westElementBuilder.face(Direction.DOWN).uvs(0, 0, 16, 16).texture("#sideTop").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); - westElementBuilder.face(Direction.NORTH).uvs(0, 0, 16, 16).texture("#sideBottom").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); - westElementBuilder.face(Direction.SOUTH).uvs(0, 0, 16, 16).texture("#sideTop").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); - westElementBuilder.face(Direction.WEST).uvs(16, 0, 0, 16).texture("#end").end(); - westElementBuilder.face(Direction.EAST).uvs(16, 0, 0, 16).texture("#end").end(); - ModelFile westModel = westElementBuilder.end(); - - ElementBuilder eastElementBuilder = models().withExistingParent(basePath + "_east", "cube").texture("particle", pillarEnd).texture("sideBottom", sideBottom).texture("end", pillarEnd).texture("sideTop", sideTop).element(); - eastElementBuilder.face(Direction.UP).uvs(0, 0, 16, 16).texture("#sideBottom").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); - eastElementBuilder.face(Direction.DOWN).uvs(0, 0, 16, 16).texture("#sideBottom").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); - eastElementBuilder.face(Direction.NORTH).uvs(0, 0, 16, 16).texture("#sideTop").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); - eastElementBuilder.face(Direction.SOUTH).uvs(0, 0, 16, 16).texture("#sideBottom").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); - eastElementBuilder.face(Direction.WEST).uvs(16, 0, 0, 16).texture("#end").end(); - eastElementBuilder.face(Direction.EAST).uvs(16, 0, 0, 16).texture("#end").end(); - ModelFile eastModel = eastElementBuilder.end(); - - VariantBlockStateBuilder builder = getVariantBuilder(block); - builder.partialState().with(BlockPillarCap.FACING, Direction.UP).modelForState().modelFile(upModel).addModel(); - builder.partialState().with(BlockPillarCap.FACING, Direction.DOWN).modelForState().modelFile(downModel).addModel(); - builder.partialState().with(BlockPillarCap.FACING, Direction.NORTH).modelForState().modelFile(northModel).addModel(); - builder.partialState().with(BlockPillarCap.FACING, Direction.SOUTH).modelForState().modelFile(southModel).addModel(); - builder.partialState().with(BlockPillarCap.FACING, Direction.WEST).modelForState().modelFile(westModel).addModel(); - builder.partialState().with(BlockPillarCap.FACING, Direction.EAST).modelForState().modelFile(eastModel).addModel(); - } - - private BlockModelBuilder rotateTextureFace(BlockModelBuilder file, Direction face, FaceRotation rotation, String texture) - { -// BiConsumer.ElementBuilder.FaceBuilder> biCon = (fc, rot) -> { -// rot.rotation(rotation).texture(texture); -// }; - return file.element().face(face).uvs(16, 0, 0, 16).rotation(rotation).texture("#east").end().end(); -// return file.element().faces(biCon).texture("#east").end(); - } - - private void buildCubeAll(Block block) - { - getVariantBuilder(block).forAllStates(state -> ConfiguredModel.builder().modelFile(cubeAll(block)).build()); - } - -// private void buildStairs(StairsBlock block, ResourceLocation texture) -// { -// getVariantBuilder(block).forAllStates(state -> ConfiguredModel.builder().modelFile(stairsBlock(block, texture)).build()); -// } - - private void buildCrystal(Block block, String name) - { - MultiPartBlockStateBuilder builder = getMultipartBuilder(block); - - ModelFile[] crystalModels = new ModelFile[7]; - for (int i = 0; i < 7; i++) - { - crystalModels[i] = models().withExistingParent("block/crystal/" + name + (i + 1), modLoc("crystal" + (i + 1))).texture("crystal", modLoc("models/" + name)); - } - - for (int i = 0; i < 7; i++) - { - Integer[] intArray = new Integer[7 - i]; - for (int j = i; j < 7; j++) - { - intArray[j - i] = j; - } - - for (Direction direction : Direction.values()) - { - Builder partBuilder = builder.part().modelFile(crystalModels[i]); - switch (direction) - { - case UP: - break; - case DOWN: - partBuilder = partBuilder.rotationX(180); - break; - case EAST: - partBuilder = partBuilder.rotationX(90).rotationY(90); - break; - case WEST: - partBuilder = partBuilder.rotationX(90).rotationY(270); - break; - case NORTH: - partBuilder = partBuilder.rotationX(90); - break; - case SOUTH: - partBuilder = partBuilder.rotationX(270); - break; - } - - partBuilder.addModel().condition(BlockDemonCrystal.AGE, intArray).condition(BlockDemonCrystal.ATTACHED, direction).end(); - } - } - } - - private void buildFurnace(Block block) - { -// ConfiguredModel[] furnaceModel = ConfiguredModel.builder().modelFile().build(); - ModelFile furnace_off = models().orientableWithBottom("alchemicalreactionchamber", BloodMagic.rl("block/arc_side"), BloodMagic.rl("block/arc_front"), BloodMagic.rl("block/arc_bottom"), BloodMagic.rl("block/arc_top")); -// getVariantBuilder(block).addModels(block.getDefaultState().with(BlockAlchemicalReactionChamber.FACING, Direction.NORTH).with(BlockAlchemicalReactionChamber.LIT, false), furnaceModel); - - VariantBlockStateBuilder builder = getVariantBuilder(block); - - builder.partialState().with(BlockAlchemicalReactionChamber.FACING, Direction.NORTH).with(BlockAlchemicalReactionChamber.LIT, false).modelForState().modelFile(furnace_off).addModel(); - builder.partialState().with(BlockAlchemicalReactionChamber.FACING, Direction.EAST).with(BlockAlchemicalReactionChamber.LIT, false).modelForState().modelFile(furnace_off).rotationY(90).addModel(); - builder.partialState().with(BlockAlchemicalReactionChamber.FACING, Direction.SOUTH).with(BlockAlchemicalReactionChamber.LIT, false).modelForState().modelFile(furnace_off).rotationY(180).addModel(); - builder.partialState().with(BlockAlchemicalReactionChamber.FACING, Direction.WEST).with(BlockAlchemicalReactionChamber.LIT, false).modelForState().modelFile(furnace_off).rotationY(270).addModel(); - builder.partialState().with(BlockAlchemicalReactionChamber.FACING, Direction.NORTH).with(BlockAlchemicalReactionChamber.LIT, true).modelForState().modelFile(furnace_off).addModel(); - builder.partialState().with(BlockAlchemicalReactionChamber.FACING, Direction.EAST).with(BlockAlchemicalReactionChamber.LIT, true).modelForState().modelFile(furnace_off).rotationY(90).addModel(); - builder.partialState().with(BlockAlchemicalReactionChamber.FACING, Direction.SOUTH).with(BlockAlchemicalReactionChamber.LIT, true).modelForState().modelFile(furnace_off).rotationY(180).addModel(); - builder.partialState().with(BlockAlchemicalReactionChamber.FACING, Direction.WEST).with(BlockAlchemicalReactionChamber.LIT, true).modelForState().modelFile(furnace_off).rotationY(270).addModel(); - -// getVariantBuilder(block). - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockTags.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockTags.java deleted file mode 100644 index 1e464bc6..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockTags.java +++ /dev/null @@ -1,48 +0,0 @@ -package wayoftime.bloodmagic.common.data; - -import java.nio.file.Path; - -import net.minecraft.block.Blocks; -import net.minecraft.data.BlockTagsProvider; -import net.minecraft.data.DataGenerator; -import net.minecraft.tags.BlockTags; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.data.ExistingFileHelper; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.common.tags.BloodMagicTags; - -public class GeneratorBlockTags extends BlockTagsProvider -{ - public GeneratorBlockTags(DataGenerator generatorIn, ExistingFileHelper exFileHelper) - { - super(generatorIn, BloodMagic.MODID, exFileHelper); - } - - @Override - public void registerTags() - { - this.getOrCreateBuilder(BlockTags.WALLS).add(BloodMagicBlocks.DUNGEON_BRICK_WALL.get()); - this.getOrCreateBuilder(BlockTags.WALLS).add(BloodMagicBlocks.DUNGEON_POLISHED_WALL.get()); - this.getOrCreateBuilder(BloodMagicTags.Blocks.MUSHROOM_STEM).add(Blocks.MUSHROOM_STEM).add(Blocks.CRIMSON_STEM).add(Blocks.WARPED_STEM); - this.getOrCreateBuilder(BloodMagicTags.Blocks.MUSHROOM_HYPHAE).add(Blocks.BROWN_MUSHROOM_BLOCK).add(Blocks.RED_MUSHROOM_BLOCK).add(Blocks.CRIMSON_HYPHAE).add(Blocks.WARPED_HYPHAE).add(Blocks.STRIPPED_CRIMSON_HYPHAE).add(Blocks.STRIPPED_WARPED_HYPHAE).add(Blocks.NETHER_WART_BLOCK).add(Blocks.WARPED_WART_BLOCK).add(Blocks.SHROOMLIGHT); - } - - /** - * Resolves a Path for the location to save the given tag. - */ - @Override - protected Path makePath(ResourceLocation id) - { - return this.generator.getOutputFolder().resolve("data/" + id.getNamespace() + "/tags/blocks/" + id.getPath() + ".json"); - } - - /** - * Gets a name for this provider, to use in logging. - */ - @Override - public String getName() - { - return "Block Tags"; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorFluidTags.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorFluidTags.java deleted file mode 100644 index df5c4ac1..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorFluidTags.java +++ /dev/null @@ -1,22 +0,0 @@ -package wayoftime.bloodmagic.common.data; - -import net.minecraft.data.DataGenerator; -import net.minecraft.data.FluidTagsProvider; -import net.minecraftforge.common.data.ExistingFileHelper; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.common.tags.BloodMagicTags; - -public class GeneratorFluidTags extends FluidTagsProvider -{ - public GeneratorFluidTags(DataGenerator generatorIn, ExistingFileHelper existingFileHelper) - { - super(generatorIn, BloodMagic.MODID, existingFileHelper); - } - - @Override - public void registerTags() - { - this.getOrCreateBuilder(BloodMagicTags.LIFE_ESSENCE).add(BloodMagicBlocks.LIFE_ESSENCE_FLUID.get(), BloodMagicBlocks.LIFE_ESSENCE_FLUID_FLOWING.get()); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemModels.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemModels.java deleted file mode 100644 index 47d9f125..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemModels.java +++ /dev/null @@ -1,221 +0,0 @@ -package wayoftime.bloodmagic.common.data; - -import net.minecraft.block.Block; -import net.minecraft.data.DataGenerator; -import net.minecraft.item.Item; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.generators.ItemModelBuilder; -import net.minecraftforge.client.model.generators.ItemModelProvider; -import net.minecraftforge.client.model.generators.ModelFile; -import net.minecraftforge.common.data.ExistingFileHelper; -import net.minecraftforge.fml.RegistryObject; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.common.item.BloodMagicItems; - -public class GeneratorItemModels extends ItemModelProvider -{ - public GeneratorItemModels(DataGenerator generator, ExistingFileHelper existingFileHelper) - { - super(generator, BloodMagic.MODID, existingFileHelper); - } - - @Override - protected void registerModels() - { -// registerBlockModel(BloodMagicBlocks.TARTARICFORGE.get()); -// registerBlockModel(BloodMagicBlocks.SPEED_RUNE.get()); - - for (RegistryObject item : BloodMagicItems.BASICITEMS.getEntries()) - { - registerBasicItem(item.get()); - } - - for (RegistryObject block : BloodMagicBlocks.BASICBLOCKS.getEntries()) - { - registerBlockModel(block.get()); - } - - for (RegistryObject block : BloodMagicBlocks.DUNGEONBLOCKS.getEntries()) - { - registerBlockModel(block.get()); - } - - registerBlockModel(BloodMagicBlocks.BLANK_RITUAL_STONE.get()); - registerBlockModel(BloodMagicBlocks.AIR_RITUAL_STONE.get()); - registerBlockModel(BloodMagicBlocks.WATER_RITUAL_STONE.get()); - registerBlockModel(BloodMagicBlocks.FIRE_RITUAL_STONE.get()); - registerBlockModel(BloodMagicBlocks.EARTH_RITUAL_STONE.get()); - registerBlockModel(BloodMagicBlocks.DUSK_RITUAL_STONE.get()); - registerBlockModel(BloodMagicBlocks.DAWN_RITUAL_STONE.get()); - registerBlockModel(BloodMagicBlocks.ALCHEMICAL_REACTION_CHAMBER.get()); - registerBlockModel(BloodMagicBlocks.NETHER_SOIL.get()); - - registerCustomBlockPath(BloodMagicBlocks.RAW_CRYSTAL_BLOCK.get(), "crystal/defaultcrystal1"); - registerCustomBlockPath(BloodMagicBlocks.CORROSIVE_CRYSTAL_BLOCK.get(), "crystal/corrosivecrystal1"); - registerCustomBlockPath(BloodMagicBlocks.DESTRUCTIVE_CRYSTAL_BLOCK.get(), "crystal/destructivecrystal1"); - registerCustomBlockPath(BloodMagicBlocks.VENGEFUL_CRYSTAL_BLOCK.get(), "crystal/vengefulcrystal1"); - registerCustomBlockPath(BloodMagicBlocks.STEADFAST_CRYSTAL_BLOCK.get(), "crystal/steadfastcrystal1"); - - registerCustomBlockPath(BloodMagicBlocks.DUNGEON_BRICK_ASSORTED.get(), "dungeon_brick1"); - registerBlockModel(BloodMagicBlocks.DUNGEON_STONE.get()); - registerBlockModel(BloodMagicBlocks.DUNGEON_BRICK_STAIRS.get()); - registerBlockModel(BloodMagicBlocks.DUNGEON_POLISHED_STAIRS.get()); - registerBlockModel(BloodMagicBlocks.DUNGEON_PILLAR_CENTER.get()); - registerBlockModel(BloodMagicBlocks.DUNGEON_PILLAR_SPECIAL.get()); - registerBlockModel(BloodMagicBlocks.DUNGEON_PILLAR_CAP.get()); - registerCustomBlockPath(BloodMagicBlocks.DUNGEON_BRICK_WALL.get(), "dungeon_brick_wall_inventory"); - registerCustomBlockPath(BloodMagicBlocks.DUNGEON_POLISHED_WALL.get(), "dungeon_polished_wall_inventory"); - registerBlockModel(BloodMagicBlocks.DUNGEON_BRICK_GATE.get()); - registerBlockModel(BloodMagicBlocks.DUNGEON_POLISHED_GATE.get()); - - registerToggleableItem(BloodMagicItems.GREEN_GROVE_SIGIL.get()); - registerToggleableItem(BloodMagicItems.FAST_MINER_SIGIL.get()); - registerToggleableItem(BloodMagicItems.MAGNETISM_SIGIL.get()); - registerToggleableItem(BloodMagicItems.ICE_SIGIL.get()); - registerDemonWillVariantItem(BloodMagicItems.PETTY_GEM.get()); - registerDemonWillVariantItem(BloodMagicItems.LESSER_GEM.get()); - registerDemonWillVariantItem(BloodMagicItems.COMMON_GEM.get()); - registerDemonWillVariantItem(BloodMagicItems.GREATER_GEM.get()); - registerDemonSword(BloodMagicItems.SENTIENT_SWORD.get()); - registerDemonTool(BloodMagicItems.SENTIENT_AXE.get()); - registerDemonTool(BloodMagicItems.SENTIENT_PICKAXE.get()); - registerDemonTool(BloodMagicItems.SENTIENT_SHOVEL.get()); - registerDemonTool(BloodMagicItems.SENTIENT_SCYTHE.get()); - registerSacrificialKnife(BloodMagicItems.SACRIFICIAL_DAGGER.get()); - - registerCustomFullTexture(BloodMagicBlocks.MIMIC.get(), "solidopaquemimic"); - registerCustomFullTexture(BloodMagicBlocks.ETHEREAL_MIMIC.get(), "etherealopaquemimic"); - this.crop(BloodMagicBlocks.GROWING_DOUBT.get().getRegistryName().getPath(), modLoc("block/creeping_doubt_8")); - - registerBlockModel(BloodMagicBlocks.SHAPED_CHARGE.get()); - registerBlockModel(BloodMagicBlocks.DEFORESTER_CHARGE.get()); - registerBlockModel(BloodMagicBlocks.VEINMINE_CHARGE.get()); - registerBlockModel(BloodMagicBlocks.FUNGAL_CHARGE.get()); - - registerMultiLayerItem(BloodMagicItems.SLATE_VIAL.get(), modLoc("item/alchemic_vial"), modLoc("item/alchemic_ribbon")); - registerMultiLayerItem(BloodMagicItems.MELEE_DAMAGE_ANOINTMENT.get(), modLoc("item/alchemic_vial"), modLoc("item/alchemic_liquid"), modLoc("item/alchemic_ribbon")); - registerMultiLayerItem(BloodMagicItems.SILK_TOUCH_ANOINTMENT.get(), modLoc("item/alchemic_vial"), modLoc("item/alchemic_liquid"), modLoc("item/alchemic_ribbon")); - registerMultiLayerItem(BloodMagicItems.FORTUNE_ANOINTMENT.get(), modLoc("item/alchemic_vial"), modLoc("item/alchemic_liquid"), modLoc("item/alchemic_ribbon")); - registerMultiLayerItem(BloodMagicItems.HOLY_WATER_ANOINTMENT.get(), modLoc("item/alchemic_vial"), modLoc("item/alchemic_liquid"), modLoc("item/alchemic_ribbon")); - registerMultiLayerItem(BloodMagicItems.HIDDEN_KNOWLEDGE_ANOINTMENT.get(), modLoc("item/alchemic_vial"), modLoc("item/alchemic_liquid"), modLoc("item/alchemic_ribbon")); - registerMultiLayerItem(BloodMagicItems.QUICK_DRAW_ANOINTMENT.get(), modLoc("item/alchemic_vial"), modLoc("item/alchemic_liquid"), modLoc("item/alchemic_ribbon")); - registerMultiLayerItem(BloodMagicItems.LOOTING_ANOINTMENT.get(), modLoc("item/alchemic_vial"), modLoc("item/alchemic_liquid"), modLoc("item/alchemic_ribbon")); - registerMultiLayerItem(BloodMagicItems.BOW_POWER_ANOINTMENT.get(), modLoc("item/alchemic_vial"), modLoc("item/alchemic_liquid"), modLoc("item/alchemic_ribbon")); - registerMultiLayerItem(BloodMagicItems.WILL_POWER_ANOINTMENT.get(), modLoc("item/alchemic_vial_will"), modLoc("item/alchemic_liquid"), modLoc("item/alchemic_ribbon_will")); - registerMultiLayerItem(BloodMagicItems.SMELTING_ANOINTMENT.get(), modLoc("item/alchemic_vial"), modLoc("item/alchemic_liquid"), modLoc("item/alchemic_ribbon")); - - } - - private void registerCustomFullTexture(Block block, String texturePath) - { - String path = block.getRegistryName().getPath(); - getBuilder(path).parent(new ModelFile.UncheckedModelFile(modLoc("block/" + texturePath))); - } - - private void registerCustomBlockPath(Block block, String newPath) - { - String path = block.getRegistryName().getPath(); - getBuilder(path).parent(new ModelFile.UncheckedModelFile(modLoc("block/" + newPath))); - } - - private void registerBlockModel(Block block) - { - String path = block.getRegistryName().getPath(); - getBuilder(path).parent(new ModelFile.UncheckedModelFile(modLoc("block/" + path))); - } - - private void registerBasicItem(Item item) - { - String path = item.getRegistryName().getPath(); - singleTexture(path, mcLoc("item/generated"), "layer0", modLoc("item/" + path)); - } - - private void registerMultiLayerItem(Item item, ResourceLocation... locations) - { - String path = item.getRegistryName().getPath(); - ItemModelBuilder builder = getBuilder(path).parent(getExistingFile(mcLoc("item/generated"))); -// ModelFile model = withExistingParent(path, mcLoc("item/handheld")); - - for (int i = 0; i < locations.length; i++) - { - builder.texture("layer" + i, locations[i]); - } - - builder.assertExistence(); - } - - private void registerToggleableItem(Item item) - { - String path = item.getRegistryName().getPath(); - ModelFile activatedFile = singleTexture("item/variants/" + path + "_activated", mcLoc("item/handheld"), "layer0", modLoc("item/" + path + "_activated")); - ModelFile deactivatedFile = singleTexture("item/variants/" + path + "_deactivated", mcLoc("item/handheld"), "layer0", modLoc("item/" + path + "_deactivated")); - getBuilder(path).override().predicate(BloodMagic.rl("active"), 0).model(deactivatedFile).end().override().predicate(BloodMagic.rl("active"), 1).model(activatedFile).end(); - } - - private void registerDemonWillVariantItem(Item item) - { - String path = item.getRegistryName().getPath(); - ItemModelBuilder builder = getBuilder(path); - - for (EnumDemonWillType type : EnumDemonWillType.values()) - { - String name = ""; - if (type.ordinal() != 0) - { - name = "_" + type.name().toLowerCase(); - } - ModelFile willFile = singleTexture("item/variants/" + path + name, mcLoc("item/handheld"), "layer0", modLoc("item/" + path + name)); - builder = builder.override().predicate(BloodMagic.rl("type"), type.ordinal()).model(willFile).end(); - } - } - - private void registerDemonSword(Item item) - { - String path = item.getRegistryName().getPath(); - ItemModelBuilder builder = getBuilder(path); - - for (int i = 0; i <= 1; i++) - { - for (EnumDemonWillType type : EnumDemonWillType.values()) - { - String name = i == 0 ? "_deactivated" : "_activated"; - if (type.ordinal() != 0) - { - name = "_" + type.name().toLowerCase() + name; - } - ModelFile willFile = singleTexture("item/variants/" + path + name, mcLoc("item/handheld"), "layer0", modLoc("item/" + path + name)); - builder = builder.override().predicate(BloodMagic.rl("type"), type.ordinal()).predicate(BloodMagic.rl("active"), i).model(willFile).end(); - } - } - } - - private void registerDemonTool(Item item) - { - String path = item.getRegistryName().getPath(); - ItemModelBuilder builder = getBuilder(path); - - for (EnumDemonWillType type : EnumDemonWillType.values()) - { - String name = ""; - if (type.ordinal() != 0) - { - name = "_" + type.name().toLowerCase() + name; - } - ModelFile willFile = singleTexture("item/variants/" + path + name, mcLoc("item/handheld"), "layer0", modLoc("item/" + path + name)); - builder = builder.override().predicate(BloodMagic.rl("type"), type.ordinal()).model(willFile).end(); - - } - } - - private void registerSacrificialKnife(Item item) - { - String path = item.getRegistryName().getPath(); - ItemModelBuilder builder = getBuilder(path); - - ModelFile baseKnifeFile = singleTexture("item/variants/" + path, mcLoc("item/handheld"), "layer0", modLoc("item/" + path)); - ModelFile ceremonialKnifeFile = singleTexture("item/variants/" + path + "_ceremonial", mcLoc("item/handheld"), "layer0", modLoc("item/" + path + "_ceremonial")); - builder = builder.override().predicate(BloodMagic.rl("incense"), 0).model(baseKnifeFile).end().override().predicate(BloodMagic.rl("incense"), 1).model(ceremonialKnifeFile).end(); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemTags.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemTags.java deleted file mode 100644 index 80508474..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemTags.java +++ /dev/null @@ -1,164 +0,0 @@ -package wayoftime.bloodmagic.common.data; - -import java.nio.file.Path; - -import net.minecraft.data.BlockTagsProvider; -import net.minecraft.data.DataGenerator; -import net.minecraft.data.ItemTagsProvider; -import net.minecraft.item.Item; -import net.minecraft.tags.ITag.INamedTag; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.data.ExistingFileHelper; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.common.item.BloodMagicItems; -import wayoftime.bloodmagic.common.tags.BloodMagicTags; - -public class GeneratorItemTags extends ItemTagsProvider -{ - public GeneratorItemTags(DataGenerator dataGenerator, BlockTagsProvider blockTagProvider, ExistingFileHelper existingFileHelper) - { - super(dataGenerator, blockTagProvider, BloodMagic.MODID, existingFileHelper); - } - - @Override - public void registerTags() - { - registerIngots(); - registerOres(); - registerDusts(); - registerFragments(); - registerGravels(); - - registerFurnaceCells(); - registerReverters(); - registerSieves(); - registerExplosives(); - registerHydration(); - registerResonators(); - registerCuttingFluids(); - - this.getOrCreateBuilder(BloodMagicTags.DUST_SULFUR).add(BloodMagicItems.SULFUR.get()); - this.getOrCreateBuilder(BloodMagicTags.DUST_SALTPETER).add(BloodMagicItems.SALTPETER.get()); - this.getOrCreateBuilder(BloodMagicTags.ARC_TOOL).addTag(BloodMagicTags.ARC_TOOL_FURNACE); - this.getOrCreateBuilder(BloodMagicTags.ARC_TOOL).addTag(BloodMagicTags.ARC_TOOL_REVERTER); - this.getOrCreateBuilder(BloodMagicTags.ARC_TOOL).addTag(BloodMagicTags.ARC_TOOL_SIEVE); - this.getOrCreateBuilder(BloodMagicTags.ARC_TOOL).addTag(BloodMagicTags.ARC_TOOL_EXPLOSIVE); - this.getOrCreateBuilder(BloodMagicTags.ARC_TOOL).addTag(BloodMagicTags.ARC_TOOL_HYDRATE); - this.getOrCreateBuilder(BloodMagicTags.ARC_TOOL).addTag(BloodMagicTags.ARC_TOOL_RESONATOR); - this.getOrCreateBuilder(BloodMagicTags.ARC_TOOL).addTag(BloodMagicTags.ARC_TOOL_CUTTINGFLUID); - - this.getOrCreateBuilder(BloodMagicTags.CRYSTAL_DEMON).add(BloodMagicItems.RAW_CRYSTAL.get()); - this.getOrCreateBuilder(BloodMagicTags.CRYSTAL_DEMON).add(BloodMagicItems.CORROSIVE_CRYSTAL.get()); - this.getOrCreateBuilder(BloodMagicTags.CRYSTAL_DEMON).add(BloodMagicItems.DESTRUCTIVE_CRYSTAL.get()); - this.getOrCreateBuilder(BloodMagicTags.CRYSTAL_DEMON).add(BloodMagicItems.VENGEFUL_CRYSTAL.get()); - this.getOrCreateBuilder(BloodMagicTags.CRYSTAL_DEMON).add(BloodMagicItems.STEADFAST_CRYSTAL.get()); - - this.copy(BloodMagicTags.Blocks.MUSHROOM_STEM, BloodMagicTags.MUSHROOM_STEM); - this.copy(BloodMagicTags.Blocks.MUSHROOM_HYPHAE, BloodMagicTags.MUSHROOM_HYPHAE); - -// this.getOrCreateBuilder(GOORESISTANT).addTag(BlockTags.DOORS); -// this.getOrCreateBuilder(GOORESISTANT).addTag(BlockTags.BEDS); -// this.getOrCreateBuilder(GOORESISTANT).add(Blocks.PISTON, Blocks.PISTON_HEAD, Blocks.STICKY_PISTON, Blocks.MOVING_PISTON); - - } - - private void registerIngots() - { - getOrCreateBuilder(BloodMagicTags.INGOT_HELLFORGED).add(BloodMagicItems.HELLFORGED_INGOT.get()); - } - - private void registerOres() - { - getOrCreateBuilder(BloodMagicTags.ORE_COPPER); - getOrCreateBuilder(BloodMagicTags.ORE_LEAD); - getOrCreateBuilder(BloodMagicTags.ORE_OSMIUM); - getOrCreateBuilder(BloodMagicTags.ORE_SILVER); - getOrCreateBuilder(BloodMagicTags.ORE_TIN); - } - - private void registerDusts() - { - getOrCreateBuilder(BloodMagicTags.DUST_IRON).add(BloodMagicItems.IRON_SAND.get()); - getOrCreateBuilder(BloodMagicTags.DUST_GOLD).add(BloodMagicItems.GOLD_SAND.get()); - getOrCreateBuilder(BloodMagicTags.DUST_COAL).add(BloodMagicItems.COAL_SAND.get()); - getOrCreateBuilder(BloodMagicTags.DUST_NETHERITE_SCRAP).add(BloodMagicItems.NETHERITE_SCRAP_SAND.get()); - getOrCreateBuilder(BloodMagicTags.DUST_HELLFORGED).add(BloodMagicItems.HELLFORGED_SAND.get()); - getOrCreateBuilder(BloodMagicTags.DUST_CORRUPTED).add(BloodMagicItems.CORRUPTED_DUST.get()); - getOrCreateBuilder(BloodMagicTags.TINYDUST_CORRUPTED).add(BloodMagicItems.CORRUPTED_DUST_TINY.get()); - } - - private void registerFragments() - { - getOrCreateBuilder(BloodMagicTags.FRAGMENT_IRON).add(BloodMagicItems.IRON_FRAGMENT.get()); - getOrCreateBuilder(BloodMagicTags.FRAGMENT_GOLD).add(BloodMagicItems.GOLD_FRAGMENT.get()); - getOrCreateBuilder(BloodMagicTags.FRAGMENT_NETHERITE_SCRAP).add(BloodMagicItems.NETHERITE_SCRAP_FRAGMENT.get()); - } - - private void registerGravels() - { - getOrCreateBuilder(BloodMagicTags.GRAVEL_IRON).add(BloodMagicItems.IRON_GRAVEL.get()); - getOrCreateBuilder(BloodMagicTags.GRAVEL_GOLD).add(BloodMagicItems.GOLD_GRAVEL.get()); - getOrCreateBuilder(BloodMagicTags.GRAVEL_NETHERITE_SCRAP).add(BloodMagicItems.NETHERITE_SCRAP_GRAVEL.get()); - } - - private void registerFurnaceCells() - { - this.registerTool(BloodMagicItems.PRIMITIVE_FURNACE_CELL.get(), BloodMagicTags.ARC_TOOL_FURNACE); - this.registerTool(BloodMagicItems.LAVA_CRYSTAL.get(), BloodMagicTags.ARC_TOOL_FURNACE); - } - - private void registerReverters() - { - this.registerTool(BloodMagicItems.SANGUINE_REVERTER.get(), BloodMagicTags.ARC_TOOL_REVERTER); - } - - private void registerSieves() - { - this.registerTool(BloodMagicItems.AIR_INSCRIPTION_TOOL.get(), BloodMagicTags.ARC_TOOL_SIEVE); - } - - private void registerExplosives() - { - this.registerTool(BloodMagicItems.EXPLOSIVE_POWDER.get(), BloodMagicTags.ARC_TOOL_EXPLOSIVE); - this.registerTool(BloodMagicItems.PRIMITIVE_EXPLOSIVE_CELL.get(), BloodMagicTags.ARC_TOOL_EXPLOSIVE); - } - - private void registerHydration() - { - this.registerTool(BloodMagicItems.PRIMITIVE_HYDRATION_CELL.get(), BloodMagicTags.ARC_TOOL_HYDRATE); - } - - private void registerResonators() - { - this.registerTool(BloodMagicItems.PRIMITIVE_CRYSTALLINE_RESONATOR.get(), BloodMagicTags.ARC_TOOL_RESONATOR); - this.registerTool(BloodMagicItems.CRYSTALLINE_RESONATOR.get(), BloodMagicTags.ARC_TOOL_RESONATOR); - } - - private void registerCuttingFluids() - { - this.registerTool(BloodMagicItems.BASIC_CUTTING_FLUID.get(), BloodMagicTags.ARC_TOOL_CUTTINGFLUID); - } - - public void registerTool(Item item, INamedTag tag) - { - this.getOrCreateBuilder(tag).add(item); - } - - /** - * Resolves a Path for the location to save the given tag. - */ - @Override - protected Path makePath(ResourceLocation id) - { - return this.generator.getOutputFolder().resolve("data/" + id.getNamespace() + "/tags/items/" + id.getPath() + ".json"); - } - - /** - * Gets a name for this provider, to use in logging. - */ - @Override - public String getName() - { - return "Item Tags"; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java deleted file mode 100644 index b579d029..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java +++ /dev/null @@ -1,626 +0,0 @@ -package wayoftime.bloodmagic.common.data; - -import net.minecraft.data.DataGenerator; -import net.minecraftforge.common.data.LanguageProvider; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.common.item.BloodMagicItems; - -public class GeneratorLanguage extends LanguageProvider -{ - public GeneratorLanguage(DataGenerator gen) - { - super(gen, BloodMagic.MODID, "en_us"); - } - - @Override - protected void addTranslations() - { - // HUD - add("hud.bloodmagic.inactive", "Inactive"); - - // Creative Tab - add("itemGroup.bloodmagic.creativeTab", "Blood Magic"); - - add("chat.bloodmagic.damageSource", "%s's soul became too weak"); - - // Tile Entitites - add("tile.bloodmagic.soulforge.name", "Hellfire Forge"); - add("tile.bloodmagic.arc.name", "Alchemical Reaction Chamber"); - add("tile.bloodmagic.alchemytable.name", "Alchemy Table"); - - // Blood Orb tooltips - add("tooltip.bloodmagic.extraInfo", "&9-Hold shift for more info-"); - add("tooltip.bloodmagic.orb.desc", "Stores raw Life Essence"); - add("tooltip.bloodmagic.orb.owner", "Added by: %s"); - add("tooltip.bloodmagic.currentOwner", "Current owner: %s"); - add("tooltip.bloodmagic.currentTier", "Current tier: %d"); - add("tooltip.bloodmagic.config.disabled", "Currently disabled in the Config"); - add("tooltip.bloodmagic.tier", "Tier %d"); - - // Sigil tooltips - add("tooltip.bloodmagic.sigil.divination.desc", "Peer into the soul"); - add("tooltip.bloodmagic.sigil.divination.otherNetwork", "Peering into the soul of %s"); - add("tooltip.bloodmagic.sigil.divination.currentAltarTier", "Current Tier: %d"); - add("tooltip.bloodmagic.sigil.divination.currentEssence", "Current Essence: %d LP"); - add("tooltip.bloodmagic.sigil.divination.currentAltarCapacity", "Current Capacity: %d LP"); - add("tooltip.bloodmagic.sigil.divination.currentTranquility", "Current Tranquility: %d"); -// add("tooltip.bloodmagic.sigil.divination.currentInversion", "Current Inversion: %d"); - add("tooltip.bloodmagic.sigil.divination.currentBonus", "Current Bonus: +%d%%"); - - add("tooltip.bloodmagic.sigil.seer.desc", "When seeing all is not enough"); - add("tooltip.bloodmagic.sigil.seer.currentAltarProgress", "Current Progress: %d LP/ %s LP"); - add("tooltip.bloodmagic.sigil.seer.currentAltarProgress.percent", "Current Progress: %s"); - add("tooltip.bloodmagic.sigil.seer.currentAltarConsumptionRate", "Consumption Rate: %d LP"); - add("tooltip.bloodmagic.sigil.seer.currentAltarTier", "Current Tier: %d"); - add("tooltip.bloodmagic.sigil.seer.currentEssence", "Current Essence: %d LP"); - add("tooltip.bloodmagic.sigil.seer.currentAltarCapacity", "Current Capacity: %d LP"); - add("tooltip.bloodmagic.sigil.seer.currentCharge", "Current Charge: %d"); - add("tooltip.bloodmagic.sigil.seer.currentTranquility", "Current Tranquility: %d"); - add("tooltip.bloodmagic.sigil.seer.currentBonus", "Current Bonus: +%d%%"); - - add("tooltip.bloodmagic.sigil.holding.press", "Press %s to modify"); - add("tooltip.bloodmagic.sigil.holding.desc", "Sigil-ception"); - add("tooltip.bloodmagic.sigil.holding.sigilInSlot", "Slot %d: %s"); - - add("tooltip.bloodmagic.activated", "Activated"); - add("tooltip.bloodmagic.deactivated", "Deactivated"); - - add("tooltip.bloodmagic.decoration.safe", "Safe for decoration"); - add("tooltip.bloodmagic.decoration.notSafe", "Dangerous for decoration"); - - // General Tooltips - add("tooltip.bloodmagic.arcaneAshes", "Ashes used to draw an alchemy circle"); - add("tooltip.bloodmagic.will", "Will Quality: %s"); - add("tooltip.bloodmagic.sentientSword.desc", "Uses demon will to unleash its full potential."); - add("tooltip.bloodmagic.sentientAxe.desc", "Uses demon will to unleash its full potential."); - add("tooltip.bloodmagic.sentientPickaxe.desc", "Uses demon will to unleash its full potential."); - add("tooltip.bloodmagic.sentientShovel.desc", "Uses demon will to unleash its full potential."); - add("tooltip.bloodmagic.soulGem.petty", "A gem used to contain a little will"); - add("tooltip.bloodmagic.soulGem.lesser", "A gem used to contain some will"); - add("tooltip.bloodmagic.soulGem.common", "A gem used to contain more will"); - add("tooltip.bloodmagic.soulGem.greater", "A gem used to contain a greater amount of will"); - add("tooltip.bloodmagic.soulGem.grand", "A gem used to contain a large amount of will"); - add("tooltip.bloodmagic.soulSnare.desc", "Throw at a monster and then kill them to obtain their demonic will"); - - add("tooltip.bloodmagic.currentType.default", "Contains: Raw Will"); - add("tooltip.bloodmagic.currentType.corrosive", "Contains: Corrosive Will"); - add("tooltip.bloodmagic.currentType.destructive", "Contains: Destructive Will"); - add("tooltip.bloodmagic.currentType.vengeful", "Contains: Vengeful Will"); - add("tooltip.bloodmagic.currentType.steadfast", "Contains: Steadfast Will"); - - add("tooltip.bloodmagic.currentBaseType.default", "Raw"); - add("tooltip.bloodmagic.currentBaseType.corrosive", "Corrosive"); - add("tooltip.bloodmagic.currentBaseType.destructive", "Destructive"); - add("tooltip.bloodmagic.currentBaseType.vengeful", "Vengeful"); - add("tooltip.bloodmagic.currentBaseType.steadfast", "Steadfast"); - add("tooltip.bloodmagic.sacrificialdagger.desc", "Just a prick of the finger will suffice..."); - add("tooltip.bloodmagic.slate.desc", "Infused stone inside of a Blood Altar"); - add("tooltip.bloodmagic.inscriber.desc", "The writing is on the wall..."); - - add("tooltip.bloodmagic.sigil.water.desc", "Infinite water, anyone?"); - add("tooltip.bloodmagic.sigil.lava.desc", "HOT! DO NOT EAT"); - add("tooltip.bloodmagic.sigil.void.desc", "Better than a Swiffer®!"); - add("tooltip.bloodmagic.sigil.greengrove.desc", "Environmentally friendly"); - add("tooltip.bloodmagic.sigil.magnetism.desc", "I have a very magnetic personality"); - add("tooltip.bloodmagic.sigil.fastminer.desc", "Keep mining, and mining..."); - add("tooltip.bloodmagic.sigil.air.desc", "I feel lighter already..."); - add("tooltip.bloodmagic.sigil.bloodlight.desc", "I see a light!"); - - add("tooltip.bloodmagic.activationcrystal.weak", "Activates low-level rituals"); - add("tooltip.bloodmagic.activationcrystal.awakened", "Activates more powerful rituals"); - add("tooltip.bloodmagic.activationcrystal.creative", "Creative Only - Activates any ritual"); - - add("tooltip.bloodmagic.arctool.additionaldrops", "Increases chance of additional outputs by: x%s"); - add("tooltip.bloodmagic.arctool.uses", "Uses remaining: %s"); - - add("itemGroup.bloodmagictab", "Blood Magic"); - - add("tooltip.bloodmagic.experienceTome", "A book used to store experience"); - add("tooltip.bloodmagic.experienceTome.exp", "Exp: %0.3f"); - add("tooltip.bloodmagic.experienceTome.expLevel", "Level: %d"); - - add("tooltip.bloodmagic.throwing_dagger.desc", "Not to be used in the kitchen"); - - add("key.bloodmagic.category", "Blood Magic"); - - // Ritual info - add("tooltip.bloodmagic.diviner.currentRitual", "Current Ritual: %s"); - add("tooltip.bloodmagic.diviner.blankRune", "Blank Runes: %d"); - add("tooltip.bloodmagic.diviner.waterRune", "Water Runes: %d"); - add("tooltip.bloodmagic.diviner.airRune", "Air Runes: %d"); - add("tooltip.bloodmagic.diviner.fireRune", "Fire Runes: %d"); - add("tooltip.bloodmagic.diviner.earthRune", "Earth Runes: %d"); - add("tooltip.bloodmagic.diviner.duskRune", "Dusk Runes: %d"); - add("tooltip.bloodmagic.diviner.dawnRune", "Dawn Runes: %d"); - add("tooltip.bloodmagic.diviner.totalRune", "Total Runes: %d"); - add("tooltip.bloodmagic.diviner.extraInfo", "Press shift for extra info"); - add("tooltip.bloodmagic.diviner.extraExtraInfo", "-Hold shift + alt for augmentation info-"); - add("tooltip.bloodmagic.diviner.currentDirection", "Current Direction: %s"); - - add("tooltip.bloodmagic.holdShiftForInfo", "Press shift for extra info"); - - add("ritual.bloodmagic.blockRange.tooBig", "The block range given is too big! Needs to be at most %s blocks."); - add("ritual.bloodmagic.blockRange.tooFar", "The block range given is too far! Needs to be within a vertical range of %s blocks and a horizontal range of %s blocks."); - add("ritual.bloodmagic.blockRange.inactive", "The ritual stone is currently inactive, and cannot have its range modified."); - add("ritual.bloodmagic.blockRange.noRange", "The range was not properly chosen."); - add("ritual.bloodmagic.blockRange.firstBlock", "First block for new range stored."); - add("ritual.bloodmagic.blockRange.success", "New range successfully set!"); - add("ritual.bloodmagic.willConfig.set", "The ritual will use these Demon Will types: %s"); - add("ritual.bloodmagic.willConfig.void", "The ritual no longer uses Demon Will"); - - add("ritual.bloodmagic.testRitual", "Test Ritual"); - add("ritual.bloodmagic.waterRitual", "Ritual of the Full Spring"); - add("ritual.bloodmagic.lavaRitual", "Serenade of the Nether"); - add("ritual.bloodmagic.greenGroveRitual", "Ritual of the Green Grove"); - add("ritual.bloodmagic.jumpRitual", "Ritual of the High Jump"); - add("ritual.bloodmagic.wellOfSufferingRitual", "Well of Suffering"); - add("ritual.bloodmagic.featheredKnifeRitual", "Ritual of the Feathered Knife"); - add("ritual.bloodmagic.regenerationRitual", "Ritual of Regeneration"); - add("ritual.bloodmagic.harvestRitual", "Reap of the Harvest Moon"); - add("ritual.bloodmagic.magneticRitual", "Ritual of Magnetism"); - add("ritual.bloodmagic.crushingRitual", "Ritual of the Crusher"); - add("ritual.bloodmagic.fullStomachRitual", "Ritual of the Satiated Stomach"); - add("ritual.bloodmagic.interdictionRitual", "Ritual of Interdiction"); - add("ritual.bloodmagic.containmentRitual", "Ritual of Containment"); - add("ritual.bloodmagic.speedRitual", "Ritual of Speed"); - add("ritual.bloodmagic.suppressionRitual", "Ritual of Suppression"); - add("ritual.bloodmagic.expulsionRitual", "Aura of Expulsion"); - add("ritual.bloodmagic.zephyrRitual", "Call of the Zephyr"); - add("ritual.bloodmagic.upgradeRemoveRitual", "Sound of the Cleansing Soul"); - add("ritual.bloodmagic.armourEvolveRitual", "Ritual of Living Evolution"); - add("ritual.bloodmagic.animalGrowthRitual", "Ritual of the Shepherd"); - add("ritual.bloodmagic.crystalHarvestRitual", "Crack of the Fractured Crystal"); - add("ritual.bloodmagic.forsakenSoulRitual", "Gathering of the Forsaken Souls"); - add("ritual.bloodmagic.crystalSplitRitual", "Resonance of the Faceted Crystal"); - add("ritual.bloodmagic.ellipseRitual", "Focus of the Ellipsoid"); - - add("ritual.bloodmagic.cobblestoneRitual", "Le Vulcanos Frigius"); - add("ritual.bloodmagic.placerRitual", "The Filler"); - add("ritual.bloodmagic.fellingRitual", "The Timberman"); - add("ritual.bloodmagic.pumpRitual", "Hymn of Siphoning"); - add("ritual.bloodmagic.altarBuilderRitual", "The Assembly of the High Altar"); - add("ritual.bloodmagic.portalRitual", "The Gate of the Fold"); - - add("ritual.bloodmagic.waterRitual.info", "Generates a source of water from the master ritual stone."); - add("ritual.bloodmagic.lavaRitual.info", "Generates a source of lava from the master ritual stone."); - add("ritual.bloodmagic.lavaRitual.default.info", "(Raw) Decreases the LP cost of placing lava and allows lava to be placed insided of a linked container."); - add("ritual.bloodmagic.lavaRitual.corrosive.info", "(Corrosive) Entities within range that are immune to fire are damaged severely."); - add("ritual.bloodmagic.lavaRitual.destructive.info", "(Destructive) Lava placement range is increased based on total Will."); - add("ritual.bloodmagic.lavaRitual.vengeful.info", "(Vengeful) Entities within range have Fire Fuse applied to them."); - add("ritual.bloodmagic.lavaRitual.steadfast.info", "(Steadfast) Players within a designated range have Fire Resistance applied to them."); - - add("ritual.bloodmagic.greenGroveRitual.info", "Grows crops within its area."); - add("ritual.bloodmagic.jumpRitual.info", "Causes entities to leap up into the air."); - add("ritual.bloodmagic.wellOfSufferingRitual.info", "Attacks mobs within its damage zone and puts the LP into a nearby blood altar."); - add("ritual.bloodmagic.featheredKnifeRitual.info", "Drains health from players in its area and puts the LP into a nearby blood altar."); - add("ritual.bloodmagic.regenerationRitual.info", "Casts regeneration on entities within its range if they are missing health."); - add("ritual.bloodmagic.regenerationRitual.default.info", "(Raw)"); - add("ritual.bloodmagic.regenerationRitual.corrosive.info", "(Corrosive) Steals health from non-players inside of its Vampirism range and directly heals players."); - add("ritual.bloodmagic.regenerationRitual.destructive.info", "(Destructive)"); - add("ritual.bloodmagic.regenerationRitual.vengeful.info", "(Vengeful)"); - add("ritual.bloodmagic.regenerationRitual.steadfast.info", "(Steadfast)"); - add("ritual.bloodmagic.harvestRitual.info", "Harvests plants within its range, dropping the results on the ground."); - add("ritual.bloodmagic.magneticRitual.info", "Pulls up ores from the ground and puts them into its placement range."); - add("ritual.bloodmagic.crushingRitual.info", "Breaks blocks within its crushing range and places the items into the linked chest."); - add("ritual.bloodmagic.crushingRitual.destructive.info", "(Destructive) Blocks are broken down forcefully: all blocks broken are affected by Fortune III."); - add("ritual.bloodmagic.crushingRitual.steadfast.info", "(Steadfast) Causes all blocks that are broken to be picked up with silk touch. Overrides Fortune where applicable."); - add("ritual.bloodmagic.crushingRitual.corrosive.info", "(Corrosive) All blocks are broken to be processed with a form of cutting fluid. Overrides Silk Touch where applicable."); - add("ritual.bloodmagic.crushingRitual.vengeful.info", "(Vengeful) Compresses the inventory on successful operation. Currently only does one compression per operation."); - add("ritual.bloodmagic.crushingRitual.default.info", "(Raw) Increases the speed of the ritual based on total Will."); - add("ritual.bloodmagic.greenGroveRitual.corrosive.info", "(Corrosive) Entities within range are attacked by nearby plants, leeching away their life."); - add("ritual.bloodmagic.greenGroveRitual.default.info", "(Raw) Increases the speed of all of the ritual operations depending on the total Will in the Aura."); - add("ritual.bloodmagic.greenGroveRitual.vengeful.info", "(Vengeful) Increases the rate that a growth tick is successful."); - add("ritual.bloodmagic.greenGroveRitual.steadfast.info", "(Steadfast) Seeds are replanted and blocks are hydrated within the Hydration range."); - add("ritual.bloodmagic.greenGroveRitual.destructive.info", "(Destructive) Growing range is increased based on total Will."); - add("ritual.bloodmagic.featheredKnifeRitual.default.info", "(Raw) Increases the speed of the ritual based on the total Will in the Aura."); - add("ritual.bloodmagic.featheredKnifeRitual.destructive.info", "(Destructive) Increases the yield of the ritual based on total Will."); - add("ritual.bloodmagic.featheredKnifeRitual.vengeful.info", "(Vengeful) Sets the minimum health for sacrificing to 10%%. Overridden by Steadfast for the Owner if active."); - add("ritual.bloodmagic.featheredKnifeRitual.corrosive.info", "(Corrosive) Uses the player's Incense to increase the yield."); - add("ritual.bloodmagic.featheredKnifeRitual.steadfast.info", "(Steadfast) Sets the minimum health for sacrificing from 30%% to 70%%."); - add("ritual.bloodmagic.speedRitual.default.info", "(Raw) Increases the velocity caused by the ritual based on total Will."); - add("ritual.bloodmagic.speedRitual.vengeful.info", "(Vengeful) Prevents adult mobs and players from being transported. Players are transported if paired with Destructive."); - add("ritual.bloodmagic.speedRitual.destructive.info", "(Destructive) Prevents child mobs and players from being transported. Players are transported if paired with Vengeful."); - add("ritual.bloodmagic.animalGrowthRitual.vengeful.info", "(Vengeful) Decreases the time it takes for adults to breed again."); - add("ritual.bloodmagic.animalGrowthRitual.steadfast.info", "(Steadfast) Automatically breeds adults within its area using items in the connected chest."); - add("ritual.bloodmagic.animalGrowthRitual.default.info", "(Raw) Increases the speed of the ritual based on the total Will in the Aura."); - add("ritual.bloodmagic.animalGrowthRitual.destructive.info", "(Destructive) Causes adults that have not bred lately to run at mobs and explode."); - add("ritual.bloodmagic.animalGrowthRitual.corrosive.info", "(Corrosive) Unimplemented."); - add("ritual.bloodmagic.groundingRitual.info", "Forces entities on the ground and prevents jumping."); - add("ritual.bloodmagic.groundingRitual.default.info", "(Raw) Affects players."); - add("ritual.bloodmagic.groundingRitual.corrosive.info", "(Corrosive) Disables gravity (+Vengeful) Applies Levitation."); - add("ritual.bloodmagic.groundingRitual.destructive.info", "(Destructive) Applies Heavy Heart (increases fall damage) (+Vengeful) Stronger effect."); - add("ritual.bloodmagic.groundingRitual.steadfast.info", "(Steadfast) Affects Bosses. Doesn't affect bosses that are immune against motion change or immune against potions (except Wither and Ender Dragon)."); - add("ritual.bloodmagic.groundingRitual.vengeful.info", "(Vengeful) Makes effects stronger. (+Corrosive) Applies Levitation. (+Destructive) Higher Heavy Heart amplifier."); - add("ritual.bloodmagic.condorRitual.info", "Provides flight in an area around the ritual."); - add("ritual.bloodmagic.eternalSoulRitual.info", "Capable of transferring Life Essence from a Network back into an Altar at a cost."); - - add("ritual.bloodmagic.crystalSplitRitual.info", "Splits apart a well-grown Raw crystal cluster into seperal aspected crystal clusters."); - add("ritual.bloodmagic.fullStomachRitual.info", "Takes food from the linked chest and fills the player's saturation with it."); - add("ritual.bloodmagic.interdictionRitual.info", "Pushes all mobs within its area away from the master ritual stone."); - add("ritual.bloodmagic.containmentRitual.info", "Pulls all mobs within its area towards the master ritual stone."); - add("ritual.bloodmagic.speedRitual.info", "Launches players within its range in the direction of the ritual."); - add("ritual.bloodmagic.suppressionRitual.info", "Suppresses fluids within its range - deactivating the ritual returns the fluids back to the world."); - add("ritual.bloodmagic.expulsionRitual.info", "Expels players from its range that are neither the owner nor have a bound blood orb in the chest on top of the master ritual stone."); - add("ritual.bloodmagic.zephyrRitual.info", "Picks up items within its range and places them into the linked chest."); - add("ritual.bloodmagic.upgradeRemoveRitual.info", "Removes all upgrades (and downgrades) from your Living Armor and gives you the corresponding Upgrade (and Downgrade) Tomes. These Tomes can be used to be applied to your Living Armor again."); - add("ritual.bloodmagic.armourEvolveRitual.info", "Increases the amount of maximum Upgrade Points on your Living Armor to 300."); - add("ritual.bloodmagic.animalGrowthRitual.info", "Increases the maturity rate of baby animals within its range."); - add("ritual.bloodmagic.forsakenSoulRitual.info", "Damages mobs within its damage range and when the mob dies a demon crystal within its crystal range will be grown."); - add("ritual.bloodmagic.crystalHarvestRitual.info", "Breaks Demon Will crystal clusters within its range, dropping the results on top of the crystals."); - add("ritual.bloodmagic.placerRitual.info", "Grabs blocks that are inside of the connected inventory and places them into the world."); - add("ritual.bloodmagic.fellingRitual.info", "A standard tree-cutting machine, this ritual will cut down all trees and leaves within its area and collect the drops."); - add("ritual.bloodmagic.pumpRitual.info", "Looks around the world and grabs fluids from the defined area. Will only remove and put the fluid into the connected tank if the tank has at least a bucket's worth of the same fluid."); - add("ritual.bloodmagic.altarBuilderRitual.info", "Builds an altar out of the components inside of the connected inventory."); - add("ritual.bloodmagic.portalRitual.info", "Creates a portal network based on the activator and the immediately surrounding blocks. Blocks can be changed after activation without changing the network of portals, and portals with the same \"key\" will link together."); - add("ritual.bloodmagic.meteorRitual.info", "Consumes an item inside of its item range to summon a meteor full of resources from the sky, aimed directly at the ritual."); - - add("ritual.bloodmagic.waterRitual.waterRange.info", "(Water) The area that the ritual will place water source blocks."); - add("ritual.bloodmagic.waterRitual.waterTank.info", "(Raw) The tank that the ritual will place water into."); - add("ritual.bloodmagic.lavaRitual.lavaRange.info", "(Lava) The area that the ritual will place lava source blocks."); - add("ritual.bloodmagic.lavaRitual.lavaTank.info", "(Raw) The tank that the ritual will place lava into."); - add("ritual.bloodmagic.lavaRitual.fireFuse.info", "(Vengeful) Entities in this range are afflicted by Fire Fuse."); - add("ritual.bloodmagic.lavaRitual.fireResist.info", "(Steadfast) Players in this range have Fire Resist applied."); - add("ritual.bloodmagic.lavaRitual.fireDamage.info", "(Corrosive) Entities within this range that are immune to fire damage are hurt proportional to the Will."); - add("ritual.bloodmagic.greenGroveRitual.growing.info", "(Growth) The area that the ritual will grow plants in."); - add("ritual.bloodmagic.greenGroveRitual.leech.info", "(Corrosive) Entities in this area have their life drained to grow nearby crops."); - add("ritual.bloodmagic.greenGroveRitual.hydrate.info", "(Steadfast) Blocks within this range are rehydrated into farmland, and seeds within the area are planted nearby."); - add("ritual.bloodmagic.jumpRitual.jumpRange.info", "(Jumping) Entities in this range will be launched in the air."); - add("ritual.bloodmagic.wellOfSufferingRitual.altar.info", "(Altar) This range defines the area that the ritual searches for the blood altar. Changing this will either expand or limit the range to a certain region."); - add("ritual.bloodmagic.wellOfSufferingRitual.damage.info", "(Damage) This defines where the ritual will damage a mob. All mobs inside of this range (except for players) will receive damage over time."); - add("ritual.bloodmagic.featheredKnifeRitual.altar.info", "(Altar) This range defines the area that the ritual searches for the blood altar. Changing this will either expand or limit the range to a certain region."); - add("ritual.bloodmagic.featheredKnifeRitual.damage.info", "(Damage) This defines where the ritual will damage a player. Players inside of this range will receive damage over time up to the specified limit."); - add("ritual.bloodmagic.regenerationRitual.heal.info", "(Healing) Entities within this range will receive a regeneration buff."); - add("ritual.bloodmagic.regenerationRitual.vampire.info", "(Vampirism) Mobs within this range have their health syphoned to heal players in the Healing range."); - add("ritual.bloodmagic.harvestRitual.harvestRange.info", "(Harvesting) Plants within this range will be harvested."); - add("ritual.bloodmagic.magneticRitual.placementRange.info", "(Placement) The range that the ritual will place the grabbed ores into."); - add("ritual.bloodmagic.crushingRitual.crushingRange.info", "(Crushing) The blocks that the ritual will break."); - add("ritual.bloodmagic.crushingRitual.chest.info", "(Chest) The location of the inventory that the ritual will place the broken blocks into."); - add("ritual.bloodmagic.fullStomachRitual.fillRange.info", "(Feeding) The range that the ritual will look at to feed players."); - add("ritual.bloodmagic.fullStomachRitual.chest.info", "(Chest) The location of the inventory that the ritual will grab food from to feed players in range."); - add("ritual.bloodmagic.interdictionRitual.interdictionRange.info", "(Push) The area of the ritual where mobs will be pushed. All mobs are pushed away from the master ritual stone, regardless of where this area is."); - add("ritual.bloodmagic.containmentRitual.containmentRange.info", "(Containment) The area of the ritual where mobs will be pulled. All mobs are pulled towards the master ritual stone, regardless of where this area is."); - add("ritual.bloodmagic.speedRitual.sanicRange.info", "(Speed) All entities within this area are launched in the direction of the arrow formed by the ritual."); - add("ritual.bloodmagic.suppressionRitual.suppressionRange.info", "(Suppress) All liquids within the range are suppressed."); - add("ritual.bloodmagic.expulsionRitual.expulsionRange.info", "(Expulsion) The area from which players that are not owner or have an orb in the chest will be teleported away from."); - add("ritual.bloodmagic.zephyrRitual.zephyrRange.info", "(Suction) Items within this range will be sucked into the linked chest."); - add("ritual.bloodmagic.zephyrRitual.chest.info", "(Chest) The location of the inventory that the ritual will place the picked up items into."); - add("ritual.bloodmagic.animalGrowthRitual.growing.info", "(Growth) Animals within this range will grow much faster."); - add("ritual.bloodmagic.animalGrowthRitual.chest.info", "(Chest) Chest for breeding items if properly augmented."); - add("ritual.bloodmagic.forsakenSoulRitual.crystal.info", "(Crystal) Demon Crystals in this range receive an increase in growth speed when a mob is killed by the ritual."); - add("ritual.bloodmagic.forsakenSoulRitual.damage.info", "(Damage) Mobs within this range will be slowly damaged, and when killed will grow the crystals."); - add("ritual.bloodmagic.crystalHarvestRitual.crystal.info", "(Crystal) All Demon Will crystal clusters have a single crystal broken off, spawning the crystal into the world. If there is only one crystal on the cluster, it will not break it."); - - add("ritual.bloodmagic.ellipseRitual.info", "Creates a hollow spheroid around the ritual using the blocks in the attached chest."); - add("ritual.bloodmagic.ellipseRitual.spheroidRange.info", "(Placement) The range that the ritual will place its blocks in. Spheroid is centered on the ritual - if one side is shorter than the side opposite the spheroid is truncated."); - add("ritual.bloodmagic.ellipseRitual.chest.info", "(Chest) The location of the inventory that the ritual will grab blocks from to place in the world."); - - add("ritual.bloodmagic.placerRitual.placerRange.info", "(Placement) The range that the ritual will place its blocks in."); - add("ritual.bloodmagic.placerRitual.chest.info", "(Chest) The location of the inventory that the ritual will grab blocks from to place in the world."); - add("ritual.bloodmagic.fellingRitual.fellingRange.info", "(Cutting) The range that the ritual will search out logs and leaves in order to cut down."); - add("ritual.bloodmagic.fellingRitual.chest.info", "(Chest) The location of the inventory that the ritual will place the results into."); - add("ritual.bloodmagic.pumpRitual.pumpRange.info", "(Pump) The region that the ritual will look for fluids to grab from the world."); - - add("tooltip.bloodmagic.ritualReader.currentState", "Current mode: %s"); - add("tooltip.bloodmagic.ritualReader.set_area", "Define Area"); - add("tooltip.bloodmagic.ritualReader.information", "Information"); - add("tooltip.bloodmagic.ritualReader.set_will_types", "Set Will Consumed"); - add("tooltip.bloodmagic.ritualReader.desc.set_area", "Right click on an active Master Ritual stone to cycle what area of the ritual you want to modify. Then click on the two corners of the new range you want to set the range."); - add("tooltip.bloodmagic.ritualReader.desc.information", "Right click on an active Master Ritual Stone to gather basic information about the ritual."); - add("tooltip.bloodmagic.ritualReader.desc.set_will_types", "Set the types of demon will that the ritual will consume from the aura by right clicking on the MRS with the same types of crystals on your hotbar."); - - // Living Armour - the 'u' is important, TehNut! - add("living_upgrade.bloodmagic.arrow_protect", "Pin Cushion"); - add("living_upgrade.bloodmagic.speed", "Quick Feet"); - add("living_upgrade.bloodmagic.digging", "Dwarven Might"); - add("living_upgrade.bloodmagic.poison_resist", "Poison Resistance"); - add("living_upgrade.bloodmagic.fire_resist", "Gift of Ignis"); - add("living_upgrade.bloodmagic.self_sacrifice", "Tough Palms"); - add("living_upgrade.bloodmagic.knockback_resist", "Body Builder"); - add("living_upgrade.bloodmagic.physical_protect", "Tough"); - add("living_upgrade.bloodmagic.health", "Healthy"); - add("living_upgrade.bloodmagic.melee_damage", "Fierce Strike"); - add("living_upgrade.bloodmagic.arrow_shot", "Trick Shot"); - add("living_upgrade.bloodmagic.step_assist", "Step Assist"); - add("living_upgrade.bloodmagic.grim_reaper", "Grim Reaper's Sprint"); - add("living_upgrade.bloodmagic.solar_powered", "Solar Powered"); - add("living_upgrade.bloodmagic.thaumRunicShielding", "Runic Shielding"); - add("living_upgrade.bloodmagic.revealing", "Revealing"); - add("living_upgrade.bloodmagic.experienced", "Experienced"); - add("living_upgrade.bloodmagic.jump", "Strong Legs"); - add("living_upgrade.bloodmagic.fall_protect", "Soft Fall"); - add("living_upgrade.bloodmagic.grave_digger", "Grave Digger"); - add("living_upgrade.bloodmagic.sprint_attack", "Charging Strike"); - add("living_upgrade.bloodmagic.critical_strike", "True Strike"); - add("living_upgrade.bloodmagic.elytra", "Elytra"); - add("living_upgrade.bloodmagic.night_sight", "Nocturnal Prowess"); - add("living_upgrade.bloodmagic.repair", "Repairing"); - - add("living_upgrade.bloodmagic.slowness", "Limp Leg"); - add("living_upgrade.bloodmagic.crippledArm", "Crippled Arm"); - add("living_upgrade.bloodmagic.slippery", "Loose Traction"); - add("living_upgrade.bloodmagic.battleHunger", "Battle Hungry"); - add("living_upgrade.bloodmagic.quenched", "Quenched"); - add("living_upgrade.bloodmagic.meleeDecrease", "Dulled Blade"); - add("living_upgrade.bloodmagic.digSlowdown", "Weakened Pick"); - add("living_upgrade.bloodmagic.stormTrooper", "Storm Trooper"); - add("living_upgrade.bloodmagic.slowHeal", "Diseased"); - add("living_upgrade.bloodmagic.disoriented", "Disoriented"); - - add("tooltip.bloodmagic.livingarmour.upgrade.level", "%s (Level %d)"); - add("tooltip.bloodmagic.livingarmour.upgrade.progress", "%s (%d/100)"); - add("tooltip.bloodmagic.livingarmour.upgrade.points", "Upgrade points: %s / %s"); - - add("tooltip.bloodmagic.livingarmour.extraExtraInfo", "&9-Hold shift + M for progress info-"); - - add("tooltip.bloodmagic.slate_vial", "A glass vial infused with a simple slate"); - add("tooltip.bloodmagic.blood_provider.slate.desc", "A simple ampoule containing 500LP"); - - add("chat.bloodmagic.living_upgrade_level_increase", "%s has leveled up to %d"); - - // Anointments. Doesn't have any spelling to be pedantic about. - add("anointment.bloodmagic.melee_damage", "Whetstone"); - add("anointment.bloodmagic.silk_touch", "Soft Touch"); - add("anointment.bloodmagic.fortune", "Fortunate"); - add("anointment.bloodmagic.holy_water", "Holy Light"); - add("anointment.bloodmagic.hidden_knowledge", "Miner's Secrets"); - add("anointment.bloodmagic.quick_draw", "Deft Hands"); - add("anointment.bloodmagic.bow_power", "Heavy Shot"); - add("anointment.bloodmagic.looting", "Plundering"); - add("anointment.bloodmagic.smelting", "Heated Tool"); - - // Guide - add("guide.bloodmagic.name", "Sanguine Scientiem"); - add("guide.bloodmagic.landing_text", "\"It is my dear hope that by holding this tome in your hands, I may impart the knowledge of the lost art that is Blood Magic\"$(br)$(o)- Magus Arcana$()"); - - // Keybinds - add("bloodmagic.keybind.open_holding", "Open Sigil of Holding"); - add("bloodmagic.keybind.cycle_holding_pos", "Cycle Sigil (+)"); - add("bloodmagic.keybind.cycle_holding_neg", "Cycle Sigil (-)"); - - // Block names - addBlock(BloodMagicBlocks.BLANK_RUNE, "Blank Rune"); - addBlock(BloodMagicBlocks.SPEED_RUNE, "Speed Rune"); - addBlock(BloodMagicBlocks.SACRIFICE_RUNE, "Rune of Sacrifice"); - addBlock(BloodMagicBlocks.SELF_SACRIFICE_RUNE, "Rune of Self Sacrifice"); - addBlock(BloodMagicBlocks.DISPLACEMENT_RUNE, "Displacement Rune"); - addBlock(BloodMagicBlocks.CAPACITY_RUNE, "Rune of Capacity"); - addBlock(BloodMagicBlocks.AUGMENTED_CAPACITY_RUNE, "Rune of Augmented Capacity"); - addBlock(BloodMagicBlocks.ORB_RUNE, "Rune of the Orb"); - addBlock(BloodMagicBlocks.ACCELERATION_RUNE, "Acceleration Rune"); - addBlock(BloodMagicBlocks.CHARGING_RUNE, "Charging Rune"); - addBlock(BloodMagicBlocks.BLOOD_ALTAR, "Blood Altar"); - addBlock(BloodMagicBlocks.SOUL_FORGE, "Hellfire Forge"); - addBlock(BloodMagicBlocks.BLANK_RITUAL_STONE, "Ritual Stone"); - addBlock(BloodMagicBlocks.AIR_RITUAL_STONE, "Air Ritual Stone"); - addBlock(BloodMagicBlocks.WATER_RITUAL_STONE, "Water Ritual Stone"); - addBlock(BloodMagicBlocks.FIRE_RITUAL_STONE, "Fire Ritual Stone"); - addBlock(BloodMagicBlocks.EARTH_RITUAL_STONE, "Earth Ritual Stone"); - addBlock(BloodMagicBlocks.DUSK_RITUAL_STONE, "Dusk Ritual Stone"); - addBlock(BloodMagicBlocks.DAWN_RITUAL_STONE, "Dawn Ritual Stone"); - addBlock(BloodMagicBlocks.MASTER_RITUAL_STONE, "Master Ritual Stone"); - - addBlock(BloodMagicBlocks.ALCHEMICAL_REACTION_CHAMBER, "Alchemical Reaction Chamber"); - addBlock(BloodMagicBlocks.ALCHEMY_TABLE, "Alchemy Table"); - addBlock(BloodMagicBlocks.INCENSE_ALTAR, "Incense Altar"); - - addBlock(BloodMagicBlocks.BLOODSTONE, "Large Bloodstone Brick"); - addBlock(BloodMagicBlocks.BLOODSTONE_BRICK, "Bloodstone Brick"); - - addBlock(BloodMagicBlocks.RAW_CRYSTAL_BLOCK, "Raw Crystal Cluster"); - addBlock(BloodMagicBlocks.CORROSIVE_CRYSTAL_BLOCK, "Corrosive Crystal Cluster"); - addBlock(BloodMagicBlocks.DESTRUCTIVE_CRYSTAL_BLOCK, "Destructive Crystal Cluster"); - addBlock(BloodMagicBlocks.VENGEFUL_CRYSTAL_BLOCK, "Vengeful Crystal Cluster"); - addBlock(BloodMagicBlocks.STEADFAST_CRYSTAL_BLOCK, "Steadfast Crystal Cluster"); - - addBlock(BloodMagicBlocks.DEMON_CRUCIBLE, "Demon Crucible"); - addBlock(BloodMagicBlocks.DEMON_CRYSTALLIZER, "Demon Crystallizer"); - - addBlock(BloodMagicBlocks.WOOD_PATH, "Wooden Path"); - addBlock(BloodMagicBlocks.WOOD_TILE_PATH, "Tiled Wooden Path"); - addBlock(BloodMagicBlocks.STONE_PATH, "Stone Path"); - addBlock(BloodMagicBlocks.STONE_TILE_PATH, "Tiled Stone Path"); - addBlock(BloodMagicBlocks.WORN_STONE_PATH, "Worn Stone Path"); - addBlock(BloodMagicBlocks.WORN_STONE_TILE_PATH, "Tiled Worn Stone Path"); - addBlock(BloodMagicBlocks.OBSIDIAN_PATH, "Obsidian Path"); - addBlock(BloodMagicBlocks.OBSIDIAN_TILE_PATH, "Tiled Obsidian Path"); - - addBlock(BloodMagicBlocks.DUNGEON_BRICK_1, "Demon Bricks"); - addBlock(BloodMagicBlocks.DUNGEON_BRICK_2, "Offset Demon Bricks"); - addBlock(BloodMagicBlocks.DUNGEON_BRICK_3, "Long Demon Bricks"); - addBlock(BloodMagicBlocks.DUNGEON_SMALL_BRICK, "Small Demon Bricks"); - addBlock(BloodMagicBlocks.DUNGEON_BRICK_ASSORTED, "Assorted Demon Bricks"); - - addBlock(BloodMagicBlocks.DUNGEON_STONE, "Demon Stone"); - addBlock(BloodMagicBlocks.DUNGEON_POLISHED_STONE, "Polished Demon Stone"); - addBlock(BloodMagicBlocks.DUNGEON_TILE, "Demon Stone Tiles"); - addBlock(BloodMagicBlocks.DUNGEON_TILE_SPECIAL, "Accented Demon Stone Tiles"); - - addBlock(BloodMagicBlocks.DUNGEON_BRICK_GATE, "Demon Brick Gate"); - addBlock(BloodMagicBlocks.DUNGEON_POLISHED_GATE, "Demon Stone Gate"); - - addBlock(BloodMagicBlocks.DUNGEON_BRICK_STAIRS, "Demon Brick Stairs"); - addBlock(BloodMagicBlocks.DUNGEON_POLISHED_STAIRS, "Demon Stone Stairs"); - - addBlock(BloodMagicBlocks.DUNGEON_BRICK_WALL, "Demon Brick Wall"); - addBlock(BloodMagicBlocks.DUNGEON_POLISHED_WALL, "Demon Stone Wall"); - - addBlock(BloodMagicBlocks.DUNGEON_PILLAR_CAP, "Demon Stone Pillar Cap"); - addBlock(BloodMagicBlocks.DUNGEON_PILLAR_CENTER, "Demon Stone Pillar"); - addBlock(BloodMagicBlocks.DUNGEON_PILLAR_SPECIAL, "Accented Demon Stone Pillar"); - addBlock(BloodMagicBlocks.DUNGEON_EYE, "Demon Eye"); - - addBlock(BloodMagicBlocks.DUNGEON_ORE, "Demonite"); - - addBlock(BloodMagicBlocks.SHAPED_CHARGE, "Shaped Charge"); - addBlock(BloodMagicBlocks.DEFORESTER_CHARGE, "Deforester Charge"); - addBlock(BloodMagicBlocks.VEINMINE_CHARGE, "Controlled Charge"); - addBlock(BloodMagicBlocks.FUNGAL_CHARGE, "Fungal Charge"); - - // Item names - addItem(BloodMagicItems.WEAK_BLOOD_ORB, "Weak Blood Orb"); - addItem(BloodMagicItems.APPRENTICE_BLOOD_ORB, "Apprentice Blood Orb"); - addItem(BloodMagicItems.MAGICIAN_BLOOD_ORB, "Magician Blood Orb"); - addItem(BloodMagicItems.MASTER_BLOOD_ORB, "Master Blood Orb"); - addItem(BloodMagicItems.DIVINATION_SIGIL, "Divination Sigil"); - addItem(BloodMagicItems.WATER_SIGIL, "Water Sigil"); - addItem(BloodMagicItems.LAVA_SIGIL, "Lava Sigil"); - addItem(BloodMagicItems.VOID_SIGIL, "Void Sigil"); - addItem(BloodMagicItems.GREEN_GROVE_SIGIL, "Sigil of the Green Grove"); - addItem(BloodMagicItems.FAST_MINER_SIGIL, "Sigil of the Fast Miner"); - addItem(BloodMagicItems.MAGNETISM_SIGIL, "Sigil of Magnetism"); - addItem(BloodMagicItems.ICE_SIGIL, "Sigil of the Frozen Lake"); - addItem(BloodMagicItems.AIR_SIGIL, "Air Sigil"); - addItem(BloodMagicItems.BLOOD_LIGHT_SIGIL, "Sigil of the Blood Lamp"); - addItem(BloodMagicItems.SEER_SIGIL, "Seer's Sigil"); - addItem(BloodMagicItems.HOLDING_SIGIL, "Sigil of Holding"); - - addItem(BloodMagicBlocks.LIFE_ESSENCE_BUCKET, "Bucket of Life"); - addItem(BloodMagicItems.ARCANE_ASHES, "Arcane Ashes"); - addItem(BloodMagicItems.SLATE, "Blank Slate"); - addItem(BloodMagicItems.REINFORCED_SLATE, "Reinforced Slate"); - addItem(BloodMagicItems.IMBUED_SLATE, "Imbued Slate"); - addItem(BloodMagicItems.DEMONIC_SLATE, "Demonic Slate"); - addItem(BloodMagicItems.ETHEREAL_SLATE, "Ethereal Slate"); - - addItem(BloodMagicItems.DAGGER_OF_SACRIFICE, "Dagger of Sacrifice"); - addItem(BloodMagicItems.SACRIFICIAL_DAGGER, "Sacrificial Knife"); - addItem(BloodMagicItems.LAVA_CRYSTAL, "Lava Crystal"); - - addItem(BloodMagicItems.REAGENT_WATER, "Water Reagent"); - addItem(BloodMagicItems.REAGENT_LAVA, "Lava Reagent"); - addItem(BloodMagicItems.REAGENT_FAST_MINER, "Mining Reagent"); - addItem(BloodMagicItems.REAGENT_GROWTH, "Growth Reagent"); - addItem(BloodMagicItems.REAGENT_VOID, "Void Reagent"); - addItem(BloodMagicItems.REAGENT_MAGNETISM, "Magnetism Reagent"); - addItem(BloodMagicItems.REAGENT_AIR, "Air Reagent"); - addItem(BloodMagicItems.REAGENT_BLOOD_LIGHT, "Blood Lamp Reagent"); - addItem(BloodMagicItems.REAGENT_SIGHT, "Sight Reagent"); - addItem(BloodMagicItems.REAGENT_BINDING, "Binding Reagent"); - addItem(BloodMagicItems.REAGENT_HOLDING, "Holding Reagent"); - - addItem(BloodMagicItems.PETTY_GEM, "Petty Tartaric Gem"); - addItem(BloodMagicItems.LESSER_GEM, "Lesser Tartaric Gem"); - addItem(BloodMagicItems.COMMON_GEM, "Common Tartaric Gem"); - addItem(BloodMagicItems.GREATER_GEM, "Greater Tartaric Gem"); - addItem(BloodMagicItems.MONSTER_SOUL_RAW, "Demon Will"); - addItem(BloodMagicItems.MONSTER_SOUL_CORROSIVE, "Demon Will"); - addItem(BloodMagicItems.MONSTER_SOUL_DESTRUCTIVE, "Demon Will"); - addItem(BloodMagicItems.MONSTER_SOUL_STEADFAST, "Demon Will"); - addItem(BloodMagicItems.MONSTER_SOUL_VENGEFUL, "Demon Will"); - addItem(BloodMagicItems.SOUL_SNARE, "Soul Snare"); - addItem(BloodMagicItems.SENTIENT_SWORD, "Sentient Sword"); - addItem(BloodMagicItems.SENTIENT_AXE, "Sentient Axe"); - addItem(BloodMagicItems.SENTIENT_PICKAXE, "Sentient Pickaxe"); - addItem(BloodMagicItems.SENTIENT_SHOVEL, "Sentient Shovel"); - addItem(BloodMagicItems.SENTIENT_SCYTHE, "Sentient Scythe"); - - addItem(BloodMagicItems.WEAK_ACTIVATION_CRYSTAL, "Weak Activation Crystal"); - addItem(BloodMagicItems.AWAKENED_ACTIVATION_CRYSTAL, "Awakened Activation Crystal"); - addItem(BloodMagicItems.CREATIVE_ACTIVATION_CRYSTAL, "Creative Activation Crystal"); - addItem(BloodMagicItems.WATER_INSCRIPTION_TOOL, "Inscription Tool: Water"); - addItem(BloodMagicItems.FIRE_INSCRIPTION_TOOL, "Inscription Tool: Fire"); - addItem(BloodMagicItems.EARTH_INSCRIPTION_TOOL, "Inscription Tool: Earth"); - addItem(BloodMagicItems.AIR_INSCRIPTION_TOOL, "Inscription Tool: Air"); - addItem(BloodMagicItems.DUSK_INSCRIPTION_TOOL, "Inscription Tool: Dusk"); - - addItem(BloodMagicItems.BASE_RITUAL_DIVINER, "Ritual Diviner"); - addItem(BloodMagicItems.DUSK_RITUAL_DIVINER, "Ritual Diviner [Dusk]"); - addItem(BloodMagicItems.RITUAL_READER, "Ritual Tinkerer"); - - addItem(BloodMagicItems.WEAK_BLOOD_SHARD, "Weak Blood Shard"); - addItem(BloodMagicItems.RAW_CRYSTAL, "Demon Will Crystal"); - addItem(BloodMagicItems.CORROSIVE_CRYSTAL, "Corrosive Will Crystal"); - addItem(BloodMagicItems.DESTRUCTIVE_CRYSTAL, "Destructive Will Crystal"); - addItem(BloodMagicItems.VENGEFUL_CRYSTAL, "Vengeful Will Crystal"); - addItem(BloodMagicItems.STEADFAST_CRYSTAL, "Steadfast Will Crystal"); - - addItem(BloodMagicItems.SANGUINE_REVERTER, "Sanguine Reverter"); - addItem(BloodMagicItems.PRIMITIVE_FURNACE_CELL, "Primitive Fuel Cell"); - - addItem(BloodMagicItems.PRIMITIVE_CRYSTALLINE_RESONATOR, "Primitive Resonator"); - addItem(BloodMagicItems.CRYSTALLINE_RESONATOR, "Crystalline Resonator"); - - addItem(BloodMagicItems.PRIMITIVE_HYDRATION_CELL, "Primitive Hydration Cell"); - addItem(BloodMagicItems.PRIMITIVE_EXPLOSIVE_CELL, "Primitive Explosive Cell"); - addItem(BloodMagicItems.EXPLOSIVE_POWDER, "Explosive Powder"); - - addItem(BloodMagicItems.BASIC_CUTTING_FLUID, "Basic Cutting Fluid"); - - addItem(BloodMagicItems.EXPERIENCE_TOME, "Tome of Peritia"); - - addItem(BloodMagicItems.LIVING_HELMET, "Living Helmet"); - addItem(BloodMagicItems.LIVING_PLATE, "Living Chestplate"); - addItem(BloodMagicItems.LIVING_LEGGINGS, "Living Leggings"); - addItem(BloodMagicItems.LIVING_BOOTS, "Living Boots"); - - addItem(BloodMagicItems.LIVING_TOME, "Living Armour Upgrade Tome"); - - addItem(BloodMagicItems.THROWING_DAGGER, "Iron Throwing Dagger"); - addItem(BloodMagicItems.THROWING_DAGGER_SYRINGE, "Syringe Throwing Dagger"); - addItem(BloodMagicItems.SLATE_AMPOULE, "Slate Ampoule"); - - // Anointment Items - addItem(BloodMagicItems.SLATE_VIAL, "Slate-infused Vial"); - addItem(BloodMagicItems.MELEE_DAMAGE_ANOINTMENT, "Honing Oil"); - addItem(BloodMagicItems.SILK_TOUCH_ANOINTMENT, "Soft Coating"); - addItem(BloodMagicItems.FORTUNE_ANOINTMENT, "Fortuna Extract"); - addItem(BloodMagicItems.HOLY_WATER_ANOINTMENT, "Holy Water"); - addItem(BloodMagicItems.HIDDEN_KNOWLEDGE_ANOINTMENT, "Miner's Secrets"); - addItem(BloodMagicItems.QUICK_DRAW_ANOINTMENT, "Dexterity Alkahest"); - addItem(BloodMagicItems.BOW_POWER_ANOINTMENT, "Iron Tip"); - addItem(BloodMagicItems.LOOTING_ANOINTMENT, "Plunderer's Glint"); - addItem(BloodMagicItems.SMELTING_ANOINTMENT, "Slow-burning Oil"); - - // Alchemy Items - addItem(BloodMagicItems.PLANT_OIL, "Plant Oil"); - - // Sands - addItem(BloodMagicItems.COAL_SAND, "Coal Sand"); - addItem(BloodMagicItems.IRON_SAND, "Iron Sand"); - addItem(BloodMagicItems.GOLD_SAND, "Gold Sand"); - addItem(BloodMagicItems.NETHERITE_SCRAP_SAND, "Netherite Scrap Sand"); - addItem(BloodMagicItems.SULFUR, "Sulfur"); - addItem(BloodMagicItems.SALTPETER, "Saltpeter"); - - // Fragments - addItem(BloodMagicItems.IRON_FRAGMENT, "Iron Ore Fragment"); - addItem(BloodMagicItems.GOLD_FRAGMENT, "Gold Ore Fragment"); - addItem(BloodMagicItems.NETHERITE_SCRAP_FRAGMENT, "Ancient Debris Fragment"); - - // Gravels - addItem(BloodMagicItems.IRON_GRAVEL, "Iron Gravel"); - addItem(BloodMagicItems.GOLD_GRAVEL, "Gold Gravel"); - addItem(BloodMagicItems.NETHERITE_SCRAP_GRAVEL, "Ancient Debris Gravel"); - -// addItem(BloodMagicItems , ""); - - // JEI - add("jei.bloodmagic.recipe.minimumsouls", "Minimum: %s Will"); - add("jei.bloodmagic.recipe.soulsdrained", "Drained: %s Will"); - add("jei.bloodmagic.recipe.requiredlp", "LP: %d"); - add("jei.bloodmagic.recipe.requiredtier", "Tier: %d"); - add("jei.bloodmagic.recipe.consumptionrate", "Consumption: %s LP/t"); - add("jei.bloodmagic.recipe.drainrate", "Drain: %s LP/t"); - - add("jei.bloodmagic.recipe.lpDrained", "Drained: %s LP"); - add("jei.bloodmagic.recipe.ticksRequired", "Time: %sTicks"); - - add("jei.bloodmagic.recipe.altar", "Blood Altar"); - add("jei.bloodmagic.recipe.soulforge", "Hellfire Forge"); - add("jei.bloodmagic.recipe.alchemyarraycrafting", "Alchemy Array"); - add("jei.bloodmagic.recipe.arc", "ARC Recipe"); - add("jei.bloodmagic.recipe.arcfurnace", "ARC Furnace Recipe"); - add("jei.bloodmagic.recipe.alchemytable", "Alchemy Table"); - - // Chat - add("chat.bloodmagic.ritual.weak", "You feel a push, but are too weak to perform this ritual."); - add("chat.bloodmagic.ritual.prevent", "The ritual is actively resisting you!"); - add("chat.bloodmagic.ritual.activate", "A rush of energy flows through the ritual!"); - add("chat.bloodmagic.ritual.notValid", "You feel that these runes are not configured correctly..."); - - // GUI - add("gui.bloodmagic.empty", "Empty"); - - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLootTable.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLootTable.java deleted file mode 100644 index e2a6c743..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLootTable.java +++ /dev/null @@ -1,190 +0,0 @@ -package wayoftime.bloodmagic.common.data; - -import java.util.List; -import java.util.Map; -import java.util.function.BiConsumer; -import java.util.function.Consumer; -import java.util.function.Supplier; -import java.util.stream.Collectors; - -import com.google.common.collect.ImmutableList; -import com.mojang.datafixers.util.Pair; - -import net.minecraft.advancements.criterion.StatePropertiesPredicate; -import net.minecraft.block.Block; -import net.minecraft.block.Blocks; -import net.minecraft.block.CropsBlock; -import net.minecraft.data.DataGenerator; -import net.minecraft.data.LootTableProvider; -import net.minecraft.data.loot.BlockLootTables; -import net.minecraft.data.loot.ChestLootTables; -import net.minecraft.item.Item; -import net.minecraft.item.Items; -import net.minecraft.loot.ConstantRange; -import net.minecraft.loot.ItemLootEntry; -import net.minecraft.loot.LootParameterSet; -import net.minecraft.loot.LootParameterSets; -import net.minecraft.loot.LootPool; -import net.minecraft.loot.LootTable; -import net.minecraft.loot.LootTableManager; -import net.minecraft.loot.ValidationTracker; -import net.minecraft.loot.conditions.BlockStateProperty; -import net.minecraft.loot.conditions.ILootCondition; -import net.minecraft.loot.functions.EnchantWithLevels; -import net.minecraft.loot.functions.SetCount; -import net.minecraft.state.Property; -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.RegistryObject; -import net.minecraftforge.registries.ForgeRegistries; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.common.block.BlockDemonCrystal; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.common.item.BloodMagicItems; - -public class GeneratorLootTable extends LootTableProvider -{ - public GeneratorLootTable(DataGenerator dataGeneratorIn) - { - super(dataGeneratorIn); - } - - @Override - protected List>>, LootParameterSet>> getTables() - { - return ImmutableList.of(Pair.of(BMBlocks::new, LootParameterSets.BLOCK), Pair.of(BMLootTables::new, LootParameterSets.CHEST)); - } - - private static class BMLootTables extends ChestLootTables - { - @Override - public void accept(BiConsumer acceptor) - { - acceptor.accept(BloodMagic.rl("test"), testLootTableGeneration()); - } - - private LootTable.Builder testLootTableGeneration() - { - LootTable.Builder table = LootTable.builder(); - LootPool.Builder pool = LootPool.builder().name("test").addEntry(ItemLootEntry.builder(Items.BOOK).weight(10).acceptFunction(EnchantWithLevels.func_215895_a(ConstantRange.of(30)).func_216059_e())); - - table.addLootPool(pool); -// table.build(); - - return table; - } - } - - private static class BMBlocks extends BlockLootTables - { - @Override - protected void addTables() - { - for (RegistryObject block : BloodMagicBlocks.BASICBLOCKS.getEntries()) - { - this.registerDropSelfLootTable(block.get()); - } - - for (RegistryObject block : BloodMagicBlocks.DUNGEONBLOCKS.getEntries()) - { - this.registerDropSelfLootTable(block.get()); - } - - registerDropSelfLootTable(BloodMagicBlocks.BLOOD_ALTAR.get()); - registerNoDropLootTable(BloodMagicBlocks.ALCHEMY_ARRAY.get()); - registerNoDropLootTable(BloodMagicBlocks.BLOOD_LIGHT.get()); - registerDropSelfLootTable(BloodMagicBlocks.SOUL_FORGE.get()); - registerDropSelfLootTable(BloodMagicBlocks.BLANK_RITUAL_STONE.get()); - registerDropping(BloodMagicBlocks.AIR_RITUAL_STONE.get(), BloodMagicBlocks.BLANK_RITUAL_STONE.get()); - registerDropping(BloodMagicBlocks.WATER_RITUAL_STONE.get(), BloodMagicBlocks.BLANK_RITUAL_STONE.get()); - registerDropping(BloodMagicBlocks.FIRE_RITUAL_STONE.get(), BloodMagicBlocks.BLANK_RITUAL_STONE.get()); - registerDropping(BloodMagicBlocks.EARTH_RITUAL_STONE.get(), BloodMagicBlocks.BLANK_RITUAL_STONE.get()); - registerDropping(BloodMagicBlocks.DUSK_RITUAL_STONE.get(), BloodMagicBlocks.BLANK_RITUAL_STONE.get()); - registerDropping(BloodMagicBlocks.DAWN_RITUAL_STONE.get(), BloodMagicBlocks.BLANK_RITUAL_STONE.get()); - registerDropSelfLootTable(BloodMagicBlocks.ALCHEMY_TABLE.get()); - registerDropSelfLootTable(BloodMagicBlocks.ALCHEMICAL_REACTION_CHAMBER.get()); - registerDropSelfLootTable(BloodMagicBlocks.DEMON_CRUCIBLE.get()); - registerDropSelfLootTable(BloodMagicBlocks.DEMON_CRYSTALLIZER.get()); - registerDropSelfLootTable(BloodMagicBlocks.INCENSE_ALTAR.get()); -// registerNoDropLootTable(BloodMagicBlocks.RAW_CRYSTAL_BLOCK.get()); - registerDropping(BloodMagicBlocks.NETHER_SOIL.get(), Blocks.NETHERRACK); - - registerDropCrystalsLootTable(BloodMagicBlocks.RAW_CRYSTAL_BLOCK.get(), BloodMagicItems.RAW_CRYSTAL.get()); - registerDropCrystalsLootTable(BloodMagicBlocks.CORROSIVE_CRYSTAL_BLOCK.get(), BloodMagicItems.CORROSIVE_CRYSTAL.get()); - registerDropCrystalsLootTable(BloodMagicBlocks.DESTRUCTIVE_CRYSTAL_BLOCK.get(), BloodMagicItems.DESTRUCTIVE_CRYSTAL.get()); - registerDropCrystalsLootTable(BloodMagicBlocks.VENGEFUL_CRYSTAL_BLOCK.get(), BloodMagicItems.VENGEFUL_CRYSTAL.get()); - registerDropCrystalsLootTable(BloodMagicBlocks.STEADFAST_CRYSTAL_BLOCK.get(), BloodMagicItems.STEADFAST_CRYSTAL.get()); - - registerDropSelfLootTable(BloodMagicBlocks.DUNGEON_BRICK_ASSORTED.get()); - registerDropSelfLootTable(BloodMagicBlocks.DUNGEON_STONE.get()); - registerDropSelfLootTable(BloodMagicBlocks.DUNGEON_BRICK_STAIRS.get()); - registerDropSelfLootTable(BloodMagicBlocks.DUNGEON_POLISHED_STAIRS.get()); - registerDropSelfLootTable(BloodMagicBlocks.DUNGEON_PILLAR_CENTER.get()); - registerDropSelfLootTable(BloodMagicBlocks.DUNGEON_PILLAR_SPECIAL.get()); - registerDropSelfLootTable(BloodMagicBlocks.DUNGEON_PILLAR_CAP.get()); - registerDropSelfLootTable(BloodMagicBlocks.DUNGEON_BRICK_WALL.get()); - registerDropSelfLootTable(BloodMagicBlocks.DUNGEON_POLISHED_WALL.get()); - registerDropSelfLootTable(BloodMagicBlocks.DUNGEON_BRICK_GATE.get()); - registerDropSelfLootTable(BloodMagicBlocks.DUNGEON_POLISHED_GATE.get()); - - registerDropSelfLootTable(BloodMagicBlocks.MIMIC.get()); - registerDropSelfLootTable(BloodMagicBlocks.ETHEREAL_MIMIC.get()); - - registerCropDropLootTable(BloodMagicBlocks.GROWING_DOUBT.get(), BloodMagicItems.WEAK_BLOOD_SHARD.get()); - - registerNoDropLootTable(BloodMagicBlocks.SHAPED_CHARGE.get()); - registerNoDropLootTable(BloodMagicBlocks.DEFORESTER_CHARGE.get()); - registerNoDropLootTable(BloodMagicBlocks.VEINMINE_CHARGE.get()); - registerNoDropLootTable(BloodMagicBlocks.FUNGAL_CHARGE.get()); - } - - private void registerNoDropLootTable(Block block) - { - LootPool.Builder builder = LootPool.builder().name(block.getRegistryName().toString()); - this.registerLootTable(block, LootTable.builder().addLootPool(builder)); - } - - private void registerCropDropLootTable(Block block, Item item) - { - LootTable.Builder builder = LootTable.builder(); - - for (int i = 0; i < 7; i++) - { - ILootCondition.IBuilder harvestAge = BlockStateProperty.builder(block).fromProperties(StatePropertiesPredicate.Builder.newBuilder().withIntProp(CropsBlock.AGE, i)); - builder = builder.addLootPool(LootPool.builder().addEntry(ItemLootEntry.builder(item).acceptFunction(SetCount.builder(ConstantRange.of(1))).acceptCondition(harvestAge))); - } - - this.registerLootTable(block, builder); - } - - private void registerDropCrystalsLootTable(Block block, Item item) - { - LootTable.Builder builder = LootTable.builder(); - - for (int i = 0; i < 7; i++) - { - ILootCondition.IBuilder harvestAge = BlockStateProperty.builder(block).fromProperties(StatePropertiesPredicate.Builder.newBuilder().withIntProp(BlockDemonCrystal.AGE, i)); - builder = builder.addLootPool(LootPool.builder().addEntry(ItemLootEntry.builder(item).acceptFunction(SetCount.builder(ConstantRange.of(i + 1))).acceptCondition(harvestAge))); - } - - this.registerLootTable(block, builder); - } - - protected static & IStringSerializable> LootTable.Builder droppingWhen(Block block, Property property, T value) - { - return LootTable.builder().addLootPool(withSurvivesExplosion(block, LootPool.builder().rolls(ConstantRange.of(1)).addEntry(ItemLootEntry.builder(block).acceptCondition(BlockStateProperty.builder(block).fromProperties(StatePropertiesPredicate.Builder.newBuilder().withProp(property, value)))))); - } - - @Override - protected Iterable getKnownBlocks() - { - return ForgeRegistries.BLOCKS.getValues().stream().filter(b -> b.getRegistryName().getNamespace().equals(BloodMagic.MODID)).collect(Collectors.toList()); - } - } - - @Override - protected void validate(Map map, ValidationTracker validationtracker) - { - map.forEach((name, table) -> LootTableManager.validateLootTable(validationtracker, name, table)); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/data/recipe/BaseRecipeProvider.java b/src/main/java/wayoftime/bloodmagic/common/data/recipe/BaseRecipeProvider.java deleted file mode 100644 index e8e9ead3..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/data/recipe/BaseRecipeProvider.java +++ /dev/null @@ -1,44 +0,0 @@ -package wayoftime.bloodmagic.common.data.recipe; - -import java.util.Collections; -import java.util.List; -import java.util.function.Consumer; - -import net.minecraft.data.DataGenerator; -import net.minecraft.data.IFinishedRecipe; -import net.minecraft.data.RecipeProvider; -import wayoftime.bloodmagic.common.recipe.ISubRecipeProvider; - -public abstract class BaseRecipeProvider extends RecipeProvider -{ - private final String modid; - - public BaseRecipeProvider(DataGenerator gen, String modid) - { - super(gen); - this.modid = modid; - } - - @Override - public String getName() - { - return super.getName() + modid; - } - - @Override - protected void registerRecipes(Consumer consumer) - { - getSubRecipeProviders().forEach(subRecipeProvider -> subRecipeProvider.addRecipes(consumer)); - } - - /** - * Gets all the sub/offloaded recipe providers that this recipe provider has. - * - * @implNote This is only called once per provider so there is no need to bother - * caching the list that this returns - */ - protected List getSubRecipeProviders() - { - return Collections.emptyList(); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/data/recipe/BloodMagicRecipeBuilder.java b/src/main/java/wayoftime/bloodmagic/common/data/recipe/BloodMagicRecipeBuilder.java deleted file mode 100644 index 21098bdf..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/data/recipe/BloodMagicRecipeBuilder.java +++ /dev/null @@ -1,145 +0,0 @@ -package wayoftime.bloodmagic.common.data.recipe; - -import java.util.ArrayList; -import java.util.List; -import java.util.function.Consumer; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; - -import net.minecraft.advancements.Advancement; -import net.minecraft.advancements.AdvancementRewards; -import net.minecraft.advancements.ICriterionInstance; -import net.minecraft.advancements.IRequirementsStrategy; -import net.minecraft.advancements.criterion.RecipeUnlockedTrigger; -import net.minecraft.data.IFinishedRecipe; -import net.minecraft.item.crafting.IRecipeSerializer; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.crafting.CraftingHelper; -import net.minecraftforge.common.crafting.conditions.ICondition; -import net.minecraftforge.registries.ForgeRegistries; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.util.Constants; - -public abstract class BloodMagicRecipeBuilder> -{ - - protected static ResourceLocation bmSerializer(String name) - { - return new ResourceLocation(BloodMagic.MODID, name); - } - - protected final List conditions = new ArrayList<>(); - protected final Advancement.Builder advancementBuilder = Advancement.Builder.builder(); - protected final ResourceLocation serializerName; - - protected BloodMagicRecipeBuilder(ResourceLocation serializerName) - { - this.serializerName = serializerName; - } - - public BUILDER addCriterion(RecipeCriterion criterion) - { - return addCriterion(criterion.name, criterion.criterion); - } - - public BUILDER addCriterion(String name, ICriterionInstance criterion) - { - advancementBuilder.withCriterion(name, criterion); - return (BUILDER) this; - } - - public BUILDER addCondition(ICondition condition) - { - conditions.add(condition); - return (BUILDER) this; - } - - protected boolean hasCriteria() - { - return !advancementBuilder.getCriteria().isEmpty(); - } - - protected abstract RecipeResult getResult(ResourceLocation id); - - protected void validate(ResourceLocation id) - { - } - - public void build(Consumer consumer, ResourceLocation id) - { - validate(id); - if (hasCriteria()) - { - // If there is a way to "unlock" this recipe then add an advancement with the - // criteria - advancementBuilder.withParentId(new ResourceLocation("recipes/root")).withCriterion("has_the_recipe", RecipeUnlockedTrigger.create(id)).withRewards(AdvancementRewards.Builder.recipe(id)).withRequirementsStrategy(IRequirementsStrategy.OR); - } - consumer.accept(getResult(id)); - } - - protected abstract class RecipeResult implements IFinishedRecipe - { - - private final ResourceLocation id; - - public RecipeResult(ResourceLocation id) - { - this.id = id; - } - - @Override - public JsonObject getRecipeJson() - { - JsonObject jsonObject = new JsonObject(); - jsonObject.addProperty(Constants.JSON.TYPE, serializerName.toString()); - if (!conditions.isEmpty()) - { - JsonArray conditionsArray = new JsonArray(); - for (ICondition condition : conditions) - { - conditionsArray.add(CraftingHelper.serialize(condition)); - } - jsonObject.add(Constants.JSON.CONDITIONS, conditionsArray); - } - this.serialize(jsonObject); - return jsonObject; - } - - @Nonnull - @Override - public IRecipeSerializer getSerializer() - { - // Note: This may be null if something is screwed up but this method isn't - // actually used so it shouldn't matter - // and in fact it will probably be null if only the API is included. But again, - // as we manually just use - // the serializer's name this should not effect us - return ForgeRegistries.RECIPE_SERIALIZERS.getValue(serializerName); - } - - @Nonnull - @Override - public ResourceLocation getID() - { - return this.id; - } - - @Nullable - @Override - public JsonObject getAdvancementJson() - { - return hasCriteria() ? advancementBuilder.serialize() : null; - } - - @Nullable - @Override - public ResourceLocation getAdvancementID() - { - return new ResourceLocation(id.getNamespace(), "recipes/" + id.getPath()); - } - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/data/recipe/BloodMagicRecipeProvider.java b/src/main/java/wayoftime/bloodmagic/common/data/recipe/BloodMagicRecipeProvider.java deleted file mode 100644 index af4c0c89..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/data/recipe/BloodMagicRecipeProvider.java +++ /dev/null @@ -1,27 +0,0 @@ -package wayoftime.bloodmagic.common.data.recipe; - -import java.util.Arrays; -import java.util.List; - -import net.minecraft.data.DataGenerator; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.common.recipe.ARCRecipeProvider; -import wayoftime.bloodmagic.common.recipe.AlchemyArrayRecipeProvider; -import wayoftime.bloodmagic.common.recipe.AlchemyTableRecipeProvider; -import wayoftime.bloodmagic.common.recipe.BloodAltarRecipeProvider; -import wayoftime.bloodmagic.common.recipe.ISubRecipeProvider; -import wayoftime.bloodmagic.common.recipe.TartaricForgeRecipeProvider; - -public class BloodMagicRecipeProvider extends BaseRecipeProvider -{ - public BloodMagicRecipeProvider(DataGenerator gen) - { - super(gen, BloodMagic.MODID); - } - - @Override - protected List getSubRecipeProviders() - { - return Arrays.asList(new BloodAltarRecipeProvider(), new AlchemyArrayRecipeProvider(), new TartaricForgeRecipeProvider(), new ARCRecipeProvider(), new AlchemyTableRecipeProvider()); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/data/recipe/RecipeCriterion.java b/src/main/java/wayoftime/bloodmagic/common/data/recipe/RecipeCriterion.java deleted file mode 100644 index 4418c70a..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/data/recipe/RecipeCriterion.java +++ /dev/null @@ -1,20 +0,0 @@ -package wayoftime.bloodmagic.common.data.recipe; - -import net.minecraft.advancements.ICriterionInstance; - -public class RecipeCriterion -{ - public final String name; - public final ICriterionInstance criterion; - - private RecipeCriterion(String name, ICriterionInstance criterion) - { - this.name = name; - this.criterion = criterion; - } - - public static RecipeCriterion of(String name, ICriterionInstance criterion) - { - return new RecipeCriterion(name, criterion); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/ARCRecipeBuilder.java b/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/ARCRecipeBuilder.java deleted file mode 100644 index cda7631a..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/ARCRecipeBuilder.java +++ /dev/null @@ -1,109 +0,0 @@ -package wayoftime.bloodmagic.common.data.recipe.builder; - -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - -import org.apache.commons.lang3.tuple.Pair; - -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; - -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fluids.FluidStack; -import wayoftime.bloodmagic.recipe.helper.SerializerHelper; -import wayoftime.bloodmagic.recipe.helper.FluidStackIngredient; -import wayoftime.bloodmagic.recipe.RecipeARC; -import wayoftime.bloodmagic.common.data.recipe.BloodMagicRecipeBuilder; -import wayoftime.bloodmagic.util.Constants; - -public class ARCRecipeBuilder extends BloodMagicRecipeBuilder -{ - private final Ingredient input; - private final Ingredient arcTool; - private final FluidStackIngredient inputFluid; - private final ItemStack output; - private final FluidStack outputFluid; - private final List> addedItems = new ArrayList>(); - private final boolean consumeIngredient; - - protected ARCRecipeBuilder(Ingredient input, Ingredient arcTool, FluidStackIngredient inputFluid, ItemStack output, FluidStack outputFluid, boolean consumeIngredient) - { - super(bmSerializer("arc")); - this.input = input; - this.arcTool = arcTool; - this.inputFluid = inputFluid; - this.output = output; - this.outputFluid = outputFluid == null ? FluidStack.EMPTY : outputFluid; - this.consumeIngredient = consumeIngredient; - } - - public static ARCRecipeBuilder arc(Ingredient input, Ingredient arcTool, FluidStackIngredient inputFluid, ItemStack output, FluidStack outputFluid) - { - return new ARCRecipeBuilder(input, arcTool, inputFluid, output, outputFluid, false); - } - - public static ARCRecipeBuilder arcConsume(Ingredient input, Ingredient arcTool, FluidStackIngredient inputFluid, ItemStack output, FluidStack outputFluid) - { - return new ARCRecipeBuilder(input, arcTool, inputFluid, output, outputFluid, true); - } - - public ARCRecipeBuilder addRandomOutput(ItemStack stack, double chance) - { - if (addedItems.size() >= RecipeARC.MAX_RANDOM_OUTPUTS) - { - return this; - } - - addedItems.add(Pair.of(stack, chance)); - - return this; - } - - @Override - protected ARCRecipeResult getResult(ResourceLocation id) - { - return new ARCRecipeResult(id); - } - - public class ARCRecipeResult extends RecipeResult - { - protected ARCRecipeResult(ResourceLocation id) - { - super(id); - } - - @Override - public void serialize(@Nonnull JsonObject json) - { - json.add(Constants.JSON.INPUT, input.serialize()); - json.add(Constants.JSON.TOOL, arcTool.serialize()); - - if (inputFluid != null) - json.add(Constants.JSON.INPUT_FLUID, inputFluid.serialize()); - - if (addedItems.size() > 0) - { - JsonArray mainArray = new JsonArray(); - for (Pair pair : addedItems) - { - JsonObject jsonObj = new JsonObject(); - jsonObj.addProperty(Constants.JSON.CHANCE, pair.getValue().floatValue()); - jsonObj.add(Constants.JSON.TYPE, SerializerHelper.serializeItemStack(pair.getKey())); - mainArray.add(jsonObj); - } - - json.add(Constants.JSON.ADDEDOUTPUT, mainArray); - } - - if (outputFluid != null && !outputFluid.isEmpty()) - json.add(Constants.JSON.OUTPUT_FLUID, SerializerHelper.serializeFluidStack(outputFluid)); - - json.add(Constants.JSON.OUTPUT, SerializerHelper.serializeItemStack(output)); - json.addProperty("consumeingredient", consumeIngredient); - } - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/AlchemyArrayRecipeBuilder.java b/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/AlchemyArrayRecipeBuilder.java deleted file mode 100644 index 429c8f58..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/AlchemyArrayRecipeBuilder.java +++ /dev/null @@ -1,58 +0,0 @@ -package wayoftime.bloodmagic.common.data.recipe.builder; - -import javax.annotation.Nonnull; - -import com.google.gson.JsonObject; - -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.ResourceLocation; -import wayoftime.bloodmagic.recipe.helper.SerializerHelper; -import wayoftime.bloodmagic.common.data.recipe.BloodMagicRecipeBuilder; -import wayoftime.bloodmagic.util.Constants; - -public class AlchemyArrayRecipeBuilder extends BloodMagicRecipeBuilder -{ - private final ResourceLocation texture; - private final Ingredient baseInput; - private final Ingredient addedInput; - private final ItemStack output; - - protected AlchemyArrayRecipeBuilder(ResourceLocation texture, Ingredient baseInput, Ingredient addedInput, ItemStack output) - { - super(bmSerializer("array")); - this.texture = texture; - this.baseInput = baseInput; - this.addedInput = addedInput; - this.output = output; - } - - public static AlchemyArrayRecipeBuilder array(ResourceLocation texture, Ingredient baseInput, Ingredient addedInput, ItemStack output) - { - return new AlchemyArrayRecipeBuilder(texture, baseInput, addedInput, output); - } - - @Override - protected AlchemyArrayRecipeResult getResult(ResourceLocation id) - { - return new AlchemyArrayRecipeResult(id); - } - - public class AlchemyArrayRecipeResult extends RecipeResult - { - protected AlchemyArrayRecipeResult(ResourceLocation id) - { - super(id); - } - - @Override - public void serialize(@Nonnull JsonObject json) - { - json.addProperty(Constants.JSON.TEXTURE, texture.toString()); -// JSONUtils.getString(json, ); - json.add(Constants.JSON.BASEINPUT, baseInput.serialize()); - json.add(Constants.JSON.ADDEDINPUT, addedInput.serialize()); - json.add(Constants.JSON.OUTPUT, SerializerHelper.serializeItemStack(output)); - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/AlchemyTableRecipeBuilder.java b/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/AlchemyTableRecipeBuilder.java deleted file mode 100644 index 19384024..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/AlchemyTableRecipeBuilder.java +++ /dev/null @@ -1,90 +0,0 @@ -package wayoftime.bloodmagic.common.data.recipe.builder; - -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; - -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.ResourceLocation; -import wayoftime.bloodmagic.recipe.helper.SerializerHelper; -import wayoftime.bloodmagic.recipe.RecipeAlchemyTable; -import wayoftime.bloodmagic.common.data.recipe.BloodMagicRecipeBuilder; -import wayoftime.bloodmagic.util.Constants; - -public class AlchemyTableRecipeBuilder extends BloodMagicRecipeBuilder -{ - private final List input; - private final ItemStack output; - private final int syphon; - private final int ticks; - private final int minimumTier; - - protected AlchemyTableRecipeBuilder(List input, ItemStack output, int syphon, int ticks, int minimumTier) - { - super(bmSerializer("alchemytable")); - this.input = input; - this.output = output; - this.syphon = syphon; - this.ticks = ticks; - this.minimumTier = minimumTier; - } - - public static AlchemyTableRecipeBuilder alchemyTable(ItemStack output, int syphon, int ticks, int minimumTier) - { - List inputList = new ArrayList(); - - return new AlchemyTableRecipeBuilder(inputList, output, syphon, ticks, minimumTier); - } - - public AlchemyTableRecipeBuilder addIngredient(Ingredient ing) - { - if (input.size() < RecipeAlchemyTable.MAX_INPUTS) - { - input.add(ing); - } - - return this; - } - - @Override - protected AlchemyTableRecipeResult getResult(ResourceLocation id) - { - return new AlchemyTableRecipeResult(id); - } - - public class AlchemyTableRecipeResult extends RecipeResult - { - protected AlchemyTableRecipeResult(ResourceLocation id) - { - super(id); - } - - @Override - public void serialize(@Nonnull JsonObject json) - { - if (input.size() > 0) - { - JsonArray mainArray = new JsonArray(); - for (Ingredient ing : input) - { - JsonElement jsonObj = ing.serialize(); - - mainArray.add(jsonObj); - } - - json.add(Constants.JSON.INPUT, mainArray); - } - - json.add(Constants.JSON.OUTPUT, SerializerHelper.serializeItemStack(output)); - json.addProperty(Constants.JSON.SYPHON, syphon); - json.addProperty(Constants.JSON.TICKS, ticks); - json.addProperty(Constants.JSON.ALTAR_TIER, minimumTier); - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/BloodAltarRecipeBuilder.java b/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/BloodAltarRecipeBuilder.java deleted file mode 100644 index 9abb52ea..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/BloodAltarRecipeBuilder.java +++ /dev/null @@ -1,63 +0,0 @@ -package wayoftime.bloodmagic.common.data.recipe.builder; - -import javax.annotation.Nonnull; - -import com.google.gson.JsonObject; - -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.ResourceLocation; -import wayoftime.bloodmagic.recipe.helper.SerializerHelper; -import wayoftime.bloodmagic.common.data.recipe.BloodMagicRecipeBuilder; -import wayoftime.bloodmagic.util.Constants; - -public class BloodAltarRecipeBuilder extends BloodMagicRecipeBuilder -{ - private final Ingredient input; - private final ItemStack output; - private final int minimumTier; - private final int syphon; - private final int consumeRate; - private final int drainRate; - - protected BloodAltarRecipeBuilder(Ingredient input, ItemStack output, int minimumTier, int syphon, int consumeRate, int drainRate) - { - super(bmSerializer("altar")); - this.input = input; - this.output = output; - this.minimumTier = minimumTier; - this.syphon = syphon; - this.consumeRate = consumeRate; - this.drainRate = drainRate; - } - - public static BloodAltarRecipeBuilder altar(Ingredient input, ItemStack output, int minimumTier, int syphon, int consumeRate, int drainRate) - { - return new BloodAltarRecipeBuilder(input, output, minimumTier, syphon, consumeRate, drainRate); - } - - @Override - protected BloodAltarRecipeResult getResult(ResourceLocation id) - { - return new BloodAltarRecipeResult(id); - } - - public class BloodAltarRecipeResult extends RecipeResult - { - protected BloodAltarRecipeResult(ResourceLocation id) - { - super(id); - } - - @Override - public void serialize(@Nonnull JsonObject json) - { - json.add(Constants.JSON.INPUT, input.serialize()); - json.add(Constants.JSON.OUTPUT, SerializerHelper.serializeItemStack(output)); - json.addProperty(Constants.JSON.ALTAR_TIER, minimumTier); - json.addProperty(Constants.JSON.ALTAR_SYPHON, syphon); - json.addProperty(Constants.JSON.ALTAR_CONSUMPTION_RATE, consumeRate); - json.addProperty(Constants.JSON.ALTAR_DRAIN_RATE, drainRate); - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/TartaricForgeRecipeBuilder.java b/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/TartaricForgeRecipeBuilder.java deleted file mode 100644 index 2813fbeb..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/data/recipe/builder/TartaricForgeRecipeBuilder.java +++ /dev/null @@ -1,75 +0,0 @@ -package wayoftime.bloodmagic.common.data.recipe.builder; - -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - -import com.google.gson.JsonObject; - -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.ResourceLocation; -import wayoftime.bloodmagic.recipe.helper.SerializerHelper; -import wayoftime.bloodmagic.common.data.recipe.BloodMagicRecipeBuilder; -import wayoftime.bloodmagic.util.Constants; - -public class TartaricForgeRecipeBuilder extends BloodMagicRecipeBuilder -{ - private final List input; - private final ItemStack output; - private final double minimumSouls; - private final double soulDrain; - - protected TartaricForgeRecipeBuilder(List input, ItemStack output, double minimumSouls, double soulDrain) - { - super(bmSerializer("soulforge")); - this.input = input; - this.output = output; - this.minimumSouls = minimumSouls; - this.soulDrain = soulDrain; - } - - public static TartaricForgeRecipeBuilder tartaricForge(List input, ItemStack output, double minimumSouls, double soulDrain) - { - return new TartaricForgeRecipeBuilder(input, output, minimumSouls, soulDrain); - } - - public static TartaricForgeRecipeBuilder tartaricForge(ItemStack output, double minimumSouls, double soulDrain, Ingredient... inputArray) - { - List inputList = new ArrayList(); - for (int i = 0; i < inputArray.length; i++) - { - inputList.add(inputArray[i]); - } - return new TartaricForgeRecipeBuilder(inputList, output, minimumSouls, soulDrain); - } - - @Override - protected TartaricForgeRecipeResult getResult(ResourceLocation id) - { - return new TartaricForgeRecipeResult(id); - } - - public class TartaricForgeRecipeResult extends RecipeResult - { - protected TartaricForgeRecipeResult(ResourceLocation id) - { - super(id); - } - - @Override - public void serialize(@Nonnull JsonObject json) - { - for (int i = 0; i < Math.min(input.size(), 4); i++) - { - json.add(Constants.JSON.INPUT + i, input.get(i).serialize()); - } - - json.add(Constants.JSON.OUTPUT, SerializerHelper.serializeItemStack(output)); - json.addProperty(Constants.JSON.TARTARIC_MINIMUM, (float) minimumSouls); - json.addProperty(Constants.JSON.TARTARIC_DRAIN, (float) soulDrain); - - } - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ArmorMaterialLiving.java b/src/main/java/wayoftime/bloodmagic/common/item/ArmorMaterialLiving.java deleted file mode 100644 index 20f04529..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/ArmorMaterialLiving.java +++ /dev/null @@ -1,59 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ArmorMaterial; -import net.minecraft.item.IArmorMaterial; -import net.minecraft.item.crafting.Ingredient; - -public class ArmorMaterialLiving implements IArmorMaterial -{ - public static final IArmorMaterial INSTANCE = new ArmorMaterialLiving(); - - @Override - public int getDurability(EquipmentSlotType slot) - { - return ArmorMaterial.IRON.getDurability(slot); - } - - @Override - public int getDamageReductionAmount(EquipmentSlotType slot) - { - return ArmorMaterial.IRON.getDamageReductionAmount(slot); - } - - @Override - public int getEnchantability() - { - return ArmorMaterial.IRON.getEnchantability(); - } - - @Override - public net.minecraft.util.SoundEvent getSoundEvent() - { - return ArmorMaterial.IRON.getSoundEvent(); - } - - @Override - public Ingredient getRepairMaterial() - { - return ArmorMaterial.IRON.getRepairMaterial(); - } - - @Override - public String getName() - { - return "livingarmour"; - } - - @Override - public float getToughness() - { - return ArmorMaterial.IRON.getToughness(); - } - - @Override - public float getKnockbackResistance() - { - return ArmorMaterial.IRON.getKnockbackResistance(); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/BMItemTier.java b/src/main/java/wayoftime/bloodmagic/common/item/BMItemTier.java deleted file mode 100644 index 9da76ed4..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/BMItemTier.java +++ /dev/null @@ -1,62 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import java.util.function.Supplier; - -import net.minecraft.item.IItemTier; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.LazyValue; - -public enum BMItemTier implements IItemTier -{ - SENTIENT(4, 512, 6.0F, 2.0F, 50, () -> { - return Ingredient.fromItems(BloodMagicItems.IMBUED_SLATE.get()); - }); - - private final int harvestLevel; - private final int maxUses; - private final float efficiency; - private final float attackDamage; - private final int enchantability; - private final LazyValue repairMaterial; - - private BMItemTier(int harvestLevelIn, int maxUsesIn, float efficiencyIn, float attackDamageIn, int enchantabilityIn, Supplier repairMaterialIn) - { - this.harvestLevel = harvestLevelIn; - this.maxUses = maxUsesIn; - this.efficiency = efficiencyIn; - this.attackDamage = attackDamageIn; - this.enchantability = enchantabilityIn; - this.repairMaterial = new LazyValue<>(repairMaterialIn); - } - - public int getMaxUses() - { - return this.maxUses; - } - - public float getEfficiency() - { - return this.efficiency; - } - - public float getAttackDamage() - { - return this.attackDamage; - } - - public int getHarvestLevel() - { - return this.harvestLevel; - } - - public int getEnchantability() - { - return this.enchantability; - } - - public Ingredient getRepairMaterial() - { - return this.repairMaterial.getValue(); - } - -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java b/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java deleted file mode 100644 index 74a7e183..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java +++ /dev/null @@ -1,291 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.BlockItem; -import net.minecraft.item.Item; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.RegistryObject; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.common.item.arc.ItemARCToolBase; -import wayoftime.bloodmagic.common.item.block.ItemBlockAlchemyTable; -import wayoftime.bloodmagic.common.item.block.ItemBlockMimic; -import wayoftime.bloodmagic.common.item.block.ItemBlockShapedCharge; -import wayoftime.bloodmagic.common.item.sigil.ItemSigilAir; -import wayoftime.bloodmagic.common.item.sigil.ItemSigilBloodLight; -import wayoftime.bloodmagic.common.item.sigil.ItemSigilDivination; -import wayoftime.bloodmagic.common.item.sigil.ItemSigilFastMiner; -import wayoftime.bloodmagic.common.item.sigil.ItemSigilFrost; -import wayoftime.bloodmagic.common.item.sigil.ItemSigilGreenGrove; -import wayoftime.bloodmagic.common.item.sigil.ItemSigilHolding; -import wayoftime.bloodmagic.common.item.sigil.ItemSigilLava; -import wayoftime.bloodmagic.common.item.sigil.ItemSigilMagnetism; -import wayoftime.bloodmagic.common.item.sigil.ItemSigilVoid; -import wayoftime.bloodmagic.common.item.sigil.ItemSigilWater; -import wayoftime.bloodmagic.common.item.soul.ItemMonsterSoul; -import wayoftime.bloodmagic.common.item.soul.ItemSentientAxe; -import wayoftime.bloodmagic.common.item.soul.ItemSentientPickaxe; -import wayoftime.bloodmagic.common.item.soul.ItemSentientShovel; -import wayoftime.bloodmagic.common.item.soul.ItemSentientSword; -import wayoftime.bloodmagic.common.item.soul.ItemSoulGem; -import wayoftime.bloodmagic.common.item.soul.ItemSoulSnare; -import wayoftime.bloodmagic.common.registration.impl.BloodOrbDeferredRegister; -import wayoftime.bloodmagic.common.registration.impl.BloodOrbRegistryObject; -import wayoftime.bloodmagic.ritual.EnumRuneType; -import wayoftime.bloodmagic.structures.ItemDungeonTester; - -public class BloodMagicItems -{ -// public static Item.ToolMaterial SOUL_TOOL_MATERIAL = EnumHelper.addToolMaterial("demonic", 4, 520, 7, 8, 50); -// public static final BloodOrb WEAK_ORB_INSTANCE = new BloodOrb(new ResourceLocation(BloodMagic.MODID, "weakbloodorb"), 0, 5000, 10); - public static final BloodOrbDeferredRegister BLOOD_ORBS = new BloodOrbDeferredRegister(BloodMagic.MODID); - public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, BloodMagic.MODID); - public static final DeferredRegister BASICITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, BloodMagic.MODID); - - public static final BloodOrbRegistryObject ORB_WEAK = BLOOD_ORBS.register("weakbloodorb", () -> new BloodOrb(new ResourceLocation(BloodMagic.MODID, "weakbloodorb"), 1, 5000, 2)); - public static final BloodOrbRegistryObject ORB_APPRENTICE = BLOOD_ORBS.register("apprenticebloodorb", () -> new BloodOrb(new ResourceLocation(BloodMagic.MODID, "apprenticebloodorb"), 2, 25000, 5)); - public static final BloodOrbRegistryObject ORB_MAGICIAN = BLOOD_ORBS.register("magicianbloodorb", () -> new BloodOrb(new ResourceLocation(BloodMagic.MODID, "magicianbloodorb"), 3, 150000, 15)); - public static final BloodOrbRegistryObject ORB_MASTER = BLOOD_ORBS.register("masterbloodorb", () -> new BloodOrb(new ResourceLocation(BloodMagic.MODID, "masterbloodorb"), 4, 1000000, 25)); - public static final BloodOrbRegistryObject ORB_ARCHMAGE = BLOOD_ORBS.register("archmagebloodorb", () -> new BloodOrb(new ResourceLocation(BloodMagic.MODID, "archmagebloodorb"), 5, 10000000, 50)); -// public static final DeferredRegister BLOOD_ORBS = DeferredRegister.create(RegistrarBloodMagic.BLOOD_ORBS, BloodMagic.MODID); - -// public static final RegistryObject BLOODSTONE_ITEM = ITEMS.register("ruby_block", () -> new BlockItem(BloodMagicBlocks.BLOODSTONE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject SOUL_FORGE_ITEM = ITEMS.register("soulforge", () -> new BlockItem(BloodMagicBlocks.SOUL_FORGE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject BLANK_RUNE_ITEM = ITEMS.register("blankrune", () -> new BlockItem(BloodMagicBlocks.BLANK_RUNE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject SPEED_RUNE_ITEM = ITEMS.register("speedrune", () -> new BlockItem(BloodMagicBlocks.SPEED_RUNE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject SACRIFICE_RUNE_ITEM = ITEMS.register("sacrificerune", () -> new BlockItem(BloodMagicBlocks.SACRIFICE_RUNE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject SELF_SACRIFICE_RUNE_ITEM = ITEMS.register("selfsacrificerune", () -> new BlockItem(BloodMagicBlocks.SELF_SACRIFICE_RUNE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject DISPLACEMENT_RUNE_ITEM = ITEMS.register("dislocationrune", () -> new BlockItem(BloodMagicBlocks.DISPLACEMENT_RUNE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject CAPACITY_RUNE_ITEM = ITEMS.register("altarcapacityrune", () -> new BlockItem(BloodMagicBlocks.CAPACITY_RUNE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject AUGMENTED_CAPACITY_RUNE_ITEM = ITEMS.register("bettercapacityrune", () -> new BlockItem(BloodMagicBlocks.AUGMENTED_CAPACITY_RUNE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject ORB_RUNE_ITEM = ITEMS.register("orbcapacityrune", () -> new BlockItem(BloodMagicBlocks.ORB_RUNE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject ACCELERATION_RUNE_ITEM = ITEMS.register("accelerationrune", () -> new BlockItem(BloodMagicBlocks.ACCELERATION_RUNE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject CHARGING_RUNE_ITEM = ITEMS.register("chargingrune", () -> new BlockItem(BloodMagicBlocks.CHARGING_RUNE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject BLANK_RITUAL_STONE_ITEM = ITEMS.register("ritualstone", () -> new BlockItem(BloodMagicBlocks.BLANK_RITUAL_STONE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject AIR_RITUAL_STONE_ITEM = ITEMS.register("airritualstone", () -> new BlockItem(BloodMagicBlocks.AIR_RITUAL_STONE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject WATER_RITUAL_STONE_ITEM = ITEMS.register("waterritualstone", () -> new BlockItem(BloodMagicBlocks.WATER_RITUAL_STONE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject FIRE_RITUAL_STONE_ITEM = ITEMS.register("fireritualstone", () -> new BlockItem(BloodMagicBlocks.FIRE_RITUAL_STONE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject EARTH_RITUAL_STONE_ITEM = ITEMS.register("earthritualstone", () -> new BlockItem(BloodMagicBlocks.EARTH_RITUAL_STONE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject DUSK_RITUAL_STONE_ITEM = ITEMS.register("duskritualstone", () -> new BlockItem(BloodMagicBlocks.DUSK_RITUAL_STONE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject DAWN_RITUAL_STONE_ITEM = ITEMS.register("lightritualstone", () -> new BlockItem(BloodMagicBlocks.DAWN_RITUAL_STONE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject ALCHEMICAL_REACTION_CHAMBER_ITEM = ITEMS.register("alchemicalreactionchamber", () -> new BlockItem(BloodMagicBlocks.ALCHEMICAL_REACTION_CHAMBER.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject DEMON_CRUCIBLE_ITEM = ITEMS.register("demoncrucible", () -> new BlockItem(BloodMagicBlocks.DEMON_CRUCIBLE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject DEMON_CRYSTALLIZER_ITEM = ITEMS.register("demoncrystallizer", () -> new BlockItem(BloodMagicBlocks.DEMON_CRYSTALLIZER.get(), new Item.Properties().group(BloodMagic.TAB))); - - public static final RegistryObject BLOODSTONE_ITEM = ITEMS.register("largebloodstonebrick", () -> new BlockItem(BloodMagicBlocks.BLOODSTONE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject BLOODSTONE_BRICK_ITEM = ITEMS.register("bloodstonebrick", () -> new BlockItem(BloodMagicBlocks.BLOODSTONE_BRICK.get(), new Item.Properties().group(BloodMagic.TAB))); - - public static final RegistryObject MASTER_RITUAL_STONE_ITEM = ITEMS.register("masterritualstone", () -> new BlockItem(BloodMagicBlocks.MASTER_RITUAL_STONE.get(), new Item.Properties().group(BloodMagic.TAB))); - - public static final RegistryObject BLOOD_ALTAR_ITEM = ITEMS.register("altar", () -> new BlockItem(BloodMagicBlocks.BLOOD_ALTAR.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject ALCHEMY_TABLE_ITEM = ITEMS.register("alchemytable", () -> new ItemBlockAlchemyTable(BloodMagicBlocks.ALCHEMY_TABLE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject INCENSE_ALTAR_ITEM = ITEMS.register("incensealtar", () -> new BlockItem(BloodMagicBlocks.INCENSE_ALTAR.get(), new Item.Properties().group(BloodMagic.TAB))); - - public static final RegistryObject WOOD_PATH_ITEM = ITEMS.register("woodbrickpath", () -> new BlockItem(BloodMagicBlocks.WOOD_PATH.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject WOOD_TILE_PATH_ITEM = ITEMS.register("woodtilepath", () -> new BlockItem(BloodMagicBlocks.WOOD_TILE_PATH.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject STONE_PATH_ITEM = ITEMS.register("stonebrickpath", () -> new BlockItem(BloodMagicBlocks.STONE_PATH.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject STONE_TILE_PATH_ITEM = ITEMS.register("stonetilepath", () -> new BlockItem(BloodMagicBlocks.STONE_TILE_PATH.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject WORN_STONE_PATH_ITEM = ITEMS.register("wornstonebrickpath", () -> new BlockItem(BloodMagicBlocks.WORN_STONE_PATH.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject WORN_STONE_TILE_PATH_ITEM = ITEMS.register("wornstonetilepath", () -> new BlockItem(BloodMagicBlocks.WORN_STONE_TILE_PATH.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject OBSIDIAN_PATH_ITEM = ITEMS.register("obsidianbrickpath", () -> new BlockItem(BloodMagicBlocks.OBSIDIAN_PATH.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject OBSIDIAN_TILE_PATH_ITEM = ITEMS.register("obsidiantilepath", () -> new BlockItem(BloodMagicBlocks.OBSIDIAN_TILE_PATH.get(), new Item.Properties().group(BloodMagic.TAB))); - - public static final RegistryObject MIMIC_ITEM = ITEMS.register("mimic", () -> new ItemBlockMimic(BloodMagicBlocks.MIMIC.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject MIMIC_ETHEREAL_ITEM = ITEMS.register("ethereal_mimic", () -> new ItemBlockMimic(BloodMagicBlocks.ETHEREAL_MIMIC.get(), new Item.Properties().group(BloodMagic.TAB))); - - public static final RegistryObject NETHE_SOIL_ITEM = ITEMS.register("nether_soil", () -> new BlockItem(BloodMagicBlocks.NETHER_SOIL.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject GROWING_DOUBT_ITEM = ITEMS.register("growing_doubt", () -> new BlockItem(BloodMagicBlocks.GROWING_DOUBT.get(), new Item.Properties().group(BloodMagic.TAB))); - - public static final RegistryObject SHAPED_CHARGE_ITEM = ITEMS.register("shaped_charge", () -> new ItemBlockShapedCharge(BloodMagicBlocks.SHAPED_CHARGE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject DEFORESTER_CHARGE_ITEM = ITEMS.register("deforester_charge", () -> new ItemBlockShapedCharge(BloodMagicBlocks.DEFORESTER_CHARGE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject VEINMINE_CHARGE_ITEM = ITEMS.register("veinmine_charge", () -> new ItemBlockShapedCharge(BloodMagicBlocks.VEINMINE_CHARGE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject FUNGAL_CHARGE_ITEM = ITEMS.register("fungal_charge", () -> new ItemBlockShapedCharge(BloodMagicBlocks.FUNGAL_CHARGE.get(), new Item.Properties().group(BloodMagic.TAB))); - // TODO: Need to rework the above instantiations for the ItemBlocks so that it's - // done with the Blocks. - -// public static final RegistryObject WEAK_BLOOD_ORB = BASICITEMS.register("weakbloodorb", ItemBloodOrb::new); -// public static final RegistryObject WEAK_BLOOD_ORB = BASICITEMS.register("weakbloodorb", () -> new ItemBloodOrb(WEAK_ORB_INSTANCE)); - public static final RegistryObject WEAK_BLOOD_ORB = BASICITEMS.register("weakbloodorb", () -> new ItemBloodOrb(ORB_WEAK)); - public static final RegistryObject APPRENTICE_BLOOD_ORB = BASICITEMS.register("apprenticebloodorb", () -> new ItemBloodOrb(ORB_APPRENTICE)); - public static final RegistryObject MAGICIAN_BLOOD_ORB = BASICITEMS.register("magicianbloodorb", () -> new ItemBloodOrb(ORB_MAGICIAN)); - public static final RegistryObject MASTER_BLOOD_ORB = BASICITEMS.register("masterbloodorb", () -> new ItemBloodOrb(ORB_MASTER)); - - public static final RegistryObject DIVINATION_SIGIL = BASICITEMS.register("divinationsigil", () -> new ItemSigilDivination(true)); - public static final RegistryObject SEER_SIGIL = BASICITEMS.register("seersigil", () -> new ItemSigilDivination(false)); - public static final RegistryObject SACRIFICIAL_DAGGER = BASICITEMS.register("sacrificialdagger", () -> new ItemSacrificialDagger()); - public static final RegistryObject SLATE = BASICITEMS.register("blankslate", () -> new ItemBase()); - public static final RegistryObject REINFORCED_SLATE = BASICITEMS.register("reinforcedslate", () -> new ItemBase()); - public static final RegistryObject IMBUED_SLATE = BASICITEMS.register("infusedslate", () -> new ItemBase()); - public static final RegistryObject DEMONIC_SLATE = BASICITEMS.register("demonslate", () -> new ItemBase()); - public static final RegistryObject ETHEREAL_SLATE = BASICITEMS.register("etherealslate", () -> new ItemBase()); - public static final RegistryObject WATER_SIGIL = BASICITEMS.register("watersigil", () -> new ItemSigilWater()); - public static final RegistryObject VOID_SIGIL = BASICITEMS.register("voidsigil", () -> new ItemSigilVoid()); - public static final RegistryObject LAVA_SIGIL = BASICITEMS.register("lavasigil", () -> new ItemSigilLava()); - public static final RegistryObject GREEN_GROVE_SIGIL = ITEMS.register("growthsigil", () -> new ItemSigilGreenGrove()); - public static final RegistryObject FAST_MINER_SIGIL = ITEMS.register("miningsigil", () -> new ItemSigilFastMiner()); - public static final RegistryObject MAGNETISM_SIGIL = ITEMS.register("sigilofmagnetism", () -> new ItemSigilMagnetism()); - public static final RegistryObject ICE_SIGIL = ITEMS.register("icesigil", () -> new ItemSigilFrost()); - public static final RegistryObject AIR_SIGIL = BASICITEMS.register("airsigil", ItemSigilAir::new); - public static final RegistryObject BLOOD_LIGHT_SIGIL = BASICITEMS.register("bloodlightsigil", ItemSigilBloodLight::new); - public static final RegistryObject HOLDING_SIGIL = BASICITEMS.register("sigilofholding", ItemSigilHolding::new); - - public static final RegistryObject ARCANE_ASHES = BASICITEMS.register("arcaneashes", () -> new ItemArcaneAshes()); - public static final RegistryObject DAGGER_OF_SACRIFICE = BASICITEMS.register("daggerofsacrifice", () -> new ItemDaggerOfSacrifice()); - public static final RegistryObject LAVA_CRYSTAL = BASICITEMS.register("lavacrystal", () -> new ItemLavaCrystal()); - public static final RegistryObject WEAK_BLOOD_SHARD = BASICITEMS.register("weakbloodshard", () -> new ItemBase()); - public static final RegistryObject EXPERIENCE_TOME = BASICITEMS.register("experiencebook", () -> new ItemExperienceBook()); - - public static final RegistryObject LIVING_HELMET = BASICITEMS.register("livinghelmet", () -> new ItemLivingArmor(EquipmentSlotType.HEAD)); - public static final RegistryObject LIVING_PLATE = BASICITEMS.register("livingplate", () -> new ItemLivingArmor(EquipmentSlotType.CHEST)); - public static final RegistryObject LIVING_LEGGINGS = BASICITEMS.register("livingleggings", () -> new ItemLivingArmor(EquipmentSlotType.LEGS)); - public static final RegistryObject LIVING_BOOTS = BASICITEMS.register("livingboots", () -> new ItemLivingArmor(EquipmentSlotType.FEET)); - - public static final RegistryObject LIVING_TOME = BASICITEMS.register("upgradetome", () -> new ItemLivingTome()); - - // Ritual stuffs - public static final RegistryObject WEAK_ACTIVATION_CRYSTAL = BASICITEMS.register("activationcrystalweak", () -> new ItemActivationCrystal(ItemActivationCrystal.CrystalType.WEAK)); - public static final RegistryObject AWAKENED_ACTIVATION_CRYSTAL = BASICITEMS.register("activationcrystalawakened", () -> new ItemActivationCrystal(ItemActivationCrystal.CrystalType.AWAKENED)); - public static final RegistryObject CREATIVE_ACTIVATION_CRYSTAL = BASICITEMS.register("activationcrystalcreative", () -> new ItemActivationCrystal(ItemActivationCrystal.CrystalType.CREATIVE)); - - public static final RegistryObject AIR_INSCRIPTION_TOOL = BASICITEMS.register("airscribetool", () -> new ItemInscriptionTool(EnumRuneType.AIR)); - public static final RegistryObject FIRE_INSCRIPTION_TOOL = BASICITEMS.register("firescribetool", () -> new ItemInscriptionTool(EnumRuneType.FIRE)); - public static final RegistryObject WATER_INSCRIPTION_TOOL = BASICITEMS.register("waterscribetool", () -> new ItemInscriptionTool(EnumRuneType.WATER)); - public static final RegistryObject EARTH_INSCRIPTION_TOOL = BASICITEMS.register("earthscribetool", () -> new ItemInscriptionTool(EnumRuneType.EARTH)); - public static final RegistryObject DUSK_INSCRIPTION_TOOL = BASICITEMS.register("duskscribetool", () -> new ItemInscriptionTool(EnumRuneType.DUSK)); - - public static final RegistryObject BASE_RITUAL_DIVINER = BASICITEMS.register("ritualdiviner", () -> new ItemRitualDiviner(0)); - public static final RegistryObject DUSK_RITUAL_DIVINER = BASICITEMS.register("ritualdivinerdusk", () -> new ItemRitualDiviner(1)); - - public static final RegistryObject RITUAL_READER = BASICITEMS.register("ritualtinkerer", ItemRitualReader::new); - - // Reagents used to make the Sigils - public static final RegistryObject REAGENT_WATER = BASICITEMS.register("reagentwater", () -> new ItemBase()); - public static final RegistryObject REAGENT_LAVA = BASICITEMS.register("reagentlava", () -> new ItemBase()); - public static final RegistryObject REAGENT_VOID = BASICITEMS.register("reagentvoid", () -> new ItemBase()); - public static final RegistryObject REAGENT_GROWTH = BASICITEMS.register("reagentgrowth", () -> new ItemBase()); - public static final RegistryObject REAGENT_FAST_MINER = BASICITEMS.register("reagentfastminer", () -> new ItemBase()); - public static final RegistryObject REAGENT_MAGNETISM = BASICITEMS.register("reagentmagnetism", () -> new ItemBase()); - public static final RegistryObject REAGENT_AIR = BASICITEMS.register("reagentair", () -> new ItemBase()); - public static final RegistryObject REAGENT_BLOOD_LIGHT = BASICITEMS.register("reagentbloodlight", () -> new ItemBase()); - public static final RegistryObject REAGENT_SIGHT = BASICITEMS.register("reagentsight", () -> new ItemBase()); - public static final RegistryObject REAGENT_BINDING = BASICITEMS.register("reagentbinding", () -> new ItemBase()); - public static final RegistryObject REAGENT_HOLDING = BASICITEMS.register("reagentholding", () -> new ItemBase()); - - // Tartaric Gems - public static final RegistryObject PETTY_GEM = ITEMS.register("soulgempetty", () -> new ItemSoulGem("petty", 64)); - public static final RegistryObject LESSER_GEM = ITEMS.register("soulgemlesser", () -> new ItemSoulGem("lesser", 256)); - public static final RegistryObject COMMON_GEM = ITEMS.register("soulgemcommon", () -> new ItemSoulGem("common", 1024)); - public static final RegistryObject GREATER_GEM = ITEMS.register("soulgemgreater", () -> new ItemSoulGem("greater", 4096)); - - public static final RegistryObject MONSTER_SOUL_RAW = BASICITEMS.register("basemonstersoul", () -> new ItemMonsterSoul(EnumDemonWillType.DEFAULT)); - public static final RegistryObject MONSTER_SOUL_CORROSIVE = BASICITEMS.register("basemonstersoul_corrosive", () -> new ItemMonsterSoul(EnumDemonWillType.CORROSIVE)); - public static final RegistryObject MONSTER_SOUL_DESTRUCTIVE = BASICITEMS.register("basemonstersoul_destructive", () -> new ItemMonsterSoul(EnumDemonWillType.DESTRUCTIVE)); - public static final RegistryObject MONSTER_SOUL_STEADFAST = BASICITEMS.register("basemonstersoul_steadfast", () -> new ItemMonsterSoul(EnumDemonWillType.STEADFAST)); - public static final RegistryObject MONSTER_SOUL_VENGEFUL = BASICITEMS.register("basemonstersoul_vengeful", () -> new ItemMonsterSoul(EnumDemonWillType.VENGEFUL)); - - public static final RegistryObject SOUL_SNARE = BASICITEMS.register("soulsnare", ItemSoulSnare::new); - public static final RegistryObject SENTIENT_SWORD = ITEMS.register("soulsword", () -> new ItemSentientSword()); - public static final RegistryObject SENTIENT_AXE = ITEMS.register("soulaxe", () -> new ItemSentientAxe()); - public static final RegistryObject SENTIENT_PICKAXE = ITEMS.register("soulpickaxe", () -> new ItemSentientPickaxe()); - public static final RegistryObject SENTIENT_SHOVEL = ITEMS.register("soulshovel", () -> new ItemSentientShovel()); - public static final RegistryObject SENTIENT_SCYTHE = ITEMS.register("soulscythe", () -> new ItemSentientScythe()); - - public static final RegistryObject RAW_CRYSTAL_BLOCK_ITEM = ITEMS.register("rawdemoncrystal", () -> new BlockItem(BloodMagicBlocks.RAW_CRYSTAL_BLOCK.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject CORROSIVE_CRYSTAL_BLOCK_ITEM = ITEMS.register("corrosivedemoncrystal", () -> new BlockItem(BloodMagicBlocks.CORROSIVE_CRYSTAL_BLOCK.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject DESTRUCTIVE_CRYSTAL_BLOCK_ITEM = ITEMS.register("destructivedemoncrystal", () -> new BlockItem(BloodMagicBlocks.DESTRUCTIVE_CRYSTAL_BLOCK.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject VENGEFUL_CRYSTAL_BLOCK_ITEM = ITEMS.register("vengefuldemoncrystal", () -> new BlockItem(BloodMagicBlocks.VENGEFUL_CRYSTAL_BLOCK.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject STEADFAST_CRYSTAL_BLOCK_ITEM = ITEMS.register("steadfastdemoncrystal", () -> new BlockItem(BloodMagicBlocks.STEADFAST_CRYSTAL_BLOCK.get(), new Item.Properties().group(BloodMagic.TAB))); - - public static final RegistryObject RAW_CRYSTAL = BASICITEMS.register("defaultcrystal", () -> new ItemDemonCrystal(EnumDemonWillType.DEFAULT)); - public static final RegistryObject CORROSIVE_CRYSTAL = BASICITEMS.register("corrosivecrystal", () -> new ItemDemonCrystal(EnumDemonWillType.CORROSIVE)); - public static final RegistryObject VENGEFUL_CRYSTAL = BASICITEMS.register("vengefulcrystal", () -> new ItemDemonCrystal(EnumDemonWillType.VENGEFUL)); - public static final RegistryObject DESTRUCTIVE_CRYSTAL = BASICITEMS.register("destructivecrystal", () -> new ItemDemonCrystal(EnumDemonWillType.DESTRUCTIVE)); - public static final RegistryObject STEADFAST_CRYSTAL = BASICITEMS.register("steadfastcrystal", () -> new ItemDemonCrystal(EnumDemonWillType.STEADFAST)); - - public static final RegistryObject DEMON_WILL_GAUGE = BASICITEMS.register("demonwillgauge", ItemDemonWillGauge::new); - - // ARC Tools - public static final RegistryObject SANGUINE_REVERTER = BASICITEMS.register("sanguinereverter", () -> new ItemARCToolBase(32, 2)); - public static final RegistryObject PRIMITIVE_FURNACE_CELL = BASICITEMS.register("furnacecell_primitive", () -> new ItemARCToolBase(128, 1.25)); - public static final RegistryObject PRIMITIVE_EXPLOSIVE_CELL = BASICITEMS.register("primitive_explosive_cell", () -> new ItemARCToolBase(256, 1.25)); - public static final RegistryObject PRIMITIVE_HYDRATION_CELL = BASICITEMS.register("primitive_hydration_cell", () -> new ItemARCToolBase(128, 1.25)); - public static final RegistryObject PRIMITIVE_CRYSTALLINE_RESONATOR = BASICITEMS.register("primitive_crystalline_resonator", () -> new ItemARCToolBase(128, 1.25)); - public static final RegistryObject CRYSTALLINE_RESONATOR = BASICITEMS.register("crystalline_resonator", () -> new ItemARCToolBase(512, 2, 2)); - - // Alchemy Table items - public static final RegistryObject BASIC_CUTTING_FLUID = BASICITEMS.register("basiccuttingfluid", () -> new ItemARCToolBase(64, 1)); - public static final RegistryObject EXPLOSIVE_POWDER = BASICITEMS.register("explosivepowder", () -> new ItemARCToolBase(64, 1)); - - public static final RegistryObject SULFUR = BASICITEMS.register("sulfur", () -> new ItemBase()); - public static final RegistryObject SALTPETER = BASICITEMS.register("saltpeter", () -> new ItemBase()); - public static final RegistryObject PLANT_OIL = BASICITEMS.register("plantoil", () -> new ItemBase()); - - public static final RegistryObject THROWING_DAGGER = BASICITEMS.register("throwing_dagger", ItemThrowingDagger::new); - public static final RegistryObject THROWING_DAGGER_SYRINGE = BASICITEMS.register("throwing_dagger_syringe", ItemThrowingDaggerSyringe::new); - public static final RegistryObject SLATE_AMPOULE = BASICITEMS.register("slate_ampoule", () -> new ItemBloodProvider("slate", 500)); - - // Anointments - public static final RegistryObject SLATE_VIAL = ITEMS.register("slate_vial", () -> new ItemBase(16, "slate_vial")); - public static final RegistryObject MELEE_DAMAGE_ANOINTMENT = ITEMS.register("melee_anointment", () -> new ItemAnointmentProvider(BloodMagic.rl("melee_damage"), 0xFF0000, 1, 256)); - public static final RegistryObject SILK_TOUCH_ANOINTMENT = ITEMS.register("silk_touch_anointment", () -> new ItemAnointmentProvider(BloodMagic.rl("silk_touch"), 0x00B0FF, 1, 256)); - public static final RegistryObject FORTUNE_ANOINTMENT = ITEMS.register("fortune_anointment", () -> new ItemAnointmentProvider(BloodMagic.rl("fortune"), 3381504, 1, 256)); - public static final RegistryObject HOLY_WATER_ANOINTMENT = ITEMS.register("holy_water_anointment", () -> new ItemAnointmentProvider(BloodMagic.rl("holy_water"), 0xC6E6FB, 1, 256)); - public static final RegistryObject HIDDEN_KNOWLEDGE_ANOINTMENT = ITEMS.register("hidden_knowledge_anointment", () -> new ItemAnointmentProvider(BloodMagic.rl("hidden_knowledge"), 0xC8F902, 1, 256)); - public static final RegistryObject QUICK_DRAW_ANOINTMENT = ITEMS.register("quick_draw_anointment", () -> new ItemBowAnointmentProvider(BloodMagic.rl("quick_draw"), 0xF0E130, 1, 256, true)); - public static final RegistryObject LOOTING_ANOINTMENT = ITEMS.register("looting_anointment", () -> new ItemAnointmentProvider(BloodMagic.rl("looting"), 0x6D2AFF, 1, 256)); - public static final RegistryObject BOW_POWER_ANOINTMENT = ITEMS.register("bow_power_anointment", () -> new ItemBowAnointmentProvider(BloodMagic.rl("bow_power"), 0xD8D8D8, 1, 256, true)); - public static final RegistryObject WILL_POWER_ANOINTMENT = ITEMS.register("will_power_anointment", () -> new ItemAnointmentProvider(BloodMagic.rl("will_power"), 0xD8D8D8, 1, 256)); - public static final RegistryObject SMELTING_ANOINTMENT = ITEMS.register("smelting_anointment", () -> new ItemAnointmentProvider(BloodMagic.rl("smelting"), 0xCE2029, 1, 256)); - - // Fragments - public static final RegistryObject IRON_FRAGMENT = BASICITEMS.register("ironfragment", () -> new ItemBase()); - public static final RegistryObject GOLD_FRAGMENT = BASICITEMS.register("goldfragment", () -> new ItemBase()); - public static final RegistryObject NETHERITE_SCRAP_FRAGMENT = BASICITEMS.register("fragment_netherite_scrap", () -> new ItemBase()); - - // Gravels - public static final RegistryObject IRON_GRAVEL = BASICITEMS.register("irongravel", () -> new ItemBase()); - public static final RegistryObject GOLD_GRAVEL = BASICITEMS.register("goldgravel", () -> new ItemBase()); - public static final RegistryObject NETHERITE_SCRAP_GRAVEL = BASICITEMS.register("gravel_netherite_scrap", () -> new ItemBase()); - - // Sands - public static final RegistryObject IRON_SAND = BASICITEMS.register("ironsand", () -> new ItemBase()); - public static final RegistryObject GOLD_SAND = BASICITEMS.register("goldsand", () -> new ItemBase()); - public static final RegistryObject COAL_SAND = BASICITEMS.register("coalsand", () -> new ItemBase()); - public static final RegistryObject NETHERITE_SCRAP_SAND = BASICITEMS.register("sand_netherite", () -> new ItemBase()); - public static final RegistryObject CORRUPTED_DUST = BASICITEMS.register("corrupted_dust", () -> new ItemBase()); - public static final RegistryObject CORRUPTED_DUST_TINY = BASICITEMS.register("corrupted_tinydust", () -> new ItemBase()); - public static final RegistryObject HELLFORGED_SAND = BASICITEMS.register("sand_hellforged", () -> new ItemBase()); - - // Dungeons - public static final RegistryObject HELLFORGED_INGOT = BASICITEMS.register("ingot_hellforged", () -> new ItemBase()); - - public static final RegistryObject DUNGEON_BRICK_1_BLOCK = ITEMS.register("dungeon_brick1", () -> new BlockItem(BloodMagicBlocks.DUNGEON_BRICK_1.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject DUNGEON_BRICK_2_BLOCK = ITEMS.register("dungeon_brick2", () -> new BlockItem(BloodMagicBlocks.DUNGEON_BRICK_2.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject DUNGEON_BRICK_3_BLOCK = ITEMS.register("dungeon_brick3", () -> new BlockItem(BloodMagicBlocks.DUNGEON_BRICK_3.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject DUNGEON_BRICK_ASSORTED_BLOCK = ITEMS.register("dungeon_brick_assorted", () -> new BlockItem(BloodMagicBlocks.DUNGEON_BRICK_ASSORTED.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject DUNGEON_STONE_BLOCK = ITEMS.register("dungeon_stone", () -> new BlockItem(BloodMagicBlocks.DUNGEON_STONE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject DUNGEON_EYE = ITEMS.register("dungeon_eye", () -> new BlockItem(BloodMagicBlocks.DUNGEON_EYE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject DUNGEON_POLISHED_STONE_BLOCK = ITEMS.register("dungeon_polished", () -> new BlockItem(BloodMagicBlocks.DUNGEON_POLISHED_STONE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject DUNGEON_TILE_BLOCK = ITEMS.register("dungeon_tile", () -> new BlockItem(BloodMagicBlocks.DUNGEON_TILE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject DUNGEON_TILE_SPECIAL_BLOCK = ITEMS.register("dungeon_tilespecial", () -> new BlockItem(BloodMagicBlocks.DUNGEON_TILE_SPECIAL.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject DUNGEON_SMALL_BRICK_BLOCK = ITEMS.register("dungeon_smallbrick", () -> new BlockItem(BloodMagicBlocks.DUNGEON_SMALL_BRICK.get(), new Item.Properties().group(BloodMagic.TAB))); - - public static final RegistryObject DUNGEON_BRICK_STAIRS_BLOCK = ITEMS.register("dungeon_brick_stairs", () -> new BlockItem(BloodMagicBlocks.DUNGEON_BRICK_STAIRS.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject DUNGEON_POLISHED_STAIRS_BLOCK = ITEMS.register("dungeon_polished_stairs", () -> new BlockItem(BloodMagicBlocks.DUNGEON_POLISHED_STAIRS.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject DUNGEON_PILLAR_CENTER_BLOCK = ITEMS.register("dungeon_pillar_center", () -> new BlockItem(BloodMagicBlocks.DUNGEON_PILLAR_CENTER.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject DUNGEON_PILLAR_SPECIAL_BLOCK = ITEMS.register("dungeon_pillar_special", () -> new BlockItem(BloodMagicBlocks.DUNGEON_PILLAR_SPECIAL.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject DUNGEON_PILLAR_CAP_BLOCK = ITEMS.register("dungeon_pillar_cap", () -> new BlockItem(BloodMagicBlocks.DUNGEON_PILLAR_CAP.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject DUNGEON_BRICK_WALL_BLOCK = ITEMS.register("dungeon_brick_wall", () -> new BlockItem(BloodMagicBlocks.DUNGEON_BRICK_WALL.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject DUNGEON_POLISHED_WALL_BLOCK = ITEMS.register("dungeon_polished_wall", () -> new BlockItem(BloodMagicBlocks.DUNGEON_POLISHED_WALL.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject DUNGEON_BRICK_GATE_BLOCK = ITEMS.register("dungeon_brick_gate", () -> new BlockItem(BloodMagicBlocks.DUNGEON_BRICK_GATE.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject DUNGEON_POLISHED_GATE_BLOCK = ITEMS.register("dungeon_polished_gate", () -> new BlockItem(BloodMagicBlocks.DUNGEON_POLISHED_GATE.get(), new Item.Properties().group(BloodMagic.TAB))); - - public static final RegistryObject DUNGEON_ORE_BLOCK = ITEMS.register("dungeon_ore", () -> new BlockItem(BloodMagicBlocks.DUNGEON_ORE.get(), new Item.Properties().group(BloodMagic.TAB))); - - public static final RegistryObject HELLFORGED_BLOCK = ITEMS.register("dungeon_metal", () -> new BlockItem(BloodMagicBlocks.HELLFORGED_BLOCK.get(), new Item.Properties().group(BloodMagic.TAB))); - public static final RegistryObject DUNGEON_TESTER = BASICITEMS.register("dungeon_tester", ItemDungeonTester::new); - -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/BloodOrb.java b/src/main/java/wayoftime/bloodmagic/common/item/BloodOrb.java deleted file mode 100644 index a0a88332..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/BloodOrb.java +++ /dev/null @@ -1,61 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.registries.ForgeRegistryEntry; - -/** - * Base Blood Orb class object for blood orbs - */ -public final class BloodOrb extends ForgeRegistryEntry -{ - private final ResourceLocation name; - private final int tier; - private final int capacity; - private final int fillRate; - - /** - * A base object for BloodOrbs. A bit cleaner than the old way through - * EnergyItems. - * - * @param name - A name for the Orb. Gets put into an unlocalized name. - * @param tier - The tier of the Orb. - * @param capacity - The max amount of LP the Orb can store. - * @param fillRate - The amount of LP per tick the Altar can fill the network - * with. - */ - public BloodOrb(ResourceLocation name, int tier, int capacity, int fillRate) - { - this.name = name; - this.tier = tier; - this.capacity = capacity; - this.fillRate = fillRate; - } - - public ResourceLocation getResourceLocation() - { - return name; - } - - public int getTier() - { - return tier; - } - - public int getCapacity() - { - return capacity; - } - - public int getFillRate() - { - return fillRate; - } - - @Override - public String toString() - { -// return "BloodOrb{" + "name='" + name + '\'' + ", tier=" + tier + ", capacity=" + capacity + ", owner=" -// + getRegistryName() + '}'; - return "BloodOrb{" + "name='" + name + '\'' + ", tier=" + tier + ", capacity=" + capacity + '}'; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ExpandedArmor.java b/src/main/java/wayoftime/bloodmagic/common/item/ExpandedArmor.java deleted file mode 100644 index 39a45a5f..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/ExpandedArmor.java +++ /dev/null @@ -1,20 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import com.google.common.collect.Multimap; - -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.attributes.Attribute; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ItemStack; -import net.minecraft.util.DamageSource; - -public interface ExpandedArmor -{ - -// Multimap getAttributeModifiers(EquipmentSlotType slot, ItemStack stack); - - void damageArmor(LivingEntity livingEntity, ItemStack stack, DamageSource source, float damage, EquipmentSlotType slot); - - Multimap getAttributeModifiers(EquipmentSlotType slot, ItemStack stack); -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/IActivatable.java b/src/main/java/wayoftime/bloodmagic/common/item/IActivatable.java deleted file mode 100644 index 096e30b6..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/IActivatable.java +++ /dev/null @@ -1,32 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import javax.annotation.Nonnull; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import wayoftime.bloodmagic.util.Constants; - -/** - * Interface for activatable Items - */ -public interface IActivatable -{ - default boolean getActivated(ItemStack stack) - { - return !stack.isEmpty() && stack.hasTag() && stack.getTag().getBoolean(Constants.NBT.ACTIVATED); - } - - @Nonnull - default ItemStack setActivatedState(ItemStack stack, boolean activated) - { - if (!stack.isEmpty()) - { - if (!stack.hasTag()) - stack.setTag(new CompoundNBT()); - - stack.getTag().putBoolean(Constants.NBT.ACTIVATED, activated); - } - - return stack; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/IBindable.java b/src/main/java/wayoftime/bloodmagic/common/item/IBindable.java deleted file mode 100644 index 95017ea7..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/IBindable.java +++ /dev/null @@ -1,40 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import javax.annotation.Nullable; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import wayoftime.bloodmagic.core.data.Binding; - -/** - * Implement this interface on any Item that can be bound to a player. - */ -public interface IBindable -{ - /** - * Gets an object that stores who this item is bound to. - *

- * If the item is not bound, this will be null. - * - * @param stack - The owned ItemStack - * @return - The binding object - */ - @Nullable - default Binding getBinding(ItemStack stack) - { - Binding binding = Binding.fromStack(stack); - return !stack.isEmpty() && binding != null ? binding : null; - } - - /** - * Called when the player attempts to bind the item. - * - * @param player - The Player attempting to bind the item - * @param stack - The ItemStack to attempt binding - * @return If binding was successful. - */ - default boolean onBind(PlayerEntity player, ItemStack stack) - { - return true; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/IBloodOrb.java b/src/main/java/wayoftime/bloodmagic/common/item/IBloodOrb.java deleted file mode 100644 index 903467a1..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/IBloodOrb.java +++ /dev/null @@ -1,15 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import javax.annotation.Nullable; - -import net.minecraft.item.ItemStack; - -/** - * Interface for any items that are Blood Orbs - * TODO: Should either merge this implementation with BloodOrb or clean it up idk - */ -public interface IBloodOrb -{ - @Nullable - BloodOrb getOrb(ItemStack stack); -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemActivationCrystal.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemActivationCrystal.java deleted file mode 100644 index 8d3244d0..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemActivationCrystal.java +++ /dev/null @@ -1,72 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import java.util.List; - -import javax.annotation.Nonnull; - -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.core.data.Binding; - -public class ItemActivationCrystal extends Item implements IBindable -{ - final CrystalType type; - - public ItemActivationCrystal(CrystalType type) - { - super(new Item.Properties().maxStackSize(1).group(BloodMagic.TAB)); - this.type = type; - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.activationcrystal." + type.name().toLowerCase()).mergeStyle(TextFormatting.GRAY)); - - if (!stack.hasTag()) - return; - - Binding binding = getBinding(stack); - if (binding != null) - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentOwner", binding.getOwnerName()).mergeStyle(TextFormatting.GRAY)); - - super.addInformation(stack, world, tooltip, flag); - } - - public int getCrystalLevel(ItemStack stack) - { - return this.type.equals(CrystalType.CREATIVE) ? Integer.MAX_VALUE : type.ordinal() + 1; - } - - public enum CrystalType - { - WEAK, AWAKENED, CREATIVE,; - - @Nonnull - public static ItemStack getStack(int level) - { - if (level < 0) - { - level = 0; - } - switch (level) - { - case 0: - return new ItemStack(BloodMagicItems.WEAK_ACTIVATION_CRYSTAL.get()); - case 1: - return new ItemStack(BloodMagicItems.AWAKENED_ACTIVATION_CRYSTAL.get()); - default: - return new ItemStack(BloodMagicItems.CREATIVE_ACTIVATION_CRYSTAL.get()); - } - } - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemAnointmentProvider.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemAnointmentProvider.java deleted file mode 100644 index f9042b42..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemAnointmentProvider.java +++ /dev/null @@ -1,131 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.SwordItem; -import net.minecraft.particles.ParticleTypes; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvent; -import net.minecraft.util.SoundEvents; -import net.minecraft.world.World; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.anointment.AnointmentData; -import wayoftime.bloodmagic.anointment.AnointmentHolder; -import wayoftime.bloodmagic.core.AnointmentRegistrar; - -public class ItemAnointmentProvider extends Item -{ -// public Anointment anointment; - public ResourceLocation anointRL; - private int colour; - private int level; - private int maxDamage; - - public ItemAnointmentProvider(ResourceLocation anointRL, int colour, int level, int maxDamage) - { - super(new Item.Properties().maxStackSize(16).group(BloodMagic.TAB)); - this.anointRL = anointRL; - this.colour = colour; - this.level = level; - this.maxDamage = maxDamage; -// this.anointment = anointment; - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) - { - ItemStack stack = player.getHeldItem(hand); - ItemStack weaponStack = player.getHeldItem(hand == Hand.MAIN_HAND ? Hand.OFF_HAND : Hand.MAIN_HAND); -// if (world.isRemote && !unusable) -// { -// Vector3d vec = player.getLookVec(); -// double wantedVelocity = 1.7; -// -// // TODO - Revisit after potions -//// if (player.isPotionActive(RegistrarBloodMagic.BOOST)) -//// { -//// int amplifier = player.getActivePotionEffect(RegistrarBloodMagic.BOOST).getAmplifier(); -//// wantedVelocity += (1 + amplifier) * (0.35); -//// } -// -// player.setMotion(vec.x * wantedVelocity, vec.y * wantedVelocity, vec.z * wantedVelocity); -// } -// -// world.playSound(player, player.getPosX(), player.getPosY(), player.getPosZ(), SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) -// * 0.8F); - - if (!world.isRemote) - { - if (!weaponStack.isEmpty() && isItemValidForApplication(weaponStack)) - { - AnointmentHolder holder = AnointmentHolder.fromItemStack(weaponStack); - if (holder == null) - { - holder = new AnointmentHolder(); - } - - if (holder.applyAnointment(weaponStack, AnointmentRegistrar.ANOINTMENT_MAP.get(anointRL), new AnointmentData(level, 0, maxDamage))) - { -// if (world instanceof ServerWorld) - { - SoundEvent soundevent = SoundEvents.ITEM_BOTTLE_EMPTY; - world.playSound(null, player.getPosition(), soundevent, SoundCategory.BLOCKS, 1.0F, 1.0F); - } - stack.shrink(1); - holder.toItemStack(weaponStack); - return ActionResult.resultConsume(stack); - } - } - } else - { - if (!weaponStack.isEmpty() && isItemValidForApplication(weaponStack)) - { - AnointmentHolder holder = AnointmentHolder.fromItemStack(weaponStack); - if (holder == null) - { - holder = new AnointmentHolder(); - } - if (holder.canApplyAnointment(weaponStack, AnointmentRegistrar.ANOINTMENT_MAP.get(anointRL), new AnointmentData(level, 0, maxDamage))) - { - boolean flag1 = false; - double d0 = (double) (colour >> 16 & 255) / 255.0D; - double d1 = (double) (colour >> 8 & 255) / 255.0D; - double d2 = (double) (colour >> 0 & 255) / 255.0D; - for (int i = 0; i < 16; i++) - { - world.addParticle(flag1 ? ParticleTypes.AMBIENT_ENTITY_EFFECT - : ParticleTypes.ENTITY_EFFECT, player.getPosXRandom(0.3D), player.getPosYRandom(), player.getPosZRandom(0.3D), d0, d1, d2); - } - - return ActionResult.resultConsume(stack); - } - } - } - - return super.onItemRightClick(world, player, hand); - } - - public boolean isItemValidForApplication(ItemStack stack) - { - return isItemTool(stack) || isItemSword(stack); - } - - public static boolean isItemTool(ItemStack stack) - { - return !stack.getItem().getToolTypes(stack).isEmpty(); - } - - public static boolean isItemSword(ItemStack stack) - { - return stack.getItem() instanceof SwordItem; - } - - public int getColor() - { - return colour; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemArcaneAshes.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemArcaneAshes.java deleted file mode 100644 index bb7f4844..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemArcaneAshes.java +++ /dev/null @@ -1,99 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import java.util.List; - -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemUseContext; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.tile.TileAlchemyArray; - -public class ItemArcaneAshes extends Item -{ - public ItemArcaneAshes() - { - super(new Item.Properties().maxStackSize(1).group(BloodMagic.TAB).maxDamage(20)); - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.arcaneAshes").mergeStyle(TextFormatting.GRAY)); - } - - @Override - public ActionResultType onItemUse(ItemUseContext context) - { - ItemStack stack = context.getItem(); - BlockPos newPos = context.getPos().offset(context.getFace()); - World world = context.getWorld(); - PlayerEntity player = context.getPlayer(); - - if (world.isAirBlock(newPos)) - { - if (!world.isRemote) - { - Direction rotation = Direction.fromAngle(player.getRotationYawHead()); - world.setBlockState(newPos, BloodMagicBlocks.ALCHEMY_ARRAY.get().getDefaultState()); - TileEntity tile = world.getTileEntity(newPos); - if (tile instanceof TileAlchemyArray) - { - ((TileAlchemyArray) tile).setRotation(rotation); - } - -// PickaxeItem d; - stack.damageItem(1, player, (entity) -> { - entity.sendBreakAnimation(EquipmentSlotType.MAINHAND); - }); - - } - - return ActionResultType.SUCCESS; - } - - return ActionResultType.FAIL; - } - -// @Override -// public ActionResultType onItemUse(PlayerEntity player, World world, BlockPos blockPos, Hand hand, Direction side, float hitX, float hitY, float hitZ) -// { -// ItemStack stack = player.getHeldItem(hand); -// BlockPos newPos = blockPos.offset(side); -// -// if (world.isAirBlock(newPos)) -// { -// if (!world.isRemote) -// { -// Direction rotation = Direction.fromAngle(player.getRotationYawHead()); -// world.setBlockState(newPos, RegistrarBloodMagicBlocks.ALCHEMY_ARRAY.getDefaultState()); -// TileEntity tile = world.getTileEntity(newPos); -// if (tile instanceof TileAlchemyArray) -// { -// ((TileAlchemyArray) tile).setRotation(rotation); -// } -// -// stack.damageItem(1, player); -// } -// -// return ActionResultType.SUCCESS; -// } -// -// return ActionResultType.FAIL; -// } - -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemBase.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemBase.java deleted file mode 100644 index f2b157c9..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemBase.java +++ /dev/null @@ -1,49 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import java.util.List; - -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wayoftime.bloodmagic.BloodMagic; - -public class ItemBase extends Item -{ - private final String desc; - - public ItemBase() - { - this(""); - } - - public ItemBase(String desc) - { - this(64, desc); - } - - public ItemBase(int stackSize) - { - this(stackSize, ""); - } - - public ItemBase(int stackSize, String desc) - { - super(new Item.Properties().maxStackSize(stackSize).group(BloodMagic.TAB)); - this.desc = desc; - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { - if (!desc.isEmpty()) - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic." + desc).mergeStyle(TextFormatting.GRAY)); - - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemBindableBase.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemBindableBase.java deleted file mode 100644 index 5dcb6d1d..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemBindableBase.java +++ /dev/null @@ -1,35 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import java.util.List; - -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.core.data.Binding; - -public class ItemBindableBase extends Item implements IBindable -{ - public ItemBindableBase() - { - super(new Item.Properties().maxStackSize(1).group(BloodMagic.TAB)); - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { - if (!stack.hasTag()) - return; - - Binding binding = getBinding(stack); - if (binding != null) - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentOwner", binding.getOwnerName()).mergeStyle(TextFormatting.GRAY)); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemBloodOrb.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemBloodOrb.java deleted file mode 100644 index 198e16c5..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemBloodOrb.java +++ /dev/null @@ -1,105 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import java.util.List; -import java.util.function.Supplier; - -import javax.annotation.Nullable; - -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.common.extensions.IForgeItem; -import wayoftime.bloodmagic.core.data.Binding; -import wayoftime.bloodmagic.core.data.SoulNetwork; -import wayoftime.bloodmagic.core.data.SoulTicket; -import wayoftime.bloodmagic.util.helper.NetworkHelper; -import wayoftime.bloodmagic.util.helper.PlayerHelper; - -public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb, IForgeItem -{ - private final Supplier sup; - - public ItemBloodOrb(Supplier sup) - { - this.sup = sup; - } - - @Override - public BloodOrb getOrb(ItemStack stack) - { - return sup.get(); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) - { - ItemStack stack = player.getHeldItem(hand); - BloodOrb orb = getOrb(stack); - - if (orb == null) - return ActionResult.resultFail(stack); - - if (world == null) - return super.onItemRightClick(world, player, hand); - - world.playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F - + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F); - - if (PlayerHelper.isFakePlayer(player)) - return super.onItemRightClick(world, player, hand); - - if (!stack.hasTag()) - return super.onItemRightClick(world, player, hand); - - Binding binding = getBinding(stack); - if (binding == null) - return super.onItemRightClick(world, player, hand); - - if (world.isRemote) - return super.onItemRightClick(world, player, hand); - - SoulNetwork ownerNetwork = NetworkHelper.getSoulNetwork(binding); - if (binding.getOwnerId().equals(player.getGameProfile().getId())) - ownerNetwork.setOrbTier(orb.getTier()); - - ownerNetwork.add(SoulTicket.item(stack, world, player, 200), orb.getCapacity()); // Add LP to owner's network - ownerNetwork.hurtPlayer(player, 200); // Hurt whoever is using it - return super.onItemRightClick(world, player, hand); - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) - { - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.orb.desc").mergeStyle(TextFormatting.GRAY)); - - BloodOrb orb = getOrb(stack); - if (flag.isAdvanced() && orb != null) - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.orb.owner", stack.getItem().getRegistryName()).mergeStyle(TextFormatting.GRAY)); - - super.addInformation(stack, world, tooltip, flag); - } - -// - @Override - public ItemStack getContainerItem(ItemStack stack) - { - return stack.copy(); - } - - @Override - public boolean hasContainerItem(ItemStack stack) - { - return true; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemBloodProvider.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemBloodProvider.java deleted file mode 100644 index 8f466ec1..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemBloodProvider.java +++ /dev/null @@ -1,82 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import java.util.List; - -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.particles.RedstoneParticleData; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.altar.IBloodAltar; -import wayoftime.bloodmagic.util.helper.PlayerHelper; -import wayoftime.bloodmagic.util.helper.PlayerSacrificeHelper; - -public class ItemBloodProvider extends Item -{ - protected final String tooltipBase; - public final int lpProvided; - - public ItemBloodProvider(String name, int lpProvided) - { - super(new Item.Properties().maxStackSize(64).group(BloodMagic.TAB)); - - this.tooltipBase = "tooltip.bloodmagic.blood_provider." + name + "."; - this.lpProvided = lpProvided; - } - - public ItemBloodProvider(String name) - { - this(name, 0); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) - { - ItemStack stack = player.getHeldItem(hand); - if (PlayerHelper.isFakePlayer(player)) - return super.onItemRightClick(world, player, hand); - - IBloodAltar altarEntity = PlayerSacrificeHelper.getAltar(world, player.getPosition()); - if (altarEntity != null) - { - double posX = player.getPosX(); - double posY = player.getPosY(); - double posZ = player.getPosZ(); - world.playSound(player, posX, posY, posZ, SoundEvents.BLOCK_GLASS_BREAK, SoundCategory.BLOCKS, 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F); - - for (int l = 0; l < 8; ++l) - world.addParticle(RedstoneParticleData.REDSTONE_DUST, posX + Math.random() - Math.random(), posY + Math.random() - Math.random(), posZ + Math.random() - Math.random(), 0, 0, 0); - - if (!world.isRemote && PlayerHelper.isFakePlayer(player)) - return super.onItemRightClick(world, player, hand); - - altarEntity.fillMainTank(lpProvided); - if (!player.isCreative()) - { - stack.shrink(1); - } - } - - return super.onItemRightClick(world, player, hand); - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { - tooltip.add(new TranslationTextComponent(tooltipBase + "desc").mergeStyle(TextFormatting.ITALIC).mergeStyle(TextFormatting.GRAY)); - - super.addInformation(stack, world, tooltip, flag); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemBowAnointmentProvider.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemBowAnointmentProvider.java deleted file mode 100644 index af9ab56f..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemBowAnointmentProvider.java +++ /dev/null @@ -1,32 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import net.minecraft.item.BowItem; -import net.minecraft.item.CrossbowItem; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - -public class ItemBowAnointmentProvider extends ItemAnointmentProvider -{ - boolean crossbowsValid; - - public ItemBowAnointmentProvider(ResourceLocation anointRL, int colour, int level, int maxDamage, boolean crossbowsValid) - { - super(anointRL, colour, level, maxDamage); - this.crossbowsValid = crossbowsValid; - } - - public boolean isItemValidForApplication(ItemStack stack) - { - return isItemBow(stack) || (crossbowsValid && isItemCrossbow(stack)); - } - - public static boolean isItemBow(ItemStack stack) - { - return (stack.getItem() instanceof BowItem); - } - - public static boolean isItemCrossbow(ItemStack stack) - { - return (stack.getItem() instanceof CrossbowItem); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemDaggerOfSacrifice.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemDaggerOfSacrifice.java deleted file mode 100644 index f1ba5d85..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemDaggerOfSacrifice.java +++ /dev/null @@ -1,75 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.monster.IMob; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; -import net.minecraftforge.common.util.FakePlayer; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.util.DamageSourceBloodMagic; -import wayoftime.bloodmagic.util.helper.PlayerSacrificeHelper; - -public class ItemDaggerOfSacrifice extends Item -{ - public ItemDaggerOfSacrifice() - { - super(new Item.Properties().maxStackSize(1).group(BloodMagic.TAB)); - } - - @Override - public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) - { - if (attacker instanceof FakePlayer) - return false; - - if (target == null || attacker == null || attacker.getEntityWorld().isRemote - || (attacker instanceof PlayerEntity && !(attacker instanceof ServerPlayerEntity))) - return false; - - if (!target.isNonBoss()) - return false; - - if (target instanceof PlayerEntity) - return false; - - if (target.isChild() && !(target instanceof IMob)) - return false; - - if (!target.isAlive() || target.getHealth() < 0.5F) - return false; - -// EntityEntry entityEntry = EntityRegistry.getEntry(target.getClass()); -// if (entityEntry == null) -// return false; -// int lifeEssenceRatio = BloodMagicAPI.INSTANCE.getValueManager().getSacrificial().getOrDefault(entityEntry.getRegistryName(), 25); - int lifeEssenceRatio = 25; - - if (lifeEssenceRatio <= 0) - return false; - - int lifeEssence = (int) (lifeEssenceRatio * target.getHealth()); -// if (target instanceof AnimalEntity) -// { -// lifeEssence = (int) (lifeEssence * (1 + PurificationHelper.getCurrentPurity((AnimalEntity) target))); -// } - - if (target.isChild()) - { - lifeEssence *= 0.5F; - } - - if (PlayerSacrificeHelper.findAndFillAltar(attacker.getEntityWorld(), target, lifeEssence, true)) - { - target.getEntityWorld().playSound(null, target.getPosX(), target.getPosY(), target.getPosZ(), SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F - + (target.getEntityWorld().rand.nextFloat() - target.getEntityWorld().rand.nextFloat()) * 0.8F); - target.setHealth(-1); - target.onDeath(DamageSourceBloodMagic.INSTANCE); - } - - return false; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemDemonCrystal.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemDemonCrystal.java deleted file mode 100644 index 8e36fe65..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemDemonCrystal.java +++ /dev/null @@ -1,52 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; -import wayoftime.bloodmagic.api.compat.IDiscreteDemonWill; - -public class ItemDemonCrystal extends Item implements IDiscreteDemonWill -{ - private EnumDemonWillType type; - - public ItemDemonCrystal(EnumDemonWillType type) - { - super(new Item.Properties().group(BloodMagic.TAB)); - this.type = type; - } - - @Override - public double getWill(ItemStack willStack) - { - return getDiscretization(willStack) * willStack.getCount(); - } - - @Override - public double drainWill(ItemStack willStack, double drainAmount) - { - double discretization = getDiscretization(willStack); - int drainedNumber = (int) Math.floor(Math.min(willStack.getCount() * discretization, drainAmount) - / discretization); - - if (drainedNumber > 0) - { - willStack.shrink(drainedNumber); - return drainedNumber * discretization; - } - - return 0; - } - - @Override - public double getDiscretization(ItemStack willStack) - { - return 50; - } - - @Override - public EnumDemonWillType getType(ItemStack willStack) - { - return type; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemDemonWillGauge.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemDemonWillGauge.java deleted file mode 100644 index c44fe1aa..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemDemonWillGauge.java +++ /dev/null @@ -1,54 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import java.util.List; - -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.api.compat.IDemonWillViewer; -import wayoftime.bloodmagic.util.handler.event.GenericHandler; - -public class ItemDemonWillGauge extends Item implements IDemonWillViewer -{ - public ItemDemonWillGauge() - { - super(new Item.Properties().maxStackSize(1).group(BloodMagic.TAB)); - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.willGauge").mergeStyle(TextFormatting.GRAY)); - } - - @Override - public boolean canSeeDemonWillAura(World world, ItemStack stack, PlayerEntity player) - { - return true; - } - - @Override - public int getDemonWillAuraResolution(World world, ItemStack stack, PlayerEntity player) - { - return 100; - } - - @Override - public void inventoryTick(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected) - { - if (entityIn instanceof PlayerEntity && entityIn.ticksExisted % 50 == 0) - { - GenericHandler.sendPlayerDemonWillAura((PlayerEntity) entityIn); - } - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemExperienceBook.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemExperienceBook.java deleted file mode 100644 index 3c5bb6ba..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemExperienceBook.java +++ /dev/null @@ -1,210 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import java.util.List; - -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.SoundEvents; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.util.BMLog; -import wayoftime.bloodmagic.util.helper.NBTHelper; - -public class ItemExperienceBook extends Item -{ - public ItemExperienceBook() - { - super(new Item.Properties().maxStackSize(1).group(BloodMagic.TAB)); - } - - @Override - @OnlyIn(Dist.CLIENT) - public boolean hasEffect(ItemStack stack) - { - return true; - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.experienceTome").mergeStyle(TextFormatting.GRAY)); - - if (!stack.hasTag()) - return; - - double storedExp = getStoredExperience(stack); - - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.experienceTome.exp", (int) storedExp).mergeStyle(TextFormatting.GRAY)); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.experienceTome.expLevel", getLevelForExperience(storedExp)).mergeStyle(TextFormatting.GRAY)); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) - { - ItemStack stack = player.getHeldItem(hand); - if (!world.isRemote) - { - if (player.isSneaking()) - absorbOneLevelExpFromPlayer(stack, player); - else - giveOneLevelExpToPlayer(stack, player); - } - - return new ActionResult<>(ActionResultType.SUCCESS, stack); - } - - public void giveOneLevelExpToPlayer(ItemStack stack, PlayerEntity player) - { - float progress = player.experience; - int expToNext = getExperienceForNextLevel(player.experienceLevel); - - int neededExp = (int) Math.ceil((1 - progress) * expToNext); - float containedExp = (float) getStoredExperience(stack); - - BMLog.DEBUG.info("Needed: " + neededExp + ", contained: " + containedExp + ", exp to next: " + expToNext); - - if (containedExp >= neededExp) - { - setStoredExperience(stack, containedExp - neededExp); - addPlayerXP(player, neededExp); - - if (player.experienceLevel % 5 == 0) - { - float f = player.experienceLevel > 30 ? 1.0F : (float) player.experienceLevel / 30.0F; - player.getEntityWorld().playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), SoundEvents.ENTITY_PLAYER_LEVELUP, player.getSoundCategory(), f * 0.75F, 1.0F); - } - } else - { - setStoredExperience(stack, 0); - addPlayerXP(player, (int) containedExp); - } - } - - public void absorbOneLevelExpFromPlayer(ItemStack stack, PlayerEntity player) - { - float progress = player.experience; - - if (progress > 0) - { - int expDeduction = (int) getExperienceAcquiredToNext(player); - if (expDeduction > 0) - { - addPlayerXP(player, -expDeduction); - addExperience(stack, expDeduction); - } - } else if (progress == 0 && player.experienceLevel > 0) - { - int expDeduction = getExperienceForNextLevel(player.experienceLevel - 1); - addPlayerXP(player, -expDeduction); - addExperience(stack, expDeduction); - } - } - - // Credits to Ender IO for some of the experience code, although now modified - // slightly for my convenience. - public static int getPlayerXP(PlayerEntity player) - { - return (int) (getExperienceForLevel(player.experienceLevel) + (player.experience * player.xpBarCap())); - } - - public static void addPlayerXP(PlayerEntity player, int amount) - { - int experience = Math.max(0, getPlayerXP(player) + amount); - player.experienceTotal = experience; - player.experienceLevel = getLevelForExperience(experience); - int expForLevel = getExperienceForLevel(player.experienceLevel); - player.experience = (float) (experience - expForLevel) / (float) player.xpBarCap(); - } - - public static void setStoredExperience(ItemStack stack, double exp) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble("experience", exp); - } - - public static double getStoredExperience(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - return tag.getDouble("experience"); - } - - public static void addExperience(ItemStack stack, double exp) - { - setStoredExperience(stack, getStoredExperience(stack) + exp); - } - - public static int getExperienceForNextLevel(int currentLevel) - { - if (currentLevel < 16) - { - return 2 * currentLevel + 7; - } else if (currentLevel < 31) - { - return 5 * currentLevel - 38; - } else - { - return 9 * currentLevel - 158; - } - } - - // TODO: Change to calculation form. - public static int getExperienceForLevel(int level) - { - if (level >= 21863) - { - return Integer.MAX_VALUE; - } - if (level == 0) - { - return 0; - } - int res = 0; - for (int i = 0; i < level; i++) - { - res += getExperienceForNextLevel(i); - } - return res; - } - - public static double getExperienceAcquiredToNext(PlayerEntity player) - { - return player.experience * player.xpBarCap(); - } - - public static int getLevelForExperience(double exp) - { - if (exp <= 352) - { - return (int) Math.floor(solveParabola(1, 6, -exp)); - } else if (exp <= 1507) - { - return (int) Math.floor(solveParabola(2.5, -40.5, 360 - exp)); - } else - { - return (int) Math.floor(solveParabola(4.5, -162.5, 2220 - exp)); - } - } - - public static double solveParabola(double a, double b, double c) - { - return (-b + Math.sqrt(b * b - 4 * a * c)) / (2 * a); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemInscriptionTool.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemInscriptionTool.java deleted file mode 100644 index 6d31a984..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemInscriptionTool.java +++ /dev/null @@ -1,67 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import java.util.List; - -import net.minecraft.block.BlockState; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemUseContext; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.common.block.BlockRitualStone; -import wayoftime.bloodmagic.ritual.EnumRuneType; -import wayoftime.bloodmagic.util.helper.TextHelper; - -public class ItemInscriptionTool extends Item -{ - private final EnumRuneType type; - - public ItemInscriptionTool(EnumRuneType type) - { - super(new Item.Properties().maxStackSize(1).group(BloodMagic.TAB).maxDamage(40)); - - this.type = type; - } - - @Override - public ActionResultType onItemUse(ItemUseContext context) - { - ItemStack stack = context.getItem(); - BlockPos pos = context.getPos(); - World world = context.getWorld(); - PlayerEntity player = context.getPlayer(); - BlockState state = world.getBlockState(pos); - - if (state.getBlock() instanceof BlockRitualStone - && !((BlockRitualStone) state.getBlock()).isRuneType(world, pos, type)) - { - ((BlockRitualStone) state.getBlock()).setRuneType(world, pos, type); - if (!player.isCreative()) - { - stack.damageItem(1, player, (entity) -> { - entity.sendBreakAnimation(EquipmentSlotType.MAINHAND); - }); - } - return ActionResultType.SUCCESS; - } - - return ActionResultType.FAIL; - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { - tooltip.add(new TranslationTextComponent(TextHelper.localizeEffect("tooltip.bloodmagic.inscriber.desc")).mergeStyle(TextFormatting.GRAY)); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemLavaCrystal.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemLavaCrystal.java deleted file mode 100644 index 008e7dd8..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemLavaCrystal.java +++ /dev/null @@ -1,129 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import net.minecraft.advancements.CriteriaTriggers; -import net.minecraft.block.Blocks; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemUseContext; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; -import net.minecraft.util.math.BlockPos; -import net.minecraftforge.fml.common.thread.EffectiveSide; -import wayoftime.bloodmagic.core.data.Binding; -import wayoftime.bloodmagic.core.data.SoulTicket; -import wayoftime.bloodmagic.util.helper.NetworkHelper; -import wayoftime.bloodmagic.util.helper.PlayerHelper; - -//TODO: Make some hook somewhere that attaches the pos to the ticket otherwise the tickets are basically useless lmao -public class ItemLavaCrystal extends ItemBindableBase -{ - public ItemLavaCrystal() - { - super(); - } - - @Override - public ItemStack getContainerItem(ItemStack stack) - { - Binding binding = getBinding(stack); - if (binding != null) - NetworkHelper.getSoulNetwork(binding.getOwnerId()).syphon(SoulTicket.item(stack, 50)); - - ItemStack returnStack = new ItemStack(this); - returnStack.setTag(stack.getTag()); - return returnStack; - } - - @Override - public boolean hasContainerItem(ItemStack stack) - { - return true; - } - - @Override - public int getBurnTime(ItemStack stack) - { - Binding binding = getBinding(stack); - if (binding == null) - return -1; - - if (EffectiveSide.get().isServer()) - { - if (NetworkHelper.canSyphonFromContainer(stack, 50)) - return 200; - else - { - PlayerEntity player = PlayerHelper.getPlayerFromUUID(binding.getOwnerId()); - if (player != null) - { - player.addPotionEffect(new EffectInstance(Effects.NAUSEA, 99)); - } - } - } else - { - return 200; - } - - return -1; - } - -// @Nullable -// @Override -// public Binding getBinding(ItemStack stack) -// { -// if (stack.getTag() == null) // hasTagCompound doesn't work on empty stacks with tags -// return null; -// -// NBTBase bindingTag = stack.getTag().get("binding"); -// if (bindingTag == null || bindingTag.getId() != 10 || bindingTag.isEmpty()) // Make sure it's both a tag -// // compound and that it has actual -// // data. -// return null; -// -// NBTTagCompound nbt = (NBTTagCompound) bindingTag; -// return new Binding(NBTUtil.getUUIDFromTag(nbt.getCompoundTag("id")), nbt.getString("name")); -// } - - @Override - public ActionResultType onItemUse(ItemUseContext context) - { - BlockPos pos = context.getPos(); - Direction facing = context.getFace(); - pos = pos.offset(facing); - PlayerEntity player = context.getPlayer(); - Hand hand = context.getHand(); - ItemStack itemstack = player.getHeldItem(hand); - - Binding binding = getBinding(player.getHeldItem(hand)); - - if (binding == null) - return ActionResultType.FAIL; - - if (!player.canPlayerEdit(pos, facing, itemstack)) - return ActionResultType.FAIL; - - if (context.getWorld().isAirBlock(pos) && context.getWorld().isRemote) - { - context.getWorld().playSound(player, pos, SoundEvents.ITEM_FIRECHARGE_USE, SoundCategory.BLOCKS, 1.0F, random.nextFloat() * 0.4F + 0.8F); - return ActionResultType.SUCCESS; - } - - if (context.getWorld().isAirBlock(pos) && NetworkHelper.getSoulNetwork(binding).syphonAndDamage(player, SoulTicket.item(player.getHeldItem(hand), 100)).isSuccess()) - { - context.getWorld().playSound(player, pos, SoundEvents.ITEM_FIRECHARGE_USE, SoundCategory.BLOCKS, 1.0F, random.nextFloat() * 0.4F + 0.8F); - context.getWorld().setBlockState(pos, Blocks.FIRE.getDefaultState(), 11); - } else - return ActionResultType.FAIL; - - if (player instanceof ServerPlayerEntity) - CriteriaTriggers.PLACED_BLOCK.trigger((ServerPlayerEntity) player, pos, itemstack); - - return ActionResultType.SUCCESS; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemLivingArmor.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemLivingArmor.java deleted file mode 100644 index 3830ad32..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemLivingArmor.java +++ /dev/null @@ -1,190 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import java.util.List; -import java.util.UUID; -import java.util.function.Consumer; - -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; - -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.attributes.Attribute; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ArmorItem; -import net.minecraft.item.Item; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.ItemStack; -import net.minecraft.util.DamageSource; -import net.minecraft.util.NonNullList; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.core.living.ILivingContainer; -import wayoftime.bloodmagic.core.living.LivingStats; - -public class ItemLivingArmor extends ArmorItem implements ILivingContainer, ExpandedArmor -{ - - private static final int MAX_ABSORPTION = 100000; - - public ItemLivingArmor(EquipmentSlotType slot) - { - super(ArmorMaterialLiving.INSTANCE, slot, new Item.Properties().maxStackSize(1).group(BloodMagic.TAB)); - } - - @Override - public String getArmorTexture(ItemStack stack, Entity entity, EquipmentSlotType slot, String type) - { - if (this == BloodMagicItems.LIVING_PLATE.get() || this == BloodMagicItems.LIVING_HELMET.get() || this == BloodMagicItems.LIVING_BOOTS.get()) - { - return "bloodmagic:models/armor/livingarmour_layer_1.png"; - } - - if (this == BloodMagicItems.LIVING_LEGGINGS.get()) - { - return "bloodmagic:models/armor/livingarmour_layer_2.png"; - } else - { - return null; - } - } - - @Override - public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) - { - return repair.getItem() == BloodMagicItems.REAGENT_BINDING.get() || super.getIsRepairable(toRepair, repair); - } - -// @Override -// public void setDamage(ItemStack stack, int damage) -// { -// this.damageItem(stack, amount, entity, onBroken) -// if (this.slot != EquipmentSlotType.CHEST) -// { -// return; -// } -// if (damage >= this.getMaxDamage(stack)) -// { -// super.setDamage(stack, this.getMaxDamage(stack) - 1); -// } -// } - - @Override - public int damageItem(ItemStack stack, int amount, T entity, Consumer onBroken) - { - return Math.min((stack.getMaxDamage() - 1) - stack.getDamage() - amount, 0); - } - - @Override - public Multimap getAttributeModifiers(EquipmentSlotType slot, ItemStack stack) - { -// Multimap modifiers = super.getAttributeModifiers(slot, stack); - Multimap modifiers = HashMultimap.create(); - modifiers.putAll(super.getAttributeModifiers(slot, stack)); - if (slot != EquipmentSlotType.CHEST) - return modifiers; - - LivingStats stats = getLivingStats(stack); - if (stats == null) - return modifiers; - - stats.getUpgrades().forEach((k, v) -> { - if (k.getAttributeProvider() != null) - k.getAttributeProvider().handleAttributes(stats, modifiers, UUID.nameUUIDFromBytes(k.getKey().toString().getBytes()), k, k.getLevel(v.intValue())); - }); - - return modifiers; - } - -// @Override -// public ArmorProperties getProperties(EntityLivingBase player, @Nonnull ItemStack armor, DamageSource source, double damage, int slot) { -// if (source == DamageSource.DROWN || source == DamageSource.OUT_OF_WORLD) -// return new ArmorProperties(-1, 0D, 0); -// -// double armorReduction; -// double damageAmount = 0.25; -// double armorPenetrationReduction = 0; -// -// if (armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOR_FEET || armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOR_HEAD) -// damageAmount = 3d / 20d * 0.6; -// else if (armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOR_LEGS) -// damageAmount = 6d / 20d * 0.6; -// else if (armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOR_CHEST) -// damageAmount = 0.64; -// -// if (armor.getItem() == RegistrarBloodMagicItems.LIVING_ARMOR_CHEST) { -// armorReduction = 0.24 / 0.64; // This values puts it at iron level -// -// if (!LivingUtil.hasFullSet((EntityPlayer) player)) -// return new ArmorProperties(-1, damageAmount * armorReduction, MAX_ABSORPTION); -// -// LivingStats stats = getLivingStats(armor); -// double protection = 1.0D; -// if (stats != null) -// for (Map.Entry entry : stats.getUpgrades().entrySet()) -// if (entry.getKey().getArmorProvider() != null) -// protection *= 1 - entry.getKey().getArmorProvider().getProtection((EntityPlayer) player, stats, source, entry.getKey().getLevel(entry.getValue())); -// -// armorReduction += (1 - protection) * (1 - armorReduction); -// damageAmount *= armorReduction; -// return new ArmorProperties(-1, source.isUnblockable() ? 1 - protection : damageAmount, MAX_ABSORPTION); -// } else if (source.isUnblockable()) -// return new ArmorProperties(-1, damageAmount * armorPenetrationReduction, MAX_ABSORPTION); -// -// return new ArmorProperties(-1, damageAmount, MAX_ABSORPTION); -// } - - @Override - public void fillItemGroup(ItemGroup group, NonNullList items) - { - if (!isInGroup(group)) - return; - - ItemStack stack = new ItemStack(this); - if (slot == EquipmentSlotType.CHEST) - updateLivingStats(stack, new LivingStats()); - - items.add(stack); - } - -// @Override -// public void fillItemGroup(ItemGroup group, NonNullList items) -// { -// if (this.isInGroup(group)) -// { -// for (EnumDemonWillType type : EnumDemonWillType.values()) -// { -// ItemStack stack = new ItemStack(this); -// this.setCurrentType(type, stack); -// this.setWill(type, stack, maxWill); -// items.add(stack); -// } -// } -// } - - @Override - public void damageArmor(LivingEntity livingEntity, ItemStack stack, DamageSource source, float damage, EquipmentSlotType slot) - { - if (slot == EquipmentSlotType.CHEST && damage > getMaxDamage() - stack.getDamage()) - { -// livingEntity.attackEntityFrom(source, amount) -// } - livingEntity.attackEntityFrom(DamageSource.MAGIC, 2.0F); - return; - } - -// stack.damage((int) damage, livingEntity, entity -> {}); - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { - ILivingContainer.appendLivingTooltip(getLivingStats(stack), tooltip, true); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemLivingTome.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemLivingTome.java deleted file mode 100644 index fe6c0a32..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemLivingTome.java +++ /dev/null @@ -1,105 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import java.util.List; -import java.util.Map.Entry; - -import org.apache.commons.lang3.tuple.Pair; - -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.core.LivingArmorRegistrar; -import wayoftime.bloodmagic.core.living.ILivingContainer; -import wayoftime.bloodmagic.core.living.LivingStats; -import wayoftime.bloodmagic.core.living.LivingUpgrade; -import wayoftime.bloodmagic.core.living.LivingUtil; - -public class ItemLivingTome extends Item implements ILivingContainer -{ - - public ItemLivingTome() - { - super(new Item.Properties().maxStackSize(1).group(BloodMagic.TAB)); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) - { - ItemStack held = player.getHeldItem(hand); - - LivingStats armorStats = LivingStats.fromPlayer(player, true); - if (armorStats == null) - return ActionResult.resultPass(held); - - LivingStats tomeStats = getLivingStats(held); - if (tomeStats == null) - return ActionResult.resultPass(held); - - boolean[] flag = new boolean[] { false }; - tomeStats.getUpgrades().forEach((k, v) -> { - if (armorStats.getLevel(k.getKey()) >= tomeStats.getLevel(k.getKey())) - return; - - Pair upgraded = LivingUtil.applyNewExperience(player, k, v); // FIXME set levels - // directly, don't add - // experience - flag[0] = flag[0] || upgraded.getRight(); - }); -// LivingStats.toPlayer(player, armorStats); - if (flag[0]) - { - held.shrink(1); - return ActionResult.resultSuccess(held); - } else - return ActionResult.resultPass(held); - } - - @Override - public void fillItemGroup(ItemGroup group, NonNullList items) - { - if (!isInGroup(group)) - return; - - for (Entry entry : LivingArmorRegistrar.UPGRADE_MAP.entrySet()) - { - LivingUpgrade upgrade = entry.getValue(); - int exp = 0; - - while ((exp = upgrade.getNextRequirement(exp)) != 0) - { - ItemStack tome = new ItemStack(this); - updateLivingStats(tome, new LivingStats().setMaxPoints(upgrade.getLevelCost(exp)).addExperience(upgrade.getKey(), exp)); - items.add(tome); - } - } - -// LivingArmorRegistrar.UPGRADE_MAP.forEach(upgrade -> { -// int exp = 0; -// -// while ((exp = upgrade.getNextRequirement(exp)) != 0) -// { -// ItemStack tome = new ItemStack(this); -// updateLivingStats(tome, new LivingStats().setMaxPoints(upgrade.getLevelCost(exp)).addExperience(upgrade.getKey(), exp)); -// display.add(tome); -// } -// }); - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { - ILivingContainer.appendLivingTooltip(getLivingStats(stack), tooltip, false); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemLivingTrainer.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemLivingTrainer.java deleted file mode 100644 index 241dd4dd..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemLivingTrainer.java +++ /dev/null @@ -1,28 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import java.util.List; - -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.core.living.ILivingContainer; - -public class ItemLivingTrainer extends Item implements ILivingContainer -{ - public ItemLivingTrainer() - { - super(new Item.Properties().maxStackSize(1).group(BloodMagic.TAB)); - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { - ILivingContainer.appendLivingTooltip(getLivingStats(stack), tooltip, false); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemRitualDiviner.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemRitualDiviner.java deleted file mode 100644 index 13f2c0a9..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemRitualDiviner.java +++ /dev/null @@ -1,598 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import java.util.Collections; -import java.util.List; - -import com.google.common.collect.Lists; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.BlockItem; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemUseContext; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.particles.ParticleTypes; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.NonNullList; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceContext; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.common.block.BlockRitualStone; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.ritual.EnumRuneType; -import wayoftime.bloodmagic.ritual.Ritual; -import wayoftime.bloodmagic.ritual.RitualComponent; -import wayoftime.bloodmagic.tile.TileMasterRitualStone; -import wayoftime.bloodmagic.util.Constants; -import wayoftime.bloodmagic.util.Utils; -import wayoftime.bloodmagic.util.handler.event.ClientHandler; -import wayoftime.bloodmagic.util.helper.RitualHelper; -import wayoftime.bloodmagic.util.helper.TextHelper; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; - -public class ItemRitualDiviner extends Item -{ - final int type; - public static final String tooltipBase = "tooltip.bloodmagic.diviner."; - public static String[] names = - { "normal", "dusk", "dawn" }; - - public ItemRitualDiviner(int type) - { - super(new Item.Properties().maxStackSize(1).group(BloodMagic.TAB)); - this.type = type; - } - -// @Override -// public String getHighlightTip(ItemStack stack, String displayName) -// { -// if (Strings.isNullOrEmpty(getCurrentRitual(stack))) -// return displayName; -// -// Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(getCurrentRitual(stack)); -// if (ritual == null) -// return displayName; -// -// return displayName + ": " + TextHelper.localize(ritual.getTranslationKey()); -// } - - @Override - public ActionResultType onItemUse(ItemUseContext context) - { - ItemStack stack = context.getPlayer().getHeldItem(context.getHand()); - if (context.getPlayer().isSneaking()) - { - if (context.getWorld().isRemote) - { - trySetDisplayedRitual(stack, context.getWorld(), context.getPos()); - } - - return ActionResultType.SUCCESS; - } else if (addRuneToRitual(stack, context.getWorld(), context.getPos(), context.getPlayer())) - { - if (context.getWorld().isRemote) - { - spawnParticles(context.getWorld(), context.getPos().offset(context.getFace()), 15); - } - - return ActionResultType.SUCCESS; - // TODO: Have the diviner automagically build the ritual - } - - return ActionResultType.PASS; - } - - /** - * Adds a single rune to the ritual. - * - * @param stack - The Ritual Diviner stack - * @param world - The World - * @param pos - Block Position of the MRS. - * @param player - The Player attempting to place the ritual - * @return - True if a rune was successfully added - */ - public boolean addRuneToRitual(ItemStack stack, World world, BlockPos pos, PlayerEntity player) - { - TileEntity tile = world.getTileEntity(pos); - - if (tile instanceof TileMasterRitualStone) - { - Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(this.getCurrentRitual(stack)); - if (ritual != null) - { - Direction direction = getDirection(stack); - List components = Lists.newArrayList(); - ritual.gatherComponents(components::add); - for (RitualComponent component : components) - { - if (!canPlaceRitualStone(component.getRuneType(), stack)) - { - return false; - } - BlockPos offset = component.getOffset(direction); - BlockPos newPos = pos.add(offset); - BlockState state = world.getBlockState(newPos); - Block block = state.getBlock(); - if (RitualHelper.isRune(world, newPos)) - { - if (RitualHelper.isRuneType(world, newPos, component.getRuneType())) - { - if (world.isRemote) - { - undisplayHologram(); - } - } else - { - // Replace existing ritual stone - RitualHelper.setRuneType(world, newPos, component.getRuneType()); - return true; - } - } else if (block.isAir(state, world, newPos))// || block.isReplaceable(world, newPos)) - { - if (!consumeStone(stack, world, player)) - { - return false; - } - ((BlockRitualStone) BloodMagicBlocks.BLANK_RITUAL_STONE.get()).setRuneType(world, newPos, component.getRuneType()); - return true; - } else - { - return false; // TODO: Possibly replace the block with a - // ritual stone - } - } - } - } - - return false; - } - - @OnlyIn(Dist.CLIENT) - public void trySetDisplayedRitual(ItemStack itemStack, World world, BlockPos pos) - { - TileEntity tile = world.getTileEntity(pos); - - if (tile instanceof TileMasterRitualStone) - { - Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(this.getCurrentRitual(itemStack)); - TileMasterRitualStone masterRitualStone = (TileMasterRitualStone) tile; - - if (ritual != null) - { - Direction direction = getDirection(itemStack); - ClientHandler.setRitualHolo(masterRitualStone, ritual, direction, true); - } - } - } - - @OnlyIn(Dist.CLIENT) - public void undisplayHologram() - { - ClientHandler.setRitualHoloToNull(); - } - - // TODO: Make this work for any IRitualStone - public boolean consumeStone(ItemStack stack, World world, PlayerEntity player) - { - if (player.isCreative()) - { - return true; - } - - NonNullList inventory = player.inventory.mainInventory; - for (ItemStack newStack : inventory) - { - if (newStack.isEmpty()) - { - - continue; - } - Item item = newStack.getItem(); - if (item instanceof BlockItem) - { - Block block = ((BlockItem) item).getBlock(); - if (block instanceof BlockRitualStone) - { - newStack.shrink(1); - return true; - } - } - } - - return false; - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { - if (!stack.hasTag()) - return; - - Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(this.getCurrentRitual(stack)); - if (ritual != null) - { - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.diviner.currentRitual", new TranslationTextComponent(ritual.getTranslationKey()))); - - boolean sneaking = Screen.hasShiftDown(); -// boolean extraInfo = sneaking && Keyboard.isKeyDown(Keyboard.KEY_M); - boolean extraInfo = sneaking && Screen.hasAltDown(); - - if (extraInfo) - { - tooltip.add(new StringTextComponent("")); - - for (EnumDemonWillType type : EnumDemonWillType.values()) - { - if (TextHelper.canTranslate(ritual.getTranslationKey() + "." + type.name().toLowerCase() + ".info")) - { - tooltip.add(new TranslationTextComponent(ritual.getTranslationKey() + "." + type.name().toLowerCase() + ".info")); - } - } - } else if (sneaking) - { - tooltip.add(new TranslationTextComponent(tooltipBase + "currentDirection", Utils.toFancyCasing(getDirection(stack).name()))); - tooltip.add(new StringTextComponent("")); - List components = Lists.newArrayList(); - ritual.gatherComponents(components::add); - - int blankRunes = 0; - int airRunes = 0; - int waterRunes = 0; - int fireRunes = 0; - int earthRunes = 0; - int duskRunes = 0; - int dawnRunes = 0; - int totalRunes = components.size(); - - for (RitualComponent component : components) - { - switch (component.getRuneType()) - { - case BLANK: - blankRunes++; - break; - case AIR: - airRunes++; - break; - case EARTH: - earthRunes++; - break; - case FIRE: - fireRunes++; - break; - case WATER: - waterRunes++; - break; - case DUSK: - duskRunes++; - break; - case DAWN: - dawnRunes++; - break; - } - } - - if (blankRunes > 0) - tooltip.add(new TranslationTextComponent(tooltipBase + "blankRune", blankRunes).mergeStyle(EnumRuneType.BLANK.colorCode)); - if (waterRunes > 0) - tooltip.add(new TranslationTextComponent(tooltipBase + "waterRune", waterRunes).mergeStyle(EnumRuneType.WATER.colorCode)); - if (airRunes > 0) - tooltip.add(new TranslationTextComponent(tooltipBase + "airRune", airRunes).mergeStyle(EnumRuneType.AIR.colorCode)); - if (fireRunes > 0) - tooltip.add(new TranslationTextComponent(tooltipBase + "fireRune", fireRunes).mergeStyle(EnumRuneType.FIRE.colorCode)); - if (earthRunes > 0) - tooltip.add(new TranslationTextComponent(tooltipBase + "earthRune", earthRunes).mergeStyle(EnumRuneType.EARTH.colorCode)); - if (duskRunes > 0) - tooltip.add(new TranslationTextComponent(tooltipBase + "duskRune", duskRunes).mergeStyle(EnumRuneType.DUSK.colorCode)); - if (dawnRunes > 0) - tooltip.add(new TranslationTextComponent(tooltipBase + "dawnRune", dawnRunes).mergeStyle(EnumRuneType.DAWN.colorCode)); - - tooltip.add(new StringTextComponent("")); - tooltip.add(new TranslationTextComponent(tooltipBase + "totalRune", totalRunes)); - } else - { - tooltip.add(new StringTextComponent("")); - if (TextHelper.canTranslate(ritual.getTranslationKey() + ".info")) - { - tooltip.add(new TranslationTextComponent(ritual.getTranslationKey() + ".info")); - tooltip.add(new StringTextComponent("")); - } - - tooltip.add(new TranslationTextComponent(tooltipBase + "extraInfo").mergeStyle(TextFormatting.BLUE)); - tooltip.add(new TranslationTextComponent(tooltipBase + "extraExtraInfo").mergeStyle(TextFormatting.BLUE)); - } - } - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) - { - ItemStack stack = player.getHeldItem(hand); - - RayTraceResult ray = rayTrace(world, player, RayTraceContext.FluidMode.NONE); - - if (ray != null && ray.getType() == RayTraceResult.Type.BLOCK) - { - return new ActionResult<>(ActionResultType.PASS, stack); - } - - if (player.isSneaking()) - { - if (!world.isRemote) - { - cycleRitual(stack, player, false); - } - - return new ActionResult<>(ActionResultType.SUCCESS, stack); - } else - { - if (!world.isRemote) - { - cycleDirection(stack, player); - } - } - - return new ActionResult<>(ActionResultType.PASS, stack); - } - - @Override - public void onUse(World worldIn, LivingEntity entityLiving, ItemStack stack, int count) - { - if (!entityLiving.world.isRemote && entityLiving instanceof PlayerEntity) - { - PlayerEntity player = (PlayerEntity) entityLiving; - - RayTraceResult ray = rayTrace(player.world, player, RayTraceContext.FluidMode.NONE); - - if (ray != null && ray.getType() == RayTraceResult.Type.BLOCK) - { - return; -// return false; - } - - if (!player.isSwingInProgress) - { - if (player.isSneaking()) - { - cycleRitual(stack, player, true); - } else - { - cycleDirection(stack, player); - } - } - } - -// return false; - } - - public void cycleDirection(ItemStack stack, PlayerEntity player) - { - Direction direction = getDirection(stack); - Direction newDirection; - switch (direction) - { - case NORTH: - newDirection = Direction.EAST; - break; - case EAST: - newDirection = Direction.SOUTH; - break; - case SOUTH: - newDirection = Direction.WEST; - break; - case WEST: - newDirection = Direction.NORTH; - break; - default: - newDirection = Direction.NORTH; - } - - setDirection(stack, newDirection); - notifyDirectionChange(newDirection, player); - } - - public void notifyDirectionChange(Direction direction, PlayerEntity player) - { - player.sendStatusMessage(new TranslationTextComponent(tooltipBase + "currentDirection", Utils.toFancyCasing(direction.name())), true); - } - - public void setDirection(ItemStack stack, Direction direction) - { - if (!stack.hasTag()) - { - stack.setTag(new CompoundNBT()); - } - - CompoundNBT tag = stack.getTag(); - - tag.putInt(Constants.NBT.DIRECTION, direction.getIndex()); - } - - public Direction getDirection(ItemStack stack) - { - if (!stack.hasTag()) - { - stack.setTag(new CompoundNBT()); - return Direction.NORTH; - } - - CompoundNBT tag = stack.getTag(); - - int dir = tag.getInt(Constants.NBT.DIRECTION); - if (dir == 0) - { - return Direction.NORTH; - } - - return Direction.values()[tag.getInt(Constants.NBT.DIRECTION)]; - } - - /** - * Cycles the ritual forward or backward - */ - public void cycleRitual(ItemStack stack, PlayerEntity player, boolean reverse) - { - String key = getCurrentRitual(stack); - List rituals = BloodMagic.RITUAL_MANAGER.getSortedRituals(); - if (reverse) - Collections.reverse(rituals = Lists.newArrayList(rituals)); - - String firstId = ""; - boolean foundId = false; - boolean foundFirst = false; - - for (Ritual ritual : rituals) - { - String id = BloodMagic.RITUAL_MANAGER.getId(ritual); - - if (!BloodMagic.RITUAL_MANAGER.enabled(id, false) || !canDivinerPerformRitual(stack, ritual)) - { - continue; - } - - if (!foundFirst) - { - firstId = id; - foundFirst = true; - } - - if (foundId) - { - setCurrentRitual(stack, id); - notifyRitualChange(id, player); - return; - } else if (id.equals(key)) - { - foundId = true; - } - } - - if (foundFirst) - { - setCurrentRitual(stack, firstId); - notifyRitualChange(firstId, player); - } - } - - public boolean canDivinerPerformRitual(ItemStack stack, Ritual ritual) - { - if (ritual == null) - { - return false; - } - - List components = Lists.newArrayList(); - ritual.gatherComponents(components::add); - for (RitualComponent component : components) - { - if (!canPlaceRitualStone(component.getRuneType(), stack)) - { - return false; - } - } - - return true; - } - - public void notifyRitualChange(String key, PlayerEntity player) - { - Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(key); - if (ritual != null) - { - player.sendStatusMessage(new TranslationTextComponent(ritual.getTranslationKey()), true); - } - } - - public void setCurrentRitual(ItemStack stack, String key) - { - if (!stack.hasTag()) - { - stack.setTag(new CompoundNBT()); - } - - CompoundNBT tag = stack.getTag(); - - tag.putString("current_ritual", key); - } - - public String getCurrentRitual(ItemStack stack) - { - if (!stack.hasTag()) - { - stack.setTag(new CompoundNBT()); - } - - CompoundNBT tag = stack.getTag(); - return tag.getString("current_ritual"); - } - - public boolean canPlaceRitualStone(EnumRuneType rune, ItemStack stack) - { - int meta = type; - switch (rune) - { - case BLANK: - case AIR: - case EARTH: - case FIRE: - case WATER: - return true; - case DUSK: - return meta >= 1; - case DAWN: - return meta >= 2; - } - - return false; - } - - public static void spawnParticles(World worldIn, BlockPos pos, int amount) - { - BlockState state = worldIn.getBlockState(pos); - Block block = worldIn.getBlockState(pos).getBlock(); - - if (block.isAir(state, worldIn, pos)) - { - for (int i = 0; i < amount; ++i) - { - double d0 = random.nextGaussian() * 0.02D; - double d1 = random.nextGaussian() * 0.02D; - double d2 = random.nextGaussian() * 0.02D; - worldIn.addParticle(ParticleTypes.HAPPY_VILLAGER, (double) ((float) pos.getX() - + random.nextFloat()), (double) pos.getY() - + (double) random.nextFloat(), (double) ((float) pos.getZ() - + random.nextFloat()), d0, d1, d2); - } - } else - { - for (int i1 = 0; i1 < amount; ++i1) - { - double d0 = random.nextGaussian() * 0.02D; - double d1 = random.nextGaussian() * 0.02D; - double d2 = random.nextGaussian() * 0.02D; - worldIn.addParticle(ParticleTypes.HAPPY_VILLAGER, (double) ((float) pos.getX() - + random.nextFloat()), (double) pos.getY() - + (double) random.nextFloat() - * 1.0f, (double) ((float) pos.getZ() + random.nextFloat()), d0, d1, d2); - } - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemRitualReader.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemRitualReader.java deleted file mode 100644 index 04bfbae6..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemRitualReader.java +++ /dev/null @@ -1,347 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemUseContext; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.NonNullList; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceContext.FluidMode; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.demonaura.WorldDemonWillHandler; -import wayoftime.bloodmagic.ritual.AreaDescriptor; -import wayoftime.bloodmagic.ritual.EnumRitualReaderState; -import wayoftime.bloodmagic.ritual.IMasterRitualStone; -import wayoftime.bloodmagic.ritual.Ritual; -import wayoftime.bloodmagic.tile.TileMasterRitualStone; -import wayoftime.bloodmagic.util.ChatUtil; -import wayoftime.bloodmagic.util.Constants; -import wayoftime.bloodmagic.util.handler.event.ClientHandler; -import wayoftime.bloodmagic.util.helper.NBTHelper; -import wayoftime.bloodmagic.util.helper.TextHelper; -import wayoftime.bloodmagic.will.DemonWillHolder; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; -import wayoftime.bloodmagic.api.compat.IDiscreteDemonWill; - -public class ItemRitualReader extends Item -{ - public static final String tooltipBase = "tooltip.bloodmagic.ritualReader."; - - public ItemRitualReader() - { - super(new Item.Properties().maxStackSize(1).group(BloodMagic.TAB)); - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { - if (!stack.hasTag()) - return; - - EnumRitualReaderState state = this.getState(stack); - tooltip.add(new TranslationTextComponent(tooltipBase + "currentState", TextHelper.localizeEffect(tooltipBase + state.toString().toLowerCase())).mergeStyle(TextFormatting.GRAY)); - - tooltip.add(new StringTextComponent("")); - - boolean sneaking = Screen.hasShiftDown(); - - if (sneaking) - { - tooltip.add(new TranslationTextComponent(tooltipBase + "desc." + state.toString().toLowerCase()).mergeStyle(TextFormatting.GRAY)); - } else - { - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.extraInfo").mergeStyle(TextFormatting.GRAY)); - } - - super.addInformation(stack, world, tooltip, flag); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) - { - ItemStack stack = player.getHeldItem(hand); - RayTraceResult ray = Item.rayTrace(world, player, FluidMode.NONE); - if (ray != null && ray.getType() == RayTraceResult.Type.BLOCK) - { - return new ActionResult<>(ActionResultType.PASS, stack); - } - - if (player.isSneaking()) - { - if (!world.isRemote) - { - cycleReader(stack, player); - } - - return new ActionResult<>(ActionResultType.SUCCESS, stack); - } - - return new ActionResult<>(ActionResultType.PASS, stack); - } - - @Override - public ActionResultType onItemUse(ItemUseContext context) - { - World world = context.getWorld(); - BlockPos pos = context.getPos(); - - PlayerEntity player = context.getPlayer(); - ItemStack stack = context.getItem(); - Hand hand = context.getHand(); - Direction direction = context.getFace(); - -// ItemStack stack = player.getHeldItem(hand); - if (!world.isRemote) - { - EnumRitualReaderState state = this.getState(stack); - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof IMasterRitualStone) - { - IMasterRitualStone master = (IMasterRitualStone) tile; - if (master.getCurrentRitual() == null) - super.onItemUse(context); - this.setMasterBlockPos(stack, pos); - this.setBlockPos(stack, BlockPos.ZERO); - - switch (state) - { - case INFORMATION: - master.provideInformationOfRitualToPlayer(player); - - break; - case SET_AREA: - if (player.isSneaking() && player.getHeldItem(Hand.OFF_HAND).getItem() instanceof ItemBloodOrb) - { - Ritual ritual = master.getCurrentRitual(); - for (String range : ritual.getListOfRanges()) - { - AreaDescriptor aabb = ritual.getBlockRange(range); - master.setBlockRange(range, aabb); - } - break; - } - - String range = this.getCurrentBlockRange(stack); - - if (range == null || range.isEmpty() || player.isSneaking()) - { - String newRange = master.getNextBlockRange(range); - range = newRange; - this.setCurrentBlockRange(stack, newRange); - } - - master.provideInformationOfRangeToPlayer(player, range); - - break; - case SET_WILL_TYPES: - List typeList = new ArrayList<>(); - NonNullList inv = player.inventory.mainInventory; - for (int i = 0; i < 9; i++) - { - ItemStack testStack = inv.get(i); - if (testStack.isEmpty()) - { - continue; - } - - if (testStack.getItem() instanceof IDiscreteDemonWill) - { - EnumDemonWillType type = ((IDiscreteDemonWill) testStack.getItem()).getType(testStack); - if (!typeList.contains(type)) - { - typeList.add(type); - } - } - } - - master.setActiveWillConfig(player, typeList); - master.provideInformationOfWillConfigToPlayer(player, typeList); - break; - } - - return ActionResultType.FAIL; - } else - { - if (state == EnumRitualReaderState.SET_AREA) - { - BlockPos masterPos = this.getMasterBlockPos(stack); - if (!masterPos.equals(BlockPos.ZERO)) - { - BlockPos containedPos = getBlockPos(stack); - if (containedPos.equals(BlockPos.ZERO)) - { - BlockPos pos1 = pos.subtract(masterPos); - this.setBlockPos(stack, pos1); - player.sendStatusMessage(new TranslationTextComponent("ritual.bloodmagic.blockRange.firstBlock"), true); - } else - { - tile = world.getTileEntity(masterPos); - if (tile instanceof IMasterRitualStone) - { - IMasterRitualStone master = (IMasterRitualStone) tile; - BlockPos pos2 = pos.subtract(masterPos); - String range = this.getCurrentBlockRange(stack); - if (range == null || range.isEmpty()) - { - String newRange = master.getNextBlockRange(range); - range = newRange; - this.setCurrentBlockRange(stack, newRange); - } - Ritual ritual = master.getCurrentRitual(); - List willConfig = master.getActiveWillConfig(); - DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(master.getWorldObj(), master.getBlockPos()); - - int maxHorizontalRange = ritual.getMaxHorizontalRadiusForRange(range, willConfig, holder); - int maxVerticalRange = ritual.getMaxVerticalRadiusForRange(range, willConfig, holder); - int maxVolume = ritual.getMaxVolumeForRange(range, willConfig, holder); - - switch (master.setBlockRangeByBounds(player, range, containedPos, pos2)) - { - case SUCCESS: - player.sendStatusMessage(new TranslationTextComponent("ritual.bloodmagic.blockRange.success"), true); - break; - case NOT_WITHIN_BOUNDARIES: - player.sendStatusMessage(new TranslationTextComponent("ritual.bloodmagic.blockRange.tooFar", maxVerticalRange, maxHorizontalRange), false); - break; - case VOLUME_TOO_LARGE: - player.sendStatusMessage(new TranslationTextComponent("ritual.bloodmagic.blockRange.tooBig", maxVolume), false); - break; - default: - player.sendStatusMessage(new TranslationTextComponent("ritual.bloodmagic.blockRange.noRange"), false); - break; - } - } - this.setBlockPos(stack, BlockPos.ZERO); - } - } - } - } - } else - { - EnumRitualReaderState state = this.getState(stack); - - if (state == EnumRitualReaderState.SET_AREA) - { - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileMasterRitualStone) - { - - System.out.println("Setting range holo... I think"); - ClientHandler.setRitualRangeHolo((TileMasterRitualStone) tile, true); - - } - } - - } - - return super.onItemUse(context); - } - - public BlockPos getBlockPos(ItemStack stack) - { - stack = NBTHelper.checkNBT(stack); - return new BlockPos(stack.getTag().getInt(Constants.NBT.X_COORD), stack.getTag().getInt(Constants.NBT.Y_COORD), stack.getTag().getInt(Constants.NBT.Z_COORD)); - } - - public ItemStack setBlockPos(ItemStack stack, BlockPos pos) - { - stack = NBTHelper.checkNBT(stack); - CompoundNBT itemTag = stack.getTag(); - itemTag.putInt(Constants.NBT.X_COORD, pos.getX()); - itemTag.putInt(Constants.NBT.Y_COORD, pos.getY()); - itemTag.putInt(Constants.NBT.Z_COORD, pos.getZ()); - return stack; - } - - public BlockPos getMasterBlockPos(ItemStack stack) - { - stack = NBTHelper.checkNBT(stack); - return new BlockPos(stack.getTag().getInt(Constants.NBT.X_COORD + "master"), stack.getTag().getInt(Constants.NBT.Y_COORD + "master"), stack.getTag().getInt(Constants.NBT.Z_COORD + "master")); - } - - public ItemStack setMasterBlockPos(ItemStack stack, BlockPos pos) - { - stack = NBTHelper.checkNBT(stack); - CompoundNBT itemTag = stack.getTag(); - itemTag.putInt(Constants.NBT.X_COORD + "master", pos.getX()); - itemTag.putInt(Constants.NBT.Y_COORD + "master", pos.getY()); - itemTag.putInt(Constants.NBT.Z_COORD + "master", pos.getZ()); - return stack; - } - - public String getCurrentBlockRange(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - return tag.getString("range"); - } - - public void setCurrentBlockRange(ItemStack stack, String range) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putString("range", range); - } - - public void cycleReader(ItemStack stack, PlayerEntity player) - { - EnumRitualReaderState prevState = getState(stack); - int val = prevState.ordinal(); - int nextVal = val + 1 >= EnumRitualReaderState.values().length ? 0 : val + 1; - EnumRitualReaderState nextState = EnumRitualReaderState.values()[nextVal]; - - setState(stack, nextState); - notifyPlayerOfStateChange(nextState, player); - } - - public void notifyPlayerOfStateChange(EnumRitualReaderState state, PlayerEntity player) - { - ChatUtil.sendNoSpam(player, new TranslationTextComponent(tooltipBase + "currentState", new TranslationTextComponent(tooltipBase + state.toString().toLowerCase()))); - } - - public void setState(ItemStack stack, EnumRitualReaderState state) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putInt(Constants.NBT.RITUAL_READER, state.ordinal()); - } - - public EnumRitualReaderState getState(ItemStack stack) - { - if (!stack.hasTag()) - { - stack.setTag(new CompoundNBT()); - return EnumRitualReaderState.INFORMATION; - } - - CompoundNBT tag = stack.getTag(); - - return EnumRitualReaderState.values()[tag.getInt(Constants.NBT.RITUAL_READER)]; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemSacrificialDagger.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemSacrificialDagger.java deleted file mode 100644 index cc312150..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemSacrificialDagger.java +++ /dev/null @@ -1,215 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import java.util.List; - -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.UseAction; -import net.minecraft.particles.RedstoneParticleData; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.common.MinecraftForge; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.ConfigHandler; -import wayoftime.bloodmagic.event.SacrificeKnifeUsedEvent; -import wayoftime.bloodmagic.util.Constants; -import wayoftime.bloodmagic.util.DamageSourceBloodMagic; -import wayoftime.bloodmagic.util.helper.IncenseHelper; -import wayoftime.bloodmagic.util.helper.NBTHelper; -import wayoftime.bloodmagic.util.helper.PlayerHelper; -import wayoftime.bloodmagic.util.helper.PlayerSacrificeHelper; - -public class ItemSacrificialDagger extends Item -{ - - public ItemSacrificialDagger() - { - super(new Item.Properties().maxStackSize(1).group(BloodMagic.TAB)); - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { -// tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.sacrificialDagger.desc")))); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sacrificialdagger.desc").mergeStyle(TextFormatting.GRAY)); - -// if (stack.getItemDamage() == 1) -// list.add(TextHelper.localizeEffect("tooltip.bloodmagic.sacrificialDagger.creative")); - } - - @Override - public void onPlayerStoppedUsing(ItemStack stack, World worldIn, LivingEntity entityLiving, int timeLeft) - { - if (entityLiving instanceof PlayerEntity && !entityLiving.getEntityWorld().isRemote) - if (PlayerSacrificeHelper.sacrificePlayerHealth((PlayerEntity) entityLiving)) - IncenseHelper.setHasMaxIncense(stack, (PlayerEntity) entityLiving, false); - } - - @Override - public boolean hasEffect(ItemStack stack) - { - return IncenseHelper.getHasMaxIncense(stack) || super.hasEffect(stack); - } - - @Override - public int getUseDuration(ItemStack stack) - { - return 72000; - } - - @Override - public UseAction getUseAction(ItemStack stack) - { - return UseAction.BOW; - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) - { - ItemStack stack = player.getHeldItem(hand); - if (PlayerHelper.isFakePlayer(player)) - return super.onItemRightClick(world, player, hand); - - if (this.canUseForSacrifice(stack)) - { - player.setActiveHand(hand); - return ActionResult.resultSuccess(stack); - } - - int lpAdded = ConfigHandler.values.sacrificialDaggerConversion * 2; - -// RayTraceResult rayTrace = rayTrace(world, player, false); -// if (rayTrace != null && rayTrace.typeOfHit == RayTraceResult.Type.BLOCK) -// { -// TileEntity tile = world.getTileEntity(rayTrace.getBlockPos()); -// -// if (tile != null && tile instanceof TileAltar && stack.getItemDamage() == 1) -// lpAdded = ((TileAltar) tile).getCapacity(); -// } - - if (!player.abilities.isCreativeMode) - { - SacrificeKnifeUsedEvent evt = new SacrificeKnifeUsedEvent(player, true, true, 2, lpAdded); - if (MinecraftForge.EVENT_BUS.post(evt)) - return super.onItemRightClick(world, player, hand); - - if (evt.shouldDrainHealth) - { - player.hurtResistantTime = 0; - player.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 0.001F); - player.setHealth(Math.max(player.getHealth() - 1.998F, 0.0001f)); - if (player.getHealth() <= 0.001f && !world.isRemote) - { - player.onDeath(DamageSourceBloodMagic.INSTANCE); - player.setHealth(0); - } -// player.attackEntityFrom(BloodMagicAPI.getDamageSource(), 2.0F); - } - - if (!evt.shouldFillAltar) - return super.onItemRightClick(world, player, hand); - - lpAdded = evt.lpAdded; - } else if (player.isSneaking()) - { - lpAdded = Integer.MAX_VALUE; - } - - double posX = player.getPosX(); - double posY = player.getPosY(); - double posZ = player.getPosZ(); - world.playSound(player, posX, posY, posZ, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F); - - for (int l = 0; l < 8; ++l) - world.addParticle(RedstoneParticleData.REDSTONE_DUST, posX + Math.random() - Math.random(), posY + Math.random() - Math.random(), posZ + Math.random() - Math.random(), 0, 0, 0); - - if (!world.isRemote && PlayerHelper.isFakePlayer(player)) - return super.onItemRightClick(world, player, hand); - - // TODO - Check if SoulFray is active - PlayerSacrificeHelper.findAndFillAltar(world, player, lpAdded, false); - - return super.onItemRightClick(world, player, hand); - } - - @Override - public void inventoryTick(ItemStack stack, World world, Entity entity, int itemSlot, boolean isSelected) - { - if (!world.isRemote && entity instanceof PlayerEntity) - this.setUseForSacrifice(stack, this.isPlayerPreparedForSacrifice(world, (PlayerEntity) entity)); - } - - public boolean isPlayerPreparedForSacrifice(World world, PlayerEntity player) - { - return !world.isRemote && (PlayerSacrificeHelper.getPlayerIncense(player) > 0); - } - - public boolean canUseForSacrifice(ItemStack stack) - { - stack = NBTHelper.checkNBT(stack); - return stack.getTag().getBoolean(Constants.NBT.SACRIFICE); - } - - public void setUseForSacrifice(ItemStack stack, boolean sacrifice) - { - stack = NBTHelper.checkNBT(stack); - stack.getTag().putBoolean(Constants.NBT.SACRIFICE, sacrifice); - } - -// @Override -// @SideOnly(Side.CLIENT) -// public ItemMeshDefinition getMeshDefinition() -// { -// return stack -> { -// String variant = "type=normal"; -// if (stack.getItemDamage() != 0) -// variant = "type=creative"; -// -// if (canUseForSacrifice(stack)) -// variant = "type=ceremonial"; -// -// return new ModelResourceLocation(getRegistryName(), variant); -// }; -// } -// -// @Override -// public void gatherVariants(Consumer variants) -// { -// variants.accept("type=normal"); -// variants.accept("type=creative"); -// variants.accept("type=ceremonial"); -// } -// -// public enum DaggerType implements ISubItem -// { -// -// NORMAL, CREATIVE,; -// -// @Nonnull -// @Override -// public String getInternalName() -// { -// return name().toLowerCase(Locale.ROOT); -// } -// -// @Nonnull -// @Override -// public ItemStack getStack(int count) -// { -// return new ItemStack(RegistrarBloodMagicItems.SACRIFICIAL_DAGGER, count, ordinal()); -// } -// } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemSentientScythe.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemSentientScythe.java deleted file mode 100644 index b9d6c59c..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemSentientScythe.java +++ /dev/null @@ -1,843 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.UUID; - -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; - -import net.minecraft.block.BlockState; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.CreatureAttribute; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.attributes.Attribute; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.ai.attributes.Attributes; -import net.minecraft.entity.monster.IMob; -import net.minecraft.entity.monster.SlimeEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.HoeItem; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.network.play.server.SEntityVelocityPacket; -import net.minecraft.particles.ParticleTypes; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; -import net.minecraft.stats.Stats; -import net.minecraft.util.ActionResult; -import net.minecraft.util.DamageSource; -import net.minecraft.util.EntityPredicates; -import net.minecraft.util.Hand; -import net.minecraft.util.SoundEvents; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.Difficulty; -import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; -import wayoftime.bloodmagic.api.compat.IDemonWill; -import wayoftime.bloodmagic.api.compat.IDemonWillWeapon; -import wayoftime.bloodmagic.api.compat.IMultiWillTool; -import wayoftime.bloodmagic.common.tags.BloodMagicTags; -import wayoftime.bloodmagic.util.Constants; -import wayoftime.bloodmagic.util.helper.NBTHelper; -import wayoftime.bloodmagic.will.PlayerDemonWillHandler; - -public class ItemSentientScythe extends HoeItem implements IDemonWillWeapon, IMultiWillTool -{ - public static int[] soulBracket = new int[] { 16, 60, 200, 400, 1000 }; - public static double[] defaultDamageAdded = new double[] { 0.5, 1, 1.5, 2, 2.5 }; - public static double[] destructiveDamageAdded = new double[] { 1, 1.5, 2, 2.5, 3 }; - public static double[] vengefulDamageAdded = new double[] { 0, 0.5, 1, 1.5, 2 }; - public static double[] steadfastDamageAdded = new double[] { 0, 0.5, 1, 1.5, 2 }; - public static double[] defaultDigSpeedAdded = new double[] { 1, 1.5, 2, 3, 4 }; - public static double[] soulDrainPerSwing = new double[] { 0.05, 0.1, 0.2, 0.4, 0.75 }; - public static double[] soulDrop = new double[] { 2, 4, 7, 10, 13 }; - public static double[] staticDrop = new double[] { 1, 1, 2, 3, 3 }; - - public static double[] healthBonus = new double[] { 0, 0, 0, 0, 0 }; // TODO: Think of implementing this later - public static double[] vengefulAttackSpeed = new double[] { -3, -2.8, -2.7, -2.6, -2.5 }; - public static double[] destructiveAttackSpeed = new double[] { -3.1, -3.1, -3.2, -3.3, -3.3 }; - - public static int[] absorptionTime = new int[] { 200, 300, 400, 500, 600 }; - - public static double maxAbsorptionHearts = 10; - - public static int[] poisonTime = new int[] { 25, 50, 60, 80, 100 }; - public static int[] poisonLevel = new int[] { 0, 0, 0, 1, 1 }; - - public static double[] movementSpeed = new double[] { 0.05, 0.1, 0.15, 0.2, 0.25 }; - - public final static double baseAttackDamage = 4; - public final static double baseAttackSpeed = -3; - private static Map hitMap = new HashMap(); - - public ItemSentientScythe() - { - super(BMItemTier.SENTIENT, (int) baseAttackDamage, (float) baseAttackSpeed, new Item.Properties().maxDamage(520).group(BloodMagic.TAB)); -// super(RegistrarBloodMagicItems.SOUL_TOOL_MATERIAL, 8.0F, 3.1F); - } - - @Override - public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) - { - return BloodMagicTags.CRYSTAL_DEMON.contains(repair.getItem()) || super.getIsRepairable(toRepair, repair); - } - - @Override - public float getDestroySpeed(ItemStack stack, BlockState state) - { - float value = super.getDestroySpeed(stack, state); - if (value > 1) - { - return (float) (value + getDigSpeedOfSword(stack)); - } else - { - return value; - } - } - - public void recalculatePowers(ItemStack stack, World world, PlayerEntity player) - { - EnumDemonWillType type = PlayerDemonWillHandler.getLargestWillType(player); - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - this.setCurrentType(stack, soulsRemaining > 0 ? type : EnumDemonWillType.DEFAULT); - int level = getLevel(stack, soulsRemaining); - - double drain = level >= 0 ? soulDrainPerSwing[level] : 0; - double extraDamage = getExtraDamage(type, level); - - setDrainOfActivatedSword(stack, drain); - setDamageOfActivatedSword(stack, baseAttackDamage + extraDamage); - setStaticDropOfActivatedSword(stack, level >= 0 ? staticDrop[level] : 1); - setDropOfActivatedSword(stack, level >= 0 ? soulDrop[level] : 0); - setAttackSpeedOfSword(stack, level >= 0 ? getAttackSpeed(type, level) : baseAttackSpeed); - setHealthBonusOfSword(stack, level >= 0 ? getHealthBonus(type, level) : 0); - setSpeedOfSword(stack, level >= 0 ? getMovementSpeed(type, level) : 0); - setDigSpeedOfSword(stack, level >= 0 ? getDigSpeed(type, level) : 0); - } - - public double getExtraDamage(EnumDemonWillType type, int willBracket) - { - if (willBracket < 0) - { - return 0; - } - - switch (type) - { - case CORROSIVE: - case DEFAULT: - return defaultDamageAdded[willBracket]; - case DESTRUCTIVE: - return destructiveDamageAdded[willBracket]; - case VENGEFUL: - return vengefulDamageAdded[willBracket]; - case STEADFAST: - return steadfastDamageAdded[willBracket]; - } - - return 0; - } - - public double getAttackSpeed(EnumDemonWillType type, int willBracket) - { - switch (type) - { - case VENGEFUL: - return vengefulAttackSpeed[willBracket]; - case DESTRUCTIVE: - return destructiveAttackSpeed[willBracket]; - default: - return -2.9; - } - } - - public double getHealthBonus(EnumDemonWillType type, int willBracket) - { - switch (type) - { - case STEADFAST: - return healthBonus[willBracket]; - default: - return 0; - } - } - - public double getMovementSpeed(EnumDemonWillType type, int willBracket) - { - switch (type) - { - case VENGEFUL: - return movementSpeed[willBracket]; - default: - return 0; - } - } - - public double getDigSpeed(EnumDemonWillType type, int willBracket) - { - switch (type) - { - case VENGEFUL: -// return movementSpeed[willBracket]; - default: - return defaultDigSpeedAdded[willBracket]; - } - } - -// public void onLeftClickAir(ItemStack stack, LivingEntity attacker) -// { -// if (attacker instanceof PlayerEntity) -// { -// PlayerEntity attackerPlayer = (PlayerEntity) attacker; -// this.recalculatePowers(stack, attackerPlayer.getEntityWorld(), attackerPlayer); -// EnumDemonWillType type = this.getCurrentType(stack); -// double will = PlayerDemonWillHandler.getTotalDemonWill(type, attackerPlayer); -// int willBracket = this.getLevel(stack, will); -// -// this.recalculatePowers(stack, attacker.world, attackerPlayer); -// -//// applyEffectToEntity(type, willBracket, target, attackerPlayer); -// -// attackEntitiesInAreaExcludingEntity(stack, attackerPlayer, type, willBracket); -// } -// } - - @Override - public boolean onEntitySwing(ItemStack stack, LivingEntity attacker) - { - if (attacker instanceof PlayerEntity) - { - PlayerEntity attackerPlayer = (PlayerEntity) attacker; - this.recalculatePowers(stack, attackerPlayer.getEntityWorld(), attackerPlayer); - EnumDemonWillType type = this.getCurrentType(stack); - double will = PlayerDemonWillHandler.getTotalDemonWill(type, attackerPlayer); - int willBracket = this.getLevel(stack, will); - - this.recalculatePowers(stack, attacker.world, attackerPlayer); - -// applyEffectToEntity(type, willBracket, target, attackerPlayer); - - attackEntitiesInAreaExcludingEntity(stack, attackerPlayer, type, willBracket, null); - } - return false; - } - - public void attackEntitiesInAreaExcludingEntity(ItemStack stack, PlayerEntity attacker, EnumDemonWillType type, int willBracket, LivingEntity attackedEntity) - { -// System.out.println("Is client: " + attacker.world.isRemote); - double verticalRange = 2; - double horizontalRange = 2; - double range = 2; - - AxisAlignedBB aabb = null; - List list = null; - - if (attackedEntity != null) - { - aabb = attackedEntity.getBoundingBox().expand(horizontalRange, verticalRange, horizontalRange); - list = attacker.world.getEntitiesInAABBexcluding(attackedEntity, aabb, EntityPredicates.IS_ALIVE); - } else - { - Vector3d eyeVec = attacker.getEyePosition(1).add(attacker.getLookVec().scale(range)); - aabb = new AxisAlignedBB(eyeVec.getX() - horizontalRange, eyeVec.getY() - verticalRange, eyeVec.getZ() - horizontalRange, eyeVec.getX() + horizontalRange, eyeVec.getY() + verticalRange, eyeVec.getZ() + horizontalRange); -// List list = attacker.world.getEntitiesInAABBexcluding(attacker, aabb, EntityPredicates.IS_ALIVE); - list = attacker.world.getEntitiesInAABBexcluding(attacker, aabb, EntityPredicates.IS_ALIVE); - } - - list = attacker.world.getEntitiesWithinAABB(LivingEntity.class, aabb); - - // TODO: check if we actually hit something first, 'kay? - float f = (float) attacker.getAttributeValue(Attributes.ATTACK_DAMAGE); - - float f2 = attacker.getCooledAttackStrength(0.5F); -// float f2 = 1; - f = f * (0.2F + f2 * f2 * 0.8F); - attacker.resetCooldown(); -// f *= 5; - - boolean flag1 = false; - int i = 0; - i = i + EnchantmentHelper.getKnockbackModifier(attacker); - boolean flag = f2 > 0.9F; - - if (attacker.isSprinting() && flag) - { - attacker.world.playSound((PlayerEntity) null, attacker.getPosX(), attacker.getPosY(), attacker.getPosZ(), SoundEvents.ENTITY_PLAYER_ATTACK_KNOCKBACK, attacker.getSoundCategory(), 1.0F, 1.0F); - ++i; - flag1 = true; - } - - boolean didHit = false; - boolean strongAttackHit = false; - boolean weakAttackHit = false; - boolean noDamageHit = false; - - for (Entity targetEntity : list) - { - if (targetEntity.equals(attacker)) - { - continue; - } - - if (targetEntity.canBeAttackedWithItem()) - { - if (!targetEntity.hitByEntity(attacker)) - { - float f1; - if (targetEntity instanceof LivingEntity) - { - f1 = EnchantmentHelper.getModifierForCreature(stack, ((LivingEntity) targetEntity).getCreatureAttribute()); - } else - { - f1 = EnchantmentHelper.getModifierForCreature(stack, CreatureAttribute.UNDEFINED); - } - - f1 = f1 * f2; - - if (f > 0.0F || f1 > 0.0F) - { - boolean flag2 = flag && attacker.fallDistance > 0.0F && !attacker.isOnGround() && !attacker.isOnLadder() && !attacker.isInWater() && !attacker.isPotionActive(Effects.BLINDNESS) && !attacker.isPassenger() && targetEntity instanceof LivingEntity; - flag2 = flag2 && !attacker.isSprinting(); - net.minecraftforge.event.entity.player.CriticalHitEvent hitResult = net.minecraftforge.common.ForgeHooks.getCriticalHit(attacker, targetEntity, flag2, flag2 - ? 1.5F - : 1.0F); - flag2 = hitResult != null; - if (flag2) - { - f *= hitResult.getDamageModifier(); - } - - f = f + f1; - boolean flag3 = false; - double d0 = (double) (attacker.distanceWalkedModified - attacker.prevDistanceWalkedModified); - - float f4 = 0.0F; - boolean flag4 = false; - int j = EnchantmentHelper.getFireAspectModifier(attacker); - if (targetEntity instanceof LivingEntity) - { - f4 = ((LivingEntity) targetEntity).getHealth(); - if (j > 0 && !targetEntity.isBurning()) - { - flag4 = true; - targetEntity.setFire(1); - } - } - - Vector3d vector3d = targetEntity.getMotion(); - boolean flag5 = targetEntity.attackEntityFrom(DamageSource.causePlayerDamage(attacker), f); - - if (flag5) - { - didHit = true; - if (i > 0) - { - if (targetEntity instanceof LivingEntity) - { - ((LivingEntity) targetEntity).applyKnockback((float) i * 0.5F, (double) MathHelper.sin(attacker.rotationYaw * ((float) Math.PI / 180F)), (double) (-MathHelper.cos(attacker.rotationYaw * ((float) Math.PI / 180F)))); - } else - { - targetEntity.addVelocity((double) (-MathHelper.sin(attacker.rotationYaw * ((float) Math.PI / 180F)) * (float) i * 0.5F), 0.1D, (double) (MathHelper.cos(attacker.rotationYaw * ((float) Math.PI / 180F)) * (float) i * 0.5F)); - } - - } - -// if (flag3) -// { -// float f3 = 1.0F + EnchantmentHelper.getSweepingDamageRatio(attacker) * f; -// -// for (LivingEntity livingentity : this.world.getEntitiesWithinAABB(LivingEntity.class, targetEntity.getBoundingBox().grow(1.0D, 0.25D, 1.0D))) -// { -// if (livingentity != this && livingentity != targetEntity && !this.isOnSameTeam(livingentity) && (!(livingentity instanceof ArmorStandEntity) || !((ArmorStandEntity) livingentity).hasMarker()) && this.getDistanceSq(livingentity) < 9.0D) -// { -// livingentity.applyKnockback(0.4F, (double) MathHelper.sin(this.rotationYaw * ((float) Math.PI / 180F)), (double) (-MathHelper.cos(this.rotationYaw * ((float) Math.PI / 180F)))); -// livingentity.attackEntityFrom(DamageSource.causePlayerDamage(this), f3); -// } -// } -// -// this.world.playSound((PlayerEntity) null, this.getPosX(), this.getPosY(), this.getPosZ(), SoundEvents.ENTITY_PLAYER_ATTACK_SWEEP, this.getSoundCategory(), 1.0F, 1.0F); -// this.spawnSweepParticles(); -// } - - attacker.spawnSweepParticles(); - - if (targetEntity instanceof ServerPlayerEntity && targetEntity.velocityChanged) - { - ((ServerPlayerEntity) targetEntity).connection.sendPacket(new SEntityVelocityPacket(targetEntity)); - targetEntity.velocityChanged = false; - targetEntity.setMotion(vector3d); - } - - if (flag2) - { - attacker.onCriticalHit(targetEntity); - } - - if (!flag2 && !flag3) - { - if (flag) - { - strongAttackHit = true; - } else - { - weakAttackHit = true; - } - } - - if (f1 > 0.0F) - { - attacker.onEnchantmentCritical(targetEntity); - } - - attacker.setLastAttackedEntity(targetEntity); - if (targetEntity instanceof LivingEntity) - { - EnchantmentHelper.applyThornEnchantments((LivingEntity) targetEntity, attacker); - } - - EnchantmentHelper.applyArthropodEnchantments(attacker, targetEntity); - ItemStack itemstack1 = stack; - Entity entity = targetEntity; -// if (targetEntity instanceof EnderDragonPartEntity) -// { -// entity = ((EnderDragonPartEntity) targetEntity).dragon; -// } - - if (!attacker.world.isRemote && !itemstack1.isEmpty() && entity instanceof LivingEntity) - { - ItemStack copy = itemstack1.copy(); - itemstack1.hitEntity((LivingEntity) entity, attacker); - if (itemstack1.isEmpty()) - { - net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(attacker, copy, Hand.MAIN_HAND); - attacker.setHeldItem(Hand.MAIN_HAND, ItemStack.EMPTY); - } - } - - if (targetEntity instanceof LivingEntity) - { - float f5 = f4 - ((LivingEntity) targetEntity).getHealth(); - attacker.addStat(Stats.DAMAGE_DEALT, Math.round(f5 * 10.0F)); - if (j > 0) - { - targetEntity.setFire(j * 4); - } - - if (attacker.world instanceof ServerWorld && f5 > 2.0F) - { - int k = (int) ((double) f5 * 0.5D); - ((ServerWorld) attacker.world).spawnParticle(ParticleTypes.DAMAGE_INDICATOR, targetEntity.getPosX(), targetEntity.getPosYHeight(0.5D), targetEntity.getPosZ(), k, 0.1D, 0.0D, 0.1D, 0.2D); - } - - applyEffectToEntity(type, willBracket, (LivingEntity) targetEntity, attacker); - } - - } else - { - noDamageHit = true; - if (flag4) - { - targetEntity.extinguish(); - } - } - } - - } - } - } - - if (didHit) - { - if (flag1) - { - attacker.setMotion(attacker.getMotion().mul(0.6D, 1.0D, 0.6D)); - attacker.setSprinting(false); - } - - attacker.addExhaustion(0.1F); - - attacker.world.playSound((PlayerEntity) null, attacker.getPosX(), attacker.getPosY(), attacker.getPosZ(), SoundEvents.ENTITY_PLAYER_ATTACK_SWEEP, attacker.getSoundCategory(), 1.0F, 1.0F); - } - - if (noDamageHit) - { - attacker.world.playSound((PlayerEntity) null, attacker.getPosX(), attacker.getPosY(), attacker.getPosZ(), SoundEvents.ENTITY_PLAYER_ATTACK_NODAMAGE, attacker.getSoundCategory(), 1.0F, 1.0F); - } - - if (strongAttackHit) - { - attacker.world.playSound((PlayerEntity) null, attacker.getPosX(), attacker.getPosY(), attacker.getPosZ(), SoundEvents.ENTITY_PLAYER_ATTACK_STRONG, attacker.getSoundCategory(), 1.0F, 1.0F); - } - if (weakAttackHit) - { - attacker.world.playSound((PlayerEntity) null, attacker.getPosX(), attacker.getPosY(), attacker.getPosZ(), SoundEvents.ENTITY_PLAYER_ATTACK_WEAK, attacker.getSoundCategory(), 1.0F, 1.0F); - } - } - - public void applyEffectToEntity(EnumDemonWillType type, int willBracket, LivingEntity target, PlayerEntity attacker) - { - switch (type) - { - case CORROSIVE: - target.addPotionEffect(new EffectInstance(Effects.WITHER, poisonTime[willBracket], poisonLevel[willBracket])); - break; - case DEFAULT: - break; - case DESTRUCTIVE: - break; - case STEADFAST: - if (!target.isAlive()) - { - float absorption = attacker.getAbsorptionAmount(); - attacker.addPotionEffect(new EffectInstance(Effects.ABSORPTION, absorptionTime[willBracket], 127, true, false)); - attacker.setAbsorptionAmount((float) Math.min(absorption + target.getMaxHealth() * 0.05f, maxAbsorptionHearts)); - } - break; - case VENGEFUL: - break; - } - } - - @Override - public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) - { - stack.damageItem(1, attacker, (entity) -> { - entity.sendBreakAnimation(EquipmentSlotType.MAINHAND); - }); - -// if (super.hitEntity(stack, target, attacker)) -// { - if (attacker instanceof PlayerEntity) - { - UUID id = attacker.getUniqueID(); - - PlayerEntity attackerPlayer = (PlayerEntity) attacker; - -// System.out.println("Hit map: " + hitMap.containsKey(id)); - - if (hitMap.containsKey(id) && hitMap.get(id)) - { - EnumDemonWillType type = this.getCurrentType(stack); - double will = PlayerDemonWillHandler.getTotalDemonWill(type, attackerPlayer); - int willBracket = this.getLevel(stack, will); - applyEffectToEntity(type, willBracket, target, attackerPlayer); - } else - { - this.recalculatePowers(stack, attackerPlayer.getEntityWorld(), attackerPlayer); - EnumDemonWillType type = this.getCurrentType(stack); - double will = PlayerDemonWillHandler.getTotalDemonWill(type, attackerPlayer); - int willBracket = this.getLevel(stack, will); - hitMap.put(id, true); - this.attackEntitiesInAreaExcludingEntity(stack, attackerPlayer, type, willBracket, target); - hitMap.remove(id); - } - } - - return true; -// } - -// return false; - } - - @Override - public EnumDemonWillType getCurrentType(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - if (!tag.contains(Constants.NBT.WILL_TYPE)) - { - return EnumDemonWillType.DEFAULT; - } - - return EnumDemonWillType.valueOf(tag.getString(Constants.NBT.WILL_TYPE).toUpperCase(Locale.ENGLISH)); - } - - public void setCurrentType(ItemStack stack, EnumDemonWillType type) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putString(Constants.NBT.WILL_TYPE, type.toString()); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) - { - recalculatePowers(player.getHeldItem(hand), world, player); - - return super.onItemRightClick(world, player, hand); - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) - { - return oldStack.getItem() != newStack.getItem(); - } - - private int getLevel(ItemStack stack, double soulsRemaining) - { - int lvl = -1; - for (int i = 0; i < soulBracket.length; i++) - { - if (soulsRemaining >= soulBracket[i]) - { - lvl = i; - } - } - - return lvl; - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { - if (!stack.hasTag()) - return; - - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sentientAxe.desc").mergeStyle(TextFormatting.GRAY)); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentType." + getCurrentType(stack).name().toLowerCase()).mergeStyle(TextFormatting.GRAY)); - } - - @Override - public boolean onLeftClickEntity(ItemStack stack, PlayerEntity player, Entity entity) - { - recalculatePowers(stack, player.getEntityWorld(), player); - - double drain = this.getDrainOfActivatedSword(stack); - if (drain > 0) - { - EnumDemonWillType type = getCurrentType(stack); - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - - if (drain > soulsRemaining) - { - return false; - } else - { - PlayerDemonWillHandler.consumeDemonWill(type, player, drain); - } - } - - return super.onLeftClickEntity(stack, player, entity); - } - - @Override - public List getRandomDemonWillDrop(LivingEntity killedEntity, LivingEntity attackingEntity, ItemStack stack, int looting) - { - List soulList = new ArrayList<>(); - - if (killedEntity.getEntityWorld().getDifficulty() != Difficulty.PEACEFUL && !(killedEntity instanceof IMob)) - { - return soulList; - } - - double willModifier = killedEntity instanceof SlimeEntity ? 0.67 : 1; - - IDemonWill soul; - - EnumDemonWillType type = this.getCurrentType(stack); - switch (type) - { - case CORROSIVE: - soul = ((IDemonWill) BloodMagicItems.MONSTER_SOUL_CORROSIVE.get()); - break; - case DESTRUCTIVE: - soul = ((IDemonWill) BloodMagicItems.MONSTER_SOUL_DESTRUCTIVE.get()); - break; - case STEADFAST: - soul = ((IDemonWill) BloodMagicItems.MONSTER_SOUL_STEADFAST.get()); - break; - case VENGEFUL: - soul = ((IDemonWill) BloodMagicItems.MONSTER_SOUL_VENGEFUL.get()); - break; - default: - soul = ((IDemonWill) BloodMagicItems.MONSTER_SOUL_RAW.get()); - break; - } - - for (int i = 0; i <= looting; i++) - { - if (i == 0 || attackingEntity.getEntityWorld().rand.nextDouble() < 0.4) - { - ItemStack soulStack = soul.createWill(willModifier * (this.getDropOfActivatedSword(stack) * attackingEntity.getEntityWorld().rand.nextDouble() + this.getStaticDropOfActivatedSword(stack)) * killedEntity.getMaxHealth() / 20d); - soulList.add(soulStack); - } - } - - return soulList; - } - - // TODO: Change attack speed. - @Override - public Multimap getAttributeModifiers(EquipmentSlotType slot, ItemStack stack) - { - Multimap multimap = HashMultimap.create(); - if (slot == EquipmentSlotType.MAINHAND) - { - multimap.put(Attributes.ATTACK_DAMAGE, new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getDamageOfActivatedSword(stack), AttributeModifier.Operation.ADDITION)); - multimap.put(Attributes.ATTACK_SPEED, new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", this.getAttackSpeedOfSword(stack), AttributeModifier.Operation.ADDITION)); - multimap.put(Attributes.MAX_HEALTH, new AttributeModifier(new UUID(0, 31818145), "Weapon modifier", this.getHealthBonusOfSword(stack), AttributeModifier.Operation.ADDITION)); - multimap.put(Attributes.MOVEMENT_SPEED, new AttributeModifier(new UUID(0, 4218052), "Weapon modifier", this.getSpeedOfSword(stack), AttributeModifier.Operation.ADDITION)); - } - - return multimap; - } - - public double getDamageOfActivatedSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_DAMAGE); - } - - public void setDamageOfActivatedSword(ItemStack stack, double damage) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); - } - - public double getDrainOfActivatedSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN); - } - - public void setDrainOfActivatedSword(ItemStack stack, double drain) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); - } - - public double getStaticDropOfActivatedSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP); - } - - public void setStaticDropOfActivatedSword(ItemStack stack, double drop) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); - } - - public double getDropOfActivatedSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_DROP); - } - - public void setDropOfActivatedSword(ItemStack stack, double drop) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_DROP, drop); - } - - public double getHealthBonusOfSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_HEALTH); - } - - public void setHealthBonusOfSword(ItemStack stack, double hp) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); - } - - public double getAttackSpeedOfSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED); - } - - public void setAttackSpeedOfSword(ItemStack stack, double speed) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); - } - - public double getSpeedOfSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_SPEED); - } - - public void setSpeedOfSword(ItemStack stack, double speed) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); - } - - public double getDigSpeedOfSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED); - } - - public void setDigSpeedOfSword(ItemStack stack, double speed) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED, speed); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemSigil.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemSigil.java deleted file mode 100644 index f609305f..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemSigil.java +++ /dev/null @@ -1,63 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import java.util.List; - -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wayoftime.bloodmagic.core.data.Binding; -import wayoftime.bloodmagic.common.item.sigil.ISigil; -import wayoftime.bloodmagic.util.Constants; -import wayoftime.bloodmagic.util.helper.NBTHelper; - -/** - * Base class for all (static) sigils. - */ -public class ItemSigil extends Item implements IBindable, ISigil -{ - private int lpUsed; - - public ItemSigil(Properties prop, int lpUsed) - { - super(prop); - - this.lpUsed = lpUsed; - } - - public boolean isUnusable(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - return stack.getTag().getBoolean(Constants.NBT.UNUSABLE); - } - - public ItemStack setUnusable(ItemStack stack, boolean unusable) - { - NBTHelper.checkNBT(stack); - - stack.getTag().putBoolean(Constants.NBT.UNUSABLE, unusable); - return stack; - } - - public int getLpUsed() - { - return lpUsed; - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { - if (!stack.hasTag()) - return; - - Binding binding = getBinding(stack); - if (binding != null) - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentOwner", binding.getOwnerName())); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemThrowingDagger.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemThrowingDagger.java deleted file mode 100644 index 38370400..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemThrowingDagger.java +++ /dev/null @@ -1,117 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import java.util.List; - -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; -import wayoftime.bloodmagic.entity.projectile.AbstractEntityThrowingDagger; -import wayoftime.bloodmagic.entity.projectile.EntityThrowingDagger; -import wayoftime.bloodmagic.will.PlayerDemonWillHandler; - -public class ItemThrowingDagger extends Item -{ - public static int[] soulBracket = new int[] { 1, 60, 200, 400, 1000, 2000, 4000 }; - - public static double[] soulDrop = new double[] { 2, 4, 7, 10, 13, 15, 18 }; - public static double[] staticDrop = new double[] { 1, 1, 2, 3, 3, 4, 4 }; - - public ItemThrowingDagger() - { - super(new Item.Properties().maxStackSize(64).group(BloodMagic.TAB)); - -// setTranslationKey(BloodMagic.MODID + ".soulSnare."); -// setCreativeTab(BloodMagic.TAB_BM); -// setHasSubtypes(true); -// setMaxStackSize(16); - } - - @Override - public ActionResult onItemRightClick(World worldIn, PlayerEntity playerIn, Hand hand) - { - ItemStack stack = playerIn.getHeldItem(hand); - if (!playerIn.isCreative()) - { - stack.shrink(1); - } - playerIn.getCooldownTracker().setCooldown(this, 50); - - worldIn.playSound((PlayerEntity) null, playerIn.getPosX(), playerIn.getPosY(), playerIn.getPosZ(), SoundEvents.ENTITY_SNOWBALL_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (random.nextFloat() * 0.4F + 0.8F)); - - if (!worldIn.isRemote) - { -// System.out.println("Attempting to spawn"); -// EntitySoulSnare snare = new EntitySoulSnare(worldIn, playerIn); -// snare.func_234612_a_(playerIn, playerIn.rotationPitch, playerIn.rotationYaw, 0.0F, 1.5F, 1.0F); -// worldIn.addEntity(snare); - EnumDemonWillType largestType = PlayerDemonWillHandler.getLargestWillType(playerIn); - double souls = PlayerDemonWillHandler.getTotalDemonWill(largestType, playerIn); - - ItemStack copyStack = stack.copy(); - copyStack.setCount(1); - AbstractEntityThrowingDagger dagger = getDagger(copyStack, worldIn, playerIn); - - int level = getLevel(souls); - if (level >= 0) - { - double willDrop = (soulDrop[level] * worldIn.rand.nextDouble() + staticDrop[level]); - dagger.setWillDrop(willDrop); - dagger.setWillType(largestType); - } - - worldIn.addEntity(dagger); -// -// SnowballEntity snowballentity = new SnowballEntity(worldIn, playerIn); -// snowballentity.setItem(itemstack); -// snowballentity.func_234612_a_(playerIn, playerIn.rotationPitch, playerIn.rotationYaw, 0.0F, 1.5F, 1.0F); -// worldIn.addEntity(snowballentity); - } - - return new ActionResult<>(ActionResultType.SUCCESS, stack); - } - - public AbstractEntityThrowingDagger getDagger(ItemStack stack, World world, PlayerEntity player) - { - AbstractEntityThrowingDagger dagger = new EntityThrowingDagger(stack, world, player); - dagger.func_234612_a_(player, player.rotationPitch, player.rotationYaw, 0.0F, 3F, 0.5F); - dagger.setDamage(10); - return dagger; - } - - private int getLevel(double soulsRemaining) - { - int lvl = -1; - for (int i = 0; i < soulBracket.length; i++) - { - if (soulsRemaining >= soulBracket[i]) - { - lvl = i; - } - } - - return lvl; - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.throwing_dagger.desc").mergeStyle(TextFormatting.ITALIC).mergeStyle(TextFormatting.GRAY)); - - super.addInformation(stack, world, tooltip, flag); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemThrowingDaggerSyringe.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemThrowingDaggerSyringe.java deleted file mode 100644 index c9384df8..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemThrowingDaggerSyringe.java +++ /dev/null @@ -1,19 +0,0 @@ -package wayoftime.bloodmagic.common.item; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import wayoftime.bloodmagic.entity.projectile.AbstractEntityThrowingDagger; -import wayoftime.bloodmagic.entity.projectile.EntityThrowingDaggerSyringe; - -public class ItemThrowingDaggerSyringe extends ItemThrowingDagger -{ - @Override - public AbstractEntityThrowingDagger getDagger(ItemStack stack, World world, PlayerEntity player) - { - AbstractEntityThrowingDagger dagger = new EntityThrowingDaggerSyringe(stack, world, player); - dagger.func_234612_a_(player, player.rotationPitch, player.rotationYaw, 0.0F, 3F, 0.5F); - dagger.setDamage(8); - return dagger; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/arc/IARCTool.java b/src/main/java/wayoftime/bloodmagic/common/item/arc/IARCTool.java deleted file mode 100644 index f4c094ba..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/arc/IARCTool.java +++ /dev/null @@ -1,19 +0,0 @@ -package wayoftime.bloodmagic.common.item.arc; - -import net.minecraft.item.ItemStack; - -/** - * Interface for items that affect ARC operation - */ -public interface IARCTool -{ - default double getCraftingSpeedMultiplier(ItemStack stack) - { - return 1; - } - - default double getAdditionalOutputChanceMultiplier(ItemStack stack) - { - return 1; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/arc/ItemARCToolBase.java b/src/main/java/wayoftime/bloodmagic/common/item/arc/ItemARCToolBase.java deleted file mode 100644 index 7867c6b5..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/arc/ItemARCToolBase.java +++ /dev/null @@ -1,57 +0,0 @@ -package wayoftime.bloodmagic.common.item.arc; - -import java.util.List; - -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.util.ChatUtil; - -public class ItemARCToolBase extends Item implements IARCTool -{ - private final double craftingMultiplier; - private final double additionalOutputChance; - - public ItemARCToolBase(int maxDamage, double craftingMultiplier) - { - this(maxDamage, craftingMultiplier, 1); - } - - public ItemARCToolBase(int maxDamage, double craftingMultiplier, double additionalOutputChance) - { - super(new Item.Properties().maxStackSize(1).group(BloodMagic.TAB).maxDamage(maxDamage)); - this.craftingMultiplier = craftingMultiplier; - this.additionalOutputChance = additionalOutputChance; - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.arctool.uses", stack.getMaxDamage() - stack.getDamage()).mergeStyle(TextFormatting.GRAY)); - - if (getAdditionalOutputChanceMultiplier(stack) != 1) - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.arctool.additionaldrops", ChatUtil.DECIMAL_FORMAT.format(getAdditionalOutputChanceMultiplier(stack))).mergeStyle(TextFormatting.GRAY)); - - super.addInformation(stack, world, tooltip, flag); - } - - @Override - public double getCraftingSpeedMultiplier(ItemStack stack) - { - return craftingMultiplier; - } - - @Override - public double getAdditionalOutputChanceMultiplier(ItemStack stack) - { - return additionalOutputChance; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/block/ItemBlockAlchemyTable.java b/src/main/java/wayoftime/bloodmagic/common/item/block/ItemBlockAlchemyTable.java deleted file mode 100644 index ee0aed2e..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/block/ItemBlockAlchemyTable.java +++ /dev/null @@ -1,96 +0,0 @@ -package wayoftime.bloodmagic.common.item.block; - -import net.minecraft.advancements.CriteriaTriggers; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.SoundType; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.item.BlockItem; -import net.minecraft.item.BlockItemUseContext; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import wayoftime.bloodmagic.common.block.BlockAlchemyTable; -import wayoftime.bloodmagic.tile.TileAlchemyTable; - -public class ItemBlockAlchemyTable extends BlockItem -{ - public ItemBlockAlchemyTable(Block block, Properties properties) - { - super(block, properties); - } - - @Override - public ActionResultType tryPlace(BlockItemUseContext context) - { -// PlayerEntity player = context.getPlayer() -// float yaw = player.rotationYaw; - Direction direction = context.getPlacementHorizontalFacing(); - PlayerEntity player = context.getPlayer(); - - if (direction.getYOffset() != 0) - { - return ActionResultType.FAIL; - } - - World world = context.getWorld(); - BlockPos pos = context.getPos(); - - if (!world.isAirBlock(pos.offset(direction))) - { - return ActionResultType.FAIL; - } - - BlockState thisState = this.getBlock().getDefaultState().with(BlockAlchemyTable.DIRECTION, direction).with(BlockAlchemyTable.INVISIBLE, false); - BlockState newState = this.getBlock().getDefaultState().with(BlockAlchemyTable.DIRECTION, direction).with(BlockAlchemyTable.INVISIBLE, true); - - if (!this.canPlace(context, thisState) || !world.setBlockState(pos.offset(direction), newState, 3)) - { - return ActionResultType.FAIL; - } - - if (!world.setBlockState(pos, thisState, 3)) - { - return ActionResultType.FAIL; - } - - BlockState state = world.getBlockState(pos); - if (state.getBlock() == this.getBlock()) - { - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileAlchemyTable) - { - ((TileAlchemyTable) tile).setInitialTableParameters(direction, false, pos.offset(direction)); - } - - TileEntity slaveTile = world.getTileEntity(pos.offset(direction)); - if (slaveTile instanceof TileAlchemyTable) - { - ((TileAlchemyTable) slaveTile).setInitialTableParameters(direction, true, pos); - } - - setTileEntityNBT(world, context.getPlayer(), pos, context.getItem()); - this.getBlock().onBlockPlacedBy(world, pos, state, context.getPlayer(), context.getItem()); - if (player instanceof ServerPlayerEntity) - { - CriteriaTriggers.PLACED_BLOCK.trigger((ServerPlayerEntity) player, pos, context.getItem()); - } - } - - SoundType soundtype = state.getSoundType(world, pos, context.getPlayer()); - world.playSound(player, pos, this.getPlaceSound(state, world, pos, context.getPlayer()), SoundCategory.BLOCKS, (soundtype.getVolume() - + 1.0F) / 2.0F, soundtype.getPitch() * 0.8F); - if (player == null || !player.abilities.isCreativeMode) - { - context.getItem().shrink(1); - } - - return ActionResultType.func_233537_a_(world.isRemote); - -// return ActionResultType.SUCCESS; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/block/ItemBlockMimic.java b/src/main/java/wayoftime/bloodmagic/common/item/block/ItemBlockMimic.java deleted file mode 100644 index 3123a5f9..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/block/ItemBlockMimic.java +++ /dev/null @@ -1,139 +0,0 @@ -package wayoftime.bloodmagic.common.item.block; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.SoundType; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.BlockItem; -import net.minecraft.item.BlockItemUseContext; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.ChestTileEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import wayoftime.bloodmagic.tile.TileMimic; - -public class ItemBlockMimic extends BlockItem -{ - public ItemBlockMimic(Block block, Properties prop) - { - super(block, prop); - } - - @Override - public ActionResultType tryPlace(BlockItemUseContext context) - { - PlayerEntity player = context.getPlayer(); - ItemStack stack = player.getHeldItem(context.getHand()); - - // If not sneaking, do normal item use - if (!player.isSneaking()) - { - return super.tryPlace(context); - } - - BlockPos pos = context.getPos().offset(context.getFace().getOpposite()); - World world = context.getWorld(); - Direction direction = context.getFace(); - - // IF sneaking and player has permission, replace the targeted block - if (player.canPlayerEdit(pos, direction, stack)) - { - // Store information about the block being replaced and its appropriate - // itemstack - BlockState replacedBlockstate = world.getBlockState(pos); - Block replacedBlock = replacedBlockstate.getBlock(); - ItemStack replacedStack = replacedBlock.getItem(world, pos, replacedBlockstate); - - // Get the state for the mimic - BlockState mimicBlockstate = this.getBlock().getDefaultState(); - - // Check if the block can be replaced - - if (!canReplaceBlock(world, pos, replacedBlockstate)) - { - return super.tryPlace(context); - } - - // Check if the tile entity, if any, can be replaced - TileEntity tileReplaced = world.getTileEntity(pos); - if (!canReplaceTile(tileReplaced)) - { - return ActionResultType.FAIL; - } - - // If tile can be replaced, store info about the tile - CompoundNBT tileTag = getTagFromTileEntity(tileReplaced); - if (tileReplaced != null) - { - CompoundNBT voidTag = new CompoundNBT(); - voidTag.putInt("x", pos.getX()); - voidTag.putInt("y", pos.getY()); - voidTag.putInt("z", pos.getZ()); - tileReplaced.deserializeNBT(voidTag); - } - - // Remove one item from stack - stack.shrink(1); - - // Replace the block - world.setBlockState(pos, mimicBlockstate, 3); - // Make placing sound - SoundType soundtype = mimicBlockstate.getSoundType(world, pos, context.getPlayer()); - world.playSound(player, pos, soundtype.getPlaceSound(), SoundCategory.BLOCKS, (soundtype.getVolume() + 1.0F) / 2.0F, soundtype.getPitch() * 0.8F); - - // Replace the tile entity - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileMimic) - { - TileMimic mimic = (TileMimic) tile; - mimic.tileTag = tileTag; -// mimic.setReplacedState(replacedBlockstate); - mimic.setMimic(replacedBlockstate); - mimic.setInventorySlotContents(0, replacedStack); - mimic.refreshTileEntity(); - - if (player.isCreative()) - { - mimic.dropItemsOnBreak = false; - } - } - return ActionResultType.SUCCESS; - } - - return ActionResultType.FAIL; - - } - - public boolean canReplaceTile(TileEntity tile) - { - if (tile instanceof ChestTileEntity) - { - return true; - } - - return tile == null; - } - - public boolean canReplaceBlock(World world, BlockPos pos, BlockState state) - { - return state.getBlockHardness(world, pos) != -1.0F; - } - - public CompoundNBT getTagFromTileEntity(TileEntity tile) - { - CompoundNBT tag = new CompoundNBT(); - - if (tile != null) - { - return tile.write(tag); - } - - return tag; - } - -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/block/ItemBlockShapedCharge.java b/src/main/java/wayoftime/bloodmagic/common/item/block/ItemBlockShapedCharge.java deleted file mode 100644 index 1069a834..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/block/ItemBlockShapedCharge.java +++ /dev/null @@ -1,71 +0,0 @@ -package wayoftime.bloodmagic.common.item.block; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.BlockItem; -import net.minecraft.item.BlockItemUseContext; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; -import net.minecraft.world.World; -import wayoftime.bloodmagic.anointment.AnointmentHolder; -import wayoftime.bloodmagic.entity.projectile.EntityShapedCharge; -import wayoftime.bloodmagic.tile.TileExplosiveCharge; - -public class ItemBlockShapedCharge extends BlockItem -{ - public ItemBlockShapedCharge(Block blockIn, Properties builder) - { - super(blockIn, builder); - } - - @Override - public ActionResult onItemRightClick(World worldIn, PlayerEntity playerIn, Hand hand) - { - ItemStack stack = playerIn.getHeldItem(hand); - if (!playerIn.isCreative()) - { - stack.shrink(1); - } - - worldIn.playSound((PlayerEntity) null, playerIn.getPosX(), playerIn.getPosY(), playerIn.getPosZ(), SoundEvents.ENTITY_SNOWBALL_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (random.nextFloat() * 0.4F + 0.8F)); - - if (!worldIn.isRemote) - { -// EntitySoulSnare snare = new EntitySoulSnare(worldIn, playerIn); - EntityShapedCharge charge = new EntityShapedCharge(worldIn, this.getBlock(), playerIn); - charge.func_234612_a_(playerIn, playerIn.rotationPitch, playerIn.rotationYaw, 0.0F, 1.5F, 1.0F); - charge.setAnointmentHolder(AnointmentHolder.fromItemStack(stack)); - worldIn.addEntity(charge); -// -// SnowballEntity snowballentity = new SnowballEntity(worldIn, playerIn); -// snowballentity.setItem(itemstack); -// snowballentity.func_234612_a_(playerIn, playerIn.rotationPitch, playerIn.rotationYaw, 0.0F, 1.5F, 1.0F); -// worldIn.addEntity(snowballentity); - } - - return new ActionResult<>(ActionResultType.SUCCESS, stack); - } - - @Override - public ActionResultType tryPlace(BlockItemUseContext context) - { - ActionResultType result = super.tryPlace(context); - - AnointmentHolder holder = AnointmentHolder.fromItemStack(context.getItem()); - if (holder != null) - { - TileEntity tile = context.getWorld().getTileEntity(context.getPos()); - if (tile instanceof TileExplosiveCharge) - { - ((TileExplosiveCharge) tile).setAnointmentHolder(holder); - } - } - - return result; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/inventory/ContainerHolding.java b/src/main/java/wayoftime/bloodmagic/common/item/inventory/ContainerHolding.java deleted file mode 100644 index 3e207e89..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/inventory/ContainerHolding.java +++ /dev/null @@ -1,202 +0,0 @@ -package wayoftime.bloodmagic.common.item.inventory; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.container.Container; -import net.minecraft.inventory.container.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.fml.common.thread.EffectiveSide; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.common.item.sigil.ISigil; -import wayoftime.bloodmagic.common.item.sigil.ItemSigilHolding; - -public class ContainerHolding extends Container -{ - public final InventoryHolding inventoryHolding; - private final int PLAYER_INVENTORY_ROWS = 3; - private final int PLAYER_INVENTORY_COLUMNS = 9; - private final PlayerEntity player; - - public ContainerHolding(int windowId, PlayerInventory playerInventory, PacketBuffer extraData) - { - this(windowId, playerInventory.player, playerInventory, new InventoryHolding(extraData.readItemStack())); - } - - public ContainerHolding(int windowId, PlayerEntity player, PlayerInventory playerInventory, InventoryHolding inventoryHolding) - { - super(BloodMagicBlocks.HOLDING_CONTAINER.get(), windowId); - this.player = player; - this.inventoryHolding = inventoryHolding; - int currentSlotHeldIn = player.inventory.currentItem; - this.setup(playerInventory, currentSlotHeldIn); - } - - public void setup(PlayerInventory inventory, int currentSlotHeldIn) - { - for (int columnIndex = 0; columnIndex < ItemSigilHolding.inventorySize; ++columnIndex) - { - this.addSlot(new SlotHolding(this, inventoryHolding, player, columnIndex, 8 + columnIndex * 36, 17)); - } - - for (int rowIndex = 0; rowIndex < PLAYER_INVENTORY_ROWS; ++rowIndex) - { - for (int columnIndex = 0; columnIndex < PLAYER_INVENTORY_COLUMNS; ++columnIndex) - { - this.addSlot(new Slot(player.inventory, columnIndex + rowIndex * 9 + 9, 8 + columnIndex * 18, 41 + rowIndex * 18)); - } - } - - for (int actionBarIndex = 0; actionBarIndex < PLAYER_INVENTORY_COLUMNS; ++actionBarIndex) - { - if (actionBarIndex == currentSlotHeldIn) - { - this.addSlot(new SlotDisabled(player.inventory, actionBarIndex, 8 + actionBarIndex * 18, 99)); - } else - { - this.addSlot(new Slot(player.inventory, actionBarIndex, 8 + actionBarIndex * 18, 99)); - } - } - } - - @Override - public boolean canInteractWith(PlayerEntity entityPlayer) - { - return true; - } - - @Override - public void onContainerClosed(PlayerEntity entityPlayer) - { - super.onContainerClosed(entityPlayer); - - if (!entityPlayer.getEntityWorld().isRemote) - { - saveInventory(entityPlayer); - } - } - - @Override - public void detectAndSendChanges() - { - super.detectAndSendChanges(); - - if (!player.getEntityWorld().isRemote) - { - saveInventory(player); - } - } - - @Override - public ItemStack transferStackInSlot(PlayerEntity entityPlayer, int slotIndex) - { - ItemStack stack = ItemStack.EMPTY; - Slot slotObject = inventorySlots.get(slotIndex); - int slots = inventorySlots.size(); - - if (slotObject != null && slotObject.getHasStack()) - { - ItemStack stackInSlot = slotObject.getStack(); - stack = stackInSlot.copy(); - - if (stack.getItem() instanceof ISigil) - { - if (slotIndex < ItemSigilHolding.inventorySize) - { - if (!this.mergeItemStack(stackInSlot, ItemSigilHolding.inventorySize, slots, false)) - { - return ItemStack.EMPTY; - } - } else if (!this.mergeItemStack(stackInSlot, 0, ItemSigilHolding.inventorySize, false)) - { - return ItemStack.EMPTY; - } - } else if (stack.getItem() instanceof ItemSigilHolding) - { - if (slotIndex < ItemSigilHolding.inventorySize + (PLAYER_INVENTORY_ROWS * PLAYER_INVENTORY_COLUMNS)) - { - if (!this.mergeItemStack(stackInSlot, ItemSigilHolding.inventorySize + (PLAYER_INVENTORY_ROWS * PLAYER_INVENTORY_COLUMNS), inventorySlots.size(), false)) - { - return ItemStack.EMPTY; - } - } else if (!this.mergeItemStack(stackInSlot, ItemSigilHolding.inventorySize, ItemSigilHolding.inventorySize + (PLAYER_INVENTORY_ROWS * PLAYER_INVENTORY_COLUMNS), false)) - { - return ItemStack.EMPTY; - } - } - - if (stackInSlot.isEmpty()) - { - slotObject.putStack(ItemStack.EMPTY); - } else - { - slotObject.onSlotChanged(); - } - - if (stackInSlot.getCount() == stack.getCount()) - { - return ItemStack.EMPTY; - } - - slotObject.onTake(player, stackInSlot); - } - - return stack; - } - - public void saveInventory(PlayerEntity entityPlayer) - { - inventoryHolding.onGuiSaved(entityPlayer); - } - - private class SlotHolding extends Slot - { - private final PlayerEntity player; - private ContainerHolding containerHolding; - - public SlotHolding(ContainerHolding containerHolding, IInventory inventory, PlayerEntity player, int slotIndex, int x, int y) - { - super(inventory, slotIndex, x, y); - this.player = player; - this.containerHolding = containerHolding; - } - - @Override - public void onSlotChanged() - { - super.onSlotChanged(); - - if (EffectiveSide.get().isServer()) - { - containerHolding.saveInventory(player); - } - } - - @Override - public boolean isItemValid(ItemStack itemStack) - { - return itemStack.getItem() instanceof ISigil && !(itemStack.getItem() instanceof ItemSigilHolding); - } - } - - private class SlotDisabled extends Slot - { - public SlotDisabled(IInventory inventory, int slotIndex, int x, int y) - { - super(inventory, slotIndex, x, y); - } - - @Override - public boolean isItemValid(ItemStack itemStack) - { - return false; - } - - @Override - public boolean canTakeStack(PlayerEntity player) - { - return false; - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/inventory/InventoryHolding.java b/src/main/java/wayoftime/bloodmagic/common/item/inventory/InventoryHolding.java deleted file mode 100644 index 218cd152..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/inventory/InventoryHolding.java +++ /dev/null @@ -1,82 +0,0 @@ -package wayoftime.bloodmagic.common.item.inventory; - -import java.util.UUID; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import wayoftime.bloodmagic.common.item.sigil.ISigil; -import wayoftime.bloodmagic.common.item.sigil.ItemSigilHolding; -import wayoftime.bloodmagic.util.Constants; -import wayoftime.bloodmagic.util.Utils; - -public class InventoryHolding extends ItemInventory -{ -// protected ItemStack[] inventory; - - public InventoryHolding(ItemStack itemStack) - { - super(itemStack, ItemSigilHolding.inventorySize, "SigilOfHolding"); - } - - public void onGuiSaved(PlayerEntity entityPlayer) - { - masterStack = findParentStack(entityPlayer); - - if (!masterStack.isEmpty()) - { - save(); - } - } - - public ItemStack findParentStack(PlayerEntity entityPlayer) - { - if (Utils.hasUUID(masterStack)) - { - UUID parentStackUUID = new UUID(masterStack.getTag().getLong(Constants.NBT.MOST_SIG), masterStack.getTag().getLong(Constants.NBT.LEAST_SIG)); - for (int i = 0; i < entityPlayer.inventory.getSizeInventory(); i++) - { - ItemStack itemStack = entityPlayer.inventory.getStackInSlot(i); - - if (!itemStack.isEmpty() && Utils.hasUUID(itemStack)) - { - if (itemStack.getTag().getLong(Constants.NBT.MOST_SIG) == parentStackUUID.getMostSignificantBits() && itemStack.getTag().getLong(Constants.NBT.LEAST_SIG) == parentStackUUID.getLeastSignificantBits()) - { - return itemStack; - } - } - } - } - - return ItemStack.EMPTY; - } - - public void save() - { - CompoundNBT nbtTagCompound = masterStack.getTag(); - - if (nbtTagCompound == null) - { - nbtTagCompound = new CompoundNBT(); - - UUID uuid = UUID.randomUUID(); - nbtTagCompound.putLong(Constants.NBT.MOST_SIG, uuid.getMostSignificantBits()); - nbtTagCompound.putLong(Constants.NBT.LEAST_SIG, uuid.getLeastSignificantBits()); - } - - writeToNBT(nbtTagCompound); - masterStack.setTag(nbtTagCompound); - } - - @Override - public boolean isItemValidForSlot(int slotIndex, ItemStack itemStack) - { - return itemStack.getItem() instanceof ISigil && !(itemStack.getItem() instanceof ItemSigilHolding); - } - - @Override - public int getInventoryStackLimit() - { - return 1; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/inventory/InventoryWrapper.java b/src/main/java/wayoftime/bloodmagic/common/item/inventory/InventoryWrapper.java deleted file mode 100644 index 26adf391..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/inventory/InventoryWrapper.java +++ /dev/null @@ -1,101 +0,0 @@ -package wayoftime.bloodmagic.common.item.inventory; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; - -public class InventoryWrapper implements IInventory -{ - protected int[] syncedSlots = new int[0]; - protected NonNullList inventory; - private int size; - - public InventoryWrapper(int size) - { - this.inventory = NonNullList.withSize(size, ItemStack.EMPTY); - this.size = size; - } - - @Override - public void clear() - { - this.inventory = NonNullList.withSize(size, ItemStack.EMPTY); - } - - @Override - public int getSizeInventory() - { - return size; - } - - @Override - public boolean isEmpty() - { - for (ItemStack stack : inventory) if (!stack.isEmpty()) - return false; - - return true; - } - - @Override - public ItemStack getStackInSlot(int index) - { - return inventory.get(index); - } - - @Override - public ItemStack decrStackSize(int index, int count) - { - if (!getStackInSlot(index).isEmpty()) - { - if (getStackInSlot(index).getCount() <= count) - { - ItemStack itemStack = inventory.get(index); - inventory.set(index, ItemStack.EMPTY); - markDirty(); - return itemStack; - } - - ItemStack itemStack = inventory.get(index).split(count); - markDirty(); - return itemStack; - } - - return ItemStack.EMPTY; - } - - @Override - public ItemStack removeStackFromSlot(int slot) - { - if (!inventory.get(slot).isEmpty()) - { - ItemStack itemStack = inventory.get(slot); - setInventorySlotContents(slot, ItemStack.EMPTY); - return itemStack; - } - return ItemStack.EMPTY; - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - inventory.set(slot, stack); - if (!stack.isEmpty() && stack.getCount() > getInventoryStackLimit()) - stack.setCount(getInventoryStackLimit()); - markDirty(); - } - - @Override - public void markDirty() - { - - } - - @Override - public boolean isUsableByPlayer(PlayerEntity player) - { - return false; - } - -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/inventory/ItemInventory.java b/src/main/java/wayoftime/bloodmagic/common/item/inventory/ItemInventory.java deleted file mode 100644 index 2b739f8a..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/inventory/ItemInventory.java +++ /dev/null @@ -1,252 +0,0 @@ -package wayoftime.bloodmagic.common.item.inventory; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ItemStackHelper; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.NonNullList; -import wayoftime.bloodmagic.util.Constants; -import wayoftime.bloodmagic.util.helper.NBTHelper; - -public class ItemInventory implements IInventory -{ - protected int[] syncedSlots = new int[0]; - protected ItemStack masterStack; - private NonNullList inventory; - private int size; - private String name; - - public ItemInventory(ItemStack masterStack, int size, String name) - { - this.inventory = NonNullList.withSize(size, ItemStack.EMPTY); - this.size = size; - this.name = name; - this.masterStack = masterStack; - - if (!masterStack.isEmpty()) - this.readFromStack(masterStack); - } - - public void initializeInventory(ItemStack masterStack) - { - this.masterStack = masterStack; - this.clear(); - this.readFromStack(masterStack); - } - - private boolean isSyncedSlot(int slot) - { - for (int s : this.syncedSlots) - { - if (s == slot) - { - return true; - } - } - return false; - } - - public void readFromNBT(CompoundNBT tagCompound) - { - this.inventory = NonNullList.withSize(this.getSizeInventory(), ItemStack.EMPTY); - - ItemStackHelper.loadAllItems(tagCompound, this.inventory); - } - - public void writeToNBT(CompoundNBT tagCompound) - { - ItemStackHelper.saveAllItems(tagCompound, this.inventory); -// ListNBT tags = new ListNBT(); -// -// for (int i = 0; i < inventory.size(); i++) -// { -// if ((!inventory.get(i).isEmpty()) && !isSyncedSlot(i)) -// { -// CompoundNBT data = new CompoundNBT(); -// data.putByte(Constants.NBT.SLOT, (byte) i); -// inventory.get(i).write(data); -// tags.add(data); -//// tags.appendTag(data); -// } -// } -// -// tagCompound.put(Constants.NBT.ITEMS, tags); - } - - public void readFromStack(ItemStack masterStack) - { - if (masterStack != null) - { - NBTHelper.checkNBT(masterStack); - CompoundNBT tag = masterStack.getTag(); - readFromNBT(tag.getCompound(Constants.NBT.ITEM_INVENTORY)); - } - } - - public void writeToStack(ItemStack masterStack) - { - if (masterStack != null) - { - NBTHelper.checkNBT(masterStack); - CompoundNBT tag = masterStack.getTag(); - CompoundNBT invTag = new CompoundNBT(); - writeToNBT(invTag); - tag.put(Constants.NBT.ITEM_INVENTORY, invTag); - } - } - - @Override - public int getSizeInventory() - { - return size; - } - - @Override - public ItemStack getStackInSlot(int index) - { - return inventory.get(index); - } - - @Override - public ItemStack decrStackSize(int index, int count) - { - if (!inventory.get(index).isEmpty()) - { -// if (!worldObj.isRemote) -// worldObj.markBlockForUpdate(this.pos); - - if (inventory.get(index).getCount() <= count) - { - ItemStack itemStack = inventory.get(index); - inventory.set(index, ItemStack.EMPTY); - markDirty(); - return itemStack; - } - - ItemStack itemStack = inventory.get(index).split(count); - if (inventory.get(index).isEmpty()) - inventory.set(index, ItemStack.EMPTY); - - markDirty(); - return itemStack; - } - - return null; - } - - @Override - public ItemStack removeStackFromSlot(int slot) - { - if (!inventory.get(slot).isEmpty()) - { - ItemStack itemStack = inventory.get(slot); - setInventorySlotContents(slot, ItemStack.EMPTY); - return itemStack; - } - return ItemStack.EMPTY; - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - inventory.set(slot, stack); - if (stack.getCount() > getInventoryStackLimit()) - stack.setCount(getInventoryStackLimit()); - markDirty(); -// if (!worldObj.isRemote) -// worldObj.markBlockForUpdate(this.pos); - } - - @Override - public int getInventoryStackLimit() - { - return 64; - } - - @Override - public boolean isUsableByPlayer(PlayerEntity player) - { - return true; - } - - @Override - public void openInventory(PlayerEntity player) - { - - } - - @Override - public void closeInventory(PlayerEntity player) - { - - } - - @Override - public boolean isItemValidForSlot(int index, ItemStack stack) - { - return true; - } - -// @Override -// public int getField(int id) -// { -// return 0; -// } -// -// @Override -// public void setField(int id, int value) -// { -// -// } -// -// @Override -// public int getFieldCount() -// { -// return 0; -// } - - @Override - public void clear() - { - this.inventory = NonNullList.withSize(getSizeInventory(), ItemStack.EMPTY); - } - -// @Override -// public String getName() -// { -// return name; -// } -// -// @Override -// public boolean hasCustomName() -// { -// return false; -// } -// -// @Override -// public ITextComponent getDisplayName() -// { -// return new StringTextComponent(getName()); -// } - - @Override - public void markDirty() - { - if (masterStack != null) - { - this.writeToStack(masterStack); - } - } - - @Override - public boolean isEmpty() - { - return false; - } - - public boolean canInventoryBeManipulated() - { - return masterStack != null; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ISigil.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ISigil.java deleted file mode 100644 index b438154b..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ISigil.java +++ /dev/null @@ -1,30 +0,0 @@ -package wayoftime.bloodmagic.common.item.sigil; - -import javax.annotation.Nonnull; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -/** - * Used for all ItemSigils EXCEPT for Sigils of Holding. - */ -public interface ISigil -{ - default boolean performArrayEffect(World world, BlockPos pos) - { - return false; - } - - default boolean hasArrayEffect() - { - return false; - } - - interface Holding - { - @Nonnull - ItemStack getHeldItem(ItemStack holdingStack, PlayerEntity player); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilAir.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilAir.java deleted file mode 100644 index 3fca97f4..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilAir.java +++ /dev/null @@ -1,61 +0,0 @@ -package wayoftime.bloodmagic.common.item.sigil; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.world.World; -import wayoftime.bloodmagic.core.data.SoulTicket; -import wayoftime.bloodmagic.util.helper.NetworkHelper; -import wayoftime.bloodmagic.util.helper.PlayerHelper; - -public class ItemSigilAir extends ItemSigilBase -{ - public ItemSigilAir() - { - super("air", 50); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) - { - ItemStack stack = player.getHeldItem(hand); - if (stack.getItem() instanceof ISigil.Holding) - stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - if (PlayerHelper.isFakePlayer(player)) - return ActionResult.resultFail(stack); - - boolean unusable = isUnusable(stack); - if (world.isRemote && !unusable) - { - Vector3d vec = player.getLookVec(); - double wantedVelocity = 1.7; - - // TODO - Revisit after potions -// if (player.isPotionActive(RegistrarBloodMagic.BOOST)) -// { -// int amplifier = player.getActivePotionEffect(RegistrarBloodMagic.BOOST).getAmplifier(); -// wantedVelocity += (1 + amplifier) * (0.35); -// } - - player.setMotion(vec.x * wantedVelocity, vec.y * wantedVelocity, vec.z * wantedVelocity); - } - - world.playSound(player, player.getPosX(), player.getPosY(), player.getPosZ(), SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) - * 0.8F); - - if (!world.isRemote) - { - if (!player.isCreative()) - this.setUnusable(stack, !NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()); - - if (!unusable) - player.fallDistance = 0; - } - - return super.onItemRightClick(world, player, hand); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilBase.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilBase.java deleted file mode 100644 index b33d4c1c..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilBase.java +++ /dev/null @@ -1,52 +0,0 @@ -package wayoftime.bloodmagic.common.item.sigil; - -import java.util.List; - -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.common.item.ItemSigil; - -public class ItemSigilBase extends ItemSigil -{ - protected final String tooltipBase; -// private final String name; - - public ItemSigilBase(String name, int lpUsed) - { - super(new Item.Properties().maxStackSize(1).group(BloodMagic.TAB), lpUsed); -// super(lpUsed); - -// this.name = name; - this.tooltipBase = "tooltip.bloodmagic.sigil." + name + "."; - } - - public ItemSigilBase(String name) - { - this(name, 0); - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { - tooltip.add(new TranslationTextComponent(tooltipBase + "desc").mergeStyle(TextFormatting.ITALIC).mergeStyle(TextFormatting.GRAY)); -// if (TextHelper.canTranslate(tooltipBase + "desc")) -// tooltip.addAll(Arrays.asList(WordUtils.wrap(TextHelper.localizeEffect(tooltipBase -// + "desc"), 30, "/cut", false).split("/cut"))); - - super.addInformation(stack, world, tooltip, flag); - } - -// public String getName() -// { -// return name; -// } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilBloodLight.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilBloodLight.java deleted file mode 100644 index e7245bae..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilBloodLight.java +++ /dev/null @@ -1,103 +0,0 @@ -package wayoftime.bloodmagic.common.item.sigil; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.RayTraceContext; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.core.data.SoulNetwork; -import wayoftime.bloodmagic.core.data.SoulTicket; -import wayoftime.bloodmagic.entity.projectile.EntityBloodLight; -import wayoftime.bloodmagic.util.Constants; -import wayoftime.bloodmagic.util.helper.NBTHelper; -import wayoftime.bloodmagic.util.helper.NetworkHelper; -import wayoftime.bloodmagic.util.helper.PlayerHelper; - -public class ItemSigilBloodLight extends ItemSigilBase -{ - public ItemSigilBloodLight() - { - super("bloodlight", 10); - } - - @Override - public void inventoryTick(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected) - { - if (getCooldownRemainder(stack) > 0) - reduceCooldown(stack); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) - { - ItemStack stack = player.getHeldItem(hand); - if (stack.getItem() instanceof ISigil.Holding) - stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - if (PlayerHelper.isFakePlayer(player)) - return ActionResult.resultFail(stack); - - RayTraceResult mop = rayTrace(world, player, RayTraceContext.FluidMode.NONE); - - if (getCooldownRemainder(stack) > 0) - return super.onItemRightClick(world, player, hand); - - if (mop != null && mop.getType() == RayTraceResult.Type.BLOCK) - { - BlockRayTraceResult blockRayTrace = (BlockRayTraceResult) mop; - BlockPos blockPos = blockRayTrace.getPos().offset(blockRayTrace.getFace()); - - if (world.isAirBlock(blockPos)) - { - world.setBlockState(blockPos, BloodMagicBlocks.BLOOD_LIGHT.get().getDefaultState()); - if (!world.isRemote) - { - SoulNetwork network = NetworkHelper.getSoulNetwork(getBinding(stack)); - network.syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())); - } - resetCooldown(stack); - player.swingArm(hand); - return super.onItemRightClick(world, player, hand); - } - } else - { - if (!world.isRemote) - { - SoulNetwork network = NetworkHelper.getSoulNetwork(getBinding(stack)); - EntityBloodLight light = new EntityBloodLight(world, player); - light.func_234612_a_(player, player.rotationPitch, player.rotationYaw, 0.0F, 1.5F, 1.0F); - world.addEntity(light); - network.syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())); - } - resetCooldown(stack); - } - - return super.onItemRightClick(world, player, hand); - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) - { - return oldStack.getItem() != newStack.getItem(); - } - - public int getCooldownRemainder(ItemStack stack) - { - return NBTHelper.checkNBT(stack).getTag().getInt(Constants.NBT.TICKS_REMAINING); - } - - public void reduceCooldown(ItemStack stack) - { - NBTHelper.checkNBT(stack).getTag().putInt(Constants.NBT.TICKS_REMAINING, getCooldownRemainder(stack) - 1); - } - - public void resetCooldown(ItemStack stack) - { - NBTHelper.checkNBT(stack).getTag().putInt(Constants.NBT.TICKS_REMAINING, 10); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilDivination.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilDivination.java deleted file mode 100644 index 98591287..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilDivination.java +++ /dev/null @@ -1,118 +0,0 @@ -package wayoftime.bloodmagic.common.item.sigil; - -import java.util.List; - -import com.google.common.collect.Lists; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceContext.FluidMode; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import wayoftime.bloodmagic.altar.IBloodAltar; -import wayoftime.bloodmagic.core.data.Binding; -import wayoftime.bloodmagic.api.compat.IAltarReader; -import wayoftime.bloodmagic.tile.TileIncenseAltar; -import wayoftime.bloodmagic.util.ChatUtil; -import wayoftime.bloodmagic.util.helper.NetworkHelper; -import wayoftime.bloodmagic.util.helper.NumeralHelper; -import wayoftime.bloodmagic.util.helper.PlayerHelper; - -public class ItemSigilDivination extends ItemSigilBase implements IAltarReader -{ - private final boolean isSimple; - - public ItemSigilDivination(boolean simple) - { - super(simple ? "divination" : "seer"); - isSimple = simple; - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) - { - ItemStack stack = player.getHeldItem(hand); - if (stack.getItem() instanceof ISigil.Holding) - stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - if (PlayerHelper.isFakePlayer(player)) - return ActionResult.resultFail(stack); - - if (!world.isRemote) - { - RayTraceResult position = Item.rayTrace(world, player, FluidMode.NONE); - - if (position == null || position.getType() == RayTraceResult.Type.MISS) - { - super.onItemRightClick(world, player, hand); - - Binding binding = getBinding(stack); - if (isSimple && binding != null) - { - int currentEssence = NetworkHelper.getSoulNetwork(binding).getCurrentEssence(); - List toSend = Lists.newArrayList(); - if (!binding.getOwnerId().equals(player.getGameProfile().getId())) - toSend.add(new TranslationTextComponent(tooltipBase + "otherNetwork", binding.getOwnerName())); - toSend.add(new TranslationTextComponent(tooltipBase + "currentEssence", currentEssence)); - ChatUtil.sendNoSpam(player, toSend.toArray(new ITextComponent[toSend.size()])); - } - } else - { - if (position.getType() == RayTraceResult.Type.BLOCK) - { - TileEntity tile = world.getTileEntity(new BlockPos(position.getHitVec())); - - if (tile != null && tile instanceof IBloodAltar) - { - IBloodAltar altar = (IBloodAltar) tile; - int tier = altar.getTier(); - int currentEssence = altar.getCurrentBlood(); - int capacity = altar.getCapacity(); - altar.checkTier(); - if (isSimple) - { - ChatUtil.sendNoSpam(player, new TranslationTextComponent(tooltipBase + "currentAltarTier", NumeralHelper.toRoman(tier)), new TranslationTextComponent(tooltipBase + "currentEssence", currentEssence), new TranslationTextComponent(tooltipBase + "currentAltarCapacity", capacity)); - } else - { - ChatUtil.sendNoSpam(player, new TranslationTextComponent(tooltipBase + "currentAltarTier", NumeralHelper.toRoman(tier)), new TranslationTextComponent(tooltipBase + "currentEssence", currentEssence), new TranslationTextComponent(tooltipBase + "currentAltarCapacity", capacity)); - } - } else if (tile != null && tile instanceof TileIncenseAltar) - { - TileIncenseAltar altar = (TileIncenseAltar) tile; - altar.recheckConstruction(); - double tranquility = altar.tranquility; - ChatUtil.sendNoSpam(player, new TranslationTextComponent(tooltipBase + "currentTranquility", (int) ((100D * (int) (100 * tranquility)) / 100d)), new TranslationTextComponent(tooltipBase + "currentBonus", (int) (100 * altar.incenseAddition))); - } -// else if (tile != null && tile instanceof TileInversionPillar) -// { -// TileInversionPillar pillar = (TileInversionPillar) tile; -// double inversion = pillar.getCurrentInversion(); -// ChatUtil.sendNoSpam(player, new TextComponentTranslation(tooltipBase + "currentInversion", ((int) (10 * inversion)) / 10d)); -// } - else - { - Binding binding = getBinding(stack); - if (binding != null) - { - int currentEssence = NetworkHelper.getSoulNetwork(binding).getCurrentEssence(); - List toSend = Lists.newArrayList(); - if (!binding.getOwnerId().equals(player.getGameProfile().getId())) - toSend.add(new TranslationTextComponent(tooltipBase + "otherNetwork", binding.getOwnerName())); - toSend.add(new TranslationTextComponent(tooltipBase + "currentEssence", currentEssence)); - ChatUtil.sendNoSpam(player, toSend.toArray(new ITextComponent[toSend.size()])); - } - } - } - } - - } - - return super.onItemRightClick(world, player, hand); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilFastMiner.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilFastMiner.java deleted file mode 100644 index 5caaab09..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilFastMiner.java +++ /dev/null @@ -1,61 +0,0 @@ -package wayoftime.bloodmagic.common.item.sigil; - -import java.util.List; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import wayoftime.bloodmagic.util.DamageSourceBloodMagic; -import wayoftime.bloodmagic.util.helper.PlayerHelper; - -public class ItemSigilFastMiner extends ItemSigilToggleableBase -{ - public ItemSigilFastMiner() - { - super("fast_miner", 100); - } - - @Override - public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) - { - if (PlayerHelper.isFakePlayer(player)) - return; - player.addPotionEffect(new EffectInstance(Effects.HASTE, 2, 0, true, false)); - } - - @Override - public boolean performArrayEffect(World world, BlockPos pos) - { - double radius = 10; - int ticks = 600; - int potionPotency = 2; - - AxisAlignedBB bb = new AxisAlignedBB(pos).grow(radius); - List playerList = world.getEntitiesWithinAABB(PlayerEntity.class, bb); - for (PlayerEntity player : playerList) - { - if (!player.isPotionActive(Effects.HASTE) || (player.isPotionActive(Effects.HASTE) - && player.getActivePotionEffect(Effects.HASTE).getAmplifier() < potionPotency)) - { - player.addPotionEffect(new EffectInstance(Effects.HASTE, ticks, potionPotency)); - if (!player.isCreative()) - { - player.hurtResistantTime = 0; - player.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 1.0F); - } - } - } - - return false; - } - - @Override - public boolean hasArrayEffect() - { - return true; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilFluidBase.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilFluidBase.java deleted file mode 100644 index 4a9319e9..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilFluidBase.java +++ /dev/null @@ -1,149 +0,0 @@ -package wayoftime.bloodmagic.common.item.sigil; - -import javax.annotation.Nullable; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidUtil; -import net.minecraftforge.fluids.capability.IFluidHandler; -import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction; -import net.minecraftforge.fluids.capability.wrappers.BlockWrapper; - -public abstract class ItemSigilFluidBase extends ItemSigilBase -{ - // Class for sigils that interact with fluids, either creating or deleting them. - // Sigils still have to define their own onRightClick behavior, but the actual - // fluid-interacting code is largely limited to here. - public final FluidStack sigilFluid; - - public ItemSigilFluidBase(String name, int lpUsed, FluidStack fluid) - { - super(name, lpUsed); - sigilFluid = fluid; - } - - public ItemSigilFluidBase(String name, FluidStack fluid) - { - super(name); - sigilFluid = fluid; - } - - public ItemSigilFluidBase(String name) - { - super(name); - sigilFluid = null; - } - - // The following are handler functions for fluids, all genericized. - // They're all based off of the Forge FluidUtil methods, but directly taking the - // sigilFluid constant instead of getting an argument. - - /* - * Gets a fluid handler for the targeted block and siding. Works for both tile - * entity liquid containers and fluid blocks. This one is literally identical to - * the FluidUtil method of the same signature. - */ - @Nullable - protected IFluidHandler getFluidHandler(World world, BlockPos blockPos, @Nullable Direction side) - { - BlockState state = world.getBlockState(blockPos); - Block block = state.getBlock(); - - IFluidHandler targetFluidHandler = FluidUtil.getFluidHandler(world, blockPos, side).orElse(null); - - if (targetFluidHandler == null) - - { - - } - return targetFluidHandler; -// if (block instanceof IFluidBlock) -// return new FluidBlockWrapper((IFluidBlock) block, world, blockPos); -// else if (block instanceof BlockLiquid) -// return new BlockLiquidWrapper((BlockLiquid) block, world, blockPos); -// return null; - } - - /* - * Tries to insert fluid into a fluid handler. If doTransfer is false, only - * simulate the transfer. If true, actually do so. Returns true if the transfer - * is successful, false otherwise. - */ - protected boolean tryInsertSigilFluid(IFluidHandler destination, boolean doTransfer) - { - if (destination == null) - return false; - return destination.fill(sigilFluid, doTransfer ? FluidAction.EXECUTE : FluidAction.SIMULATE) > 0; - } - - /* - * Tries basically the oppostive of the above, removing fluids instead of adding - * them - */ - protected boolean tryRemoveFluid(IFluidHandler source, int amount, boolean doTransfer) - { - if (source == null) - return false; - return source.drain(amount, doTransfer ? FluidAction.EXECUTE : FluidAction.SIMULATE) != null; - } - - /* - * Tries to place a fluid block in the world. Returns true if successful, - * otherwise false. This is the big troublesome one, oddly enough. It's - * genericized in case anyone wants to create variant sigils with weird fluids. - */ - protected boolean tryPlaceSigilFluid(PlayerEntity player, World world, BlockPos blockPos) - { - BlockState state = sigilFluid.getFluid().getAttributes().getBlock(world, blockPos, sigilFluid.getFluid().getDefaultState()); - BlockWrapper wrapper = new BlockWrapper(state, world, blockPos); - return wrapper.fill(sigilFluid, FluidAction.EXECUTE) > 0; -// // Make sure world coordinants are valid -// if (world == null || blockPos == null) -// { -// return false; -// } -// // Make sure fluid is placeable -// Fluid fluid = sigilFluid.getFluid(); -// if (!fluid.getAttributes().canBePlacedInWorld(world, blockPos, sigilFluid)) -// { -// return false; -// } -// -// // Check if the block is an air block or otherwise replaceable -// BlockState state = world.getBlockState(blockPos); -// Material mat = state.getMaterial(); -// boolean isDestSolid = mat.isSolid(); -// boolean isDestReplaceable = state.getBlock().isReplaceable(state, fluid); -// if (!world.isAirBlock(blockPos) && isDestSolid && !isDestReplaceable) -// { -// return false; -// } -// -//// // If the fluid vaporizes, this exists here in the lava sigil solely so the code -//// // is usable for other fluids -//// if (world.provider.doesWaterVaporize() && fluid.doesVaporize(sigilFluid)) -//// { -//// fluid.vaporize(player, world, blockPos, sigilFluid); -//// return true; -//// } -// -// // Finally we've done enough checking to make sure everything at the end is -// // safe, let's place some fluid. -// IFluidHandler handler; -// Block block = fluid.getAttributes().getStateForPlacement(world, blockPos, sigilFluid).getBlockState().getBlock(); -// if (block instanceof IFluidBlock) -// { -// handler = new FluidBlockWrapper((IFluidBlock) block, world, blockPos); -// } else if (block instanceof BlockLiquid) -// handler = new BlockLiquidWrapper((BlockLiquid) block, world, blockPos); -// else -// handler = new BlockWrapper(block, world, blockPos); -// return tryInsertSigilFluid(handler, true); -//// return false; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilFrost.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilFrost.java deleted file mode 100644 index 622a25ed..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilFrost.java +++ /dev/null @@ -1,24 +0,0 @@ -package wayoftime.bloodmagic.common.item.sigil; - -import net.minecraft.enchantment.FrostWalkerEnchantment; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import wayoftime.bloodmagic.util.helper.PlayerHelper; - -public class ItemSigilFrost extends ItemSigilToggleableBase -{ - public ItemSigilFrost() - { - super("frost", 100); - } - - @Override - public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) - { - if (PlayerHelper.isFakePlayer(player)) - return; - - FrostWalkerEnchantment.freezeNearby(player, world, player.getPosition(), 1); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilGreenGrove.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilGreenGrove.java deleted file mode 100644 index fb71c50e..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilGreenGrove.java +++ /dev/null @@ -1,114 +0,0 @@ -package wayoftime.bloodmagic.common.item.sigil; - -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.IGrowable; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; -import wayoftime.bloodmagic.core.data.SoulTicket; -import wayoftime.bloodmagic.util.helper.NetworkHelper; -import wayoftime.bloodmagic.util.helper.PlayerHelper; - -public class ItemSigilGreenGrove extends ItemSigilToggleableBase -{ - public ItemSigilGreenGrove() - { - super("green_grove", 150); - } - - @Override - public boolean onSigilUse(ItemStack stack, PlayerEntity player, World world, BlockPos blockPos, Direction side, Vector3d vec) - { - if (PlayerHelper.isFakePlayer(player)) - return false; - - if (!world.isRemote && NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess() && applyBonemeal(stack, world, blockPos, player)) - { - world.playEvent(2005, blockPos, 0); - return true; - } - - return false; - } - - @Override - public void onSigilUpdate(ItemStack stack, World worldIn, PlayerEntity player, int itemSlot, boolean isSelected) - { - if (PlayerHelper.isFakePlayer(player)) - return; - - int range = 3; - int verticalRange = 2; - int posX = (int) Math.round(player.getPosX() - 0.5f); - int posY = (int) player.getPosY(); - int posZ = (int) Math.round(player.getPosZ() - 0.5f); - if (worldIn instanceof ServerWorld) - { - ServerWorld serverWorld = (ServerWorld) worldIn; - for (int ix = posX - range; ix <= posX + range; ix++) - { - for (int iz = posZ - range; iz <= posZ + range; iz++) - { - for (int iy = posY - verticalRange; iy <= posY + verticalRange; iy++) - { - BlockPos blockPos = new BlockPos(ix, iy, iz); - BlockState state = worldIn.getBlockState(blockPos); - -// if (!BloodMagicAPI.INSTANCE.getBlacklist().getGreenGrove().contains(state)) - { - if (state.getBlock() instanceof IGrowable && state.getBlock() != Blocks.GRASS_BLOCK) - { - if (worldIn.rand.nextInt(50) == 0) - { - BlockState preBlockState = worldIn.getBlockState(blockPos); - if (((IGrowable) state.getBlock()).canGrow(serverWorld, blockPos, preBlockState, worldIn.isRemote)) - { - ((IGrowable) state.getBlock()).grow(serverWorld, worldIn.rand, blockPos, state); - - BlockState newState = worldIn.getBlockState(blockPos); - if (!newState.equals(preBlockState) && !worldIn.isRemote) - worldIn.playEvent(2005, blockPos, 0); - } - } - } - } - } - } - } - } - - } - - private static boolean applyBonemeal(ItemStack stack, World worldIn, BlockPos pos, PlayerEntity player) - { - BlockState blockstate = worldIn.getBlockState(pos); - int hook = net.minecraftforge.event.ForgeEventFactory.onApplyBonemeal(player, worldIn, pos, blockstate, stack); - if (hook != 0) - return hook > 0; - if (blockstate.getBlock() instanceof IGrowable) - { - IGrowable igrowable = (IGrowable) blockstate.getBlock(); - if (igrowable.canGrow(worldIn, pos, blockstate, worldIn.isRemote)) - { - if (worldIn instanceof ServerWorld) - { - if (igrowable.canUseBonemeal(worldIn, worldIn.rand, pos, blockstate)) - { - igrowable.grow((ServerWorld) worldIn, worldIn.rand, pos, blockstate); - } - - } - - return true; - } - } - - return false; - } - -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilHolding.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilHolding.java deleted file mode 100644 index c372b8c7..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilHolding.java +++ /dev/null @@ -1,390 +0,0 @@ -package wayoftime.bloodmagic.common.item.sigil; - -import java.util.List; - -import javax.annotation.Nonnull; - -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.inventory.ItemStackHelper; -import net.minecraft.inventory.container.Container; -import net.minecraft.inventory.container.INamedContainerProvider; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemUseContext; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.NonNullList; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.fml.network.NetworkHooks; -import wayoftime.bloodmagic.api.compat.IAltarReader; -import wayoftime.bloodmagic.client.key.IKeybindable; -import wayoftime.bloodmagic.client.key.KeyBindings; -import wayoftime.bloodmagic.common.item.IBindable; -import wayoftime.bloodmagic.common.item.inventory.ContainerHolding; -import wayoftime.bloodmagic.common.item.inventory.InventoryHolding; -import wayoftime.bloodmagic.core.data.Binding; -import wayoftime.bloodmagic.util.Constants; -import wayoftime.bloodmagic.util.Utils; -import wayoftime.bloodmagic.util.helper.NBTHelper; -import wayoftime.bloodmagic.util.helper.PlayerHelper; - -public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAltarReader, ISigil.Holding, INamedContainerProvider -{ - public static final int inventorySize = 5; - - public ItemSigilHolding() - { - super("holding"); - } - - @Override - public void onKeyPressed(ItemStack stack, PlayerEntity player, KeyBindings key, boolean showInChat) - { - System.out.println("Received key press on server."); - if (stack == player.getHeldItemMainhand() && stack.getItem() instanceof ItemSigilHolding && key.equals(KeyBindings.OPEN_HOLDING)) - { - Utils.setUUID(stack); - - if (player instanceof ServerPlayerEntity) - { - NetworkHooks.openGui((ServerPlayerEntity) player, this, buf -> buf.writeItemStack(stack, false)); - } -// player.openGui(BloodMagic.instance, Constants.Gui.SIGIL_HOLDING_GUI, player.getEntityWorld(), (int) player.posX, (int) player.posY, (int) player.posZ); - } - } - -// @Override -// public String getHighlightTip(ItemStack stack, String displayName) -// { -// List inv = getInternalInventory(stack); -// int currentSlot = getCurrentItemOrdinal(stack); -// ItemStack item = inv.get(currentSlot); -// -// if (item.isEmpty()) -// return displayName; -// else -// return TextHelper.localizeEffect("item.bloodmagic.sigil.holding.display", displayName, item.getDisplayName()); -// } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { - super.addInformation(stack, world, tooltip, flag); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sigil.holding.press", new TranslationTextComponent(KeyBindings.OPEN_HOLDING.getKey().getTranslationKey()).mergeStyle(TextFormatting.ITALIC)).mergeStyle(TextFormatting.GRAY)); - - if (!stack.hasTag()) - return; - - List inv = getInternalInventory(stack); - int currentSlot = getCurrentItemOrdinal(stack); - ItemStack item = inv.get(currentSlot); - - for (int i = 0; i < inventorySize; i++) - { - ItemStack invStack = inv.get(i); - if (!invStack.isEmpty()) - if (!item.isEmpty() && invStack == item) - { - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sigil.holding.sigilInSlot", i + 1, (invStack.getDisplayName().copyRaw()).mergeStyle(TextFormatting.ITALIC, TextFormatting.UNDERLINE))); -// tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sigil.holding.sigilInSlot", i + 1, new TranslationTextComponent(invStack.getDisplayName()).mergeStyle(TextFormatting.ITALIC, TextFormatting.UNDERLINE))); - - } else - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sigil.holding.sigilInSlot", i + 1, invStack.getDisplayName())); - } - } - - @Override - public ActionResultType onItemUse(ItemUseContext context) - { -// BlockPos pos = context.getPos(); -// Direction facing = context.getFace(); -// pos = pos.offset(facing); - PlayerEntity player = context.getPlayer(); - Hand hand = context.getHand(); - ItemStack stack = player.getHeldItem(hand); - -// ItemStack stack = player.getHeldItem(hand); - if (PlayerHelper.isFakePlayer(player)) - return ActionResultType.FAIL; - - int currentSlot = getCurrentItemOrdinal(stack); - NonNullList inv = getInternalInventory(stack); - ItemStack itemUsing = inv.get(currentSlot); - - if (itemUsing.isEmpty() || ((IBindable) itemUsing.getItem()).getBinding(itemUsing) == null) - return ActionResultType.PASS; - - ActionResultType result = itemUsing.getItem().onItemUse(context); - saveInventory(stack, inv); - - return result; - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) - { - ItemStack stack = player.getHeldItem(hand); - if (PlayerHelper.isFakePlayer(player)) - return ActionResult.resultFail(stack); - - int currentSlot = getCurrentItemOrdinal(stack); - NonNullList inv = getInternalInventory(stack); - ItemStack itemUsing = inv.get(currentSlot); - - if (itemUsing.isEmpty() || ((IBindable) itemUsing.getItem()).getBinding(itemUsing) == null) - return ActionResult.resultPass(stack); - - itemUsing.getItem().onItemRightClick(world, player, hand); - - saveInventory(stack, inv); - - return ActionResult.resultPass(stack); - } - - @Nonnull - @Override - public ItemStack getHeldItem(ItemStack holdingStack, PlayerEntity player) - { - return getInternalInventory(holdingStack).get(getCurrentItemOrdinal(holdingStack)); - } - - public void saveInventory(ItemStack itemStack, NonNullList inventory) - { - CompoundNBT itemTag = itemStack.getTag(); - - if (itemTag == null) - itemStack.setTag(itemTag = new CompoundNBT()); - - ItemStackHelper.saveAllItems(itemTag, inventory); - -// CompoundNBT inventoryTag = new CompoundNBT(); -// ListNBT itemList = new ListNBT(); -// -// for (int i = 0; i < inventorySize; i++) -// { -// if (!inventory.get(i).isEmpty()) -// { -// CompoundNBT tag = new CompoundNBT(); -// tag.putByte(Constants.NBT.SLOT, (byte) i); -// inventory.get(i).writeToNBT(tag); -// itemList.appendTag(tag); -// } -// } -// -// inventoryTag.put(Constants.NBT.ITEMS, itemList); -// itemTag.put(Constants.NBT.ITEM_INVENTORY, inventoryTag); - } - - @Override - public void inventoryTick(ItemStack stack, World world, Entity entity, int itemSlot, boolean isSelected) - { - if (stack.hasTag()) - tickInternalInventory(stack, world, entity, itemSlot, isSelected); - } - - public void tickInternalInventory(ItemStack itemStack, World world, Entity entity, int itemSlot, boolean isSelected) - { - for (ItemStack stack : getInternalInventory(itemStack)) - { - if (stack.isEmpty() || !(stack.getItem() instanceof IBindable) || !(stack.getItem() instanceof ISigil)) - continue; - - Binding binding = ((IBindable) stack.getItem()).getBinding(stack); - if (binding == null) - continue; - - stack.getItem().inventoryTick(stack, world, entity, itemSlot, isSelected); - } - } - -// @Override -// public void gatherVariants(@Nonnull Int2ObjectMap variants) -// { -// // No-op - Just here to stop the super from running since we're using a mesh -// // provider -// } - -// @Override -// public ItemMeshDefinition getMeshDefinition() -// { -// return stack -> { -// if (stack.hasTag() && stack.getTag().hasKey("color")) -// return new ModelResourceLocation(getRegistryName(), "type=color"); -// return new ModelResourceLocation(getRegistryName(), "type=normal"); -// }; -// } -// -// @Override -// public void gatherVariants(Consumer variants) -// { -// variants.accept("type=normal"); -// variants.accept("type=color"); -// } - - public static int next(int mode) - { - int index = mode + 1; - - if (index >= inventorySize) - { - index = 0; - } - - return index; - } - - public static int prev(int mode) - { - int index = mode - 1; - - if (index < 0) - { - index = inventorySize; - } - - return index; - } - - private static void initModeTag(ItemStack stack) - { - if (!stack.hasTag()) - { - stack = NBTHelper.checkNBT(stack); - stack.getTag().putInt(Constants.NBT.CURRENT_SIGIL, inventorySize); - } - } - - public static ItemStack getItemStackInSlot(ItemStack itemStack, int slot) - { - if (itemStack.getItem() instanceof ItemSigilHolding) - { - List inv = getInternalInventory(itemStack); - if (inv != null) - return inv.get(slot == 5 ? 4 : slot); - else - return ItemStack.EMPTY; - } - - return ItemStack.EMPTY; - } - - public static int getCurrentItemOrdinal(ItemStack stack) - { - if (stack.getItem() instanceof ItemSigilHolding) - { - initModeTag(stack); - int currentSigil = stack.getTag().getInt(Constants.NBT.CURRENT_SIGIL); - currentSigil = MathHelper.clamp(currentSigil, 0, inventorySize - 1); - return currentSigil; - } - - return 0; - } - - public static NonNullList getInternalInventory(ItemStack stack) - { - initModeTag(stack); - CompoundNBT tagCompound = stack.getTag(); - - if (tagCompound == null) - { - return NonNullList.withSize(inventorySize, ItemStack.EMPTY); - } - - NonNullList inv = NonNullList.withSize(inventorySize, ItemStack.EMPTY); - - ItemStackHelper.loadAllItems(tagCompound, inv); - -// CompoundNBT inventoryTag = tagCompound.getCompound(Constants.NBT.ITEM_INVENTORY); -// ListNBT tagList = inventoryTag.getList(Constants.NBT.ITEMS, 10); -// -// if (tagList.isEmpty()) -// { -// return NonNullList.withSize(inventorySize, ItemStack.EMPTY); -// } -// -// List inv = NonNullList.withSize(inventorySize, ItemStack.EMPTY); -// -// for (int i = 0; i < tagList.tagCount(); i++) -// { -// CompoundNBT data = tagList.getCompoundTagAt(i); -// byte j = data.getByte(Constants.NBT.SLOT); -// -// if (j >= 0 && j < inv.size()) -// { -// inv.set(j, new ItemStack(data)); -// } -// } - - return inv; - } - - public static void cycleToNextSigil(ItemStack itemStack, int mode) - { - if (itemStack.getItem() instanceof ItemSigilHolding) - { - initModeTag(itemStack); - - int index = mode; - if (mode == 120 || mode == -120) - { - int currentIndex = getCurrentItemOrdinal(itemStack); - ItemStack currentItemStack = getItemStackInSlot(itemStack, currentIndex); - if (currentItemStack.isEmpty()) - return; - if (mode < 0) - { - index = next(currentIndex); - currentItemStack = getItemStackInSlot(itemStack, index); - - while (currentItemStack.isEmpty()) - { - index = next(index); - currentItemStack = getItemStackInSlot(itemStack, index); - } - } else - { - index = prev(currentIndex); - currentItemStack = getItemStackInSlot(itemStack, index); - - while (currentItemStack.isEmpty()) - { - index = prev(index); - currentItemStack = getItemStackInSlot(itemStack, index); - } - } - } - - itemStack.getTag().putInt(Constants.NBT.CURRENT_SIGIL, index); - } - } - - @Override - public Container createMenu(int p_createMenu_1_, PlayerInventory p_createMenu_2_, PlayerEntity player) - { - // TODO Auto-generated method stub - assert player.getEntityWorld() != null; - return new ContainerHolding(p_createMenu_1_, player, p_createMenu_2_, new InventoryHolding(player.getHeldItemMainhand())); - } - - @Override - public ITextComponent getDisplayName() - { - // TODO Auto-generated method stub - return new StringTextComponent("Sigil of Holding"); - } - -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilLava.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilLava.java deleted file mode 100644 index 7affee21..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilLava.java +++ /dev/null @@ -1,89 +0,0 @@ -package wayoftime.bloodmagic.common.item.sigil; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.fluid.Fluids; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.RayTraceContext; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.IFluidHandler; -import wayoftime.bloodmagic.core.data.SoulTicket; -import wayoftime.bloodmagic.util.helper.NetworkHelper; -import wayoftime.bloodmagic.util.helper.PlayerHelper; - -public class ItemSigilLava extends ItemSigilFluidBase -{ - public ItemSigilLava() - { - super("lava", 1000, new FluidStack(Fluids.LAVA, 10000)); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) - { - ItemStack stack = player.getHeldItem(hand); - if (stack.getItem() instanceof ISigil.Holding) - stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - if (PlayerHelper.isFakePlayer(player)) - return ActionResult.resultFail(stack); - - if (!world.isRemote && !isUnusable(stack)) - { - RayTraceResult rayTrace = rayTrace(world, player, RayTraceContext.FluidMode.NONE); - - if (rayTrace == null || rayTrace.getType() != RayTraceResult.Type.BLOCK) - { - return ActionResult.resultFail(stack); - } - - BlockRayTraceResult blockRayTrace = (BlockRayTraceResult) rayTrace; - BlockPos blockPos = blockRayTrace.getPos(); - Direction sideHit = blockRayTrace.getFace(); - BlockPos blockpos1 = blockPos.offset(sideHit); - - if (world.isBlockModifiable(player, blockPos) && player.canPlayerEdit(blockpos1, sideHit, stack)) - { - - // Case for if block at blockPos is a fluid handler like a tank - // Try to put fluid into tank - IFluidHandler destination = getFluidHandler(world, blockPos, null); - if (destination != null && tryInsertSigilFluid(destination, false) - && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) - { - boolean result = tryInsertSigilFluid(destination, true); - if (result) - return ActionResult.resultSuccess(stack); - } - // Do the same as above, but use sidedness to interact with the fluid handler. - IFluidHandler destinationSide = getFluidHandler(world, blockPos, sideHit); - if (destinationSide != null && tryInsertSigilFluid(destinationSide, false) - && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) - { - boolean result = tryInsertSigilFluid(destinationSide, true); - if (result) - return ActionResult.resultSuccess(stack); - } - - // Case for if block at blockPos is not a tank - // Place fluid in world - if (destination == null && destinationSide == null) - { - BlockPos targetPos = blockPos.offset(sideHit); - if (tryPlaceSigilFluid(player, world, targetPos) - && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) - { - return ActionResult.resultSuccess(stack); - } - } - } - } - - return super.onItemRightClick(world, player, hand); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilMagnetism.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilMagnetism.java deleted file mode 100644 index b4cbea14..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilMagnetism.java +++ /dev/null @@ -1,54 +0,0 @@ -package wayoftime.bloodmagic.common.item.sigil; - -import java.util.List; - -import net.minecraft.entity.item.ExperienceOrbEntity; -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.world.World; -import wayoftime.bloodmagic.util.helper.PlayerHelper; - -public class ItemSigilMagnetism extends ItemSigilToggleableBase -{ - public ItemSigilMagnetism() - { - super("magnetism", 50); - } - - @Override - public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) - { - if (PlayerHelper.isFakePlayer(player)) - return; - - int range = 5; - int verticalRange = 5; - float posX = Math.round(player.getPosX()); - float posY = (float) (player.getPosY() - player.getEyeHeight()); - float posZ = Math.round(player.getPosZ()); - List entities = player.getEntityWorld().getEntitiesWithinAABB(ItemEntity.class, new AxisAlignedBB(posX - - 0.5f, posY - 0.5f, posZ - - 0.5f, posX + 0.5f, posY + 0.5f, posZ + 0.5f).expand(range, verticalRange, range)); - List xpOrbs = player.getEntityWorld().getEntitiesWithinAABB(ExperienceOrbEntity.class, new AxisAlignedBB(posX - - 0.5f, posY - 0.5f, posZ - - 0.5f, posX + 0.5f, posY + 0.5f, posZ + 0.5f).expand(range, verticalRange, range)); - - for (ItemEntity entity : entities) - { - if (entity != null && !world.isRemote && entity.isAlive()) - { - entity.onCollideWithPlayer(player); - } - } - - for (ExperienceOrbEntity xpOrb : xpOrbs) - { - if (xpOrb != null && !world.isRemote) - { - xpOrb.onCollideWithPlayer(player); - } - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilToggleable.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilToggleable.java deleted file mode 100644 index 7d583316..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilToggleable.java +++ /dev/null @@ -1,118 +0,0 @@ -package wayoftime.bloodmagic.common.item.sigil; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemUseContext; -import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.world.World; -import wayoftime.bloodmagic.common.item.ItemSigil; -import wayoftime.bloodmagic.core.data.Binding; -import wayoftime.bloodmagic.core.data.SoulTicket; -import wayoftime.bloodmagic.common.item.IActivatable; -import wayoftime.bloodmagic.util.Constants; -import wayoftime.bloodmagic.util.helper.NBTHelper; -import wayoftime.bloodmagic.util.helper.NetworkHelper; -import wayoftime.bloodmagic.util.helper.PlayerHelper; - -/** - * Base class for all toggleable sigils. - */ -public class ItemSigilToggleable extends ItemSigil implements IActivatable -{ - - public ItemSigilToggleable(Properties property, int lpUsed) - { - super(property, lpUsed); - } - - @Override - public boolean getActivated(ItemStack stack) - { - return !stack.isEmpty() && NBTHelper.checkNBT(stack).getTag().getBoolean(Constants.NBT.ACTIVATED); - } - - @Override - public ItemStack setActivatedState(ItemStack stack, boolean activated) - { - if (!stack.isEmpty()) - { - NBTHelper.checkNBT(stack).getTag().putBoolean(Constants.NBT.ACTIVATED, activated); - return stack; - } - - return stack; - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) - { - ItemStack stack = player.getHeldItem(hand); - if (stack.getItem() instanceof ISigil.Holding) - stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - if (PlayerHelper.isFakePlayer(player)) - return ActionResult.resultFail(stack); - - if (!world.isRemote && !isUnusable(stack)) - { - if (player.isSneaking()) - setActivatedState(stack, !getActivated(stack)); - if (getActivated(stack)) - return super.onItemRightClick(world, player, hand); - } - - return super.onItemRightClick(world, player, hand); - } - - @Override - public ActionResultType onItemUse(ItemUseContext context) - { - World world = context.getWorld(); - BlockPos blockpos = context.getPos(); - - PlayerEntity player = context.getPlayer(); - ItemStack stack = context.getItem(); - if (stack.getItem() instanceof ISigil.Holding) - stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - - Binding binding = getBinding(stack); - if (binding == null || player.isSneaking()) // Make sure Sigils are bound before handling. Also ignores while - // toggling state - return ActionResultType.PASS; - - return onSigilUse(stack, player, world, blockpos, context.getFace(), context.getHitVec()) - ? ActionResultType.SUCCESS - : ActionResultType.FAIL; - } - - public boolean onSigilUse(ItemStack itemStack, PlayerEntity player, World world, BlockPos blockPos, Direction side, Vector3d hitVec) - { - return false; - } - - @Override - public void inventoryTick(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected) - { - if (!worldIn.isRemote && entityIn instanceof PlayerEntity && getActivated(stack)) - { - if (entityIn.ticksExisted % 100 == 0) - { - if (!NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage((PlayerEntity) entityIn, SoulTicket.item(stack, worldIn, entityIn, getLpUsed())).isSuccess()) - { - setActivatedState(stack, false); - } - } - - onSigilUpdate(stack, worldIn, (PlayerEntity) entityIn, itemSlot, isSelected); - } - } - - public void onSigilUpdate(ItemStack stack, World world, PlayerEntity player, int itemSlot, boolean isSelected) - { - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilToggleableBase.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilToggleableBase.java deleted file mode 100644 index 8c57b170..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilToggleableBase.java +++ /dev/null @@ -1,55 +0,0 @@ -package wayoftime.bloodmagic.common.item.sigil; - -import java.util.List; - -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wayoftime.bloodmagic.BloodMagic; - -public class ItemSigilToggleableBase extends ItemSigilToggleable// implements IMeshProvider -{ - protected final String tooltipBase; - private final String name; - - public ItemSigilToggleableBase(String name, int lpUsed) - { - super(new Item.Properties().maxStackSize(1).group(BloodMagic.TAB), lpUsed); - - this.name = name; - this.tooltipBase = "tooltip.bloodmagic.sigil." + name + "."; - - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { - super.addInformation(stack, world, tooltip, flag); - if (!stack.hasTag()) - return; - - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic." + (getActivated(stack) ? "activated" - : "deactivated")).mergeStyle(TextFormatting.GRAY)); - } - -// @Override -// @SideOnly(Side.CLIENT) -// public ItemMeshDefinition getMeshDefinition() -// { -// return new CustomMeshDefinitionActivatable("sigil_" + name.toLowerCase(Locale.ROOT)); -// } -// -// @Override -// public void gatherVariants(Consumer variants) -// { -// variants.accept("active=false"); -// variants.accept("active=true"); -// } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilVoid.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilVoid.java deleted file mode 100644 index ef7dace9..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilVoid.java +++ /dev/null @@ -1,84 +0,0 @@ -package wayoftime.bloodmagic.common.item.sigil; - -import net.minecraft.block.BlockState; -import net.minecraft.block.IBucketPickupHandler; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.fluid.Fluids; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.RayTraceContext; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidStack; -import wayoftime.bloodmagic.core.data.SoulTicket; -import wayoftime.bloodmagic.util.helper.NetworkHelper; -import wayoftime.bloodmagic.util.helper.PlayerHelper; - -public class ItemSigilVoid extends ItemSigilFluidBase -{ - public ItemSigilVoid() - { - super("void", 50, new FluidStack(Fluids.EMPTY, 1000)); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) - { - ItemStack stack = player.getHeldItem(hand); - if (stack.getItem() instanceof ISigil.Holding) - stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - if (PlayerHelper.isFakePlayer(player)) - return ActionResult.resultFail(stack); - - if (!world.isRemote && !isUnusable(stack)) - { - RayTraceResult rayTrace = rayTrace(world, player, RayTraceContext.FluidMode.SOURCE_ONLY); - - if (rayTrace == null || rayTrace.getType() != RayTraceResult.Type.BLOCK) - { - return ActionResult.resultFail(stack); - } - - BlockRayTraceResult blockRayTrace = (BlockRayTraceResult) rayTrace; - BlockPos blockPos = blockRayTrace.getPos(); - Direction sideHit = blockRayTrace.getFace(); - - if (world.isBlockModifiable(player, blockPos) && player.canPlayerEdit(blockPos, sideHit, stack)) - { - BlockState blockState = world.getBlockState(blockPos); - if (blockState.getBlock() instanceof IBucketPickupHandler) - { - if (NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) - { - ((IBucketPickupHandler) blockState.getBlock()).pickupFluid(world, blockPos, blockState); - return ActionResult.resultSuccess(stack); - } - } - // Void is simpler than the other fluid sigils, because getFluidHandler grabs - // fluid blocks just fine - // So extract from fluid tanks with a null side; or drain fluid blocks. -// IFluidHandler destination = getFluidHandler(world, blockPos, sideHit); -// if (destination != null && tryRemoveFluid(destination, 1000, false) -// && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) -// { -// if (tryRemoveFluid(destination, 1000, true)) -// return ActionResult.resultSuccess(stack); -// } -// // Do the same as above, but use sidedness to interact with the fluid handler. -// IFluidHandler destinationSide = getFluidHandler(world, blockPos, sideHit); -// if (destinationSide != null && tryRemoveFluid(destinationSide, 1000, false) -// && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) -// { -// if (tryRemoveFluid(destinationSide, 1000, true)) -// return ActionResult.resultSuccess(stack); -// } - } - } - - return super.onItemRightClick(world, player, hand); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilWater.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilWater.java deleted file mode 100644 index a3a9356a..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilWater.java +++ /dev/null @@ -1,99 +0,0 @@ -package wayoftime.bloodmagic.common.item.sigil; - -import net.minecraft.block.Blocks; -import net.minecraft.block.CauldronBlock; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.fluid.Fluids; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.RayTraceContext; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.IFluidHandler; -import wayoftime.bloodmagic.core.data.SoulTicket; -import wayoftime.bloodmagic.util.helper.NetworkHelper; -import wayoftime.bloodmagic.util.helper.PlayerHelper; - -public class ItemSigilWater extends ItemSigilFluidBase -{ - public ItemSigilWater() - { - super("water", 100, new FluidStack(Fluids.WATER, 10000)); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) - { - ItemStack stack = player.getHeldItem(hand); - if (stack.getItem() instanceof ISigil.Holding) - stack = ((Holding) stack.getItem()).getHeldItem(stack, player); - if (PlayerHelper.isFakePlayer(player)) - return ActionResult.resultFail(stack); - - if (!world.isRemote && !isUnusable(stack)) - { - RayTraceResult rayTrace = rayTrace(world, player, RayTraceContext.FluidMode.NONE); - - if (rayTrace == null || rayTrace.getType() != RayTraceResult.Type.BLOCK) - { - return ActionResult.resultFail(stack); - } - - BlockRayTraceResult blockRayTrace = (BlockRayTraceResult) rayTrace; - BlockPos blockPos = blockRayTrace.getPos(); - Direction sideHit = blockRayTrace.getFace(); - BlockPos blockpos1 = blockPos.offset(sideHit); - - if (world.isBlockModifiable(player, blockPos) && player.canPlayerEdit(blockpos1, sideHit, stack)) - { - - // Case for if block at blockPos is a fluid handler like a tank - // Try to put fluid into tank - IFluidHandler destination = getFluidHandler(world, blockPos, null); - if (destination != null && tryInsertSigilFluid(destination, false) - && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) - { - boolean result = tryInsertSigilFluid(destination, true); - if (result) - return ActionResult.resultSuccess(stack); - } - // Do the same as above, but use sidedness to interact with the fluid handler. - IFluidHandler destinationSide = getFluidHandler(world, blockPos, sideHit); - if (destinationSide != null && tryInsertSigilFluid(destinationSide, false) - && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) - { - boolean result = tryInsertSigilFluid(destinationSide, true); - if (result) - return ActionResult.resultSuccess(stack); - } - - // Special vanilla cauldron handling, yay. - if (world.getBlockState(blockPos).getBlock() == Blocks.CAULDRON - && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) - { - world.setBlockState(blockPos, Blocks.CAULDRON.getDefaultState().with(CauldronBlock.LEVEL, 3)); - return ActionResult.resultSuccess(stack); - } - - // Case for if block at blockPos is not a tank - // Place fluid in world - if (destination == null && destinationSide == null) - { - BlockPos targetPos = blockPos.offset(sideHit); - if (tryPlaceSigilFluid(player, world, targetPos) - && NetworkHelper.getSoulNetwork(getBinding(stack)).syphonAndDamage(player, SoulTicket.item(stack, world, player, getLpUsed())).isSuccess()) - { - return ActionResult.resultSuccess(stack); - } - } - } - } - - return super.onItemRightClick(world, player, hand); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemMonsterSoul.java b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemMonsterSoul.java deleted file mode 100644 index 5cf684d0..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemMonsterSoul.java +++ /dev/null @@ -1,129 +0,0 @@ -package wayoftime.bloodmagic.common.item.soul; - -import java.util.List; - -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.Item; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.NonNullList; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.util.ChatUtil; -import wayoftime.bloodmagic.util.Constants; -import wayoftime.bloodmagic.util.helper.NBTHelper; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; -import wayoftime.bloodmagic.api.compat.IDemonWill; - -public class ItemMonsterSoul extends Item implements IDemonWill -{ - private final EnumDemonWillType type; - - public ItemMonsterSoul(EnumDemonWillType type) - { - super(new Item.Properties().maxStackSize(1).group(BloodMagic.TAB)); - this.type = type; - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { - if (!stack.hasTag()) - return; - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.will", ChatUtil.DECIMAL_FORMAT.format(getWill(getType(stack), stack))).mergeStyle(TextFormatting.GRAY)); - - super.addInformation(stack, world, tooltip, flag); - } - - @Override - public EnumDemonWillType getType(ItemStack stack) - { - return type; - } - - @Override - public double getWill(EnumDemonWillType type, ItemStack soulStack) - { - if (type != this.getType(soulStack)) - { - return 0; - } - - NBTHelper.checkNBT(soulStack); - - CompoundNBT tag = soulStack.getTag(); - - return tag.getDouble(Constants.NBT.SOULS); - } - - @Override - public void fillItemGroup(ItemGroup group, NonNullList items) - { - if (this.isInGroup(group)) - { - ItemStack stack = new ItemStack(this); - this.setWill(type, stack, 5); - items.add(stack); - } - } - - @Override - public boolean setWill(EnumDemonWillType type, ItemStack soulStack, double souls) - { - if (type != this.getType(soulStack)) - { - return false; - } - - NBTHelper.checkNBT(soulStack); - CompoundNBT tag = soulStack.getTag(); - tag.putDouble(Constants.NBT.SOULS, souls); - - return true; - } - - @Override - public double drainWill(EnumDemonWillType type, ItemStack soulStack, double drainAmount) - { - double souls = getWill(type, soulStack); - - double soulsDrained = Math.min(drainAmount, souls); - setWill(type, soulStack, souls - soulsDrained); - - return soulsDrained; - } - - @Override - public ItemStack createWill(double number) - { - ItemStack soulStack = new ItemStack(this); - setWill(getType(soulStack), soulStack, number); - return soulStack; - } - -// @Override -// public double getWill(ItemStack willStack) -// { -// return this.getWill(EnumDemonWillType.DEFAULT, willStack); -// } -// -// @Override -// public void setWill(ItemStack willStack, double will) -// { -// this.setWill(EnumDemonWillType.DEFAULT, willStack, will); -// } -// -// @Override -// public double drainWill(ItemStack willStack, double drainAmount) -// { -// return this.drainWill(EnumDemonWillType.DEFAULT, willStack, drainAmount); -// } - -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientAxe.java b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientAxe.java deleted file mode 100644 index 13c3ccd7..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientAxe.java +++ /dev/null @@ -1,560 +0,0 @@ -package wayoftime.bloodmagic.common.item.soul; - -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.UUID; - -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; - -import net.minecraft.block.BlockState; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.attributes.Attribute; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.ai.attributes.Attributes; -import net.minecraft.entity.monster.IMob; -import net.minecraft.entity.monster.SlimeEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.AxeItem; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.Difficulty; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; -import wayoftime.bloodmagic.api.compat.IDemonWill; -import wayoftime.bloodmagic.api.compat.IDemonWillWeapon; -import wayoftime.bloodmagic.api.compat.IMultiWillTool; -import wayoftime.bloodmagic.common.item.BMItemTier; -import wayoftime.bloodmagic.common.item.BloodMagicItems; -import wayoftime.bloodmagic.common.tags.BloodMagicTags; -import wayoftime.bloodmagic.util.Constants; -import wayoftime.bloodmagic.util.helper.NBTHelper; -import wayoftime.bloodmagic.will.PlayerDemonWillHandler; - -public class ItemSentientAxe extends AxeItem implements IDemonWillWeapon, IMultiWillTool -{ - public static int[] soulBracket = new int[] { 16, 60, 200, 400, 1000 }; - public static double[] defaultDamageAdded = new double[] { 1, 2, 3, 3.5, 4 }; - public static double[] destructiveDamageAdded = new double[] { 2, 3, 4, 5, 6 }; - public static double[] vengefulDamageAdded = new double[] { 0, 0.5, 1, 1.5, 2 }; - public static double[] steadfastDamageAdded = new double[] { 0, 0.5, 1, 1.5, 2 }; - public static double[] defaultDigSpeedAdded = new double[] { 1, 1.5, 2, 3, 4 }; - public static double[] soulDrainPerSwing = new double[] { 0.05, 0.1, 0.2, 0.4, 0.75 }; - public static double[] soulDrop = new double[] { 2, 4, 7, 10, 13 }; - public static double[] staticDrop = new double[] { 1, 1, 2, 3, 3 }; - - public static double[] healthBonus = new double[] { 0, 0, 0, 0, 0 }; // TODO: Think of implementing this later - public static double[] vengefulAttackSpeed = new double[] { -3, -2.8, -2.7, -2.6, -2.5 }; - public static double[] destructiveAttackSpeed = new double[] { -3.1, -3.1, -3.2, -3.3, -3.3 }; - - public static int[] absorptionTime = new int[] { 200, 300, 400, 500, 600 }; - - public static double maxAbsorptionHearts = 10; - - public static int[] poisonTime = new int[] { 25, 50, 60, 80, 100 }; - public static int[] poisonLevel = new int[] { 0, 0, 0, 1, 1 }; - - public static double[] movementSpeed = new double[] { 0.05, 0.1, 0.15, 0.2, 0.25 }; - - public final double baseAttackDamage = 8; - public final double baseAttackSpeed = -3; - - public ItemSentientAxe() - { - super(BMItemTier.SENTIENT, 8, -3.1f, new Item.Properties().maxDamage(520).group(BloodMagic.TAB)); -// super(RegistrarBloodMagicItems.SOUL_TOOL_MATERIAL, 8.0F, 3.1F); - } - - @Override - public float getDestroySpeed(ItemStack stack, BlockState state) - { - float value = super.getDestroySpeed(stack, state); - if (value > 1) - { - return (float) (value + getDigSpeedOfSword(stack)); - } else - { - return value; - } - } - - @Override - public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) - { - return BloodMagicTags.CRYSTAL_DEMON.contains(repair.getItem()) || super.getIsRepairable(toRepair, repair); - } - - public void recalculatePowers(ItemStack stack, World world, PlayerEntity player) - { - EnumDemonWillType type = PlayerDemonWillHandler.getLargestWillType(player); - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - this.setCurrentType(stack, soulsRemaining > 0 ? type : EnumDemonWillType.DEFAULT); - int level = getLevel(stack, soulsRemaining); - - double drain = level >= 0 ? soulDrainPerSwing[level] : 0; - double extraDamage = getExtraDamage(type, level); - - setDrainOfActivatedSword(stack, drain); - setDamageOfActivatedSword(stack, baseAttackDamage + extraDamage); - setStaticDropOfActivatedSword(stack, level >= 0 ? staticDrop[level] : 1); - setDropOfActivatedSword(stack, level >= 0 ? soulDrop[level] : 0); - setAttackSpeedOfSword(stack, level >= 0 ? getAttackSpeed(type, level) : baseAttackSpeed); - setHealthBonusOfSword(stack, level >= 0 ? getHealthBonus(type, level) : 0); - setSpeedOfSword(stack, level >= 0 ? getMovementSpeed(type, level) : 0); - setDigSpeedOfSword(stack, level >= 0 ? getDigSpeed(type, level) : 0); - } - - public double getExtraDamage(EnumDemonWillType type, int willBracket) - { - if (willBracket < 0) - { - return 0; - } - - switch (type) - { - case CORROSIVE: - case DEFAULT: - return defaultDamageAdded[willBracket]; - case DESTRUCTIVE: - return destructiveDamageAdded[willBracket]; - case VENGEFUL: - return vengefulDamageAdded[willBracket]; - case STEADFAST: - return steadfastDamageAdded[willBracket]; - } - - return 0; - } - - public double getAttackSpeed(EnumDemonWillType type, int willBracket) - { - switch (type) - { - case VENGEFUL: - return vengefulAttackSpeed[willBracket]; - case DESTRUCTIVE: - return destructiveAttackSpeed[willBracket]; - default: - return -2.9; - } - } - - public double getHealthBonus(EnumDemonWillType type, int willBracket) - { - switch (type) - { - case STEADFAST: - return healthBonus[willBracket]; - default: - return 0; - } - } - - public double getMovementSpeed(EnumDemonWillType type, int willBracket) - { - switch (type) - { - case VENGEFUL: - return movementSpeed[willBracket]; - default: - return 0; - } - } - - public double getDigSpeed(EnumDemonWillType type, int willBracket) - { - switch (type) - { - case VENGEFUL: -// return movementSpeed[willBracket]; - default: - return defaultDigSpeedAdded[willBracket]; - } - } - - public void applyEffectToEntity(EnumDemonWillType type, int willBracket, LivingEntity target, PlayerEntity attacker) - { - switch (type) - { - case CORROSIVE: - target.addPotionEffect(new EffectInstance(Effects.WITHER, poisonTime[willBracket], poisonLevel[willBracket])); - break; - case DEFAULT: - break; - case DESTRUCTIVE: - break; - case STEADFAST: - if (!target.isAlive()) - { - float absorption = attacker.getAbsorptionAmount(); - attacker.addPotionEffect(new EffectInstance(Effects.ABSORPTION, absorptionTime[willBracket], 127)); - attacker.setAbsorptionAmount((float) Math.min(absorption + target.getMaxHealth() * 0.05f, maxAbsorptionHearts)); - } - break; - case VENGEFUL: - break; - } - } - - @Override - public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) - { - if (super.hitEntity(stack, target, attacker)) - { - if (attacker instanceof PlayerEntity) - { - PlayerEntity attackerPlayer = (PlayerEntity) attacker; - this.recalculatePowers(stack, attackerPlayer.getEntityWorld(), attackerPlayer); - EnumDemonWillType type = this.getCurrentType(stack); - double will = PlayerDemonWillHandler.getTotalDemonWill(type, attackerPlayer); - int willBracket = this.getLevel(stack, will); - - applyEffectToEntity(type, willBracket, target, attackerPlayer); - - ItemStack offStack = attackerPlayer.getItemStackFromSlot(EquipmentSlotType.OFFHAND); -// if (offStack.getItem() instanceof ISentientSwordEffectProvider) -// { -// ISentientSwordEffectProvider provider = (ISentientSwordEffectProvider) offStack.getItem(); -// if (provider.providesEffectForWill(type)) -// { -// provider.applyOnHitEffect(type, stack, offStack, attacker, target); -// } -// } - } - - return true; - } - - return false; - } - - @Override - public EnumDemonWillType getCurrentType(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - if (!tag.contains(Constants.NBT.WILL_TYPE)) - { - return EnumDemonWillType.DEFAULT; - } - - return EnumDemonWillType.valueOf(tag.getString(Constants.NBT.WILL_TYPE).toUpperCase(Locale.ENGLISH)); - } - - public void setCurrentType(ItemStack stack, EnumDemonWillType type) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putString(Constants.NBT.WILL_TYPE, type.toString()); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) - { - recalculatePowers(player.getHeldItem(hand), world, player); - - return super.onItemRightClick(world, player, hand); - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) - { - return oldStack.getItem() != newStack.getItem(); - } - - private int getLevel(ItemStack stack, double soulsRemaining) - { - int lvl = -1; - for (int i = 0; i < soulBracket.length; i++) - { - if (soulsRemaining >= soulBracket[i]) - { - lvl = i; - } - } - - return lvl; - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { - if (!stack.hasTag()) - return; - - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sentientAxe.desc").mergeStyle(TextFormatting.GRAY)); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentType." + getCurrentType(stack).name().toLowerCase()).mergeStyle(TextFormatting.GRAY)); - } - - @Override - public boolean onLeftClickEntity(ItemStack stack, PlayerEntity player, Entity entity) - { - recalculatePowers(stack, player.getEntityWorld(), player); - - double drain = this.getDrainOfActivatedSword(stack); - if (drain > 0) - { - EnumDemonWillType type = getCurrentType(stack); - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - - if (drain > soulsRemaining) - { - return false; - } else - { - PlayerDemonWillHandler.consumeDemonWill(type, player, drain); - } - } - - return super.onLeftClickEntity(stack, player, entity); - } - - @Override - public List getRandomDemonWillDrop(LivingEntity killedEntity, LivingEntity attackingEntity, ItemStack stack, int looting) - { - List soulList = new ArrayList<>(); - - if (killedEntity.getEntityWorld().getDifficulty() != Difficulty.PEACEFUL && !(killedEntity instanceof IMob)) - { - return soulList; - } - - double willModifier = killedEntity instanceof SlimeEntity ? 0.67 : 1; - - IDemonWill soul; - - EnumDemonWillType type = this.getCurrentType(stack); - switch (type) - { - case CORROSIVE: - soul = ((IDemonWill) BloodMagicItems.MONSTER_SOUL_CORROSIVE.get()); - break; - case DESTRUCTIVE: - soul = ((IDemonWill) BloodMagicItems.MONSTER_SOUL_DESTRUCTIVE.get()); - break; - case STEADFAST: - soul = ((IDemonWill) BloodMagicItems.MONSTER_SOUL_STEADFAST.get()); - break; - case VENGEFUL: - soul = ((IDemonWill) BloodMagicItems.MONSTER_SOUL_VENGEFUL.get()); - break; - default: - soul = ((IDemonWill) BloodMagicItems.MONSTER_SOUL_RAW.get()); - break; - } - - for (int i = 0; i <= looting; i++) - { - if (i == 0 || attackingEntity.getEntityWorld().rand.nextDouble() < 0.4) - { - ItemStack soulStack = soul.createWill(willModifier * (this.getDropOfActivatedSword(stack) * attackingEntity.getEntityWorld().rand.nextDouble() + this.getStaticDropOfActivatedSword(stack)) * killedEntity.getMaxHealth() / 20d); - soulList.add(soulStack); - } - } - - return soulList; - } - - // TODO: Change attack speed. - @Override - public Multimap getAttributeModifiers(EquipmentSlotType slot, ItemStack stack) - { - Multimap multimap = HashMultimap.create(); - if (slot == EquipmentSlotType.MAINHAND) - { - multimap.put(Attributes.ATTACK_DAMAGE, new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getDamageOfActivatedSword(stack), AttributeModifier.Operation.ADDITION)); - multimap.put(Attributes.ATTACK_SPEED, new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", this.getAttackSpeedOfSword(stack), AttributeModifier.Operation.ADDITION)); - multimap.put(Attributes.MAX_HEALTH, new AttributeModifier(new UUID(0, 31818145), "Weapon modifier", this.getHealthBonusOfSword(stack), AttributeModifier.Operation.ADDITION)); - multimap.put(Attributes.MOVEMENT_SPEED, new AttributeModifier(new UUID(0, 4218052), "Weapon modifier", this.getSpeedOfSword(stack), AttributeModifier.Operation.ADDITION)); - } - - return multimap; - } - - public double getDamageOfActivatedSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_DAMAGE); - } - - public void setDamageOfActivatedSword(ItemStack stack, double damage) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); - } - - public double getDrainOfActivatedSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN); - } - - public void setDrainOfActivatedSword(ItemStack stack, double drain) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); - } - - public double getStaticDropOfActivatedSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP); - } - - public void setStaticDropOfActivatedSword(ItemStack stack, double drop) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); - } - - public double getDropOfActivatedSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_DROP); - } - - public void setDropOfActivatedSword(ItemStack stack, double drop) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_DROP, drop); - } - - public double getHealthBonusOfSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_HEALTH); - } - - public void setHealthBonusOfSword(ItemStack stack, double hp) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); - } - - public double getAttackSpeedOfSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED); - } - - public void setAttackSpeedOfSword(ItemStack stack, double speed) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); - } - - public double getSpeedOfSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_SPEED); - } - - public void setSpeedOfSword(ItemStack stack, double speed) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); - } - - public double getDigSpeedOfSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED); - } - - public void setDigSpeedOfSword(ItemStack stack, double speed) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED, speed); - } - -// @Override -// public boolean spawnSentientEntityOnDrop(ItemStack droppedStack, PlayerEntity player) { -// World world = player.getEntityWorld(); -// if (!world.isRemote) { -// this.recalculatePowers(droppedStack, world, player); -// -// EnumDemonWillType type = this.getCurrentType(droppedStack); -// double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); -// if (soulsRemaining < 1024) { -// return false; -// } -// -// PlayerDemonWillHandler.consumeDemonWill(type, player, 100); -// -// EntitySentientSpecter specterEntity = new EntitySentientSpecter(world); -// specterEntity.setPosition(player.posX, player.posY, player.posZ); -// world.spawnEntity(specterEntity); -// -// specterEntity.setItemStackToSlot(EquipmentSlotType.MAINHAND, droppedStack.copy()); -// -// specterEntity.setType(this.getCurrentType(droppedStack)); -// specterEntity.setOwner(player); -// specterEntity.setTamed(true); -// -// return true; -// } -// -// return false; -// } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientPickaxe.java b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientPickaxe.java deleted file mode 100644 index 471eb2d5..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientPickaxe.java +++ /dev/null @@ -1,562 +0,0 @@ -package wayoftime.bloodmagic.common.item.soul; - -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.UUID; - -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; - -import net.minecraft.block.BlockState; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.attributes.Attribute; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.ai.attributes.Attributes; -import net.minecraft.entity.monster.IMob; -import net.minecraft.entity.monster.SlimeEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.PickaxeItem; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.Difficulty; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; -import wayoftime.bloodmagic.api.compat.IDemonWill; -import wayoftime.bloodmagic.api.compat.IDemonWillWeapon; -import wayoftime.bloodmagic.api.compat.IMultiWillTool; -import wayoftime.bloodmagic.common.item.BMItemTier; -import wayoftime.bloodmagic.common.item.BloodMagicItems; -import wayoftime.bloodmagic.common.tags.BloodMagicTags; -import wayoftime.bloodmagic.util.Constants; -import wayoftime.bloodmagic.util.helper.NBTHelper; -import wayoftime.bloodmagic.will.PlayerDemonWillHandler; - -public class ItemSentientPickaxe extends PickaxeItem implements IDemonWillWeapon, IMultiWillTool -{ - public static int[] soulBracket = new int[] { 16, 60, 200, 400, 1000 }; - public static double[] defaultDamageAdded = new double[] { 1, 2, 3, 3.5, 4 }; - public static double[] destructiveDamageAdded = new double[] { 2, 3, 4, 5, 6 }; - public static double[] vengefulDamageAdded = new double[] { 0, 0.5, 1, 1.5, 2 }; - public static double[] steadfastDamageAdded = new double[] { 0, 0.5, 1, 1.5, 2 }; - public static double[] defaultDigSpeedAdded = new double[] { 1, 1.5, 2, 3, 4 }; - public static double[] soulDrainPerSwing = new double[] { 0.05, 0.1, 0.2, 0.4, 0.75 }; - public static double[] soulDrop = new double[] { 2, 4, 7, 10, 13 }; - public static double[] staticDrop = new double[] { 1, 1, 2, 3, 3 }; - - public static double[] healthBonus = new double[] { 0, 0, 0, 0, 0 }; // TODO: Think of implementing this later - public static double[] vengefulAttackSpeed = new double[] { -3, -2.8, -2.7, -2.6, -2.5 }; - public static double[] destructiveAttackSpeed = new double[] { -3.1, -3.1, -3.2, -3.3, -3.3 }; - - public static int[] absorptionTime = new int[] { 200, 300, 400, 500, 600 }; - - public static double maxAbsorptionHearts = 10; - - public static int[] poisonTime = new int[] { 25, 50, 60, 80, 100 }; - public static int[] poisonLevel = new int[] { 0, 0, 0, 1, 1 }; - - public static double[] movementSpeed = new double[] { 0.05, 0.1, 0.15, 0.2, 0.25 }; - - public static final double baseAttackDamage = 3; - public static final double baseAttackSpeed = -2.8; - - public ItemSentientPickaxe() - { - super(BMItemTier.SENTIENT, (int) baseAttackDamage, (float) baseAttackSpeed, new Item.Properties().maxDamage(520).group(BloodMagic.TAB)); - } - - @Override - public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) - { - return BloodMagicTags.CRYSTAL_DEMON.contains(repair.getItem()) || super.getIsRepairable(toRepair, repair); - } - - @Override - public float getDestroySpeed(ItemStack stack, BlockState state) - { - float value = super.getDestroySpeed(stack, state); - if (value > 1) - { - return (float) (value + getDigSpeedOfSword(stack)); - } else - { - return value; - } - } - - public void recalculatePowers(ItemStack stack, World world, PlayerEntity player) - { - EnumDemonWillType type = PlayerDemonWillHandler.getLargestWillType(player); - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - this.setCurrentType(stack, soulsRemaining > 0 ? type : EnumDemonWillType.DEFAULT); - int level = getLevel(stack, soulsRemaining); - - double drain = level >= 0 ? soulDrainPerSwing[level] : 0; - double extraDamage = getExtraDamage(type, level); - - setDrainOfActivatedSword(stack, drain); - setDamageOfActivatedSword(stack, baseAttackDamage + extraDamage); - setStaticDropOfActivatedSword(stack, level >= 0 ? staticDrop[level] : 1); - setDropOfActivatedSword(stack, level >= 0 ? soulDrop[level] : 0); - setAttackSpeedOfSword(stack, level >= 0 ? getAttackSpeed(type, level) : baseAttackSpeed); - setHealthBonusOfSword(stack, level >= 0 ? getHealthBonus(type, level) : 0); - setSpeedOfSword(stack, level >= 0 ? getMovementSpeed(type, level) : 0); - setDigSpeedOfSword(stack, level >= 0 ? getDigSpeed(type, level) : 0); - } - - public double getExtraDamage(EnumDemonWillType type, int willBracket) - { - if (willBracket < 0) - { - return 0; - } - - switch (type) - { - case CORROSIVE: - case DEFAULT: - return defaultDamageAdded[willBracket]; - case DESTRUCTIVE: - return destructiveDamageAdded[willBracket]; - case VENGEFUL: - return vengefulDamageAdded[willBracket]; - case STEADFAST: - return steadfastDamageAdded[willBracket]; - } - - return 0; - } - - public double getAttackSpeed(EnumDemonWillType type, int willBracket) - { - switch (type) - { - case VENGEFUL: - return vengefulAttackSpeed[willBracket]; - case DESTRUCTIVE: - return destructiveAttackSpeed[willBracket]; - default: - return -2.9; - } - } - - public double getHealthBonus(EnumDemonWillType type, int willBracket) - { - switch (type) - { - case STEADFAST: - return healthBonus[willBracket]; - default: - return 0; - } - } - - public double getMovementSpeed(EnumDemonWillType type, int willBracket) - { - switch (type) - { - case VENGEFUL: - return movementSpeed[willBracket]; - default: - return 0; - } - } - - public double getDigSpeed(EnumDemonWillType type, int willBracket) - { - switch (type) - { - case VENGEFUL: -// return movementSpeed[willBracket]; - default: - return defaultDigSpeedAdded[willBracket]; - } - } - - public void applyEffectToEntity(EnumDemonWillType type, int willBracket, LivingEntity target, PlayerEntity attacker) - { - switch (type) - { - case CORROSIVE: - target.addPotionEffect(new EffectInstance(Effects.WITHER, poisonTime[willBracket], poisonLevel[willBracket])); - break; - case DEFAULT: - break; - case DESTRUCTIVE: - break; - case STEADFAST: - if (!target.isAlive()) - { - float absorption = attacker.getAbsorptionAmount(); - attacker.addPotionEffect(new EffectInstance(Effects.ABSORPTION, absorptionTime[willBracket], 127)); - attacker.setAbsorptionAmount((float) Math.min(absorption + target.getMaxHealth() * 0.05f, maxAbsorptionHearts)); - } - break; - case VENGEFUL: - break; - } - } - - @Override - public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) - { - if (super.hitEntity(stack, target, attacker)) - { - if (attacker instanceof PlayerEntity) - { - PlayerEntity attackerPlayer = (PlayerEntity) attacker; - this.recalculatePowers(stack, attackerPlayer.getEntityWorld(), attackerPlayer); - EnumDemonWillType type = this.getCurrentType(stack); - double will = PlayerDemonWillHandler.getTotalDemonWill(type, attackerPlayer); - int willBracket = this.getLevel(stack, will); - - applyEffectToEntity(type, willBracket, target, attackerPlayer); - -// ItemStack offStack = attackerPlayer.getItemStackFromSlot(EquipmentSlotType.OFFHAND); -// if (offStack.getItem() instanceof ISentientSwordEffectProvider) -// { -// ISentientSwordEffectProvider provider = (ISentientSwordEffectProvider) offStack.getItem(); -// if (provider.providesEffectForWill(type)) -// { -// provider.applyOnHitEffect(type, stack, offStack, attacker, target); -// } -// } - } - - return true; - } - - return false; - } - - @Override - public EnumDemonWillType getCurrentType(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - if (!tag.contains(Constants.NBT.WILL_TYPE)) - { - return EnumDemonWillType.DEFAULT; - } - - return EnumDemonWillType.valueOf(tag.getString(Constants.NBT.WILL_TYPE).toUpperCase(Locale.ENGLISH)); - } - - public void setCurrentType(ItemStack stack, EnumDemonWillType type) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putString(Constants.NBT.WILL_TYPE, type.toString()); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) - { - recalculatePowers(player.getHeldItem(hand), world, player); - return super.onItemRightClick(world, player, hand); - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) - { - return oldStack.getItem() != newStack.getItem(); - } - - private int getLevel(ItemStack stack, double soulsRemaining) - { - int lvl = -1; - for (int i = 0; i < soulBracket.length; i++) - { - if (soulsRemaining >= soulBracket[i]) - { - lvl = i; - } - } - - return lvl; - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { - if (!stack.hasTag()) - return; - -// tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.sentientSword.desc")))); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sentientPickaxe.desc").mergeStyle(TextFormatting.GRAY)); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentType." + getCurrentType(stack).name().toLowerCase()).mergeStyle(TextFormatting.GRAY)); - } - - @Override - public boolean onLeftClickEntity(ItemStack stack, PlayerEntity player, Entity entity) - { - recalculatePowers(stack, player.getEntityWorld(), player); - - double drain = this.getDrainOfActivatedSword(stack); - if (drain > 0) - { - EnumDemonWillType type = getCurrentType(stack); - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - - if (drain > soulsRemaining) - { - return false; - } else - { - PlayerDemonWillHandler.consumeDemonWill(type, player, drain); - } - } - - return super.onLeftClickEntity(stack, player, entity); - } - - @Override - public List getRandomDemonWillDrop(LivingEntity killedEntity, LivingEntity attackingEntity, ItemStack stack, int looting) - { - List soulList = new ArrayList<>(); - - if (killedEntity.getEntityWorld().getDifficulty() != Difficulty.PEACEFUL && !(killedEntity instanceof IMob)) - { - return soulList; - } - - double willModifier = killedEntity instanceof SlimeEntity ? 0.67 : 1; - - IDemonWill soul; - - EnumDemonWillType type = this.getCurrentType(stack); - switch (type) - { - case CORROSIVE: - soul = ((IDemonWill) BloodMagicItems.MONSTER_SOUL_CORROSIVE.get()); - break; - case DESTRUCTIVE: - soul = ((IDemonWill) BloodMagicItems.MONSTER_SOUL_DESTRUCTIVE.get()); - break; - case STEADFAST: - soul = ((IDemonWill) BloodMagicItems.MONSTER_SOUL_STEADFAST.get()); - break; - case VENGEFUL: - soul = ((IDemonWill) BloodMagicItems.MONSTER_SOUL_VENGEFUL.get()); - break; - default: - soul = ((IDemonWill) BloodMagicItems.MONSTER_SOUL_RAW.get()); - break; - } - - for (int i = 0; i <= looting; i++) - { - if (i == 0 || attackingEntity.getEntityWorld().rand.nextDouble() < 0.4) - { - ItemStack soulStack = soul.createWill(willModifier * (this.getDropOfActivatedSword(stack) * attackingEntity.getEntityWorld().rand.nextDouble() + this.getStaticDropOfActivatedSword(stack)) * killedEntity.getMaxHealth() / 20d); - soulList.add(soulStack); - } - } - - return soulList; - } - - // TODO: Change attack speed. - @Override - public Multimap getAttributeModifiers(EquipmentSlotType slot, ItemStack stack) - { - Multimap multimap = HashMultimap.create(); - if (slot == EquipmentSlotType.MAINHAND) - { - multimap.put(Attributes.ATTACK_DAMAGE, new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getDamageOfActivatedSword(stack), AttributeModifier.Operation.ADDITION)); - multimap.put(Attributes.ATTACK_SPEED, new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", this.getAttackSpeedOfSword(stack), AttributeModifier.Operation.ADDITION)); - multimap.put(Attributes.MAX_HEALTH, new AttributeModifier(new UUID(0, 31818145), "Weapon modifier", this.getHealthBonusOfSword(stack), AttributeModifier.Operation.ADDITION)); - multimap.put(Attributes.MOVEMENT_SPEED, new AttributeModifier(new UUID(0, 4218052), "Weapon modifier", this.getSpeedOfSword(stack), AttributeModifier.Operation.ADDITION)); - } - - return multimap; - } - - public double getDamageOfActivatedSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_DAMAGE); - } - - public void setDamageOfActivatedSword(ItemStack stack, double damage) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); - } - - public double getDrainOfActivatedSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN); - } - - public void setDrainOfActivatedSword(ItemStack stack, double drain) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); - } - - public double getStaticDropOfActivatedSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP); - } - - public void setStaticDropOfActivatedSword(ItemStack stack, double drop) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); - } - - public double getDropOfActivatedSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_DROP); - } - - public void setDropOfActivatedSword(ItemStack stack, double drop) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_DROP, drop); - } - - public double getHealthBonusOfSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_HEALTH); - } - - public void setHealthBonusOfSword(ItemStack stack, double hp) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); - } - - public double getAttackSpeedOfSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED); - } - - public void setAttackSpeedOfSword(ItemStack stack, double speed) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); - } - - public double getSpeedOfSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_SPEED); - } - - public void setSpeedOfSword(ItemStack stack, double speed) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); - } - - public double getDigSpeedOfSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED); - } - - public void setDigSpeedOfSword(ItemStack stack, double speed) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED, speed); - } - -// @Override -// public boolean spawnSentientEntityOnDrop(ItemStack droppedStack, PlayerEntity player) -// { -// World world = player.getEntityWorld(); -// if (!world.isRemote) -// { -// this.recalculatePowers(droppedStack, world, player); -// -// EnumDemonWillType type = this.getCurrentType(droppedStack); -// double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); -// if (soulsRemaining < 1024) -// { -// return false; -// } -// -// PlayerDemonWillHandler.consumeDemonWill(type, player, 100); -// -// EntitySentientSpecter specterEntity = new EntitySentientSpecter(world); -// specterEntity.setPosition(player.posX, player.posY, player.posZ); -// world.spawnEntity(specterEntity); -// -// specterEntity.setItemStackToSlot(EquipmentSlotType.MAINHAND, droppedStack.copy()); -// -// specterEntity.setType(this.getCurrentType(droppedStack)); -// specterEntity.setOwner(player); -// specterEntity.setTamed(true); -// -// return true; -// } -// -// return false; -// } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientShovel.java b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientShovel.java deleted file mode 100644 index dce46373..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientShovel.java +++ /dev/null @@ -1,563 +0,0 @@ -package wayoftime.bloodmagic.common.item.soul; - -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.UUID; - -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; - -import net.minecraft.block.BlockState; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.attributes.Attribute; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.ai.attributes.Attributes; -import net.minecraft.entity.monster.IMob; -import net.minecraft.entity.monster.SlimeEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ShovelItem; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.Difficulty; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; -import wayoftime.bloodmagic.api.compat.IDemonWill; -import wayoftime.bloodmagic.api.compat.IDemonWillWeapon; -import wayoftime.bloodmagic.api.compat.IMultiWillTool; -import wayoftime.bloodmagic.common.item.BMItemTier; -import wayoftime.bloodmagic.common.item.BloodMagicItems; -import wayoftime.bloodmagic.common.tags.BloodMagicTags; -import wayoftime.bloodmagic.util.Constants; -import wayoftime.bloodmagic.util.helper.NBTHelper; -import wayoftime.bloodmagic.will.PlayerDemonWillHandler; - -public class ItemSentientShovel extends ShovelItem implements IDemonWillWeapon, IMultiWillTool -{ - public static int[] soulBracket = new int[] { 16, 60, 200, 400, 1000 }; - public static double[] defaultDamageAdded = new double[] { 1, 2, 3, 3.5, 4 }; - public static double[] destructiveDamageAdded = new double[] { 2, 3, 4, 5, 6 }; - public static double[] vengefulDamageAdded = new double[] { 0, 0.5, 1, 1.5, 2 }; - public static double[] steadfastDamageAdded = new double[] { 0, 0.5, 1, 1.5, 2 }; - public static double[] defaultDigSpeedAdded = new double[] { 1, 1.5, 2, 3, 4 }; - public static double[] soulDrainPerSwing = new double[] { 0.05, 0.1, 0.2, 0.4, 0.75 }; - public static double[] soulDrop = new double[] { 2, 4, 7, 10, 13 }; - public static double[] staticDrop = new double[] { 1, 1, 2, 3, 3 }; - - public static double[] healthBonus = new double[] { 0, 0, 0, 0, 0 }; // TODO: Think of implementing this later - public static double[] vengefulAttackSpeed = new double[] { -3, -2.8, -2.7, -2.6, -2.5 }; - public static double[] destructiveAttackSpeed = new double[] { -3.1, -3.1, -3.2, -3.3, -3.3 }; - - public static int[] absorptionTime = new int[] { 200, 300, 400, 500, 600 }; - - public static double maxAbsorptionHearts = 10; - - public static int[] poisonTime = new int[] { 25, 50, 60, 80, 100 }; - public static int[] poisonLevel = new int[] { 0, 0, 0, 1, 1 }; - - public static double[] movementSpeed = new double[] { 0.05, 0.1, 0.15, 0.2, 0.25 }; - - public static final double baseAttackDamage = 3; - public static final double baseAttackSpeed = -2.8; - - public ItemSentientShovel() - { - super(BMItemTier.SENTIENT, (int) baseAttackDamage, (float) baseAttackSpeed, new Item.Properties().maxDamage(520).group(BloodMagic.TAB)); - } - - @Override - public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) - { - return BloodMagicTags.CRYSTAL_DEMON.contains(repair.getItem()) || super.getIsRepairable(toRepair, repair); - } - - @Override - public float getDestroySpeed(ItemStack stack, BlockState state) - { - float value = super.getDestroySpeed(stack, state); - if (value > 1) - { - return (float) (value + getDigSpeedOfSword(stack)); - } else - { - return value; - } - } - - public void recalculatePowers(ItemStack stack, World world, PlayerEntity player) - { - EnumDemonWillType type = PlayerDemonWillHandler.getLargestWillType(player); - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - this.setCurrentType(stack, soulsRemaining > 0 ? type : EnumDemonWillType.DEFAULT); - int level = getLevel(stack, soulsRemaining); - - double drain = level >= 0 ? soulDrainPerSwing[level] : 0; - double extraDamage = getExtraDamage(type, level); - - setDrainOfActivatedSword(stack, drain); - setDamageOfActivatedSword(stack, baseAttackDamage + extraDamage); - setStaticDropOfActivatedSword(stack, level >= 0 ? staticDrop[level] : 1); - setDropOfActivatedSword(stack, level >= 0 ? soulDrop[level] : 0); - setAttackSpeedOfSword(stack, level >= 0 ? getAttackSpeed(type, level) : baseAttackSpeed); - setHealthBonusOfSword(stack, level >= 0 ? getHealthBonus(type, level) : 0); - setSpeedOfSword(stack, level >= 0 ? getMovementSpeed(type, level) : 0); - setDigSpeedOfSword(stack, level >= 0 ? getDigSpeed(type, level) : 0); - } - - public double getExtraDamage(EnumDemonWillType type, int willBracket) - { - if (willBracket < 0) - { - return 0; - } - - switch (type) - { - case CORROSIVE: - case DEFAULT: - return defaultDamageAdded[willBracket]; - case DESTRUCTIVE: - return destructiveDamageAdded[willBracket]; - case VENGEFUL: - return vengefulDamageAdded[willBracket]; - case STEADFAST: - return steadfastDamageAdded[willBracket]; - } - - return 0; - } - - public double getAttackSpeed(EnumDemonWillType type, int willBracket) - { - switch (type) - { - case VENGEFUL: - return vengefulAttackSpeed[willBracket]; - case DESTRUCTIVE: - return destructiveAttackSpeed[willBracket]; - default: - return -2.9; - } - } - - public double getHealthBonus(EnumDemonWillType type, int willBracket) - { - switch (type) - { - case STEADFAST: - return healthBonus[willBracket]; - default: - return 0; - } - } - - public double getMovementSpeed(EnumDemonWillType type, int willBracket) - { - switch (type) - { - case VENGEFUL: - return movementSpeed[willBracket]; - default: - return 0; - } - } - - public double getDigSpeed(EnumDemonWillType type, int willBracket) - { - switch (type) - { - case VENGEFUL: -// return movementSpeed[willBracket]; - default: - return defaultDigSpeedAdded[willBracket]; - } - } - - public void applyEffectToEntity(EnumDemonWillType type, int willBracket, LivingEntity target, PlayerEntity attacker) - { - switch (type) - { - case CORROSIVE: - target.addPotionEffect(new EffectInstance(Effects.WITHER, poisonTime[willBracket], poisonLevel[willBracket])); - break; - case DEFAULT: - break; - case DESTRUCTIVE: - break; - case STEADFAST: - if (!target.isAlive()) - { - float absorption = attacker.getAbsorptionAmount(); - attacker.addPotionEffect(new EffectInstance(Effects.ABSORPTION, absorptionTime[willBracket], 127)); - attacker.setAbsorptionAmount((float) Math.min(absorption + target.getMaxHealth() * 0.05f, maxAbsorptionHearts)); - } - break; - case VENGEFUL: - break; - } - } - - @Override - public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) - { - if (super.hitEntity(stack, target, attacker)) - { - if (attacker instanceof PlayerEntity) - { - PlayerEntity attackerPlayer = (PlayerEntity) attacker; - this.recalculatePowers(stack, attackerPlayer.getEntityWorld(), attackerPlayer); - EnumDemonWillType type = this.getCurrentType(stack); - double will = PlayerDemonWillHandler.getTotalDemonWill(type, attackerPlayer); - int willBracket = this.getLevel(stack, will); - - applyEffectToEntity(type, willBracket, target, attackerPlayer); - -// ItemStack offStack = attackerPlayer.getItemStackFromSlot(EquipmentSlotType.OFFHAND); -// if (offStack.getItem() instanceof ISentientSwordEffectProvider) -// { -// ISentientSwordEffectProvider provider = (ISentientSwordEffectProvider) offStack.getItem(); -// if (provider.providesEffectForWill(type)) -// { -// provider.applyOnHitEffect(type, stack, offStack, attacker, target); -// } -// } - } - - return true; - } - - return false; - } - - @Override - public EnumDemonWillType getCurrentType(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - if (!tag.contains(Constants.NBT.WILL_TYPE)) - { - return EnumDemonWillType.DEFAULT; - } - - return EnumDemonWillType.valueOf(tag.getString(Constants.NBT.WILL_TYPE).toUpperCase(Locale.ENGLISH)); - } - - public void setCurrentType(ItemStack stack, EnumDemonWillType type) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putString(Constants.NBT.WILL_TYPE, type.toString()); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) - { - recalculatePowers(player.getHeldItem(hand), world, player); - - return super.onItemRightClick(world, player, hand); - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) - { - return oldStack.getItem() != newStack.getItem(); - } - - private int getLevel(ItemStack stack, double soulsRemaining) - { - int lvl = -1; - for (int i = 0; i < soulBracket.length; i++) - { - if (soulsRemaining >= soulBracket[i]) - { - lvl = i; - } - } - - return lvl; - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { - if (!stack.hasTag()) - return; - -// tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.sentientSword.desc")))); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sentientShovel.desc").mergeStyle(TextFormatting.GRAY)); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentType." + getCurrentType(stack).name().toLowerCase()).mergeStyle(TextFormatting.GRAY)); - } - - @Override - public boolean onLeftClickEntity(ItemStack stack, PlayerEntity player, Entity entity) - { - recalculatePowers(stack, player.getEntityWorld(), player); - - double drain = this.getDrainOfActivatedSword(stack); - if (drain > 0) - { - EnumDemonWillType type = getCurrentType(stack); - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - - if (drain > soulsRemaining) - { - return false; - } else - { - PlayerDemonWillHandler.consumeDemonWill(type, player, drain); - } - } - - return super.onLeftClickEntity(stack, player, entity); - } - - @Override - public List getRandomDemonWillDrop(LivingEntity killedEntity, LivingEntity attackingEntity, ItemStack stack, int looting) - { - List soulList = new ArrayList<>(); - - if (killedEntity.getEntityWorld().getDifficulty() != Difficulty.PEACEFUL && !(killedEntity instanceof IMob)) - { - return soulList; - } - - double willModifier = killedEntity instanceof SlimeEntity ? 0.67 : 1; - - IDemonWill soul; - - EnumDemonWillType type = this.getCurrentType(stack); - switch (type) - { - case CORROSIVE: - soul = ((IDemonWill) BloodMagicItems.MONSTER_SOUL_CORROSIVE.get()); - break; - case DESTRUCTIVE: - soul = ((IDemonWill) BloodMagicItems.MONSTER_SOUL_DESTRUCTIVE.get()); - break; - case STEADFAST: - soul = ((IDemonWill) BloodMagicItems.MONSTER_SOUL_STEADFAST.get()); - break; - case VENGEFUL: - soul = ((IDemonWill) BloodMagicItems.MONSTER_SOUL_VENGEFUL.get()); - break; - default: - soul = ((IDemonWill) BloodMagicItems.MONSTER_SOUL_RAW.get()); - break; - } - - for (int i = 0; i <= looting; i++) - { - if (i == 0 || attackingEntity.getEntityWorld().rand.nextDouble() < 0.4) - { - ItemStack soulStack = soul.createWill(willModifier * (this.getDropOfActivatedSword(stack) * attackingEntity.getEntityWorld().rand.nextDouble() + this.getStaticDropOfActivatedSword(stack)) * killedEntity.getMaxHealth() / 20d); - soulList.add(soulStack); - } - } - - return soulList; - } - - // TODO: Change attack speed. - @Override - public Multimap getAttributeModifiers(EquipmentSlotType slot, ItemStack stack) - { - Multimap multimap = HashMultimap.create(); - if (slot == EquipmentSlotType.MAINHAND) - { - multimap.put(Attributes.ATTACK_DAMAGE, new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getDamageOfActivatedSword(stack), AttributeModifier.Operation.ADDITION)); - multimap.put(Attributes.ATTACK_SPEED, new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", this.getAttackSpeedOfSword(stack), AttributeModifier.Operation.ADDITION)); - multimap.put(Attributes.MAX_HEALTH, new AttributeModifier(new UUID(0, 31818145), "Weapon modifier", this.getHealthBonusOfSword(stack), AttributeModifier.Operation.ADDITION)); - multimap.put(Attributes.MOVEMENT_SPEED, new AttributeModifier(new UUID(0, 4218052), "Weapon modifier", this.getSpeedOfSword(stack), AttributeModifier.Operation.ADDITION)); - } - - return multimap; - } - - public double getDamageOfActivatedSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_DAMAGE); - } - - public void setDamageOfActivatedSword(ItemStack stack, double damage) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); - } - - public double getDrainOfActivatedSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN); - } - - public void setDrainOfActivatedSword(ItemStack stack, double drain) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); - } - - public double getStaticDropOfActivatedSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP); - } - - public void setStaticDropOfActivatedSword(ItemStack stack, double drop) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); - } - - public double getDropOfActivatedSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_DROP); - } - - public void setDropOfActivatedSword(ItemStack stack, double drop) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_DROP, drop); - } - - public double getHealthBonusOfSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_HEALTH); - } - - public void setHealthBonusOfSword(ItemStack stack, double hp) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); - } - - public double getAttackSpeedOfSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED); - } - - public void setAttackSpeedOfSword(ItemStack stack, double speed) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); - } - - public double getSpeedOfSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_SPEED); - } - - public void setSpeedOfSword(ItemStack stack, double speed) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); - } - - public double getDigSpeedOfSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED); - } - - public void setDigSpeedOfSword(ItemStack stack, double speed) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED, speed); - } - -// @Override -// public boolean spawnSentientEntityOnDrop(ItemStack droppedStack, PlayerEntity player) -// { -// World world = player.getEntityWorld(); -// if (!world.isRemote) -// { -// this.recalculatePowers(droppedStack, world, player); -// -// EnumDemonWillType type = this.getCurrentType(droppedStack); -// double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); -// if (soulsRemaining < 1024) -// { -// return false; -// } -// -// PlayerDemonWillHandler.consumeDemonWill(type, player, 100); -// -// EntitySentientSpecter specterEntity = new EntitySentientSpecter(world); -// specterEntity.setPosition(player.posX, player.posY, player.posZ); -// world.spawnEntity(specterEntity); -// -// specterEntity.setItemStackToSlot(EquipmentSlotType.MAINHAND, droppedStack.copy()); -// -// specterEntity.setType(this.getCurrentType(droppedStack)); -// specterEntity.setOwner(player); -// specterEntity.setTamed(true); -// -// return true; -// } -// -// return false; -// } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientSword.java b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientSword.java deleted file mode 100644 index c39ba1ed..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientSword.java +++ /dev/null @@ -1,507 +0,0 @@ -package wayoftime.bloodmagic.common.item.soul; - -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.UUID; - -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; - -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.attributes.Attribute; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.ai.attributes.Attributes; -import net.minecraft.entity.monster.IMob; -import net.minecraft.entity.monster.SlimeEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.SwordItem; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.Difficulty; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; -import wayoftime.bloodmagic.api.compat.IDemonWill; -import wayoftime.bloodmagic.api.compat.IDemonWillWeapon; -import wayoftime.bloodmagic.api.compat.IMultiWillTool; -import wayoftime.bloodmagic.common.item.BMItemTier; -import wayoftime.bloodmagic.common.item.BloodMagicItems; -import wayoftime.bloodmagic.common.tags.BloodMagicTags; -import wayoftime.bloodmagic.util.Constants; -import wayoftime.bloodmagic.util.helper.NBTHelper; -import wayoftime.bloodmagic.will.PlayerDemonWillHandler; - -public class ItemSentientSword extends SwordItem implements IDemonWillWeapon, IMultiWillTool -{ - public static int[] soulBracket = new int[] { 16, 60, 200, 400, 1000, 2000, 4000 }; - public static double[] defaultDamageAdded = new double[] { 1, 1.5, 2, 2.5, 3, 3.5, 4 }; - public static double[] destructiveDamageAdded = new double[] { 1.5, 2.25, 3, 3.75, 4.5, 5.25, 6 }; - public static double[] vengefulDamageAdded = new double[] { 0, 0.5, 1, 1.5, 2, 2.25, 2.5 }; - public static double[] steadfastDamageAdded = new double[] { 0, 0.5, 1, 1.5, 2, 2.25, 2.5 }; - public static double[] soulDrainPerSwing = new double[] { 0.05, 0.1, 0.2, 0.4, 0.75, 1, 1.25 }; - public static double[] soulDrop = new double[] { 2, 4, 7, 10, 13, 15, 18 }; - public static double[] staticDrop = new double[] { 1, 1, 2, 3, 3, 4, 4 }; - - public static double[] healthBonus = new double[] { 0, 0, 0, 0, 0, 0, 0 }; // TODO: Think of implementing this later - public static double[] vengefulAttackSpeed = new double[] { -2.1, -2, -1.8, -1.7, -1.6, -1.6, -1.5 }; - public static double[] destructiveAttackSpeed = new double[] { -2.6, -2.7, -2.8, -2.9, -3, -3, -3 }; - - public static int[] absorptionTime = new int[] { 200, 300, 400, 500, 600, 700, 800 }; - - public static double maxAbsorptionHearts = 10; - - public static int[] poisonTime = new int[] { 25, 50, 60, 80, 100, 120, 150 }; - public static int[] poisonLevel = new int[] { 0, 0, 0, 1, 1, 1, 1 }; - - public static double[] movementSpeed = new double[] { 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.4 }; - - public ItemSentientSword() - { -// super(RegistrarBloodMagicItems.SOUL_TOOL_MATERIAL); - super(BMItemTier.SENTIENT, 6, -2.6f, new Item.Properties().maxDamage(520).group(BloodMagic.TAB)); - } - - @Override - public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) - { - return BloodMagicTags.CRYSTAL_DEMON.contains(repair.getItem()) || super.getIsRepairable(toRepair, repair); - } - - public void recalculatePowers(ItemStack stack, World world, PlayerEntity player) - { - EnumDemonWillType type = PlayerDemonWillHandler.getLargestWillType(player); - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - recalculatePowers(stack, type, soulsRemaining); - } - - public void recalculatePowers(ItemStack stack, EnumDemonWillType type, double will) - { - this.setCurrentType(stack, will > 0 ? type : EnumDemonWillType.DEFAULT); - int level = getLevel(stack, will); - - double drain = level >= 0 ? soulDrainPerSwing[level] : 0; - double extraDamage = getExtraDamage(type, level); - - setActivatedState(stack, will > 16); - - setDrainOfActivatedSword(stack, drain); - setDamageOfActivatedSword(stack, 5 + extraDamage); - setStaticDropOfActivatedSword(stack, level >= 0 ? staticDrop[level] : 1); - setDropOfActivatedSword(stack, level >= 0 ? soulDrop[level] : 0); - setAttackSpeedOfSword(stack, level >= 0 ? getAttackSpeed(type, level) : -2.4); - setHealthBonusOfSword(stack, level >= 0 ? getHealthBonus(type, level) : 0); - setSpeedOfSword(stack, level >= 0 ? getMovementSpeed(type, level) : 0); - } - - public boolean getActivated(ItemStack stack) - { - return !stack.isEmpty() && NBTHelper.checkNBT(stack).getTag().getBoolean(Constants.NBT.ACTIVATED); - } - - public ItemStack setActivatedState(ItemStack stack, boolean activated) - { - if (!stack.isEmpty()) - { - NBTHelper.checkNBT(stack).getTag().putBoolean(Constants.NBT.ACTIVATED, activated); - return stack; - } - - return stack; - } - - public double getExtraDamage(EnumDemonWillType type, int willBracket) - { - if (willBracket < 0) - { - return 0; - } - - switch (type) - { - case CORROSIVE: - case DEFAULT: - return defaultDamageAdded[willBracket]; - case DESTRUCTIVE: - return destructiveDamageAdded[willBracket]; - case VENGEFUL: - return vengefulDamageAdded[willBracket]; - case STEADFAST: - return steadfastDamageAdded[willBracket]; - } - - return 0; - } - - public double getAttackSpeed(EnumDemonWillType type, int willBracket) - { - switch (type) - { - case VENGEFUL: - return vengefulAttackSpeed[willBracket]; - case DESTRUCTIVE: - return destructiveAttackSpeed[willBracket]; - default: - return -2.4; - } - } - - public double getHealthBonus(EnumDemonWillType type, int willBracket) - { - switch (type) - { - case STEADFAST: - return healthBonus[willBracket]; - default: - return 0; - } - } - - public double getMovementSpeed(EnumDemonWillType type, int willBracket) - { - switch (type) - { - case VENGEFUL: - return movementSpeed[willBracket]; - default: - return 0; - } - } - - public void applyEffectToEntity(EnumDemonWillType type, int willBracket, LivingEntity target, LivingEntity attacker) - { - switch (type) - { - case CORROSIVE: - target.addPotionEffect(new EffectInstance(Effects.WITHER, poisonTime[willBracket], poisonLevel[willBracket])); - break; - case DEFAULT: - break; - case DESTRUCTIVE: - break; - case STEADFAST: - if (!target.isAlive()) - { - float absorption = attacker.getAbsorptionAmount(); - attacker.addPotionEffect(new EffectInstance(Effects.ABSORPTION, absorptionTime[willBracket], 127, false, false)); - attacker.setAbsorptionAmount((float) Math.min(absorption + target.getMaxHealth() * 0.05f, maxAbsorptionHearts)); - } - break; - case VENGEFUL: - break; - } - } - - @Override - public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) - { - if (super.hitEntity(stack, target, attacker)) - { - if (attacker instanceof PlayerEntity) - { - PlayerEntity attackerPlayer = (PlayerEntity) attacker; - this.recalculatePowers(stack, attackerPlayer.getEntityWorld(), attackerPlayer); - EnumDemonWillType type = this.getCurrentType(stack); - double will = PlayerDemonWillHandler.getTotalDemonWill(type, attackerPlayer); - int willBracket = this.getLevel(stack, will); - - applyEffectToEntity(type, willBracket, target, attackerPlayer); - -// ItemStack offStack = attackerPlayer.getItemStackFromSlot(EntityEquipmentSlot.OFFHAND); -// if (offStack.getItem() instanceof ISentientSwordEffectProvider) -// { -// ISentientSwordEffectProvider provider = (ISentientSwordEffectProvider) offStack.getItem(); -// if (provider.providesEffectForWill(type)) -// { -// provider.applyOnHitEffect(type, stack, offStack, attacker, target); -// } -// } - } - - return true; - } - - return false; - } - - @Override - public EnumDemonWillType getCurrentType(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - if (!tag.contains(Constants.NBT.WILL_TYPE)) - { - return EnumDemonWillType.DEFAULT; - } - - return EnumDemonWillType.valueOf(tag.getString(Constants.NBT.WILL_TYPE).toUpperCase(Locale.ENGLISH)); - } - - public void setCurrentType(ItemStack stack, EnumDemonWillType type) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putString(Constants.NBT.WILL_TYPE, type.toString()); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) - { - recalculatePowers(player.getHeldItem(hand), world, player); - return super.onItemRightClick(world, player, hand); - } - - @Override - public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) - { - return oldStack.getItem() != newStack.getItem(); - } - - private int getLevel(ItemStack stack, double soulsRemaining) - { - int lvl = -1; - for (int i = 0; i < soulBracket.length; i++) - { - if (soulsRemaining >= soulBracket[i]) - { - lvl = i; - } - } - - return lvl; - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { - if (!stack.hasTag()) - return; - -// tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.sentientSword.desc")))); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sentientSword.desc").mergeStyle(TextFormatting.GRAY)); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentType." + getCurrentType(stack).name().toLowerCase()).mergeStyle(TextFormatting.GRAY)); - } - - @Override - public boolean onLeftClickEntity(ItemStack stack, PlayerEntity player, Entity entity) - { - recalculatePowers(stack, player.getEntityWorld(), player); - - double drain = this.getDrainOfActivatedSword(stack); - if (drain > 0) - { - EnumDemonWillType type = getCurrentType(stack); - double soulsRemaining = PlayerDemonWillHandler.getTotalDemonWill(type, player); - - if (drain > soulsRemaining) - { - return false; - } else - { - PlayerDemonWillHandler.consumeDemonWill(type, player, drain); - } - } - - return super.onLeftClickEntity(stack, player, entity); - } - - @Override - public List getRandomDemonWillDrop(LivingEntity killedEntity, LivingEntity attackingEntity, ItemStack stack, int looting) - { - List soulList = new ArrayList<>(); - - if (killedEntity.getEntityWorld().getDifficulty() != Difficulty.PEACEFUL && !(killedEntity instanceof IMob)) - { - return soulList; - } - - double willModifier = killedEntity instanceof SlimeEntity ? 0.67 : 1; - - IDemonWill soul; - - EnumDemonWillType type = this.getCurrentType(stack); - switch (type) - { - case CORROSIVE: - soul = ((IDemonWill) BloodMagicItems.MONSTER_SOUL_CORROSIVE.get()); - break; - case DESTRUCTIVE: - soul = ((IDemonWill) BloodMagicItems.MONSTER_SOUL_DESTRUCTIVE.get()); - break; - case STEADFAST: - soul = ((IDemonWill) BloodMagicItems.MONSTER_SOUL_STEADFAST.get()); - break; - case VENGEFUL: - soul = ((IDemonWill) BloodMagicItems.MONSTER_SOUL_VENGEFUL.get()); - break; - default: - soul = ((IDemonWill) BloodMagicItems.MONSTER_SOUL_RAW.get()); - break; - } - - for (int i = 0; i <= looting; i++) - { - if (i == 0 || attackingEntity.getEntityWorld().rand.nextDouble() < 0.4) - { - ItemStack soulStack = soul.createWill(willModifier * (this.getDropOfActivatedSword(stack) * attackingEntity.getEntityWorld().rand.nextDouble() + this.getStaticDropOfActivatedSword(stack)) * killedEntity.getMaxHealth() / 20d); - soulList.add(soulStack); - } - } - - return soulList; - } - - // TODO: Change attack speed. - @Override - public Multimap getAttributeModifiers(EquipmentSlotType slot, ItemStack stack) - { - Multimap multimap = HashMultimap.create(); - if (slot == EquipmentSlotType.MAINHAND) - { - multimap.put(Attributes.ATTACK_DAMAGE, new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", getDamageOfActivatedSword(stack), AttributeModifier.Operation.ADDITION)); - multimap.put(Attributes.ATTACK_SPEED, new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", this.getAttackSpeedOfSword(stack), AttributeModifier.Operation.ADDITION)); - multimap.put(Attributes.MAX_HEALTH, new AttributeModifier(new UUID(0, 31818145), "Weapon modifier", this.getHealthBonusOfSword(stack), AttributeModifier.Operation.ADDITION)); - multimap.put(Attributes.MOVEMENT_SPEED, new AttributeModifier(new UUID(0, 4218052), "Weapon modifier", this.getSpeedOfSword(stack), AttributeModifier.Operation.ADDITION)); - } - - return multimap; - } - - public double getDamageOfActivatedSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_DAMAGE); - } - - public void setDamageOfActivatedSword(ItemStack stack, double damage) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); - } - - public double getDrainOfActivatedSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN); - } - - public void setDrainOfActivatedSword(ItemStack stack, double drain) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); - } - - public double getStaticDropOfActivatedSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP); - } - - public void setStaticDropOfActivatedSword(ItemStack stack, double drop) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); - } - - public double getDropOfActivatedSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_DROP); - } - - public void setDropOfActivatedSword(ItemStack stack, double drop) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_DROP, drop); - } - - public double getHealthBonusOfSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_HEALTH); - } - - public void setHealthBonusOfSword(ItemStack stack, double hp) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); - } - - public double getAttackSpeedOfSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED); - } - - public void setAttackSpeedOfSword(ItemStack stack, double speed) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); - } - - public double getSpeedOfSword(ItemStack stack) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - return tag.getDouble(Constants.NBT.SOUL_SWORD_SPEED); - } - - public void setSpeedOfSword(ItemStack stack, double speed) - { - NBTHelper.checkNBT(stack); - - CompoundNBT tag = stack.getTag(); - - tag.putDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); - } - -} diff --git a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSoulGem.java b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSoulGem.java deleted file mode 100644 index 1bbfbf24..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSoulGem.java +++ /dev/null @@ -1,257 +0,0 @@ -package wayoftime.bloodmagic.common.item.soul; - -import java.util.List; -import java.util.Locale; - -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.NonNullList; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.api.compat.IMultiWillTool; -import wayoftime.bloodmagic.util.ChatUtil; -import wayoftime.bloodmagic.util.Constants; -import wayoftime.bloodmagic.util.helper.NBTHelper; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; -import wayoftime.bloodmagic.api.compat.IDemonWill; -import wayoftime.bloodmagic.api.compat.IDemonWillGem; -import wayoftime.bloodmagic.will.PlayerDemonWillHandler; - -public class ItemSoulGem extends Item implements IDemonWillGem, IMultiWillTool -{ - private final int maxWill; - private final String name; - - public ItemSoulGem(String name, int maxWill) - { - super(new Item.Properties().maxStackSize(1).group(BloodMagic.TAB)); - this.name = name; - this.maxWill = maxWill; - } - - @Override - public void fillItemGroup(ItemGroup group, NonNullList items) - { - if (this.isInGroup(group)) - { - for (EnumDemonWillType type : EnumDemonWillType.values()) - { - ItemStack stack = new ItemStack(this); - this.setCurrentType(type, stack); - this.setWill(type, stack, maxWill); - items.add(stack); - } - } - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) - { - ItemStack stack = player.getHeldItem(hand); - EnumDemonWillType type = this.getCurrentType(stack); - double drain = Math.min(this.getWill(type, stack), this.getMaxWill(type, stack) / 10); - - double filled = PlayerDemonWillHandler.addDemonWill(type, player, drain, stack); - this.drainWill(type, stack, filled, true); - - return new ActionResult<>(ActionResultType.PASS, stack); - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { - if (!stack.hasTag()) - return; - - EnumDemonWillType type = this.getCurrentType(stack); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.soulGem." + name).mergeStyle(TextFormatting.GRAY)); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.will", ChatUtil.DECIMAL_FORMAT.format(getWill(type, stack))).mergeStyle(TextFormatting.GRAY)); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentType." + getCurrentType(stack).name().toLowerCase()).mergeStyle(TextFormatting.GRAY)); - - super.addInformation(stack, world, tooltip, flag); - } - - @Override - public boolean showDurabilityBar(ItemStack stack) - { - return true; - } - - @Override - public double getDurabilityForDisplay(ItemStack stack) - { - EnumDemonWillType type = this.getCurrentType(stack); - double maxWill = getMaxWill(type, stack); - if (maxWill <= 0) - { - return 1; - } - return 1.0 - (getWill(type, stack) / maxWill); - } - - @Override - public int getRGBDurabilityForDisplay(ItemStack stack) - { - EnumDemonWillType type = this.getCurrentType(stack); - double maxWill = getMaxWill(type, stack); - if (maxWill <= 0) - { - return 1; - } - - return MathHelper.hsvToRGB(Math.max(0.0F, (float) (getWill(type, stack)) / (float) maxWill) / 3.0F, 1.0F, 1.0F); - } - - @Override - public ItemStack fillDemonWillGem(ItemStack soulGemStack, ItemStack soulStack) - { - if (soulStack != null && soulStack.getItem() instanceof IDemonWill) - { - EnumDemonWillType thisType = this.getCurrentType(soulGemStack); - if (thisType != ((IDemonWill) soulStack.getItem()).getType(soulStack)) - { - return soulStack; - } - IDemonWill soul = (IDemonWill) soulStack.getItem(); - double soulsLeft = getWill(thisType, soulGemStack); - - if (soulsLeft < getMaxWill(thisType, soulGemStack)) - { - double newSoulsLeft = Math.min(soulsLeft + soul.getWill(thisType, soulStack), getMaxWill(thisType, soulGemStack)); - soul.drainWill(thisType, soulStack, newSoulsLeft - soulsLeft); - - setWill(thisType, soulGemStack, newSoulsLeft); - if (soul.getWill(thisType, soulStack) <= 0) - { - return ItemStack.EMPTY; - } - } - } - - return soulStack; - } - - @Override - public double getWill(EnumDemonWillType type, ItemStack soulGemStack) - { - if (!type.equals(getCurrentType(soulGemStack))) - { - return 0; - } - - CompoundNBT tag = soulGemStack.getTag(); - - return tag.getDouble(Constants.NBT.SOULS); - } - - @Override - public void setWill(EnumDemonWillType type, ItemStack soulGemStack, double souls) - { - setCurrentType(type, soulGemStack); - - CompoundNBT tag = soulGemStack.getTag(); - - tag.putDouble(Constants.NBT.SOULS, souls); - } - - @Override - public double drainWill(EnumDemonWillType type, ItemStack soulGemStack, double drainAmount, boolean doDrain) - { - EnumDemonWillType currentType = this.getCurrentType(soulGemStack); - if (currentType != type) - { - return 0; - } - double souls = getWill(type, soulGemStack); - - double soulsDrained = Math.min(drainAmount, souls); - - if (doDrain) - { - setWill(type, soulGemStack, souls - soulsDrained); - } - - return soulsDrained; - } - - @Override - public int getMaxWill(EnumDemonWillType type, ItemStack soulGemStack) - { - EnumDemonWillType currentType = getCurrentType(soulGemStack); - if (!type.equals(currentType) && currentType != EnumDemonWillType.DEFAULT) - { - return 0; - } - - return maxWill; - } - - @Override - public EnumDemonWillType getCurrentType(ItemStack soulGemStack) - { - NBTHelper.checkNBT(soulGemStack); - - CompoundNBT tag = soulGemStack.getTag(); - - if (!tag.contains(Constants.NBT.WILL_TYPE)) - { - return EnumDemonWillType.DEFAULT; - } - - return EnumDemonWillType.valueOf(tag.getString(Constants.NBT.WILL_TYPE).toUpperCase(Locale.ENGLISH)); - } - - public void setCurrentType(EnumDemonWillType type, ItemStack soulGemStack) - { - NBTHelper.checkNBT(soulGemStack); - - CompoundNBT tag = soulGemStack.getTag(); - - if (type == EnumDemonWillType.DEFAULT) - { - if (tag.contains(Constants.NBT.WILL_TYPE)) - { - tag.remove(Constants.NBT.WILL_TYPE); - } - - return; - } - - tag.putString(Constants.NBT.WILL_TYPE, type.toString()); - } - - @Override - public double fillWill(EnumDemonWillType type, ItemStack stack, double fillAmount, boolean doFill) - { - if (!type.equals(getCurrentType(stack)) && this.getWill(getCurrentType(stack), stack) > 0) - { - return 0; - } - - double current = this.getWill(type, stack); - double maxWill = this.getMaxWill(type, stack); - - double filled = Math.min(fillAmount, maxWill - current); - - if (doFill) - { - this.setWill(type, stack, filled + current); - } - - return filled; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSoulSnare.java b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSoulSnare.java deleted file mode 100644 index 2de6557d..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSoulSnare.java +++ /dev/null @@ -1,72 +0,0 @@ -package wayoftime.bloodmagic.common.item.soul; - -import java.util.List; - -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.entity.projectile.EntitySoulSnare; - -public class ItemSoulSnare extends Item -{ - public static String[] names = { "base" }; - - public ItemSoulSnare() - { - super(new Item.Properties().maxStackSize(16).group(BloodMagic.TAB)); - -// setTranslationKey(BloodMagic.MODID + ".soulSnare."); -// setCreativeTab(BloodMagic.TAB_BM); -// setHasSubtypes(true); -// setMaxStackSize(16); - } - - @Override - public ActionResult onItemRightClick(World worldIn, PlayerEntity playerIn, Hand hand) - { - ItemStack stack = playerIn.getHeldItem(hand); - if (!playerIn.isCreative()) - { - stack.shrink(1); - } - - worldIn.playSound((PlayerEntity) null, playerIn.getPosX(), playerIn.getPosY(), playerIn.getPosZ(), SoundEvents.ENTITY_SNOWBALL_THROW, SoundCategory.NEUTRAL, 0.5F, 0.4F / (random.nextFloat() * 0.4F + 0.8F)); - - if (!worldIn.isRemote) - { -// System.out.println("Attempting to spawn"); - EntitySoulSnare snare = new EntitySoulSnare(worldIn, playerIn); - snare.func_234612_a_(playerIn, playerIn.rotationPitch, playerIn.rotationYaw, 0.0F, 1.5F, 1.0F); - worldIn.addEntity(snare); -// -// SnowballEntity snowballentity = new SnowballEntity(worldIn, playerIn); -// snowballentity.setItem(itemstack); -// snowballentity.func_234612_a_(playerIn, playerIn.rotationPitch, playerIn.rotationYaw, 0.0F, 1.5F, 1.0F); -// worldIn.addEntity(snowballentity); - } - - return new ActionResult<>(ActionResultType.SUCCESS, stack); - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) - { - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.soulSnare.desc").mergeStyle(TextFormatting.GRAY)); - - super.addInformation(stack, world, tooltip, flag); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/ARCRecipeProvider.java b/src/main/java/wayoftime/bloodmagic/common/recipe/ARCRecipeProvider.java deleted file mode 100644 index 1a7bbd1e..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/ARCRecipeProvider.java +++ /dev/null @@ -1,111 +0,0 @@ -package wayoftime.bloodmagic.common.recipe; - -import java.util.function.Consumer; - -import net.minecraft.block.Blocks; -import net.minecraft.data.IFinishedRecipe; -import net.minecraft.fluid.Fluids; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.tags.ITag; -import net.minecraftforge.common.Tags; -import net.minecraftforge.common.crafting.conditions.ICondition; -import net.minecraftforge.common.crafting.conditions.NotCondition; -import net.minecraftforge.common.crafting.conditions.TagEmptyCondition; -import net.minecraftforge.fluids.FluidStack; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.recipe.helper.FluidStackIngredient; -import wayoftime.bloodmagic.common.data.recipe.builder.ARCRecipeBuilder; -import wayoftime.bloodmagic.common.item.BloodMagicItems; -import wayoftime.bloodmagic.common.tags.BloodMagicTags; - -public class ARCRecipeProvider implements ISubRecipeProvider -{ - @Override - public void addRecipes(Consumer consumer) - { - String basePath = "arc/"; -// ARCRecipeBuilder.arc(Ingredient.fromTag(Tags.Items.GEMS_DIAMOND), Ingredient.fromTag(Tags.Items.BONES), null, new ItemStack(BloodMagicBlocks.BLOOD_ALTAR.get()), null).addRandomOutput(new ItemStack(Items.DIAMOND, 2), 0.5).build(consumer, BloodMagic.rl(basePath + "test1")); -// ARCRecipeBuilder.arc(Ingredient.fromTag(Tags.Items.GEMS_DIAMOND), Ingredient.fromTag(Tags.Items.BONES), null, new ItemStack(BloodMagicBlocks.BLOOD_ALTAR.get()), null).addRandomOutput(new ItemStack(Items.DIAMOND, 5), 0.5).build(consumer, BloodMagic.rl(basePath + "test3")); -// ARCRecipeBuilder.arc(Ingredient.fromTag(Tags.Items.GEMS_DIAMOND), Ingredient.fromItems(Items.ACACIA_BOAT), FluidStackIngredient.from(Fluids.LAVA, 1000), new ItemStack(BloodMagicBlocks.BLOOD_ALTAR.get()), new FluidStack(Fluids.WATER, 100)).build(consumer, BloodMagic.rl(basePath + "test2")); -// ARCRecipeBuilder.arc(Ingredient.fromTag(Tags.Items.NETHERRACK), Ingredient.fromTag(BloodMagicTags.ARC_TOOL_REVERTER), FluidStackIngredient.from(Fluids.LAVA, 1000), new ItemStack(BloodMagicBlocks.BLOOD_ALTAR.get()), new FluidStack(Fluids.WATER, 100)).addRandomOutput(new ItemStack(BloodMagicItems.SLATE.get()), 0.2).addRandomOutput(new ItemStack(BloodMagicItems.REINFORCED_SLATE.get()), 0.1).addRandomOutput(new ItemStack(BloodMagicItems.IMBUED_SLATE.get()), 0.001).build(consumer, BloodMagic.rl(basePath + "test4")); - - ARCRecipeBuilder.arc(Ingredient.fromItems(BloodMagicItems.IMBUED_SLATE.get()), Ingredient.fromTag(BloodMagicTags.ARC_TOOL_REVERTER), null, new ItemStack(BloodMagicItems.WEAK_BLOOD_SHARD.get()), null).addRandomOutput(new ItemStack(BloodMagicItems.WEAK_BLOOD_SHARD.get()), 0.2).build(consumer, BloodMagic.rl(basePath + "weakbloodshard")); - ARCRecipeBuilder.arc(Ingredient.fromItems(Items.IRON_ORE), Ingredient.fromTag(BloodMagicTags.ARC_TOOL_CUTTINGFLUID), null, new ItemStack(BloodMagicItems.IRON_SAND.get(), 2), null).build(consumer, BloodMagic.rl(basePath + "ore/dustiron")); - ARCRecipeBuilder.arc(Ingredient.fromItems(Items.GOLD_ORE), Ingredient.fromTag(BloodMagicTags.ARC_TOOL_CUTTINGFLUID), null, new ItemStack(BloodMagicItems.GOLD_SAND.get(), 2), null).build(consumer, BloodMagic.rl(basePath + "ore/dustgold")); - ARCRecipeBuilder.arc(Ingredient.fromTag(Tags.Items.NETHERRACK), Ingredient.fromTag(BloodMagicTags.ARC_TOOL_EXPLOSIVE), null, new ItemStack(BloodMagicItems.SULFUR.get()), new FluidStack(Fluids.LAVA, 5)).build(consumer, BloodMagic.rl(basePath + "netherrack_to_sulfer")); - ARCRecipeBuilder.arc(Ingredient.fromItems(Items.TERRACOTTA), Ingredient.fromTag(BloodMagicTags.ARC_TOOL_HYDRATE), FluidStackIngredient.from(Fluids.WATER, 200), new ItemStack(Blocks.CLAY), null).build(consumer, BloodMagic.rl(basePath + "clay_from_terracotta")); - ARCRecipeBuilder.arc(Ingredient.fromTag(Tags.Items.SAND), Ingredient.fromTag(BloodMagicTags.ARC_TOOL_HYDRATE), FluidStackIngredient.from(Fluids.WATER, 200), new ItemStack(Items.CLAY_BALL), null).addRandomOutput(new ItemStack(Items.CLAY_BALL), 0.5).build(consumer, BloodMagic.rl(basePath + "clay_from_sand")); - -// ConditionalRecipe.builder().addCondition(new TagEmptyCondition(Tags.Items.ORES_IRON.getName())); - - addReversionRecipes(consumer); - addSandRecipes(consumer); - addFragmentRecipes(consumer); - addGravelRecipes(consumer); - } - - private ICondition getTagCondition(ITag.INamedTag tag) - { - return new NotCondition(new TagEmptyCondition(tag.getName())); - } - - private void addSandRecipes(Consumer consumer) - { - String basePath = "arc/dusts"; - - // Ore to dust - ARCRecipeBuilder.arc(Ingredient.fromTag(Tags.Items.ORES_IRON), Ingredient.fromTag(BloodMagicTags.ARC_TOOL_CUTTINGFLUID), null, new ItemStack(BloodMagicItems.IRON_SAND.get(), 2), null).build(consumer, BloodMagic.rl(basePath + "from_ore_iron")); - ARCRecipeBuilder.arc(Ingredient.fromTag(Tags.Items.ORES_GOLD), Ingredient.fromTag(BloodMagicTags.ARC_TOOL_CUTTINGFLUID), null, new ItemStack(BloodMagicItems.GOLD_SAND.get(), 2), null).build(consumer, BloodMagic.rl(basePath + "from_ore_gold")); - ARCRecipeBuilder.arc(Ingredient.fromTag(Tags.Items.ORES_NETHERITE_SCRAP), Ingredient.fromTag(BloodMagicTags.ARC_TOOL_CUTTINGFLUID), null, new ItemStack(BloodMagicItems.NETHERITE_SCRAP_SAND.get(), 2), null).build(consumer, BloodMagic.rl(basePath + "from_ore_netherite_scrap")); - - // Ingot to dust - ARCRecipeBuilder.arc(Ingredient.fromTag(Tags.Items.INGOTS_IRON), Ingredient.fromTag(BloodMagicTags.ARC_TOOL_EXPLOSIVE), null, new ItemStack(BloodMagicItems.IRON_SAND.get()), null).build(consumer, BloodMagic.rl(basePath + "from_ingot_iron")); - ARCRecipeBuilder.arc(Ingredient.fromTag(Tags.Items.INGOTS_GOLD), Ingredient.fromTag(BloodMagicTags.ARC_TOOL_EXPLOSIVE), null, new ItemStack(BloodMagicItems.GOLD_SAND.get()), null).build(consumer, BloodMagic.rl(basePath + "from_ingot_gold")); - ARCRecipeBuilder.arc(Ingredient.fromItems(Items.NETHERITE_SCRAP), Ingredient.fromTag(BloodMagicTags.ARC_TOOL_EXPLOSIVE), null, new ItemStack(BloodMagicItems.NETHERITE_SCRAP_SAND.get()), null).build(consumer, BloodMagic.rl(basePath + "from_ingot_netherite_scrap")); - - // Gravel to dust - ARCRecipeBuilder.arc(Ingredient.fromTag(BloodMagicTags.GRAVEL_IRON), Ingredient.fromTag(BloodMagicTags.ARC_TOOL_CUTTINGFLUID), null, new ItemStack(BloodMagicItems.IRON_SAND.get()), null).build(consumer, BloodMagic.rl(basePath + "from_gravel_iron")); - ARCRecipeBuilder.arc(Ingredient.fromTag(BloodMagicTags.GRAVEL_GOLD), Ingredient.fromTag(BloodMagicTags.ARC_TOOL_CUTTINGFLUID), null, new ItemStack(BloodMagicItems.GOLD_SAND.get()), null).build(consumer, BloodMagic.rl(basePath + "from_gravel_gold")); - ARCRecipeBuilder.arc(Ingredient.fromTag(BloodMagicTags.GRAVEL_NETHERITE_SCRAP), Ingredient.fromTag(BloodMagicTags.ARC_TOOL_CUTTINGFLUID), null, new ItemStack(BloodMagicItems.NETHERITE_SCRAP_SAND.get()), null).build(consumer, BloodMagic.rl(basePath + "from_gravel_netherite_scrap")); - } - - private void addFragmentRecipes(Consumer consumer) - { - String basePath = "arc/fragments"; - ARCRecipeBuilder.arc(Ingredient.fromTag(Tags.Items.ORES_IRON), Ingredient.fromTag(BloodMagicTags.ARC_TOOL_EXPLOSIVE), null, new ItemStack(BloodMagicItems.IRON_FRAGMENT.get(), 3), null).build(consumer, BloodMagic.rl(basePath + "iron")); - ARCRecipeBuilder.arc(Ingredient.fromTag(Tags.Items.ORES_GOLD), Ingredient.fromTag(BloodMagicTags.ARC_TOOL_EXPLOSIVE), null, new ItemStack(BloodMagicItems.GOLD_FRAGMENT.get(), 3), null).build(consumer, BloodMagic.rl(basePath + "gold")); - ARCRecipeBuilder.arc(Ingredient.fromTag(Tags.Items.ORES_NETHERITE_SCRAP), Ingredient.fromTag(BloodMagicTags.ARC_TOOL_EXPLOSIVE), null, new ItemStack(BloodMagicItems.NETHERITE_SCRAP_FRAGMENT.get(), 3), null).build(consumer, BloodMagic.rl(basePath + "netherite_scrap")); - } - - private void addGravelRecipes(Consumer consumer) - { - String basePath = "arc/gravels"; - ARCRecipeBuilder.arc(Ingredient.fromTag(BloodMagicTags.FRAGMENT_IRON), Ingredient.fromTag(BloodMagicTags.ARC_TOOL_RESONATOR), null, new ItemStack(BloodMagicItems.IRON_GRAVEL.get()), null).addRandomOutput(new ItemStack(BloodMagicItems.CORRUPTED_DUST_TINY.get()), 0.05).addRandomOutput(new ItemStack(BloodMagicItems.CORRUPTED_DUST_TINY.get()), 0.01).build(consumer, BloodMagic.rl(basePath + "iron")); - ARCRecipeBuilder.arc(Ingredient.fromTag(BloodMagicTags.FRAGMENT_GOLD), Ingredient.fromTag(BloodMagicTags.ARC_TOOL_RESONATOR), null, new ItemStack(BloodMagicItems.GOLD_GRAVEL.get()), null).addRandomOutput(new ItemStack(BloodMagicItems.CORRUPTED_DUST_TINY.get()), 0.05).addRandomOutput(new ItemStack(BloodMagicItems.CORRUPTED_DUST_TINY.get()), 0.01).build(consumer, BloodMagic.rl(basePath + "gold")); - ARCRecipeBuilder.arc(Ingredient.fromTag(BloodMagicTags.FRAGMENT_NETHERITE_SCRAP), Ingredient.fromTag(BloodMagicTags.ARC_TOOL_RESONATOR), null, new ItemStack(BloodMagicItems.NETHERITE_SCRAP_GRAVEL.get()), null).addRandomOutput(new ItemStack(BloodMagicItems.CORRUPTED_DUST_TINY.get()), 0.05).addRandomOutput(new ItemStack(BloodMagicItems.CORRUPTED_DUST_TINY.get()), 0.01).build(consumer, BloodMagic.rl(basePath + "netherite_scrap")); - } - - private void addReversionRecipes(Consumer consumer) - { - String basePath = "arc/reversion/"; - // ONE - registerReversionRecipe(Ingredient.fromItems(BloodMagicItems.WEAK_BLOOD_ORB.get()), new ItemStack(Items.DIAMOND), consumer, basePath + "weak_blood_orb"); - - // TWO - registerReversionRecipe(Ingredient.fromItems(BloodMagicItems.APPRENTICE_BLOOD_ORB.get()), new ItemStack(Blocks.REDSTONE_BLOCK), consumer, basePath + "apprentice_blood_orb"); - - // THREE - registerReversionRecipe(Ingredient.fromItems(BloodMagicItems.MAGICIAN_BLOOD_ORB.get()), new ItemStack(Blocks.GOLD_BLOCK), consumer, basePath + "magician_blood_orb"); - - // FOUR - registerReversionRecipe(Ingredient.fromItems(BloodMagicItems.MASTER_BLOOD_ORB.get()), new ItemStack(BloodMagicItems.WEAK_BLOOD_SHARD.get()), consumer, basePath + "master_blood_orb"); - } - - private void registerReversionRecipe(Ingredient input, ItemStack outputStack, Consumer consumer, String path) - { - ARCRecipeBuilder.arcConsume(input, Ingredient.fromTag(BloodMagicTags.ARC_TOOL_REVERTER), null, outputStack, null).build(consumer, BloodMagic.rl(path)); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/AlchemyArrayRecipeProvider.java b/src/main/java/wayoftime/bloodmagic/common/recipe/AlchemyArrayRecipeProvider.java deleted file mode 100644 index 6350126d..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/AlchemyArrayRecipeProvider.java +++ /dev/null @@ -1,58 +0,0 @@ -package wayoftime.bloodmagic.common.recipe; - -import java.util.function.Consumer; - -import net.minecraft.data.IFinishedRecipe; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import net.minecraft.item.crafting.Ingredient; -import net.minecraftforge.common.Tags; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.common.data.recipe.builder.AlchemyArrayRecipeBuilder; -import wayoftime.bloodmagic.common.item.BloodMagicItems; -import wayoftime.bloodmagic.core.registry.AlchemyArrayRegistry; - -public class AlchemyArrayRecipeProvider implements ISubRecipeProvider -{ - - @Override - public void addRecipes(Consumer consumer) - { - String basePath = "array/"; -// AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/airsigil.png"), Ingredient.fromItems(Items.STONE), Ingredient.fromItems(Items.STONE), new ItemStack(Items.DIAMOND)).build(consumer, BloodMagic.rl(basePath -// + "airsigil")); - AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/divinationsigil.png"), Ingredient.fromItems(Items.REDSTONE), Ingredient.fromItems(BloodMagicItems.SLATE.get()), new ItemStack(BloodMagicItems.DIVINATION_SIGIL.get())).build(consumer, BloodMagic.rl(basePath + "divinationsigil")); - AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/watersigil.png"), Ingredient.fromItems(BloodMagicItems.REAGENT_WATER.get()), Ingredient.fromItems(BloodMagicItems.SLATE.get()), new ItemStack(BloodMagicItems.WATER_SIGIL.get())).build(consumer, BloodMagic.rl(basePath + "watersigil")); - AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/lavasigil.png"), Ingredient.fromItems(BloodMagicItems.REAGENT_LAVA.get()), Ingredient.fromItems(BloodMagicItems.SLATE.get()), new ItemStack(BloodMagicItems.LAVA_SIGIL.get())).build(consumer, BloodMagic.rl(basePath + "lavasigil")); - AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/voidsigil.png"), Ingredient.fromItems(BloodMagicItems.REAGENT_VOID.get()), Ingredient.fromItems(BloodMagicItems.REINFORCED_SLATE.get()), new ItemStack(BloodMagicItems.VOID_SIGIL.get())).build(consumer, BloodMagic.rl(basePath + "voidsigil")); - AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/growthsigil.png"), Ingredient.fromItems(BloodMagicItems.REAGENT_GROWTH.get()), Ingredient.fromItems(BloodMagicItems.REINFORCED_SLATE.get()), new ItemStack(BloodMagicItems.GREEN_GROVE_SIGIL.get())).build(consumer, BloodMagic.rl(basePath + "growthsigil")); - AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/fastminersigil.png"), Ingredient.fromItems(BloodMagicItems.REAGENT_FAST_MINER.get()), Ingredient.fromItems(BloodMagicItems.REINFORCED_SLATE.get()), new ItemStack(BloodMagicItems.FAST_MINER_SIGIL.get())).build(consumer, BloodMagic.rl(basePath + "fastminersigil")); - AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/magnetismsigil.png"), Ingredient.fromItems(BloodMagicItems.REAGENT_MAGNETISM.get()), Ingredient.fromItems(BloodMagicItems.IMBUED_SLATE.get()), new ItemStack(BloodMagicItems.MAGNETISM_SIGIL.get())).build(consumer, BloodMagic.rl(basePath + "magnetismsigil")); - AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/lightsigil.png"), Ingredient.fromItems(BloodMagicItems.REAGENT_BLOOD_LIGHT.get()), Ingredient.fromItems(BloodMagicItems.IMBUED_SLATE.get()), new ItemStack(BloodMagicItems.BLOOD_LIGHT_SIGIL.get())).build(consumer, BloodMagic.rl(basePath + "bloodlightsigil")); - AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/airsigil.png"), Ingredient.fromItems(BloodMagicItems.REAGENT_AIR.get()), Ingredient.fromItems(BloodMagicItems.REINFORCED_SLATE.get()), new ItemStack(BloodMagicItems.AIR_SIGIL.get())).build(consumer, BloodMagic.rl(basePath + "airsigil")); - AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/sightsigil.png"), Ingredient.fromItems(BloodMagicItems.REAGENT_SIGHT.get()), Ingredient.fromItems(BloodMagicItems.REINFORCED_SLATE.get()), new ItemStack(BloodMagicItems.SEER_SIGIL.get())).build(consumer, BloodMagic.rl(basePath + "seersigil")); - AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/sightsigil.png"), Ingredient.fromItems(BloodMagicItems.REAGENT_HOLDING.get()), Ingredient.fromItems(BloodMagicItems.IMBUED_SLATE.get()), new ItemStack(BloodMagicItems.HOLDING_SIGIL.get())).build(consumer, BloodMagic.rl(basePath + "holdingsigil")); - AlchemyArrayRecipeBuilder.array(AlchemyArrayRegistry.BINDING_ARRAY, Ingredient.fromItems(BloodMagicItems.REAGENT_BINDING.get()), Ingredient.fromItems(Items.IRON_HELMET), new ItemStack(BloodMagicItems.LIVING_HELMET.get())).build(consumer, BloodMagic.rl(basePath + "living_helmet")); - AlchemyArrayRecipeBuilder.array(AlchemyArrayRegistry.BINDING_ARRAY, Ingredient.fromItems(BloodMagicItems.REAGENT_BINDING.get()), Ingredient.fromItems(Items.IRON_CHESTPLATE), new ItemStack(BloodMagicItems.LIVING_PLATE.get())).build(consumer, BloodMagic.rl(basePath + "living_plate")); - AlchemyArrayRecipeBuilder.array(AlchemyArrayRegistry.BINDING_ARRAY, Ingredient.fromItems(BloodMagicItems.REAGENT_BINDING.get()), Ingredient.fromItems(Items.IRON_LEGGINGS), new ItemStack(BloodMagicItems.LIVING_LEGGINGS.get())).build(consumer, BloodMagic.rl(basePath + "living_leggings")); - AlchemyArrayRecipeBuilder.array(AlchemyArrayRegistry.BINDING_ARRAY, Ingredient.fromItems(BloodMagicItems.REAGENT_BINDING.get()), Ingredient.fromItems(Items.IRON_BOOTS), new ItemStack(BloodMagicItems.LIVING_BOOTS.get())).build(consumer, BloodMagic.rl(basePath + "living_boots")); - - AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/movementarray.png"), Ingredient.fromItems(Items.FEATHER), Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE), ItemStack.EMPTY).build(consumer, BloodMagic.rl(basePath + "movement")); - AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/updraftarray.png"), Ingredient.fromItems(Items.FEATHER), Ingredient.fromTag(Tags.Items.DUSTS_GLOWSTONE), ItemStack.EMPTY).build(consumer, BloodMagic.rl(basePath + "updraft")); - AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/spikearray.png"), Ingredient.fromItems(Items.COBBLESTONE), Ingredient.fromTag(Tags.Items.INGOTS_IRON), ItemStack.EMPTY).build(consumer, BloodMagic.rl(basePath + "spike")); - AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/sunarray.png"), Ingredient.fromItems(Items.COAL), Ingredient.fromItems(Items.COAL), ItemStack.EMPTY).build(consumer, BloodMagic.rl(basePath + "day")); - AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/moonarray.png"), Ingredient.fromItems(Items.LAPIS_LAZULI), Ingredient.fromItems(Items.LAPIS_LAZULI), ItemStack.EMPTY).build(consumer, BloodMagic.rl(basePath + "night")); - AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/growthsigil.png"), Ingredient.fromTag(Tags.Items.BONES), Ingredient.fromTag(Tags.Items.BONES), ItemStack.EMPTY).build(consumer, BloodMagic.rl(basePath + "grove")); - AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/bouncearray.png"), Ingredient.fromTag(Tags.Items.SLIMEBALLS), Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE), ItemStack.EMPTY).build(consumer, BloodMagic.rl(basePath + "bounce")); - // AlchemyArrayRecipeBuilder.array(BloodMagic.rl("textures/models/alchemyarrays/fastminersigil.png"), - // Ingredient.fromItems(BloodMagicItems.REAGENT_FAST_MINER.get()), - // Ingredient.fromItems(BloodMagicItems.REINFORCED_SLATE.get()), new - // ItemStack(BloodMagicItems.FAST_MINER_SIGIL.get())).build(consumer, - // BloodMagic.rl(basePath + "frostsigil")); -// BloodAltarRecipeBuilder.altar(Ingredient.fromTag(Tags.Items.GEMS_DIAMOND), new ItemStack(BloodMagicItems.WEAK_BLOOD_ORB.get()), AltarTier.ONE.ordinal(), 2000, 2, 1).build(consumer, new ResourceLocation(BloodMagic.MODID, basePath -// + "weakbloodorb")); -// BloodAltarRecipeBuilder.altar(Ingredient.fromTag(Tags.Items.STONE), new ItemStack(BloodMagicItems.SLATE.get()), AltarTier.ONE.ordinal(), 1000, 5, 5).build(consumer, new ResourceLocation(BloodMagic.MODID, basePath -// + "slate")); - - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/AlchemyTableRecipeProvider.java b/src/main/java/wayoftime/bloodmagic/common/recipe/AlchemyTableRecipeProvider.java deleted file mode 100644 index 233e2b07..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/AlchemyTableRecipeProvider.java +++ /dev/null @@ -1,76 +0,0 @@ -package wayoftime.bloodmagic.common.recipe; - -import java.util.function.Consumer; - -import net.minecraft.block.Blocks; -import net.minecraft.data.IFinishedRecipe; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.tags.ItemTags; -import net.minecraftforge.common.Tags; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.common.data.recipe.builder.AlchemyTableRecipeBuilder; -import wayoftime.bloodmagic.common.item.BloodMagicItems; -import wayoftime.bloodmagic.common.tags.BloodMagicTags; - -public class AlchemyTableRecipeProvider implements ISubRecipeProvider -{ - @Override - public void addRecipes(Consumer consumer) - { - String basePath = "alchemytable/"; - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(Items.STRING, 4), 100, 100, 0).addIngredient(Ingredient.fromTag(ItemTags.WOOL)).addIngredient(Ingredient.fromItems(Items.FLINT)).build(consumer, BloodMagic.rl(basePath + "string")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(Items.FLINT, 2), 50, 20, 0).addIngredient(Ingredient.fromItems(Items.GRAVEL)).addIngredient(Ingredient.fromItems(Items.FLINT)).build(consumer, BloodMagic.rl(basePath + "flint_from_gravel")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(Items.LEATHER, 4), 100, 200, 1).addIngredient(Ingredient.fromItems(Items.ROTTEN_FLESH)).addIngredient(Ingredient.fromItems(Items.ROTTEN_FLESH)).addIngredient(Ingredient.fromItems(Items.ROTTEN_FLESH)).addIngredient(Ingredient.fromItems(Items.ROTTEN_FLESH)).addIngredient(Ingredient.fromItems(Items.FLINT)).addIngredient(Ingredient.fromItems(Items.WATER_BUCKET)).build(consumer, BloodMagic.rl(basePath + "leather_from_flesh")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.EXPLOSIVE_POWDER.get()), 500, 200, 1).addIngredient(Ingredient.fromTag(Tags.Items.GUNPOWDER)).addIngredient(Ingredient.fromTag(Tags.Items.GUNPOWDER)).addIngredient(Ingredient.fromTag(BloodMagicTags.DUST_COAL)).build(consumer, BloodMagic.rl(basePath + "explosive_powder")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(Items.BREAD), 100, 100, 1).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_WHEAT)).addIngredient(Ingredient.fromItems(Items.SUGAR)).build(consumer, BloodMagic.rl(basePath + "bread")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(Blocks.GRASS_BLOCK), 200, 200, 1).addIngredient(Ingredient.fromItems(Items.DIRT)).addIngredient(Ingredient.fromItems(Items.BONE_MEAL)).addIngredient(Ingredient.fromItems(Items.WHEAT_SEEDS)).build(consumer, BloodMagic.rl(basePath + "grass_block")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(Items.CLAY_BALL, 2), 50, 100, 2).addIngredient(Ingredient.fromTag(Tags.Items.SAND)).addIngredient(Ingredient.fromTag(Tags.Items.SAND)).addIngredient(Ingredient.fromItems(Items.WATER_BUCKET)).build(consumer, BloodMagic.rl(basePath + "clay_from_sand")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(Items.COBWEB), 50, 50, 1).addIngredient(Ingredient.fromTag(Tags.Items.STRING)).addIngredient(Ingredient.fromTag(Tags.Items.STRING)).addIngredient(Ingredient.fromTag(Tags.Items.STRING)).build(consumer, BloodMagic.rl(basePath + "cobweb")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(Items.NETHER_WART), 50, 40, 1).addIngredient(Ingredient.fromItems(Items.NETHER_WART_BLOCK)).build(consumer, BloodMagic.rl(basePath + "nether_wart_from_block")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(Items.GOLD_NUGGET, 9), 200, 100, 2).addIngredient(Ingredient.fromItems(Items.GILDED_BLACKSTONE)).build(consumer, BloodMagic.rl(basePath + "gold_ore_from_gilded")); - - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(Items.GUNPOWDER, 3), 0, 100, 0).addIngredient(Ingredient.fromTag(BloodMagicTags.DUST_SULFUR)).addIngredient(Ingredient.fromTag(BloodMagicTags.DUST_SALTPETER)).addIngredient(Ingredient.fromTag(ItemTags.COALS)).build(consumer, BloodMagic.rl(basePath + "gunpowder")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.PLANT_OIL.get()), 100, 100, 1).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_CARROT)).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_CARROT)).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_CARROT)).addIngredient(Ingredient.fromItems(Items.BONE_MEAL)).build(consumer, BloodMagic.rl(basePath + "plantoil_from_carrots")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.PLANT_OIL.get()), 100, 100, 1).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_POTATO)).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_POTATO)).addIngredient(Ingredient.fromItems(Items.BONE_MEAL)).build(consumer, BloodMagic.rl(basePath + "plantoil_from_taters")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.PLANT_OIL.get()), 100, 100, 1).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_WHEAT)).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_WHEAT)).addIngredient(Ingredient.fromItems(Items.BONE_MEAL)).build(consumer, BloodMagic.rl(basePath + "plantoil_from_wheat")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.PLANT_OIL.get()), 100, 100, 1).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_BEETROOT)).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_BEETROOT)).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_BEETROOT)).addIngredient(Ingredient.fromItems(Items.BONE_MEAL)).build(consumer, BloodMagic.rl(basePath + "plantoil_from_beets")); - - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.IRON_SAND.get(), 2), 400, 200, 1).addIngredient(Ingredient.fromTag(Tags.Items.ORES_IRON)).addIngredient(Ingredient.fromTag(BloodMagicTags.ARC_TOOL_CUTTINGFLUID)).build(consumer, BloodMagic.rl(basePath + "sand_iron")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.GOLD_SAND.get(), 2), 400, 200, 1).addIngredient(Ingredient.fromTag(Tags.Items.ORES_GOLD)).addIngredient(Ingredient.fromTag(BloodMagicTags.ARC_TOOL_CUTTINGFLUID)).build(consumer, BloodMagic.rl(basePath + "sand_gold")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.COAL_SAND.get(), 4), 400, 200, 1).addIngredient(Ingredient.fromItems(Items.COAL)).addIngredient(Ingredient.fromItems(Items.COAL)).addIngredient(Ingredient.fromItems(Items.FLINT)).build(consumer, BloodMagic.rl(basePath + "sand_coal")); - - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.BASIC_CUTTING_FLUID.get()), 1000, 200, 1).addIngredient(Ingredient.fromItems(BloodMagicItems.PLANT_OIL.get())).addIngredient(Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE)).addIngredient(Ingredient.fromTag(Tags.Items.GUNPOWDER)).addIngredient(Ingredient.fromItems(Items.SUGAR)).addIngredient(Ingredient.fromTag(BloodMagicTags.DUST_COAL)).addIngredient(Ingredient.fromStacks(new ItemStack(Items.POTION))).build(consumer, BloodMagic.rl(basePath + "basic_cutting_fluid")); - - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.SLATE_VIAL.get(), 8), 500, 200, 1).addIngredient(Ingredient.fromItems(BloodMagicItems.SLATE.get())).addIngredient(Ingredient.fromTag(Tags.Items.GLASS)).addIngredient(Ingredient.fromTag(Tags.Items.GLASS)).addIngredient(Ingredient.fromTag(Tags.Items.GLASS)).addIngredient(Ingredient.fromTag(Tags.Items.GLASS)).addIngredient(Ingredient.fromTag(Tags.Items.GLASS)).build(consumer, BloodMagic.rl(basePath + "slate_vial")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.FORTUNE_ANOINTMENT.get()), 500, 100, 1).addIngredient(Ingredient.fromItems(BloodMagicItems.SLATE_VIAL.get())).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_NETHER_WART)).addIngredient(Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE)).addIngredient(Ingredient.fromTag(BloodMagicTags.DUST_COAL)).build(consumer, BloodMagic.rl(basePath + "fortune_anointment")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.SILK_TOUCH_ANOINTMENT.get()), 500, 100, 1).addIngredient(Ingredient.fromItems(BloodMagicItems.SLATE_VIAL.get())).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_NETHER_WART)).addIngredient(Ingredient.fromItems(Items.COBWEB)).addIngredient(Ingredient.fromTag(Tags.Items.NUGGETS_GOLD)).build(consumer, BloodMagic.rl(basePath + "silk_touch_anointment")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.MELEE_DAMAGE_ANOINTMENT.get()), 500, 100, 1).addIngredient(Ingredient.fromItems(BloodMagicItems.SLATE_VIAL.get())).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_NETHER_WART)).addIngredient(Ingredient.fromItems(Items.BLAZE_POWDER)).addIngredient(Ingredient.fromTag(Tags.Items.GEMS_QUARTZ)).build(consumer, BloodMagic.rl(basePath + "melee_damage_anointment")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.HOLY_WATER_ANOINTMENT.get()), 500, 100, 1).addIngredient(Ingredient.fromItems(BloodMagicItems.SLATE_VIAL.get())).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_NETHER_WART)).addIngredient(Ingredient.fromItems(Items.GLISTERING_MELON_SLICE)).addIngredient(Ingredient.fromTag(Tags.Items.GEMS_QUARTZ)).build(consumer, BloodMagic.rl(basePath + "holy_water_anointment")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.HIDDEN_KNOWLEDGE_ANOINTMENT.get()), 500, 100, 1).addIngredient(Ingredient.fromItems(BloodMagicItems.SLATE_VIAL.get())).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_NETHER_WART)).addIngredient(Ingredient.fromItems(Items.GLASS_BOTTLE)).addIngredient(Ingredient.fromItems(Items.ENCHANTED_BOOK)).build(consumer, BloodMagic.rl(basePath + "hidden_knowledge_anointment")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.QUICK_DRAW_ANOINTMENT.get()), 500, 100, 1).addIngredient(Ingredient.fromItems(BloodMagicItems.SLATE_VIAL.get())).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_NETHER_WART)).addIngredient(Ingredient.fromTag(Tags.Items.STRING)).addIngredient(Ingredient.fromItems(Items.SPECTRAL_ARROW)).build(consumer, BloodMagic.rl(basePath + "quick_draw_anointment")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.LOOTING_ANOINTMENT.get()), 500, 100, 1).addIngredient(Ingredient.fromItems(BloodMagicItems.SLATE_VIAL.get())).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_NETHER_WART)).addIngredient(Ingredient.fromTag(Tags.Items.GEMS_LAPIS)).addIngredient(Ingredient.fromTag(Tags.Items.BONES)).build(consumer, BloodMagic.rl(basePath + "looting_anointment")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.BOW_POWER_ANOINTMENT.get()), 500, 100, 1).addIngredient(Ingredient.fromItems(BloodMagicItems.SLATE_VIAL.get())).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_NETHER_WART)).addIngredient(Ingredient.fromTag(Tags.Items.INGOTS_IRON)).addIngredient(Ingredient.fromItems(Items.BOW)).build(consumer, BloodMagic.rl(basePath + "bow_power_anointment")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.SMELTING_ANOINTMENT.get()), 500, 100, 1).addIngredient(Ingredient.fromItems(BloodMagicItems.SLATE_VIAL.get())).addIngredient(Ingredient.fromTag(Tags.Items.CROPS_NETHER_WART)).addIngredient(Ingredient.fromItems(Items.FURNACE)).addIngredient(Ingredient.fromItems(Items.CHARCOAL, Items.COAL)).build(consumer, BloodMagic.rl(basePath + "smelting_anointment")); - - // Changed Recipes - { - - } - { - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.ARCANE_ASHES.get()), 500, 200, 1).addIngredient(Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE)).addIngredient(Ingredient.fromTag(Tags.Items.DYES_WHITE)).addIngredient(Ingredient.fromTag(Tags.Items.GUNPOWDER)).addIngredient(Ingredient.fromTag(ItemTags.COALS)).build(consumer, BloodMagic.rl(basePath + "arcane_ash")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.REAGENT_AIR.get()), 2000, 200, 2).addIngredient(Ingredient.fromItems(Items.GHAST_TEAR)).addIngredient(Ingredient.fromTag(Tags.Items.FEATHERS)).addIngredient(Ingredient.fromTag(Tags.Items.FEATHERS)).build(consumer, BloodMagic.rl(basePath + "reagent_air")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.REAGENT_WATER.get()), 300, 200, 1).addIngredient(Ingredient.fromItems(Items.SUGAR)).addIngredient(Ingredient.fromItems(Items.WATER_BUCKET)).addIngredient(Ingredient.fromItems(Items.WATER_BUCKET)).build(consumer, BloodMagic.rl(basePath + "reagent_water")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.REAGENT_LAVA.get()), 1000, 200, 1).addIngredient(Ingredient.fromItems(Items.LAVA_BUCKET)).addIngredient(Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE)).addIngredient(Ingredient.fromTag(Tags.Items.COBBLESTONE)).addIngredient(Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_COAL)).build(consumer, BloodMagic.rl(basePath + "reagent_lava")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.REAGENT_VOID.get()), 1000, 200, 2).addIngredient(Ingredient.fromItems(Items.BUCKET)).addIngredient(Ingredient.fromTag(Tags.Items.STRING)).addIngredient(Ingredient.fromTag(Tags.Items.STRING)).addIngredient(Ingredient.fromTag(Tags.Items.GUNPOWDER)).build(consumer, BloodMagic.rl(basePath + "reagent_void")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.REAGENT_GROWTH.get()), 2000, 200, 2).addIngredient(Ingredient.fromTag(ItemTags.SAPLINGS)).addIngredient(Ingredient.fromTag(ItemTags.SAPLINGS)).addIngredient(Ingredient.fromItems(Items.SUGAR_CANE)).addIngredient(Ingredient.fromItems(Items.SUGAR)).build(consumer, BloodMagic.rl(basePath + "reagent_growth")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.REAGENT_MAGNETISM.get()), 1000, 200, 3).addIngredient(Ingredient.fromTag(Tags.Items.STRING)).addIngredient(Ingredient.fromTag(Tags.Items.INGOTS_GOLD)).addIngredient(Ingredient.fromTag(Tags.Items.INGOTS_GOLD)).addIngredient(Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_IRON)).build(consumer, BloodMagic.rl(basePath + "reagent_magnetism")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.REAGENT_FAST_MINER.get()), 2000, 200, 2).addIngredient(Ingredient.fromItems(Items.IRON_PICKAXE)).addIngredient(Ingredient.fromItems(Items.IRON_AXE)).addIngredient(Ingredient.fromItems(Items.IRON_SHOVEL)).addIngredient(Ingredient.fromTag(Tags.Items.GUNPOWDER)).build(consumer, BloodMagic.rl(basePath + "reagent_fastminer")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.REAGENT_BLOOD_LIGHT.get()), 1000, 200, 3).addIngredient(Ingredient.fromTag(Tags.Items.DUSTS_GLOWSTONE)).addIngredient(Ingredient.fromItems(Items.TORCH)).addIngredient(Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE)).addIngredient(Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE)).build(consumer, BloodMagic.rl(basePath + "reagent_blood_light")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.REAGENT_SIGHT.get()), 500, 200, 1).addIngredient(Ingredient.fromTag(Tags.Items.DUSTS_GLOWSTONE)).addIngredient(Ingredient.fromTag(Tags.Items.GLASS)).addIngredient(Ingredient.fromTag(Tags.Items.GLASS)).addIngredient(Ingredient.fromItems(BloodMagicItems.DIVINATION_SIGIL.get())).build(consumer, BloodMagic.rl(basePath + "reagent_sight")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.REAGENT_BINDING.get()), 1000, 200, 3).addIngredient(Ingredient.fromTag(Tags.Items.DUSTS_GLOWSTONE)).addIngredient(Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE)).addIngredient(Ingredient.fromTag(Tags.Items.GUNPOWDER)).addIngredient(Ingredient.fromTag(Tags.Items.NUGGETS_GOLD)).build(consumer, BloodMagic.rl(basePath + "reagent_binding")); - AlchemyTableRecipeBuilder.alchemyTable(new ItemStack(BloodMagicItems.REAGENT_HOLDING.get()), 2000, 200, 2).addIngredient(Ingredient.fromTag(Tags.Items.CHESTS)).addIngredient(Ingredient.fromTag(Tags.Items.LEATHER)).addIngredient(Ingredient.fromTag(Tags.Items.STRING)).addIngredient(Ingredient.fromTag(Tags.Items.STRING)).build(consumer, BloodMagic.rl(basePath + "reagent_holding")); - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/BloodAltarRecipeProvider.java b/src/main/java/wayoftime/bloodmagic/common/recipe/BloodAltarRecipeProvider.java deleted file mode 100644 index 39f6f15a..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/BloodAltarRecipeProvider.java +++ /dev/null @@ -1,69 +0,0 @@ -package wayoftime.bloodmagic.common.recipe; - -import java.util.function.Consumer; - -import net.minecraft.data.IFinishedRecipe; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.Tags; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.altar.AltarTier; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.common.data.recipe.builder.BloodAltarRecipeBuilder; -import wayoftime.bloodmagic.common.item.BloodMagicItems; - -public class BloodAltarRecipeProvider implements ISubRecipeProvider -{ - - @Override - public void addRecipes(Consumer consumer) - { - String basePath = "altar/"; - - // ONE - BloodAltarRecipeBuilder.altar(Ingredient.fromTag(Tags.Items.GEMS_DIAMOND), new ItemStack(BloodMagicItems.WEAK_BLOOD_ORB.get()), AltarTier.ONE.ordinal(), 2000, 5, 1).build(consumer, new ResourceLocation(BloodMagic.MODID, basePath + "weakbloodorb")); - BloodAltarRecipeBuilder.altar(Ingredient.fromTag(Tags.Items.STONE), new ItemStack(BloodMagicItems.SLATE.get()), AltarTier.ONE.ordinal(), 1000, 5, 5).build(consumer, new ResourceLocation(BloodMagic.MODID, basePath + "slate")); - BloodAltarRecipeBuilder.altar(Ingredient.fromItems(Items.BUCKET), new ItemStack(BloodMagicBlocks.LIFE_ESSENCE_BUCKET.get()), AltarTier.ONE.ordinal(), 1000, 5, 0).build(consumer, BloodMagic.rl(basePath + "bucket_life")); - - // TWO - BloodAltarRecipeBuilder.altar(Ingredient.fromItems(BloodMagicItems.SLATE.get()), new ItemStack(BloodMagicItems.REINFORCED_SLATE.get()), AltarTier.TWO.ordinal(), 2000, 5, 5).build(consumer, BloodMagic.rl(basePath + "reinforcedslate")); - BloodAltarRecipeBuilder.altar(Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_REDSTONE), new ItemStack(BloodMagicItems.APPRENTICE_BLOOD_ORB.get()), AltarTier.TWO.ordinal(), 5000, 5, 5).build(consumer, BloodMagic.rl(basePath + "apprenticebloodorb")); - BloodAltarRecipeBuilder.altar(Ingredient.fromItems(Items.IRON_SWORD), new ItemStack(BloodMagicItems.DAGGER_OF_SACRIFICE.get()), AltarTier.TWO.ordinal(), 3000, 5, 5).build(consumer, BloodMagic.rl(basePath + "daggerofsacrifice")); - - // THREE - BloodAltarRecipeBuilder.altar(Ingredient.fromItems(BloodMagicItems.REINFORCED_SLATE.get()), new ItemStack(BloodMagicItems.IMBUED_SLATE.get()), AltarTier.THREE.ordinal(), 5000, 15, 10).build(consumer, BloodMagic.rl(basePath + "imbuedslate")); - BloodAltarRecipeBuilder.altar(Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_GOLD), new ItemStack(BloodMagicItems.MAGICIAN_BLOOD_ORB.get()), AltarTier.THREE.ordinal(), 25000, 20, 20).build(consumer, BloodMagic.rl(basePath + "magicianbloodorb")); - BloodAltarRecipeBuilder.altar(Ingredient.fromTag(Tags.Items.OBSIDIAN), new ItemStack(BloodMagicItems.EARTH_INSCRIPTION_TOOL.get()), AltarTier.THREE.ordinal(), 1000, 5, 5).build(consumer, BloodMagic.rl(basePath + "earth_tool")); - BloodAltarRecipeBuilder.altar(Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_LAPIS), new ItemStack(BloodMagicItems.WATER_INSCRIPTION_TOOL.get()), AltarTier.THREE.ordinal(), 1000, 5, 5).build(consumer, BloodMagic.rl(basePath + "water_tool")); - BloodAltarRecipeBuilder.altar(Ingredient.fromItems(Items.MAGMA_CREAM), new ItemStack(BloodMagicItems.FIRE_INSCRIPTION_TOOL.get()), AltarTier.THREE.ordinal(), 1000, 5, 5).build(consumer, BloodMagic.rl(basePath + "fire_tool")); - BloodAltarRecipeBuilder.altar(Ingredient.fromItems(Items.GHAST_TEAR), new ItemStack(BloodMagicItems.AIR_INSCRIPTION_TOOL.get()), AltarTier.THREE.ordinal(), 1000, 5, 5).build(consumer, BloodMagic.rl(basePath + "air_tool")); - BloodAltarRecipeBuilder.altar(Ingredient.fromItems(BloodMagicItems.LAVA_CRYSTAL.get()), new ItemStack(BloodMagicItems.WEAK_ACTIVATION_CRYSTAL.get()), AltarTier.THREE.ordinal(), 10000, 20, 10).build(consumer, BloodMagic.rl("weak_activation_crystal")); - - // FOUR - BloodAltarRecipeBuilder.altar(Ingredient.fromItems(BloodMagicItems.IMBUED_SLATE.get()), new ItemStack(BloodMagicItems.DEMONIC_SLATE.get()), AltarTier.FOUR.ordinal(), 15000, 20, 20).build(consumer, BloodMagic.rl(basePath + "demonicslate")); - BloodAltarRecipeBuilder.altar(Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_COAL), new ItemStack(BloodMagicItems.DUSK_INSCRIPTION_TOOL.get()), AltarTier.FOUR.ordinal(), 2000, 20, 10).build(consumer, BloodMagic.rl(basePath + "dusk_tool")); - BloodAltarRecipeBuilder.altar(Ingredient.fromItems(BloodMagicItems.WEAK_BLOOD_SHARD.get()), new ItemStack(BloodMagicItems.MASTER_BLOOD_ORB.get()), AltarTier.FOUR.ordinal(), 40000, 30, 50).build(consumer, BloodMagic.rl(basePath + "masterbloodorb")); - - // Changed Recipes - { - - } - { - BloodAltarRecipeBuilder.altar(Ingredient.fromTag(Tags.Items.STRING), new ItemStack(BloodMagicItems.SOUL_SNARE.get()), AltarTier.ONE.ordinal(), 500, 5, 1).build(consumer, BloodMagic.rl(basePath + "soul_snare")); - } - -// // FOUR -// registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD)), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER), AltarTier.FOUR.ordinal(), 40000, 30, 50); -// registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.IMBUED.getStack()), ItemSlate.SlateType.DEMONIC.getStack(), AltarTier.FOUR.ordinal(), 15000, 20, 20); -// registrar.addBloodAltar(new OreIngredient("blockCoal"), EnumRuneType.DUSK.getStack(), AltarTier.FOUR.ordinal(), 2000, 20, 10); -// registrar.addBloodAltar(new OreIngredient("enderpearl"), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS), AltarTier.FOUR.ordinal(), 2000, 10, 10); -// registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS)), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS, 1, 1), AltarTier.FOUR.ordinal(), 10000, 20, 10); -// -// // FIVE -// registrar.addBloodAltar(new OreIngredient("netherStar"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_ARCHMAGE), AltarTier.FIVE.ordinal(), 80000, 50, 100); -// registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.DEMONIC.getStack()), ItemSlate.SlateType.ETHEREAL.getStack(), AltarTier.FIVE.ordinal(), 30000, 40, 100); - } - -} diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/BloodMagicRecipeType.java b/src/main/java/wayoftime/bloodmagic/common/recipe/BloodMagicRecipeType.java deleted file mode 100644 index bd699910..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/BloodMagicRecipeType.java +++ /dev/null @@ -1,18 +0,0 @@ -package wayoftime.bloodmagic.common.recipe; - -import net.minecraft.item.crafting.IRecipeType; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.recipe.RecipeARC; -import wayoftime.bloodmagic.recipe.RecipeAlchemyArray; -import wayoftime.bloodmagic.recipe.RecipeAlchemyTable; -import wayoftime.bloodmagic.recipe.RecipeBloodAltar; -import wayoftime.bloodmagic.recipe.RecipeTartaricForge; - -public class BloodMagicRecipeType -{ - public static final IRecipeType ALTAR = IRecipeType.register(BloodMagic.MODID + ":altar"); - public static final IRecipeType ARRAY = IRecipeType.register(BloodMagic.MODID + ":array"); - public static final IRecipeType TARTARICFORGE = IRecipeType.register(BloodMagic.MODID + ":soulforge"); - public static final IRecipeType ARC = IRecipeType.register(BloodMagic.MODID + ":arc"); - public static final IRecipeType ALCHEMYTABLE = IRecipeType.register(BloodMagic.MODID + ":alchemytable"); -} diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/ISubRecipeProvider.java b/src/main/java/wayoftime/bloodmagic/common/recipe/ISubRecipeProvider.java deleted file mode 100644 index d7aa8f7c..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/ISubRecipeProvider.java +++ /dev/null @@ -1,14 +0,0 @@ -package wayoftime.bloodmagic.common.recipe; - -import java.util.function.Consumer; - -import net.minecraft.data.IFinishedRecipe; - -/** - * Interface for helping split the recipe provider over multiple classes to make - * it a bit easier to interact with - */ -public interface ISubRecipeProvider -{ - void addRecipes(Consumer consumer); -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/TartaricForgeRecipeProvider.java b/src/main/java/wayoftime/bloodmagic/common/recipe/TartaricForgeRecipeProvider.java deleted file mode 100644 index aa5fc597..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/TartaricForgeRecipeProvider.java +++ /dev/null @@ -1,119 +0,0 @@ -package wayoftime.bloodmagic.common.recipe; - -import java.util.function.Consumer; - -import net.minecraft.data.IFinishedRecipe; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.tags.ItemTags; -import net.minecraftforge.common.Tags; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.anointment.AnointmentData; -import wayoftime.bloodmagic.anointment.AnointmentHolder; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.common.data.recipe.builder.TartaricForgeRecipeBuilder; -import wayoftime.bloodmagic.common.item.BloodMagicItems; -import wayoftime.bloodmagic.common.tags.BloodMagicTags; -import wayoftime.bloodmagic.core.AnointmentRegistrar; - -public class TartaricForgeRecipeProvider implements ISubRecipeProvider -{ - - @Override - public void addRecipes(Consumer consumer) - { - String basePath = "soulforge/"; - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.PETTY_GEM.get()), 1, 1, Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE), Ingredient.fromTag(Tags.Items.INGOTS_GOLD), Ingredient.fromTag(Tags.Items.GLASS), Ingredient.fromTag(Tags.Items.GEMS_LAPIS)).build(consumer, BloodMagic.rl(basePath + "pettytartaricgem")); - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.LESSER_GEM.get()), 60, 20, Ingredient.fromItems(BloodMagicItems.PETTY_GEM.get()), Ingredient.fromTag(Tags.Items.GEMS_DIAMOND), Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_REDSTONE), Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_LAPIS)).build(consumer, BloodMagic.rl(basePath + "lessertartaricgem")); - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.COMMON_GEM.get()), 240, 50, Ingredient.fromItems(BloodMagicItems.LESSER_GEM.get()), Ingredient.fromTag(Tags.Items.GEMS_DIAMOND), Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_GOLD), Ingredient.fromItems(BloodMagicItems.IMBUED_SLATE.get())).build(consumer, BloodMagic.rl(basePath + "commontartaricgem")); - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.GREATER_GEM.get()), 1000, 100, Ingredient.fromItems(BloodMagicItems.COMMON_GEM.get()), Ingredient.fromItems(BloodMagicItems.DEMONIC_SLATE.get()), Ingredient.fromItems(BloodMagicItems.WEAK_BLOOD_SHARD.get()), Ingredient.fromTag(BloodMagicTags.CRYSTAL_DEMON)).build(consumer, BloodMagic.rl(basePath + "greatertartaricgem")); - - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.SENTIENT_SWORD.get()), 0, 0, Ingredient.fromItems(BloodMagicItems.PETTY_GEM.get()), Ingredient.fromItems(Items.IRON_SWORD)).build(consumer, BloodMagic.rl(basePath + "sentientsword")); - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.SENTIENT_AXE.get()), 0, 0, Ingredient.fromItems(BloodMagicItems.PETTY_GEM.get()), Ingredient.fromItems(Items.IRON_AXE)).build(consumer, BloodMagic.rl(basePath + "sentientaxe")); - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.SENTIENT_PICKAXE.get()), 0, 0, Ingredient.fromItems(BloodMagicItems.PETTY_GEM.get()), Ingredient.fromItems(Items.IRON_PICKAXE)).build(consumer, BloodMagic.rl(basePath + "sentientpickaxe")); - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.SENTIENT_SHOVEL.get()), 0, 0, Ingredient.fromItems(BloodMagicItems.PETTY_GEM.get()), Ingredient.fromItems(Items.IRON_SHOVEL)).build(consumer, BloodMagic.rl(basePath + "sentientshovel")); - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.SENTIENT_SCYTHE.get()), 0, 0, Ingredient.fromItems(BloodMagicItems.PETTY_GEM.get()), Ingredient.fromItems(Items.IRON_HOE)).build(consumer, BloodMagic.rl(basePath + "sentientscythe")); - - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicBlocks.DEMON_CRUCIBLE.get()), 400, 100, Ingredient.fromItems(Items.CAULDRON), Ingredient.fromTag(Tags.Items.STONE), Ingredient.fromTag(Tags.Items.GEMS_LAPIS), Ingredient.fromTag(Tags.Items.GEMS_DIAMOND)).build(consumer, BloodMagic.rl(basePath + "demon_crucible")); - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicBlocks.DEMON_CRYSTALLIZER.get()), 500, 100, Ingredient.fromItems(BloodMagicBlocks.SOUL_FORGE.get()), Ingredient.fromTag(Tags.Items.STONE), Ingredient.fromTag(Tags.Items.GEMS_LAPIS), Ingredient.fromTag(Tags.Items.GLASS)).build(consumer, BloodMagic.rl(basePath + "demon_crystallizer")); - - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.SANGUINE_REVERTER.get()), 350, 30, Ingredient.fromItems(Items.SHEARS), Ingredient.fromTag(Tags.Items.STONE), Ingredient.fromItems(BloodMagicItems.IMBUED_SLATE.get()), Ingredient.fromTag(Tags.Items.INGOTS_IRON)).build(consumer, BloodMagic.rl(basePath + "sanguine_reverter")); - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.PRIMITIVE_CRYSTALLINE_RESONATOR.get()), 1200, 200, Ingredient.fromTag(Tags.Items.STONE), Ingredient.fromTag(Tags.Items.INGOTS), Ingredient.fromItems(BloodMagicItems.RAW_CRYSTAL.get()), Ingredient.fromItems(BloodMagicItems.RAW_CRYSTAL.get())).build(consumer, BloodMagic.rl(basePath + "primitive_crystalline_resonator")); - - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicBlocks.RAW_CRYSTAL_BLOCK.get()), 1200, 100, Ingredient.fromItems(BloodMagicItems.RAW_CRYSTAL.get()), Ingredient.fromItems(BloodMagicItems.RAW_CRYSTAL.get()), Ingredient.fromItems(BloodMagicItems.RAW_CRYSTAL.get()), Ingredient.fromItems(BloodMagicItems.RAW_CRYSTAL.get())).build(consumer, BloodMagic.rl(basePath + "raw_crystal_block")); - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicBlocks.CORROSIVE_CRYSTAL_BLOCK.get()), 1200, 100, Ingredient.fromItems(BloodMagicItems.CORROSIVE_CRYSTAL.get()), Ingredient.fromItems(BloodMagicItems.CORROSIVE_CRYSTAL.get()), Ingredient.fromItems(BloodMagicItems.CORROSIVE_CRYSTAL.get()), Ingredient.fromItems(BloodMagicItems.CORROSIVE_CRYSTAL.get())).build(consumer, BloodMagic.rl(basePath + "corrosive_crystal_block")); - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicBlocks.DESTRUCTIVE_CRYSTAL_BLOCK.get()), 1200, 100, Ingredient.fromItems(BloodMagicItems.DESTRUCTIVE_CRYSTAL.get()), Ingredient.fromItems(BloodMagicItems.DESTRUCTIVE_CRYSTAL.get()), Ingredient.fromItems(BloodMagicItems.DESTRUCTIVE_CRYSTAL.get()), Ingredient.fromItems(BloodMagicItems.DESTRUCTIVE_CRYSTAL.get())).build(consumer, BloodMagic.rl(basePath + "destructive_crystal_block")); - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicBlocks.VENGEFUL_CRYSTAL_BLOCK.get()), 1200, 100, Ingredient.fromItems(BloodMagicItems.VENGEFUL_CRYSTAL.get()), Ingredient.fromItems(BloodMagicItems.VENGEFUL_CRYSTAL.get()), Ingredient.fromItems(BloodMagicItems.VENGEFUL_CRYSTAL.get()), Ingredient.fromItems(BloodMagicItems.VENGEFUL_CRYSTAL.get())).build(consumer, BloodMagic.rl(basePath + "vengeful_crystal_block")); - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicBlocks.STEADFAST_CRYSTAL_BLOCK.get()), 1200, 100, Ingredient.fromItems(BloodMagicItems.STEADFAST_CRYSTAL.get()), Ingredient.fromItems(BloodMagicItems.STEADFAST_CRYSTAL.get()), Ingredient.fromItems(BloodMagicItems.STEADFAST_CRYSTAL.get()), Ingredient.fromItems(BloodMagicItems.STEADFAST_CRYSTAL.get())).build(consumer, BloodMagic.rl(basePath + "steadfast_crystal_block")); - - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicBlocks.SHAPED_CHARGE.get(), 8), 10, 0.5, Ingredient.fromTag(Tags.Items.COBBLESTONE), Ingredient.fromItems(Items.CHARCOAL), Ingredient.fromTag(Tags.Items.SAND), Ingredient.fromTag(Tags.Items.STONE)).build(consumer, BloodMagic.rl(basePath + "shaped_charge")); - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicBlocks.DEFORESTER_CHARGE.get(), 8), 10, 0.5, Ingredient.fromTag(Tags.Items.COBBLESTONE), Ingredient.fromItems(Items.CHARCOAL), Ingredient.fromTag(ItemTags.LOGS), Ingredient.fromTag(ItemTags.PLANKS)).build(consumer, BloodMagic.rl(basePath + "deforester_charge")); - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicBlocks.VEINMINE_CHARGE.get(), 8), 10, 0.5, Ingredient.fromTag(Tags.Items.COBBLESTONE), Ingredient.fromItems(Items.CHARCOAL), Ingredient.fromTag(Tags.Items.SANDSTONE), Ingredient.fromTag(Tags.Items.SAND)).build(consumer, BloodMagic.rl(basePath + "vein_charge")); - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicBlocks.FUNGAL_CHARGE.get(), 8), 10, 0.5, Ingredient.fromTag(Tags.Items.COBBLESTONE), Ingredient.fromItems(Items.CHARCOAL), Ingredient.fromTag(BloodMagicTags.MUSHROOM_HYPHAE), Ingredient.fromTag(Tags.Items.MUSHROOMS)).build(consumer, BloodMagic.rl(basePath + "fungal_charge")); - - ItemStack stack = new ItemStack(BloodMagicBlocks.DEFORESTER_CHARGE.get()); - AnointmentHolder smeltingHolder = new AnointmentHolder(); - smeltingHolder.applyAnointment(stack, AnointmentRegistrar.ANOINTMENT_SMELTING.get(), new AnointmentData(1, 1, 1)); - - AnointmentHolder fortune1Holder = new AnointmentHolder(); - fortune1Holder.applyAnointment(stack, AnointmentRegistrar.ANOINTMENT_FORTUNE.get(), new AnointmentData(1, 1, 1)); - - AnointmentHolder silkHolder = new AnointmentHolder(); - silkHolder.applyAnointment(stack, AnointmentRegistrar.ANOINTMENT_SILK_TOUCH.get(), new AnointmentData(1, 1, 1)); - -// smeltingHolder.toItemStack(stack); - - String[] suffixArray = new String[] { "_smelting", "_fortune_1", "_silk_touch" }; - AnointmentHolder[] holderArray = new AnointmentHolder[] { smeltingHolder, fortune1Holder, silkHolder }; - Ingredient[] firstIngredientArray = new Ingredient[] { Ingredient.fromTag(Tags.Items.CROPS_NETHER_WART), - Ingredient.fromTag(Tags.Items.CROPS_NETHER_WART), Ingredient.fromTag(Tags.Items.CROPS_NETHER_WART) }; - Ingredient[] secondIngredientArray = new Ingredient[] { Ingredient.fromItems(Items.FURNACE), - Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE), Ingredient.fromItems(Items.COBWEB) }; - Ingredient[] thirdIngredientArray = new Ingredient[] { Ingredient.fromItems(Items.CHARCOAL, Items.COAL), - Ingredient.fromTag(BloodMagicTags.DUST_COAL), Ingredient.fromTag(Tags.Items.NUGGETS_GOLD) }; - - for (int i = 0; i < suffixArray.length; i++) - { - ItemStack deforesterStack = new ItemStack(BloodMagicBlocks.DEFORESTER_CHARGE.get()); - ItemStack fungalStack = new ItemStack(BloodMagicBlocks.FUNGAL_CHARGE.get()); - ItemStack shapedStack = new ItemStack(BloodMagicBlocks.SHAPED_CHARGE.get()); - ItemStack veinStack = new ItemStack(BloodMagicBlocks.VEINMINE_CHARGE.get()); - - AnointmentHolder holder = holderArray[i]; - holder.toItemStack(deforesterStack); - holder.toItemStack(fungalStack); - holder.toItemStack(shapedStack); - holder.toItemStack(veinStack); - - TartaricForgeRecipeBuilder.tartaricForge(shapedStack, 60, 1, Ingredient.fromItems(BloodMagicItems.SHAPED_CHARGE_ITEM.get()), firstIngredientArray[i], secondIngredientArray[i], thirdIngredientArray[i]).build(consumer, BloodMagic.rl(basePath + "shaped_charge" + suffixArray[i])); - TartaricForgeRecipeBuilder.tartaricForge(deforesterStack, 60, 1, Ingredient.fromItems(BloodMagicItems.DEFORESTER_CHARGE_ITEM.get()), firstIngredientArray[i], secondIngredientArray[i], thirdIngredientArray[i]).build(consumer, BloodMagic.rl(basePath + "deforester_charge" + suffixArray[i])); - TartaricForgeRecipeBuilder.tartaricForge(veinStack, 60, 1, Ingredient.fromItems(BloodMagicItems.VEINMINE_CHARGE_ITEM.get()), firstIngredientArray[i], secondIngredientArray[i], thirdIngredientArray[i]).build(consumer, BloodMagic.rl(basePath + "vein_charge" + suffixArray[i])); - TartaricForgeRecipeBuilder.tartaricForge(fungalStack, 60, 1, Ingredient.fromItems(BloodMagicItems.FUNGAL_CHARGE_ITEM.get()), firstIngredientArray[i], secondIngredientArray[i], thirdIngredientArray[i]).build(consumer, BloodMagic.rl(basePath + "fungal_charge" + suffixArray[i])); - - } - - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.THROWING_DAGGER.get(), 16), 32, 5, Ingredient.fromTag(Tags.Items.INGOTS_IRON), Ingredient.fromTag(Tags.Items.INGOTS_IRON), Ingredient.fromTag(Tags.Items.STRING)).build(consumer, BloodMagic.rl(basePath + "throwing_dagger")); - TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.THROWING_DAGGER_SYRINGE.get(), 8), 10, 2, Ingredient.fromTag(Tags.Items.STONE), Ingredient.fromTag(Tags.Items.GLASS)).build(consumer, BloodMagic.rl(basePath + "throwing_dagger_syringe")); - - // Changed Recipes - { -// TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.ARCANE_ASHES.get()), 0, 0, Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE), Ingredient.fromTag(Tags.Items.DYES_WHITE), Ingredient.fromTag(Tags.Items.GUNPOWDER), Ingredient.fromTag(ItemTags.COALS)).build(consumer, BloodMagic.rl(basePath + "arcaneashes")); -// TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_AIR.get()), 128, 20, Ingredient.fromItems(Items.GHAST_TEAR), Ingredient.fromTag(Tags.Items.FEATHERS), Ingredient.fromTag(Tags.Items.FEATHERS)).build(consumer, BloodMagic.rl(basePath + "reagent_air")); -// TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_WATER.get()), 10, 3, Ingredient.fromItems(Items.SUGAR), Ingredient.fromItems(Items.WATER_BUCKET), Ingredient.fromItems(Items.WATER_BUCKET)).build(consumer, BloodMagic.rl(basePath + "reagent_water")); -// TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_LAVA.get()), 32, 10, Ingredient.fromItems(Items.LAVA_BUCKET), Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE), Ingredient.fromTag(Tags.Items.COBBLESTONE), Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_COAL)).build(consumer, BloodMagic.rl(basePath + "reagent_lava")); -// TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_VOID.get()), 64, 10, Ingredient.fromItems(Items.BUCKET), Ingredient.fromTag(Tags.Items.STRING), Ingredient.fromTag(Tags.Items.STRING), Ingredient.fromTag(Tags.Items.GUNPOWDER)).build(consumer, BloodMagic.rl(basePath + "reagent_void")); -// TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_GROWTH.get()), 128, 20, Ingredient.fromTag(ItemTags.SAPLINGS), Ingredient.fromTag(ItemTags.SAPLINGS), Ingredient.fromItems(Items.SUGAR_CANE), Ingredient.fromItems(Items.SUGAR)).build(consumer, BloodMagic.rl(basePath + "reagent_growth")); -// TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_MAGNETISM.get()), 600, 10, Ingredient.fromTag(Tags.Items.STRING), Ingredient.fromTag(Tags.Items.INGOTS_GOLD), Ingredient.fromTag(Tags.Items.INGOTS_GOLD), Ingredient.fromTag(Tags.Items.STORAGE_BLOCKS_IRON)).build(consumer, BloodMagic.rl(basePath + "reagent_magnetism")); -// TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_FAST_MINER.get()), 128, 20, Ingredient.fromItems(Items.IRON_PICKAXE), Ingredient.fromItems(Items.IRON_AXE), Ingredient.fromItems(Items.IRON_SHOVEL), Ingredient.fromTag(Tags.Items.GUNPOWDER)).build(consumer, BloodMagic.rl(basePath + "reagent_fastminer")); -// TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_BLOOD_LIGHT.get()), 300, 10, Ingredient.fromTag(Tags.Items.DUSTS_GLOWSTONE), Ingredient.fromItems(Items.TORCH), Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE), Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE)).build(consumer, BloodMagic.rl(basePath + "reagent_blood_light")); -// TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_SIGHT.get()), 64, 0, Ingredient.fromTag(Tags.Items.DUSTS_GLOWSTONE), Ingredient.fromTag(Tags.Items.GLASS), Ingredient.fromTag(Tags.Items.GLASS), Ingredient.fromItems(BloodMagicItems.DIVINATION_SIGIL.get())).build(consumer, BloodMagic.rl(basePath + "reagent_sight")); -// TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_BINDING.get()), 400, 10, Ingredient.fromTag(Tags.Items.DUSTS_GLOWSTONE), Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE), Ingredient.fromTag(Tags.Items.GUNPOWDER), Ingredient.fromTag(Tags.Items.NUGGETS_GOLD)).build(consumer, BloodMagic.rl(basePath + "reagent_binding")); - - } - { - - } - } - -} diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/ARCRecipeSerializer.java b/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/ARCRecipeSerializer.java deleted file mode 100644 index 57869822..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/ARCRecipeSerializer.java +++ /dev/null @@ -1,159 +0,0 @@ -package wayoftime.bloodmagic.common.recipe.serializer; - -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - -import org.apache.commons.lang3.tuple.Pair; - -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; - -import net.minecraft.fluid.Fluids; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipeSerializer; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.JSONUtils; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.registries.ForgeRegistryEntry; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.recipe.helper.SerializerHelper; -import wayoftime.bloodmagic.recipe.helper.FluidStackIngredient; -import wayoftime.bloodmagic.recipe.RecipeARC; -import wayoftime.bloodmagic.util.Constants; - -public class ARCRecipeSerializer extends ForgeRegistryEntry> - implements IRecipeSerializer -{ - private final IFactory factory; - - public ARCRecipeSerializer(IFactory factory) - { - this.factory = factory; - } - - @Nonnull - @Override - public RECIPE read(@Nonnull ResourceLocation recipeId, @Nonnull JsonObject json) - { - JsonElement input = JSONUtils.isJsonArray(json, Constants.JSON.INPUT) - ? JSONUtils.getJsonArray(json, Constants.JSON.INPUT) - : JSONUtils.getJsonObject(json, Constants.JSON.INPUT); - - JsonElement tool = JSONUtils.isJsonArray(json, Constants.JSON.TOOL) - ? JSONUtils.getJsonArray(json, Constants.JSON.TOOL) - : JSONUtils.getJsonObject(json, Constants.JSON.TOOL); - - Ingredient inputIng = Ingredient.deserialize(input); - Ingredient toolIng = Ingredient.deserialize(tool); - ItemStack output = SerializerHelper.getItemStack(json, Constants.JSON.OUTPUT); - - List> addedItems = new ArrayList>(); - if (json.has(Constants.JSON.ADDEDOUTPUT) && JSONUtils.isJsonArray(json, Constants.JSON.ADDEDOUTPUT)) - { - JsonArray mainArray = JSONUtils.getJsonArray(json, Constants.JSON.ADDEDOUTPUT); - - arrayLoop: for (JsonElement element : mainArray) - { - if (addedItems.size() >= RecipeARC.MAX_RANDOM_OUTPUTS) - { - break arrayLoop; - } - if (element.isJsonObject()) - { - JsonObject obj = element.getAsJsonObject(); - double chance = JSONUtils.getFloat(obj, Constants.JSON.CHANCE); - ItemStack extraDrop = SerializerHelper.getItemStack(obj, Constants.JSON.TYPE); - - addedItems.add(Pair.of(extraDrop, chance)); - } - } - } - - FluidStackIngredient inputFluidIng = null; - - if (json.has(Constants.JSON.INPUT_FLUID)) - { - JsonElement inputFluid = JSONUtils.isJsonArray(json, Constants.JSON.INPUT_FLUID) - ? JSONUtils.getJsonArray(json, Constants.JSON.INPUT_FLUID) - : JSONUtils.getJsonObject(json, Constants.JSON.INPUT_FLUID); - inputFluidIng = FluidStackIngredient.deserialize(inputFluid); - } - - FluidStack outputFluidStack = FluidStack.EMPTY; - - if (json.has(Constants.JSON.OUTPUT_FLUID)) - { - JsonObject outputFluid = JSONUtils.getJsonObject(json, Constants.JSON.OUTPUT_FLUID).getAsJsonObject(); - outputFluidStack = SerializerHelper.deserializeFluid(outputFluid); - } - - boolean consumeIngredient = JSONUtils.getBoolean(json, "consumeingredient"); - - return this.factory.create(recipeId, inputIng, toolIng, inputFluidIng, output, addedItems, outputFluidStack, consumeIngredient); - } - - @Override - public RECIPE read(@Nonnull ResourceLocation recipeId, @Nonnull PacketBuffer buffer) - { - try - { - List> addedItems = new ArrayList>(); - Ingredient inputIng = Ingredient.read(buffer); - Ingredient toolIng = Ingredient.read(buffer); - ItemStack output = buffer.readItemStack(); - - int addedItemSize = buffer.readInt(); - for (int i = 0; i < addedItemSize; i++) - { - ItemStack stack = buffer.readItemStack(); - double chance = buffer.readDouble(); - addedItems.add(Pair.of(stack, chance)); - } - - FluidStackIngredient inputFluid = null; - FluidStack outputFluid = new FluidStack(Fluids.EMPTY, 1000); - - if (buffer.readBoolean()) - { - inputFluid = FluidStackIngredient.read(buffer); - } - - if (buffer.readBoolean()) - { - outputFluid = FluidStack.readFromPacket(buffer); - } - - boolean consumeIngredient = buffer.readBoolean(); - - return this.factory.create(recipeId, inputIng, toolIng, inputFluid, output, addedItems, outputFluid, consumeIngredient); - } catch (Exception e) - { - BloodMagic.LOGGER.error("Error reading ARC recipe from packet.", e); - throw e; - } - } - - @Override - public void write(@Nonnull PacketBuffer buffer, @Nonnull RECIPE recipe) - { - try - { - recipe.write(buffer); - } catch (Exception e) - { - BloodMagic.LOGGER.error("Error writing ARC recipe to packet.", e); - throw e; - } - } - - @FunctionalInterface - public interface IFactory - { - RECIPE create(ResourceLocation id, Ingredient input, Ingredient arcTool, FluidStackIngredient inputFluid, ItemStack output, List> addedItems, FluidStack outputFluid, boolean consumeIngredient); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/AlchemyArrayRecipeSerializer.java b/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/AlchemyArrayRecipeSerializer.java deleted file mode 100644 index 6ebf7753..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/AlchemyArrayRecipeSerializer.java +++ /dev/null @@ -1,89 +0,0 @@ -package wayoftime.bloodmagic.common.recipe.serializer; - -import javax.annotation.Nonnull; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; - -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipeSerializer; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.JSONUtils; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.registries.ForgeRegistryEntry; -import wayoftime.bloodmagic.recipe.helper.SerializerHelper; -import wayoftime.bloodmagic.recipe.RecipeAlchemyArray; -import wayoftime.bloodmagic.util.Constants; - -public class AlchemyArrayRecipeSerializer - extends ForgeRegistryEntry> implements IRecipeSerializer -{ - private final IFactory factory; - - public AlchemyArrayRecipeSerializer(IFactory factory) - { - this.factory = factory; - } - - @Nonnull - @Override - public RECIPE read(@Nonnull ResourceLocation recipeId, @Nonnull JsonObject json) - { - JsonElement input1 = JSONUtils.isJsonArray(json, Constants.JSON.BASEINPUT) - ? JSONUtils.getJsonArray(json, Constants.JSON.BASEINPUT) - : JSONUtils.getJsonObject(json, Constants.JSON.BASEINPUT); - - JsonElement input2 = JSONUtils.isJsonArray(json, Constants.JSON.ADDEDINPUT) - ? JSONUtils.getJsonArray(json, Constants.JSON.ADDEDINPUT) - : JSONUtils.getJsonObject(json, Constants.JSON.ADDEDINPUT); - - Ingredient baseInput = Ingredient.deserialize(input1); - Ingredient addedInput = Ingredient.deserialize(input2); - ResourceLocation texture = null; - if (json.has(Constants.JSON.TEXTURE)) - texture = new ResourceLocation(JSONUtils.getString(json, Constants.JSON.TEXTURE)); - ItemStack output = SerializerHelper.getItemStack(json, Constants.JSON.OUTPUT); - - return this.factory.create(recipeId, texture, baseInput, addedInput, output); - } - - @Override - public RECIPE read(@Nonnull ResourceLocation recipeId, @Nonnull PacketBuffer buffer) - { - try - { - ResourceLocation texture = null; - if (buffer.readBoolean()) - texture = buffer.readResourceLocation(); - Ingredient baseInput = Ingredient.read(buffer); - Ingredient addedInput = Ingredient.read(buffer); - ItemStack output = buffer.readItemStack(); - - return this.factory.create(recipeId, texture, baseInput, addedInput, output); - } catch (Exception e) - { -// Mekanism.logger.error("Error reading electrolysis recipe from packet.", e); - throw e; - } - } - - @Override - public void write(@Nonnull PacketBuffer buffer, @Nonnull RECIPE recipe) - { - try - { - recipe.write(buffer); - } catch (Exception e) - { -// Mekanism.logger.error("Error writing electrolysis recipe to packet.", e); - throw e; - } - } - - @FunctionalInterface - public interface IFactory - { - RECIPE create(ResourceLocation id, ResourceLocation texture, Ingredient baseInput, Ingredient addedInput, ItemStack output); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/AlchemyTableRecipeSerializer.java b/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/AlchemyTableRecipeSerializer.java deleted file mode 100644 index 032c1837..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/AlchemyTableRecipeSerializer.java +++ /dev/null @@ -1,116 +0,0 @@ -package wayoftime.bloodmagic.common.recipe.serializer; - -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; - -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipeSerializer; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.JSONUtils; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.registries.ForgeRegistryEntry; -import wayoftime.bloodmagic.recipe.helper.SerializerHelper; -import wayoftime.bloodmagic.recipe.RecipeAlchemyTable; -import wayoftime.bloodmagic.util.Constants; - -public class AlchemyTableRecipeSerializer - extends ForgeRegistryEntry> implements IRecipeSerializer -{ - - private final IFactory factory; - - public AlchemyTableRecipeSerializer(IFactory factory) - { - this.factory = factory; - } - - @Nonnull - @Override - public RECIPE read(@Nonnull ResourceLocation recipeId, @Nonnull JsonObject json) - { - List inputList = new ArrayList(); - - if (json.has(Constants.JSON.INPUT) && JSONUtils.isJsonArray(json, Constants.JSON.INPUT)) - { - JsonArray mainArray = JSONUtils.getJsonArray(json, Constants.JSON.INPUT); - - arrayLoop: for (JsonElement element : mainArray) - { - if (inputList.size() >= RecipeAlchemyTable.MAX_INPUTS) - { - break arrayLoop; - } - - if (element.isJsonArray()) - { - element = element.getAsJsonArray(); - } else - { - element.getAsJsonObject(); - } - - inputList.add(Ingredient.deserialize(element)); - } - } - - ItemStack output = SerializerHelper.getItemStack(json, Constants.JSON.OUTPUT); - - int syphon = JSONUtils.getInt(json, Constants.JSON.SYPHON); - int ticks = JSONUtils.getInt(json, Constants.JSON.TICKS); - int minimumTier = JSONUtils.getInt(json, Constants.JSON.ALTAR_TIER); - - return this.factory.create(recipeId, inputList, output, syphon, ticks, minimumTier); - } - - @Override - public RECIPE read(@Nonnull ResourceLocation recipeId, @Nonnull PacketBuffer buffer) - { - try - { - int size = buffer.readInt(); - List input = new ArrayList(size); - - for (int i = 0; i < size; i++) - { - input.add(i, Ingredient.read(buffer)); - } - - ItemStack output = buffer.readItemStack(); - int syphon = buffer.readInt(); - int ticks = buffer.readInt(); - int minimumTier = buffer.readInt(); - - return this.factory.create(recipeId, input, output, syphon, ticks, minimumTier); - } catch (Exception e) - { -//Mekanism.logger.error("Error reading electrolysis recipe from packet.", e); - throw e; - } - } - - @Override - public void write(@Nonnull PacketBuffer buffer, @Nonnull RECIPE recipe) - { - try - { - recipe.write(buffer); - } catch (Exception e) - { -//Mekanism.logger.error("Error writing electrolysis recipe to packet.", e); - throw e; - } - } - - @FunctionalInterface - public interface IFactory - { - RECIPE create(ResourceLocation id, List input, ItemStack output, int syphon, int ticks, int minimumTier); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/BloodAltarRecipeSerializer.java b/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/BloodAltarRecipeSerializer.java deleted file mode 100644 index a50c1fbd..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/BloodAltarRecipeSerializer.java +++ /dev/null @@ -1,85 +0,0 @@ -package wayoftime.bloodmagic.common.recipe.serializer; - -import javax.annotation.Nonnull; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; - -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipeSerializer; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.JSONUtils; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.registries.ForgeRegistryEntry; -import wayoftime.bloodmagic.recipe.helper.SerializerHelper; -import wayoftime.bloodmagic.recipe.RecipeBloodAltar; -import wayoftime.bloodmagic.util.Constants; - -public class BloodAltarRecipeSerializer - extends ForgeRegistryEntry> implements IRecipeSerializer -{ - private final IFactory factory; - - public BloodAltarRecipeSerializer(IFactory factory) - { - this.factory = factory; - } - - @Nonnull - @Override - public RECIPE read(@Nonnull ResourceLocation recipeId, @Nonnull JsonObject json) - { - JsonElement input = JSONUtils.isJsonArray(json, Constants.JSON.INPUT) - ? JSONUtils.getJsonArray(json, Constants.JSON.INPUT) - : JSONUtils.getJsonObject(json, Constants.JSON.INPUT); - - Ingredient inputIng = Ingredient.deserialize(input); - ItemStack output = SerializerHelper.getItemStack(json, Constants.JSON.OUTPUT); - int minimumTier = JSONUtils.getInt(json, Constants.JSON.ALTAR_TIER); - int syphon = JSONUtils.getInt(json, Constants.JSON.ALTAR_SYPHON); - int consumeRate = JSONUtils.getInt(json, Constants.JSON.ALTAR_CONSUMPTION_RATE); - int drainRate = JSONUtils.getInt(json, Constants.JSON.ALTAR_DRAIN_RATE); - - return this.factory.create(recipeId, inputIng, output, minimumTier, syphon, consumeRate, drainRate); - } - - @Override - public RECIPE read(@Nonnull ResourceLocation recipeId, @Nonnull PacketBuffer buffer) - { - try - { - Ingredient input = Ingredient.read(buffer); - ItemStack output = buffer.readItemStack(); - int minimumTier = buffer.readInt(); - int syphon = buffer.readInt(); - int consumeRate = buffer.readInt(); - int drainRate = buffer.readInt(); - - return this.factory.create(recipeId, input, output, minimumTier, syphon, consumeRate, drainRate); - } catch (Exception e) - { -// Mekanism.logger.error("Error reading electrolysis recipe from packet.", e); - throw e; - } - } - - @Override - public void write(@Nonnull PacketBuffer buffer, @Nonnull RECIPE recipe) - { - try - { - recipe.write(buffer); - } catch (Exception e) - { -// Mekanism.logger.error("Error writing electrolysis recipe to packet.", e); - throw e; - } - } - - @FunctionalInterface - public interface IFactory - { - RECIPE create(ResourceLocation id, Ingredient input, ItemStack output, int minimumTier, int syphon, int consumeRate, int drainRate); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/TartaricForgeRecipeSerializer.java b/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/TartaricForgeRecipeSerializer.java deleted file mode 100644 index 18fadfb4..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/recipe/serializer/TartaricForgeRecipeSerializer.java +++ /dev/null @@ -1,100 +0,0 @@ -package wayoftime.bloodmagic.common.recipe.serializer; - -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; - -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipeSerializer; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.JSONUtils; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.registries.ForgeRegistryEntry; -import wayoftime.bloodmagic.recipe.helper.SerializerHelper; -import wayoftime.bloodmagic.recipe.RecipeTartaricForge; -import wayoftime.bloodmagic.util.Constants; - -public class TartaricForgeRecipeSerializer - extends ForgeRegistryEntry> implements IRecipeSerializer -{ - - private final IFactory factory; - - public TartaricForgeRecipeSerializer(IFactory factory) - { - this.factory = factory; - } - - @Nonnull - @Override - public RECIPE read(@Nonnull ResourceLocation recipeId, @Nonnull JsonObject json) - { - List inputList = new ArrayList(); - for (int i = 0; i < 4; i++) - { - if (json.has(Constants.JSON.INPUT + i)) - { - JsonElement input = JSONUtils.isJsonArray(json, Constants.JSON.INPUT + i) - ? JSONUtils.getJsonArray(json, Constants.JSON.INPUT + i) - : JSONUtils.getJsonObject(json, Constants.JSON.INPUT + i); - inputList.add(Ingredient.deserialize(input)); - } - } - - ItemStack output = SerializerHelper.getItemStack(json, Constants.JSON.OUTPUT); - - float minimumSouls = JSONUtils.getFloat(json, Constants.JSON.TARTARIC_MINIMUM); - float soulDrain = JSONUtils.getFloat(json, Constants.JSON.TARTARIC_DRAIN); - - return this.factory.create(recipeId, inputList, output, minimumSouls, soulDrain); - } - - @Override - public RECIPE read(@Nonnull ResourceLocation recipeId, @Nonnull PacketBuffer buffer) - { - try - { - int size = buffer.readInt(); - List input = new ArrayList(size); - - for (int i = 0; i < size; i++) - { - input.add(i, Ingredient.read(buffer)); - } - - ItemStack output = buffer.readItemStack(); - double minimumSouls = buffer.readDouble(); - double soulDrain = buffer.readDouble(); - - return this.factory.create(recipeId, input, output, minimumSouls, soulDrain); - } catch (Exception e) - { -// Mekanism.logger.error("Error reading electrolysis recipe from packet.", e); - throw e; - } - } - - @Override - public void write(@Nonnull PacketBuffer buffer, @Nonnull RECIPE recipe) - { - try - { - recipe.write(buffer); - } catch (Exception e) - { -// Mekanism.logger.error("Error writing electrolysis recipe to packet.", e); - throw e; - } - } - - @FunctionalInterface - public interface IFactory - { - RECIPE create(ResourceLocation id, List input, ItemStack output, double minimumSouls, double soulDrain); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/registration/INamedEntry.java b/src/main/java/wayoftime/bloodmagic/common/registration/INamedEntry.java deleted file mode 100644 index a75d9fe8..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/registration/INamedEntry.java +++ /dev/null @@ -1,11 +0,0 @@ -package wayoftime.bloodmagic.common.registration; - -public interface INamedEntry -{ - - /** - * Used for retrieving the path/name of a registry object before the registry - * object has been fully initialized - */ - String getInternalRegistryName(); -} diff --git a/src/main/java/wayoftime/bloodmagic/common/registration/WrappedDeferredRegister.java b/src/main/java/wayoftime/bloodmagic/common/registration/WrappedDeferredRegister.java deleted file mode 100644 index f6a707df..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/registration/WrappedDeferredRegister.java +++ /dev/null @@ -1,49 +0,0 @@ -package wayoftime.bloodmagic.common.registration; - -import java.util.function.Function; -import java.util.function.Supplier; - -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.fml.RegistryObject; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.IForgeRegistry; -import net.minecraftforge.registries.IForgeRegistryEntry; -import net.minecraftforge.registries.RegistryBuilder; - -public class WrappedDeferredRegister> -{ - protected final DeferredRegister internal; - - protected WrappedDeferredRegister(String modid, IForgeRegistry registry) - { - internal = DeferredRegister.create(registry, modid); - } - - /** - * @apiNote For use with custom registries - */ - protected WrappedDeferredRegister(String modid, Class base) - { - internal = DeferredRegister.create(base, modid); - } - - protected > W register(String name, Supplier sup, - Function, W> objectWrapper) - { - return objectWrapper.apply(internal.register(name, sup)); - } - - /** - * Only call this from mekanism and for custom registries - */ - public void createAndRegister(IEventBus bus, String name) - { - internal.makeRegistry(name, RegistryBuilder::new); - register(bus); - } - - public void register(IEventBus bus) - { - internal.register(bus); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/registration/WrappedRegistryObject.java b/src/main/java/wayoftime/bloodmagic/common/registration/WrappedRegistryObject.java deleted file mode 100644 index 7d37f782..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/registration/WrappedRegistryObject.java +++ /dev/null @@ -1,32 +0,0 @@ -package wayoftime.bloodmagic.common.registration; - -import java.util.function.Supplier; - -import javax.annotation.Nonnull; - -import net.minecraftforge.fml.RegistryObject; -import net.minecraftforge.registries.IForgeRegistryEntry; - -public class WrappedRegistryObject> implements Supplier, INamedEntry -{ - - protected RegistryObject registryObject; - - protected WrappedRegistryObject(RegistryObject registryObject) - { - this.registryObject = registryObject; - } - - @Nonnull - @Override - public T get() - { - return registryObject.get(); - } - - @Override - public String getInternalRegistryName() - { - return registryObject.getId().getPath(); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/registration/impl/AnointmentDeferredRegister.java b/src/main/java/wayoftime/bloodmagic/common/registration/impl/AnointmentDeferredRegister.java deleted file mode 100644 index e689d0d9..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/registration/impl/AnointmentDeferredRegister.java +++ /dev/null @@ -1,19 +0,0 @@ -package wayoftime.bloodmagic.common.registration.impl; - -import java.util.function.Supplier; - -import wayoftime.bloodmagic.anointment.Anointment; -import wayoftime.bloodmagic.common.registration.WrappedDeferredRegister; - -public class AnointmentDeferredRegister extends WrappedDeferredRegister -{ - public AnointmentDeferredRegister(String modid) - { - super(modid, Anointment.class); - } - - public AnointmentRegistryObject register(String name, Supplier sup) - { - return register(name, sup, AnointmentRegistryObject::new); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/registration/impl/AnointmentRegistryObject.java b/src/main/java/wayoftime/bloodmagic/common/registration/impl/AnointmentRegistryObject.java deleted file mode 100644 index f017a514..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/registration/impl/AnointmentRegistryObject.java +++ /dev/null @@ -1,13 +0,0 @@ -package wayoftime.bloodmagic.common.registration.impl; - -import net.minecraftforge.fml.RegistryObject; -import wayoftime.bloodmagic.anointment.Anointment; -import wayoftime.bloodmagic.common.registration.WrappedRegistryObject; - -public class AnointmentRegistryObject extends WrappedRegistryObject -{ - public AnointmentRegistryObject(RegistryObject registryObject) - { - super(registryObject); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/registration/impl/BloodOrbDeferredRegister.java b/src/main/java/wayoftime/bloodmagic/common/registration/impl/BloodOrbDeferredRegister.java deleted file mode 100644 index 0663347b..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/registration/impl/BloodOrbDeferredRegister.java +++ /dev/null @@ -1,26 +0,0 @@ -package wayoftime.bloodmagic.common.registration.impl; - -import java.util.function.Supplier; - -import net.minecraft.util.ResourceLocation; -import wayoftime.bloodmagic.common.registration.WrappedDeferredRegister; -import wayoftime.bloodmagic.common.item.BloodOrb; - -public class BloodOrbDeferredRegister extends WrappedDeferredRegister -{ - public BloodOrbDeferredRegister(String modid) - { - super(modid, BloodOrb.class); - } - - public BloodOrbRegistryObject register(String name, ResourceLocation rl, int tier, int capacity, - int fillRate) - { - return register(name, () -> new BloodOrb(rl, tier, capacity, fillRate)); - } - - public BloodOrbRegistryObject register(String name, Supplier sup) - { - return register(name, sup, BloodOrbRegistryObject::new); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/registration/impl/BloodOrbRegistryObject.java b/src/main/java/wayoftime/bloodmagic/common/registration/impl/BloodOrbRegistryObject.java deleted file mode 100644 index e9818ea3..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/registration/impl/BloodOrbRegistryObject.java +++ /dev/null @@ -1,13 +0,0 @@ -package wayoftime.bloodmagic.common.registration.impl; - -import net.minecraftforge.fml.RegistryObject; -import wayoftime.bloodmagic.common.registration.WrappedRegistryObject; -import wayoftime.bloodmagic.common.item.BloodOrb; - -public class BloodOrbRegistryObject extends WrappedRegistryObject -{ - public BloodOrbRegistryObject(RegistryObject registryObject) - { - super(registryObject); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/registration/impl/EntityTypeDeferredRegister.java b/src/main/java/wayoftime/bloodmagic/common/registration/impl/EntityTypeDeferredRegister.java deleted file mode 100644 index 0176e647..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/registration/impl/EntityTypeDeferredRegister.java +++ /dev/null @@ -1,20 +0,0 @@ -package wayoftime.bloodmagic.common.registration.impl; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityType; -import net.minecraftforge.registries.ForgeRegistries; -import wayoftime.bloodmagic.common.registration.WrappedDeferredRegister; - -public class EntityTypeDeferredRegister extends WrappedDeferredRegister> -{ - - public EntityTypeDeferredRegister(String modid) - { - super(modid, ForgeRegistries.ENTITIES); - } - - public EntityTypeRegistryObject register(String name, EntityType.Builder builder) - { - return register(name, () -> builder.build(name), EntityTypeRegistryObject::new); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/registration/impl/EntityTypeRegistryObject.java b/src/main/java/wayoftime/bloodmagic/common/registration/impl/EntityTypeRegistryObject.java deleted file mode 100644 index e6e51ee2..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/registration/impl/EntityTypeRegistryObject.java +++ /dev/null @@ -1,26 +0,0 @@ -package wayoftime.bloodmagic.common.registration.impl; - -import javax.annotation.Nonnull; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityType; -import net.minecraftforge.fml.RegistryObject; -import wayoftime.bloodmagic.util.providers.IEntityTypeProvider; -import wayoftime.bloodmagic.common.registration.WrappedRegistryObject; - -public class EntityTypeRegistryObject extends WrappedRegistryObject> - implements IEntityTypeProvider -{ - - public EntityTypeRegistryObject(RegistryObject> registryObject) - { - super(registryObject); - } - - @Nonnull - @Override - public EntityType getEntityType() - { - return get(); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/registration/impl/IRecipeSerializerDeferredRegister.java b/src/main/java/wayoftime/bloodmagic/common/registration/impl/IRecipeSerializerDeferredRegister.java deleted file mode 100644 index 10c94aba..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/registration/impl/IRecipeSerializerDeferredRegister.java +++ /dev/null @@ -1,23 +0,0 @@ -package wayoftime.bloodmagic.common.registration.impl; - -import java.util.function.Supplier; - -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.IRecipeSerializer; -import net.minecraftforge.registries.ForgeRegistries; -import wayoftime.bloodmagic.common.registration.WrappedDeferredRegister; - -public class IRecipeSerializerDeferredRegister extends WrappedDeferredRegister> -{ - - public IRecipeSerializerDeferredRegister(String modid) - { - super(modid, ForgeRegistries.RECIPE_SERIALIZERS); - } - - public > IRecipeSerializerRegistryObject register(String name, - Supplier> sup) - { - return register(name, sup, IRecipeSerializerRegistryObject::new); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/registration/impl/IRecipeSerializerRegistryObject.java b/src/main/java/wayoftime/bloodmagic/common/registration/impl/IRecipeSerializerRegistryObject.java deleted file mode 100644 index 70d3d56c..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/registration/impl/IRecipeSerializerRegistryObject.java +++ /dev/null @@ -1,24 +0,0 @@ -package wayoftime.bloodmagic.common.registration.impl; - -import javax.annotation.Nonnull; - -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.IRecipeSerializer; -import net.minecraftforge.fml.RegistryObject; -import wayoftime.bloodmagic.common.registration.WrappedRegistryObject; - -public class IRecipeSerializerRegistryObject> - extends WrappedRegistryObject> -{ - - public IRecipeSerializerRegistryObject(RegistryObject> registryObject) - { - super(registryObject); - } - - @Nonnull - public IRecipeSerializer getRecipeSerializer() - { - return get(); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/registration/impl/LivingUpgradeDeferredRegister.java b/src/main/java/wayoftime/bloodmagic/common/registration/impl/LivingUpgradeDeferredRegister.java deleted file mode 100644 index a84c05de..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/registration/impl/LivingUpgradeDeferredRegister.java +++ /dev/null @@ -1,25 +0,0 @@ -package wayoftime.bloodmagic.common.registration.impl; - -import java.util.function.Supplier; - -import wayoftime.bloodmagic.common.registration.WrappedDeferredRegister; -import wayoftime.bloodmagic.core.living.LivingUpgrade; - -public class LivingUpgradeDeferredRegister extends WrappedDeferredRegister -{ - public LivingUpgradeDeferredRegister(String modid) - { - super(modid, LivingUpgrade.class); - } - -// public BloodOrbRegistryObject register(String name, ResourceLocation rl, int tier, int capacity, -// int fillRate) -// { -// return register(name, () -> new BloodOrb(rl, tier, capacity, fillRate)); -// } - - public LivingUpgradeRegistryObject register(String name, Supplier sup) - { - return register(name, sup, LivingUpgradeRegistryObject::new); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/registration/impl/LivingUpgradeRegistryObject.java b/src/main/java/wayoftime/bloodmagic/common/registration/impl/LivingUpgradeRegistryObject.java deleted file mode 100644 index c851d6fb..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/registration/impl/LivingUpgradeRegistryObject.java +++ /dev/null @@ -1,13 +0,0 @@ -package wayoftime.bloodmagic.common.registration.impl; - -import net.minecraftforge.fml.RegistryObject; -import wayoftime.bloodmagic.common.registration.WrappedRegistryObject; -import wayoftime.bloodmagic.core.living.LivingUpgrade; - -public class LivingUpgradeRegistryObject extends WrappedRegistryObject -{ - public LivingUpgradeRegistryObject(RegistryObject registryObject) - { - super(registryObject); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/common/registries/BloodMagicEntityTypes.java b/src/main/java/wayoftime/bloodmagic/common/registries/BloodMagicEntityTypes.java deleted file mode 100644 index f503ab48..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/registries/BloodMagicEntityTypes.java +++ /dev/null @@ -1,27 +0,0 @@ -package wayoftime.bloodmagic.common.registries; - -import net.minecraft.entity.EntityClassification; -import net.minecraft.entity.EntityType; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.common.registration.impl.EntityTypeDeferredRegister; -import wayoftime.bloodmagic.common.registration.impl.EntityTypeRegistryObject; -import wayoftime.bloodmagic.entity.projectile.AbstractEntityThrowingDagger; -import wayoftime.bloodmagic.entity.projectile.EntityBloodLight; -import wayoftime.bloodmagic.entity.projectile.EntityShapedCharge; -import wayoftime.bloodmagic.entity.projectile.EntitySoulSnare; - -public class BloodMagicEntityTypes -{ - private BloodMagicEntityTypes() - { - - } - - public static final EntityTypeDeferredRegister ENTITY_TYPES = new EntityTypeDeferredRegister(BloodMagic.MODID); - - public static final EntityTypeRegistryObject SNARE = ENTITY_TYPES.register("soulsnare", EntityType.Builder.create(EntitySoulSnare::new, EntityClassification.MISC).setTrackingRange(64).setUpdateInterval(1).size(0.25f, 0.25f)); - public static final EntityTypeRegistryObject THROWING_DAGGER = ENTITY_TYPES.register("throwing_dagger", EntityType.Builder.create(AbstractEntityThrowingDagger::new, EntityClassification.MISC).setTrackingRange(64).setUpdateInterval(1).size(0.25f, 0.25f)); - public static final EntityTypeRegistryObject BLOOD_LIGHT = ENTITY_TYPES.register("bloodlight", EntityType.Builder.create(EntityBloodLight::new, EntityClassification.MISC).setTrackingRange(64).setUpdateInterval(1).size(0.25f, 0.25f)); - public static final EntityTypeRegistryObject SHAPED_CHARGE = ENTITY_TYPES.register("shapedcharge", EntityType.Builder.create(EntityShapedCharge::new, EntityClassification.MISC).setTrackingRange(64).setUpdateInterval(1).size(0.4f, 0.4f)); - -} diff --git a/src/main/java/wayoftime/bloodmagic/common/registries/BloodMagicRecipeSerializers.java b/src/main/java/wayoftime/bloodmagic/common/registries/BloodMagicRecipeSerializers.java deleted file mode 100644 index 38a6012b..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/registries/BloodMagicRecipeSerializers.java +++ /dev/null @@ -1,36 +0,0 @@ -package wayoftime.bloodmagic.common.registries; - -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.recipe.RecipeARC; -import wayoftime.bloodmagic.recipe.RecipeAlchemyArray; -import wayoftime.bloodmagic.recipe.RecipeAlchemyTable; -import wayoftime.bloodmagic.recipe.RecipeBloodAltar; -import wayoftime.bloodmagic.recipe.RecipeTartaricForge; -import wayoftime.bloodmagic.common.recipe.serializer.ARCRecipeSerializer; -import wayoftime.bloodmagic.common.recipe.serializer.AlchemyArrayRecipeSerializer; -import wayoftime.bloodmagic.common.recipe.serializer.AlchemyTableRecipeSerializer; -import wayoftime.bloodmagic.common.recipe.serializer.BloodAltarRecipeSerializer; -import wayoftime.bloodmagic.common.recipe.serializer.TartaricForgeRecipeSerializer; -import wayoftime.bloodmagic.common.registration.impl.IRecipeSerializerDeferredRegister; -import wayoftime.bloodmagic.common.registration.impl.IRecipeSerializerRegistryObject; - -public class BloodMagicRecipeSerializers -{ - private BloodMagicRecipeSerializers() - { - - } - - public static final IRecipeSerializerDeferredRegister RECIPE_SERIALIZERS = new IRecipeSerializerDeferredRegister(BloodMagic.MODID); - - public static final IRecipeSerializerRegistryObject ALTAR = RECIPE_SERIALIZERS.register("altar", () -> new BloodAltarRecipeSerializer<>(RecipeBloodAltar::new)); - public static final IRecipeSerializerRegistryObject ARRAY = RECIPE_SERIALIZERS.register("array", () -> new AlchemyArrayRecipeSerializer<>(RecipeAlchemyArray::new)); - public static final IRecipeSerializerRegistryObject TARTARIC = RECIPE_SERIALIZERS.register("soulforge", () -> new TartaricForgeRecipeSerializer<>(RecipeTartaricForge::new)); - public static final IRecipeSerializerRegistryObject ARC = RECIPE_SERIALIZERS.register("arc", () -> new ARCRecipeSerializer<>(RecipeARC::new)); - public static final IRecipeSerializerRegistryObject ALCHEMYTABLE = RECIPE_SERIALIZERS.register("alchemytable", () -> new AlchemyTableRecipeSerializer<>(RecipeAlchemyTable::new)); - -// public static final DeferredRegister> RECIPE_SERIALIZERS = DeferredRegister.create(ForgeRegistries.RECIPE_SERIALIZERS, BloodMagic.MODID); - -// public static final DeferredObject REC = RECIPE_SERIALIZERS.register("test", () -> new BloodAltarRecipeSerializer<>(IRecipeBloodAltar::new)); -// public static final IRecipeSerializerDeferredRegister RECIPE_SERIALIZERS = new IRecipeSerializerDeferredRegister(BloodMagic.MODID); -} diff --git a/src/main/java/wayoftime/bloodmagic/common/tags/BloodMagicTags.java b/src/main/java/wayoftime/bloodmagic/common/tags/BloodMagicTags.java deleted file mode 100644 index 9ad0f087..00000000 --- a/src/main/java/wayoftime/bloodmagic/common/tags/BloodMagicTags.java +++ /dev/null @@ -1,100 +0,0 @@ -package wayoftime.bloodmagic.common.tags; - -import net.minecraft.block.Block; -import net.minecraft.fluid.Fluid; -import net.minecraft.item.Item; -import net.minecraft.tags.BlockTags; -import net.minecraft.tags.FluidTags; -import net.minecraft.tags.ITag; -import net.minecraft.tags.ItemTags; - -public class BloodMagicTags -{ - public static final ITag.INamedTag ARC_TOOL = ItemTags.makeWrapperTag("bloodmagic:arc/tool"); - public static final ITag.INamedTag ARC_TOOL_FURNACE = ItemTags.makeWrapperTag("bloodmagic:arc/furnace"); - public static final ITag.INamedTag ARC_TOOL_SIEVE = ItemTags.makeWrapperTag("bloodmagic:arc/sieve"); - public static final ITag.INamedTag ARC_TOOL_REVERTER = ItemTags.makeWrapperTag("bloodmagic:arc/reverter"); - public static final ITag.INamedTag ARC_TOOL_EXPLOSIVE = ItemTags.makeWrapperTag("bloodmagic:arc/explosive"); - public static final ITag.INamedTag ARC_TOOL_HYDRATE = ItemTags.makeWrapperTag("bloodmagic:arc/hydrate"); - public static final ITag.INamedTag ARC_TOOL_RESONATOR = ItemTags.makeWrapperTag("bloodmagic:arc/resonator"); - public static final ITag.INamedTag ARC_TOOL_CUTTINGFLUID = ItemTags.makeWrapperTag("bloodmagic:arc/cuttingfluid"); - - public static final ITag.INamedTag CRYSTAL_DEMON = ItemTags.makeWrapperTag("bloodmagic:crystals/demon"); - - public static final ITag.INamedTag LIFE_ESSENCE = FluidTags.makeWrapperTag("forge:life"); - - public static final ITag.INamedTag MUSHROOM_STEM = ItemTags.makeWrapperTag("minecraft:mushroom_stem"); - public static final ITag.INamedTag MUSHROOM_HYPHAE = ItemTags.makeWrapperTag("minecraft:mushroom_hyphae"); - - // Ores - public static final ITag.INamedTag ORE_COPPER = getForgeOreTag("copper"); - public static final ITag.INamedTag ORE_TIN = getForgeOreTag("tin"); - public static final ITag.INamedTag ORE_LEAD = getForgeOreTag("lead"); - public static final ITag.INamedTag ORE_OSMIUM = getForgeOreTag("osmium"); - public static final ITag.INamedTag ORE_SILVER = getForgeOreTag("silver"); - - // Ingots - public static final ITag.INamedTag INGOT_HELLFORGED = getForgeIngotTag("hellforged"); - - // Dusts (/Sands) - public static final ITag.INamedTag DUST_IRON = getForgeDustTag("iron"); - public static final ITag.INamedTag DUST_GOLD = getForgeDustTag("gold"); - public static final ITag.INamedTag DUST_COAL = getForgeDustTag("coal"); - public static final ITag.INamedTag DUST_SALTPETER = getForgeDustTag("saltpeter"); - public static final ITag.INamedTag DUST_SULFUR = getForgeDustTag("sulfur"); - public static final ITag.INamedTag DUST_NETHERITE_SCRAP = getForgeDustTag("netherite_scrap"); - public static final ITag.INamedTag DUST_HELLFORGED = getForgeDustTag("hellforged"); - public static final ITag.INamedTag DUST_CORRUPTED = getBMDustTag("corrupted"); - public static final ITag.INamedTag TINYDUST_CORRUPTED = getBMTinyDustTag("corrupted"); - - // Fragments - public static final ITag.INamedTag FRAGMENT_IRON = getFragmentTag("iron"); - public static final ITag.INamedTag FRAGMENT_GOLD = getFragmentTag("gold"); - public static final ITag.INamedTag FRAGMENT_NETHERITE_SCRAP = getFragmentTag("netherite_scrap"); - - // Gravels - public static final ITag.INamedTag GRAVEL_IRON = getGravelTag("iron"); - public static final ITag.INamedTag GRAVEL_GOLD = getGravelTag("gold"); - public static final ITag.INamedTag GRAVEL_NETHERITE_SCRAP = getGravelTag("netherite_scrap"); - - public static class Blocks - { - public static final ITag.INamedTag MUSHROOM_STEM = BlockTags.makeWrapperTag("minecraft:mushroom_stem"); - public static final ITag.INamedTag MUSHROOM_HYPHAE = BlockTags.makeWrapperTag("minecraft:mushroom_hyphae"); - } - - public static ITag.INamedTag getForgeOreTag(String name) - { - return ItemTags.makeWrapperTag("forge:ores/" + name); - } - - public static ITag.INamedTag getForgeIngotTag(String name) - { - return ItemTags.makeWrapperTag("forge:ingots/" + name); - } - - public static ITag.INamedTag getBMDustTag(String name) - { - return ItemTags.makeWrapperTag("bloodmagic:dusts/" + name); - } - - public static ITag.INamedTag getBMTinyDustTag(String name) - { - return ItemTags.makeWrapperTag("bloodmagic:tiny_dusts/" + name); - } - - public static ITag.INamedTag getForgeDustTag(String name) - { - return ItemTags.makeWrapperTag("forge:dusts/" + name); - } - - public static ITag.INamedTag getFragmentTag(String name) - { - return ItemTags.makeWrapperTag("bloodmagic:fragments/" + name); - } - - public static ITag.INamedTag getGravelTag(String name) - { - return ItemTags.makeWrapperTag("bloodmagic:gravels/" + name); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/compat/crt/ARCManager.java b/src/main/java/wayoftime/bloodmagic/compat/crt/ARCManager.java deleted file mode 100644 index dc2c4749..00000000 --- a/src/main/java/wayoftime/bloodmagic/compat/crt/ARCManager.java +++ /dev/null @@ -1,74 +0,0 @@ -package wayoftime.bloodmagic.compat.crt; - -import com.blamejared.crafttweaker.api.CraftTweakerAPI; -import com.blamejared.crafttweaker.api.annotations.ZenRegister; -import com.blamejared.crafttweaker.api.fluid.IFluidStack; -import com.blamejared.crafttweaker.api.item.IIngredient; -import com.blamejared.crafttweaker.api.item.IItemStack; -import com.blamejared.crafttweaker.api.managers.IRecipeManager; -import com.blamejared.crafttweaker.impl.actions.recipes.ActionAddRecipe; -import com.blamejared.crafttweaker.impl.actions.recipes.ActionRemoveOutputRecipe; -import com.blamejared.crafttweaker.impl.actions.recipes.ActionRemoveRecipeByOutput; -import com.blamejared.crafttweaker.impl.item.MCItemStackMutable; -import com.blamejared.crafttweaker.impl.item.MCWeightedItemStack; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.IRecipeType; -import net.minecraft.util.ResourceLocation; -import org.apache.commons.lang3.tuple.Pair; -import org.openzen.zencode.java.ZenCodeType; -import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType; -import wayoftime.bloodmagic.recipe.RecipeARC; -import wayoftime.bloodmagic.recipe.helper.FluidStackIngredient; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -@ZenRegister -@ZenCodeType.Name("mods.bloodmagic.ARC") -public class ARCManager implements IRecipeManager { - - @ZenCodeType.Method - public void addRecipe(String name, IItemStack output, IFluidStack outputFluid, IIngredient input, IFluidStack inputFluid, IIngredient arcTool, boolean consumeIngredient, @ZenCodeType.Optional MCWeightedItemStack[] addedItems) { - name = fixRecipeName(name); - ResourceLocation location = new ResourceLocation("crafttweaker", name); - List> addedItemsList = new ArrayList<>(); - if(addedItems != null) { - addedItemsList = Arrays.stream(addedItems).map(mcWeightedItemStack -> Pair.of(mcWeightedItemStack.getItemStack().getInternal(), mcWeightedItemStack.getWeight())).collect(Collectors.toList()); - } - RecipeARC recipeARC = new RecipeARC(location, input.asVanillaIngredient(), arcTool.asVanillaIngredient(), inputFluid.getInternal().isEmpty() ? null : FluidStackIngredient.from(inputFluid.getInternal()), output.getInternal(), addedItemsList, outputFluid.getInternal(), consumeIngredient); - CraftTweakerAPI.apply(new ActionAddRecipe(this, recipeARC, "")); - } - - @Override - public void removeRecipe(IItemStack output) { - - CraftTweakerAPI.apply(new ActionRemoveRecipeByOutput(this, output) { - @Override - public void apply() { - List toRemove = new ArrayList<>(); - for(ResourceLocation location : getManager().getRecipes().keySet()) { - IRecipe recipe = getManager().getRecipes().get(location); - if(recipe instanceof RecipeARC) { - RecipeARC recipeARC = (RecipeARC) recipe; - List allListedOutputs = recipeARC.getAllListedOutputs(); - // no other way to get the main output, and there may not even be a main output - if(allListedOutputs.size() > 0) { - if(output.matches(new MCItemStackMutable(allListedOutputs.get(0)))) { - toRemove.add(location); - } - } - } - } - toRemove.forEach(getManager().getRecipes()::remove); - } - }); - } - - @Override - public IRecipeType getRecipeType() { - return BloodMagicRecipeType.ARC; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/compat/crt/AlchemyArrayManager.java b/src/main/java/wayoftime/bloodmagic/compat/crt/AlchemyArrayManager.java deleted file mode 100644 index abc6a449..00000000 --- a/src/main/java/wayoftime/bloodmagic/compat/crt/AlchemyArrayManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package wayoftime.bloodmagic.compat.crt; - -import com.blamejared.crafttweaker.api.CraftTweakerAPI; -import com.blamejared.crafttweaker.api.annotations.ZenRegister; -import com.blamejared.crafttweaker.api.item.IIngredient; -import com.blamejared.crafttweaker.api.item.IItemStack; -import com.blamejared.crafttweaker.api.managers.IRecipeManager; -import com.blamejared.crafttweaker.impl.actions.recipes.ActionAddRecipe; -import com.blamejared.crafttweaker.impl.actions.recipes.ActionRemoveRecipeByOutput; -import com.blamejared.crafttweaker.impl.item.MCItemStackMutable; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.IRecipeType; -import net.minecraft.util.ResourceLocation; -import org.openzen.zencode.java.ZenCodeType; -import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType; -import wayoftime.bloodmagic.recipe.RecipeAlchemyArray; -import wayoftime.bloodmagic.recipe.RecipeAlchemyTable; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -@ZenRegister -@ZenCodeType.Name("mods.bloodmagic.AlchemyArray") -public class AlchemyArrayManager implements IRecipeManager { - - @ZenCodeType.Method - public void addRecipe(String name, IItemStack output, IIngredient baseInput, IIngredient addedInput, ResourceLocation texture) { - name = fixRecipeName(name); - ResourceLocation location = new ResourceLocation("crafttweaker", name); - RecipeAlchemyArray recipe = new RecipeAlchemyArray(location, texture, baseInput.asVanillaIngredient(), addedInput.asVanillaIngredient(), output.getInternal()); - CraftTweakerAPI.apply(new ActionAddRecipe(this, recipe, "")); - } - - @Override - public void removeRecipe(IItemStack output) { - - CraftTweakerAPI.apply(new ActionRemoveRecipeByOutput(this, output) { - @Override - public void apply() { - List toRemove = new ArrayList<>(); - for(ResourceLocation location : getManager().getRecipes().keySet()) { - IRecipe recipe = getManager().getRecipes().get(location); - if(recipe instanceof RecipeAlchemyArray) { - RecipeAlchemyArray recipeAT = (RecipeAlchemyArray) recipe; - ItemStack recipeOutput = recipeAT.getOutput(); - if(output.matches(new MCItemStackMutable(recipeOutput))) { - toRemove.add(location); - } - } - } - toRemove.forEach(getManager().getRecipes()::remove); - } - }); - } - - @Override - public IRecipeType getRecipeType() { - return BloodMagicRecipeType.ARRAY; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/compat/crt/AlchemyTableManager.java b/src/main/java/wayoftime/bloodmagic/compat/crt/AlchemyTableManager.java deleted file mode 100644 index 4a2e5221..00000000 --- a/src/main/java/wayoftime/bloodmagic/compat/crt/AlchemyTableManager.java +++ /dev/null @@ -1,63 +0,0 @@ -package wayoftime.bloodmagic.compat.crt; - -import com.blamejared.crafttweaker.api.CraftTweakerAPI; -import com.blamejared.crafttweaker.api.annotations.ZenRegister; -import com.blamejared.crafttweaker.api.item.IIngredient; -import com.blamejared.crafttweaker.api.item.IItemStack; -import com.blamejared.crafttweaker.api.managers.IRecipeManager; -import com.blamejared.crafttweaker.impl.actions.recipes.ActionAddRecipe; -import com.blamejared.crafttweaker.impl.actions.recipes.ActionRemoveRecipeByOutput; -import com.blamejared.crafttweaker.impl.item.MCItemStackMutable; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.IRecipeType; -import net.minecraft.util.ResourceLocation; -import org.openzen.zencode.java.ZenCodeType; -import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType; -import wayoftime.bloodmagic.recipe.RecipeAlchemyTable; -import wayoftime.bloodmagic.recipe.RecipeTartaricForge; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -@ZenRegister -@ZenCodeType.Name("mods.bloodmagic.AlchemyTable") -public class AlchemyTableManager implements IRecipeManager { - - @ZenCodeType.Method - public void addRecipe(String name, IItemStack output, IIngredient[] input, int syphon, int ticks, int minimumTier) { - name = fixRecipeName(name); - ResourceLocation location = new ResourceLocation("crafttweaker", name); - RecipeAlchemyTable recipe = new RecipeAlchemyTable(location, Arrays.stream(input).map(IIngredient::asVanillaIngredient).collect(Collectors.toList()), output.getInternal(), syphon, ticks, minimumTier); - CraftTweakerAPI.apply(new ActionAddRecipe(this, recipe, "")); - } - - @Override - public void removeRecipe(IItemStack output) { - - CraftTweakerAPI.apply(new ActionRemoveRecipeByOutput(this, output) { - @Override - public void apply() { - List toRemove = new ArrayList<>(); - for(ResourceLocation location : getManager().getRecipes().keySet()) { - IRecipe recipe = getManager().getRecipes().get(location); - if(recipe instanceof RecipeAlchemyTable) { - RecipeAlchemyTable recipeAT = (RecipeAlchemyTable) recipe; - ItemStack recipeOutput = recipeAT.getOutput(); - if(output.matches(new MCItemStackMutable(recipeOutput))) { - toRemove.add(location); - } - } - } - toRemove.forEach(getManager().getRecipes()::remove); - } - }); - } - - @Override - public IRecipeType getRecipeType() { - return BloodMagicRecipeType.ALCHEMYTABLE; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/compat/crt/BloodAltarManager.java b/src/main/java/wayoftime/bloodmagic/compat/crt/BloodAltarManager.java deleted file mode 100644 index 5a740bfa..00000000 --- a/src/main/java/wayoftime/bloodmagic/compat/crt/BloodAltarManager.java +++ /dev/null @@ -1,67 +0,0 @@ -package wayoftime.bloodmagic.compat.crt; - -import com.blamejared.crafttweaker.api.CraftTweakerAPI; -import com.blamejared.crafttweaker.api.annotations.ZenRegister; -import com.blamejared.crafttweaker.api.fluid.IFluidStack; -import com.blamejared.crafttweaker.api.item.IIngredient; -import com.blamejared.crafttweaker.api.item.IItemStack; -import com.blamejared.crafttweaker.api.managers.IRecipeManager; -import com.blamejared.crafttweaker.impl.actions.recipes.ActionAddRecipe; -import com.blamejared.crafttweaker.impl.actions.recipes.ActionRemoveRecipeByOutput; -import com.blamejared.crafttweaker.impl.item.MCItemStackMutable; -import com.blamejared.crafttweaker.impl.item.MCWeightedItemStack; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.IRecipeType; -import net.minecraft.util.ResourceLocation; -import org.apache.commons.lang3.tuple.Pair; -import org.openzen.zencode.java.ZenCodeType; -import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType; -import wayoftime.bloodmagic.recipe.RecipeARC; -import wayoftime.bloodmagic.recipe.RecipeBloodAltar; -import wayoftime.bloodmagic.recipe.helper.FluidStackIngredient; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -@ZenRegister -@ZenCodeType.Name("mods.bloodmagic.BloodAltar") -public class BloodAltarManager implements IRecipeManager { - - @ZenCodeType.Method - public void addRecipe(String name, IItemStack output, IIngredient input, int minimumTier, int syphon, int consumeRate, int drainRate) { - name = fixRecipeName(name); - ResourceLocation location = new ResourceLocation("crafttweaker", name); - RecipeBloodAltar recipeARC = new RecipeBloodAltar(location, input.asVanillaIngredient(), output.getInternal(), minimumTier, syphon, consumeRate, drainRate); - CraftTweakerAPI.apply(new ActionAddRecipe(this, recipeARC, "")); - } - - @Override - public void removeRecipe(IItemStack output) { - - CraftTweakerAPI.apply(new ActionRemoveRecipeByOutput(this, output) { - @Override - public void apply() { - List toRemove = new ArrayList<>(); - for(ResourceLocation location : getManager().getRecipes().keySet()) { - IRecipe recipe = getManager().getRecipes().get(location); - if(recipe instanceof RecipeBloodAltar) { - RecipeBloodAltar recipeBloodAltar = (RecipeBloodAltar) recipe; - ItemStack recOut = recipeBloodAltar.getOutput(); - if(output.matches(new MCItemStackMutable(recOut))) { - toRemove.add(location); - } - } - } - toRemove.forEach(getManager().getRecipes()::remove); - } - }); - } - - @Override - public IRecipeType getRecipeType() { - return BloodMagicRecipeType.ALTAR; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/compat/crt/TartaricForgeManager.java b/src/main/java/wayoftime/bloodmagic/compat/crt/TartaricForgeManager.java deleted file mode 100644 index 1a45d208..00000000 --- a/src/main/java/wayoftime/bloodmagic/compat/crt/TartaricForgeManager.java +++ /dev/null @@ -1,68 +0,0 @@ -package wayoftime.bloodmagic.compat.crt; - -import com.blamejared.crafttweaker.api.CraftTweakerAPI; -import com.blamejared.crafttweaker.api.annotations.ZenRegister; -import com.blamejared.crafttweaker.api.fluid.IFluidStack; -import com.blamejared.crafttweaker.api.item.IIngredient; -import com.blamejared.crafttweaker.api.item.IItemStack; -import com.blamejared.crafttweaker.api.managers.IRecipeManager; -import com.blamejared.crafttweaker.impl.actions.recipes.ActionAddRecipe; -import com.blamejared.crafttweaker.impl.actions.recipes.ActionRemoveRecipeByOutput; -import com.blamejared.crafttweaker.impl.item.MCItemStackMutable; -import com.blamejared.crafttweaker.impl.item.MCWeightedItemStack; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.IRecipeType; -import net.minecraft.util.ResourceLocation; -import org.apache.commons.lang3.tuple.Pair; -import org.openzen.zencode.java.ZenCodeType; -import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType; -import wayoftime.bloodmagic.recipe.RecipeARC; -import wayoftime.bloodmagic.recipe.RecipeTartaricForge; -import wayoftime.bloodmagic.recipe.helper.FluidStackIngredient; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.function.BiFunction; -import java.util.stream.Collectors; - -@ZenRegister -@ZenCodeType.Name("mods.bloodmagic.TartaricForge") -public class TartaricForgeManager implements IRecipeManager { - - @ZenCodeType.Method - public void addRecipe(String name, IItemStack output, IIngredient[] input, double minimumSouls, double soulDrain) { - name = fixRecipeName(name); - ResourceLocation location = new ResourceLocation("crafttweaker", name); - RecipeTartaricForge recipe = new RecipeTartaricForge(location, Arrays.stream(input).map(IIngredient::asVanillaIngredient).collect(Collectors.toList()), output.getInternal(), minimumSouls, soulDrain); - CraftTweakerAPI.apply(new ActionAddRecipe(this, recipe, "")); - } - - @Override - public void removeRecipe(IItemStack output) { - - CraftTweakerAPI.apply(new ActionRemoveRecipeByOutput(this, output) { - @Override - public void apply() { - List toRemove = new ArrayList<>(); - for(ResourceLocation location : getManager().getRecipes().keySet()) { - IRecipe recipe = getManager().getRecipes().get(location); - if(recipe instanceof RecipeTartaricForge) { - RecipeTartaricForge recipeTF = (RecipeTartaricForge) recipe; - ItemStack recipeOutput = recipeTF.getOutput(); - if(output.matches(new MCItemStackMutable(recipeOutput))) { - toRemove.add(location); - } - } - } - toRemove.forEach(getManager().getRecipes()::remove); - } - }); - } - - @Override - public IRecipeType getRecipeType() { - return BloodMagicRecipeType.TARTARICFORGE; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java b/src/main/java/wayoftime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java deleted file mode 100644 index 55be8f70..00000000 --- a/src/main/java/wayoftime/bloodmagic/compat/jei/BloodMagicJEIPlugin.java +++ /dev/null @@ -1,77 +0,0 @@ -package wayoftime.bloodmagic.compat.jei; - -import java.util.Objects; - -import com.google.common.collect.ImmutableSet; - -import mezz.jei.api.IModPlugin; -import mezz.jei.api.JeiPlugin; -import mezz.jei.api.helpers.IJeiHelpers; -import mezz.jei.api.registration.IRecipeCatalystRegistration; -import mezz.jei.api.registration.IRecipeCategoryRegistration; -import mezz.jei.api.registration.IRecipeRegistration; -import net.minecraft.client.Minecraft; -import net.minecraft.client.world.ClientWorld; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipeType; -import net.minecraft.util.ResourceLocation; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.impl.BloodMagicAPI; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.common.item.BloodMagicItems; -import wayoftime.bloodmagic.compat.jei.alchemytable.AlchemyTableRecipeCategory; -import wayoftime.bloodmagic.compat.jei.altar.BloodAltarRecipeCategory; -import wayoftime.bloodmagic.compat.jei.arc.ARCFurnaceRecipeCategory; -import wayoftime.bloodmagic.compat.jei.arc.ARCRecipeCategory; -import wayoftime.bloodmagic.compat.jei.array.AlchemyArrayCraftingCategory; -import wayoftime.bloodmagic.compat.jei.forge.TartaricForgeRecipeCategory; - -@JeiPlugin -public class BloodMagicJEIPlugin implements IModPlugin -{ - public static IJeiHelpers jeiHelper; - - private static final ResourceLocation ID = BloodMagic.rl("jei_plugin"); - - @Override - public void registerRecipeCatalysts(IRecipeCatalystRegistration registration) - { - registration.addRecipeCatalyst(new ItemStack(BloodMagicBlocks.SOUL_FORGE.get()), TartaricForgeRecipeCategory.UID); - registration.addRecipeCatalyst(new ItemStack(BloodMagicBlocks.BLOOD_ALTAR.get()), BloodAltarRecipeCategory.UID); - registration.addRecipeCatalyst(new ItemStack(BloodMagicItems.ARCANE_ASHES.get()), AlchemyArrayCraftingCategory.UID); - registration.addRecipeCatalyst(new ItemStack(BloodMagicBlocks.ALCHEMICAL_REACTION_CHAMBER.get()), ARCRecipeCategory.UID); - registration.addRecipeCatalyst(new ItemStack(BloodMagicBlocks.ALCHEMICAL_REACTION_CHAMBER.get()), ARCFurnaceRecipeCategory.UID); - registration.addRecipeCatalyst(new ItemStack(BloodMagicBlocks.ALCHEMY_TABLE.get()), AlchemyTableRecipeCategory.UID); - } - - @Override - public void registerCategories(IRecipeCategoryRegistration registration) - { - jeiHelper = registration.getJeiHelpers(); - registration.addRecipeCategories(new TartaricForgeRecipeCategory(registration.getJeiHelpers().getGuiHelper())); - registration.addRecipeCategories(new BloodAltarRecipeCategory(registration.getJeiHelpers().getGuiHelper())); - registration.addRecipeCategories(new AlchemyArrayCraftingCategory(registration.getJeiHelpers().getGuiHelper())); - registration.addRecipeCategories(new ARCRecipeCategory(registration.getJeiHelpers().getGuiHelper())); - registration.addRecipeCategories(new ARCFurnaceRecipeCategory(registration.getJeiHelpers().getGuiHelper())); - registration.addRecipeCategories(new AlchemyTableRecipeCategory(registration.getJeiHelpers().getGuiHelper())); - } - - @Override - public void registerRecipes(IRecipeRegistration registration) - { - ClientWorld world = Objects.requireNonNull(Minecraft.getInstance().world); - registration.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getTartaricForgeRecipes(world), TartaricForgeRecipeCategory.UID); - registration.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAltarRecipes(world), BloodAltarRecipeCategory.UID); - registration.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyArrayRecipes(world), AlchemyArrayCraftingCategory.UID); - registration.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getARCRecipes(world), ARCRecipeCategory.UID); - registration.addRecipes(ImmutableSet.copyOf(world.getRecipeManager().getRecipesForType(IRecipeType.SMELTING)), ARCFurnaceRecipeCategory.UID); - registration.addRecipes(BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyTableRecipes(world), AlchemyTableRecipeCategory.UID); - } - - @Override - public ResourceLocation getPluginUid() - { - return ID; - } - -} diff --git a/src/main/java/wayoftime/bloodmagic/compat/jei/alchemytable/AlchemyTableRecipeCategory.java b/src/main/java/wayoftime/bloodmagic/compat/jei/alchemytable/AlchemyTableRecipeCategory.java deleted file mode 100644 index 1909e83f..00000000 --- a/src/main/java/wayoftime/bloodmagic/compat/jei/alchemytable/AlchemyTableRecipeCategory.java +++ /dev/null @@ -1,162 +0,0 @@ -package wayoftime.bloodmagic.compat.jei.alchemytable; - -import java.util.List; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import com.google.common.collect.Lists; - -import mezz.jei.api.constants.VanillaTypes; -import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.gui.drawable.IDrawable; -import mezz.jei.api.gui.ingredient.IGuiItemStackGroup; -import mezz.jei.api.helpers.IGuiHelper; -import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.category.IRecipeCategory; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.core.registry.OrbRegistry; -import wayoftime.bloodmagic.recipe.RecipeAlchemyTable; -import wayoftime.bloodmagic.util.ChatUtil; -import wayoftime.bloodmagic.util.Constants; -import wayoftime.bloodmagic.util.helper.TextHelper; - -public class AlchemyTableRecipeCategory implements IRecipeCategory -{ - private static final int OUTPUT_SLOT = 0; - private static final int ORB_SLOT = 1; - private static final int INPUT_SLOT = 2; - public static final ResourceLocation UID = BloodMagic.rl(Constants.Compat.JEI_CATEGORY_ALCHEMYTABLE); - - @Nonnull - private final IDrawable background; - private final IDrawable icon; -// @Nonnull -// private final ICraftingGridHelper craftingGridHelper; - - public AlchemyTableRecipeCategory(IGuiHelper guiHelper) - { - icon = guiHelper.createDrawableIngredient(new ItemStack(BloodMagicBlocks.ALCHEMY_TABLE.get())); - background = guiHelper.createDrawable(BloodMagic.rl("gui/jei/alchemytable.png"), 0, 0, 118, 40); -// craftingGridHelper = guiHelper.createCraftingGridHelper(INPUT_SLOT); - } - - @Nonnull - @Override - public ResourceLocation getUid() - { - return UID; - } - - @Override - public List getTooltipStrings(RecipeAlchemyTable recipe, double mouseX, double mouseY) - { - List tooltip = Lists.newArrayList(); - -// if (mouseX >= 13 && mouseX <= 64 && mouseY >= 27 && mouseY <= 58) -// { -// tooltip.add(new TranslationTextComponent("jei.bloodmagic.recipe.consumptionrate", ChatUtil.DECIMAL_FORMAT.format(recipe.getConsumeRate()))); -// tooltip.add(new TranslationTextComponent("jei.bloodmagic.recipe.drainrate", ChatUtil.DECIMAL_FORMAT.format(recipe.getDrainRate()))); -// } - - if (mouseX >= 58 && mouseX <= 78 && mouseY >= 21 && mouseY <= 34) - { - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.tier", ChatUtil.DECIMAL_FORMAT.format(recipe.getMinimumTier()))); - tooltip.add(new TranslationTextComponent("jei.bloodmagic.recipe.lpDrained", ChatUtil.DECIMAL_FORMAT.format(recipe.getSyphon()))); - tooltip.add(new TranslationTextComponent("jei.bloodmagic.recipe.ticksRequired", ChatUtil.DECIMAL_FORMAT.format(recipe.getTicks()))); - } - - return tooltip; - } - - @Nonnull - @Override - public String getTitle() - { - return TextHelper.localize("jei.bloodmagic.recipe.alchemytable"); - } - - @Nonnull - @Override - public IDrawable getBackground() - { - return background; - } - - @Nullable - @Override - public IDrawable getIcon() - { - return icon; - } - - @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull RecipeAlchemyTable recipe, @Nonnull IIngredients ingredients) - { - IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); - - guiItemStacks.init(OUTPUT_SLOT, false, 91, 13); - guiItemStacks.init(ORB_SLOT, true, 60, 0); - - for (int y = 0; y < 2; ++y) - { - for (int x = 0; x < 3; ++x) - { - int index = INPUT_SLOT + x + (y * 3); - guiItemStacks.init(index, true, x * 18, y * 18); - } - } -// guiItemStacks.set(ORB_SLOT, OrbRegistry.getOrbsDownToTier(recipe.getMinimumTier())); -// guiItemStacks.set(OUTPUT_SLOT, ingredients.getOutputs(ItemStack.class).get(0)); - -// guiItemStacks.init(OUTPUT_SLOT, false, 125, 30); -// guiItemStacks.init(INPUT_SLOT, true, 31, 0); -// craftingGridHelper.setInputs(guiItemStacks, ingredients.getInputs(ItemStack.class), 3, 2); - - guiItemStacks.set(ingredients); - } - - @Override - public Class getRecipeClass() - { - return RecipeAlchemyTable.class; - } - - @Override - public void setIngredients(RecipeAlchemyTable recipe, IIngredients ingredients) - { - List validOrbs = OrbRegistry.getOrbsDownToTier(recipe.getMinimumTier()); - - ItemStack[] validOrbStacks = new ItemStack[validOrbs.size()]; - for (int i = 0; i < validOrbStacks.length; i++) - { - validOrbStacks[i] = validOrbs.get(i); - } - - List ingList = Lists.newArrayList(); - ingList.add(Ingredient.fromStacks(validOrbStacks)); - ingList.addAll(recipe.getInput()); - ingredients.setInputIngredients(ingList); - ingredients.setOutput(VanillaTypes.ITEM, recipe.getOutput()); - } - -// @Override -// public void draw(RecipeBloodAltar recipe, MatrixStack matrixStack, double mouseX, double mouseY) -// { -// Minecraft mc = Minecraft.getInstance(); -// String[] infoString = new String[] -// { TextHelper.localize("jei.bloodmagic.recipe.requiredtier", NumeralHelper.toRoman(recipe.getMinimumTier().toInt())), -// TextHelper.localize("jei.bloodmagic.recipe.requiredlp", recipe.getSyphon()) }; -// mc.fontRenderer.drawString(matrixStack, infoString[0], 90 -// - mc.fontRenderer.getStringWidth(infoString[0]) / 2, 0, Color.gray.getRGB()); -// mc.fontRenderer.drawString(matrixStack, infoString[1], 90 -// - mc.fontRenderer.getStringWidth(infoString[1]) / 2, 10, Color.gray.getRGB()); -// } - -} diff --git a/src/main/java/wayoftime/bloodmagic/compat/jei/altar/BloodAltarRecipeCategory.java b/src/main/java/wayoftime/bloodmagic/compat/jei/altar/BloodAltarRecipeCategory.java deleted file mode 100644 index 72c72c3f..00000000 --- a/src/main/java/wayoftime/bloodmagic/compat/jei/altar/BloodAltarRecipeCategory.java +++ /dev/null @@ -1,130 +0,0 @@ -package wayoftime.bloodmagic.compat.jei.altar; - -import java.awt.Color; -import java.util.List; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import com.google.common.collect.Lists; -import com.mojang.blaze3d.matrix.MatrixStack; - -import mezz.jei.api.constants.VanillaTypes; -import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.gui.drawable.IDrawable; -import mezz.jei.api.gui.ingredient.IGuiItemStackGroup; -import mezz.jei.api.helpers.IGuiHelper; -import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.category.IRecipeCategory; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.recipe.RecipeBloodAltar; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.util.ChatUtil; -import wayoftime.bloodmagic.util.Constants; -import wayoftime.bloodmagic.util.helper.NumeralHelper; -import wayoftime.bloodmagic.util.helper.TextHelper; - -public class BloodAltarRecipeCategory implements IRecipeCategory -{ - private static final int INPUT_SLOT = 1; - private static final int OUTPUT_SLOT = 0; - public static final ResourceLocation UID = BloodMagic.rl(Constants.Compat.JEI_CATEGORY_ALTAR); - - @Nonnull - private final IDrawable background; - private final IDrawable icon; -// @Nonnull -// private final ICraftingGridHelper craftingGridHelper; - - public BloodAltarRecipeCategory(IGuiHelper guiHelper) - { - icon = guiHelper.createDrawableIngredient(new ItemStack(BloodMagicBlocks.BLOOD_ALTAR.get())); - background = guiHelper.createDrawable(BloodMagic.rl("gui/jei/altar.png"), 3, 4, 155, 65); -// craftingGridHelper = guiHelper.createCraftingGridHelper(INPUT_SLOT); - } - - @Nonnull - @Override - public ResourceLocation getUid() - { - return UID; - } - - @Override - public List getTooltipStrings(RecipeBloodAltar recipe, double mouseX, double mouseY) - { - List tooltip = Lists.newArrayList(); - - if (mouseX >= 13 && mouseX <= 64 && mouseY >= 27 && mouseY <= 58) - { - tooltip.add(new TranslationTextComponent("jei.bloodmagic.recipe.consumptionrate", ChatUtil.DECIMAL_FORMAT.format(recipe.getConsumeRate()))); - tooltip.add(new TranslationTextComponent("jei.bloodmagic.recipe.drainrate", ChatUtil.DECIMAL_FORMAT.format(recipe.getDrainRate()))); - } - - return tooltip; - } - - @Nonnull - @Override - public String getTitle() - { - return TextHelper.localize("jei.bloodmagic.recipe.altar"); - } - - @Nonnull - @Override - public IDrawable getBackground() - { - return background; - } - - @Nullable - @Override - public IDrawable getIcon() - { - return icon; - } - - @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull RecipeBloodAltar recipe, @Nonnull IIngredients ingredients) - { - IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); - - guiItemStacks.init(OUTPUT_SLOT, false, 125, 30); - guiItemStacks.init(INPUT_SLOT, true, 31, 0); - - guiItemStacks.set(ingredients); - } - - @Override - public Class getRecipeClass() - { - return RecipeBloodAltar.class; - } - - @Override - public void setIngredients(RecipeBloodAltar recipe, IIngredients ingredients) - { - ingredients.setInputIngredients(recipe.getIngredients()); - ingredients.setOutput(VanillaTypes.ITEM, recipe.getOutput()); - } - - @Override - public void draw(RecipeBloodAltar recipe, MatrixStack matrixStack, double mouseX, double mouseY) - { - Minecraft mc = Minecraft.getInstance(); - String[] infoString = new String[] - { TextHelper.localize("jei.bloodmagic.recipe.requiredtier", NumeralHelper.toRoman(recipe.getMinimumTier() + 1)), - TextHelper.localize("jei.bloodmagic.recipe.requiredlp", recipe.getSyphon()) }; - mc.fontRenderer.drawString(matrixStack, infoString[0], 90 - - mc.fontRenderer.getStringWidth(infoString[0]) / 2, 0, Color.gray.getRGB()); - mc.fontRenderer.drawString(matrixStack, infoString[1], 90 - - mc.fontRenderer.getStringWidth(infoString[1]) / 2, 10, Color.gray.getRGB()); - } - -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/compat/jei/arc/ARCFurnaceRecipeCategory.java b/src/main/java/wayoftime/bloodmagic/compat/jei/arc/ARCFurnaceRecipeCategory.java deleted file mode 100644 index d8d5ca72..00000000 --- a/src/main/java/wayoftime/bloodmagic/compat/jei/arc/ARCFurnaceRecipeCategory.java +++ /dev/null @@ -1,114 +0,0 @@ -package wayoftime.bloodmagic.compat.jei.arc; - -import java.util.List; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import com.mojang.blaze3d.matrix.MatrixStack; - -import mezz.jei.api.constants.VanillaTypes; -import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.gui.drawable.IDrawable; -import mezz.jei.api.gui.ingredient.IGuiItemStackGroup; -import mezz.jei.api.helpers.IGuiHelper; -import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.category.IRecipeCategory; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipe; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fluids.FluidStack; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.common.tags.BloodMagicTags; -import wayoftime.bloodmagic.util.Constants; -import wayoftime.bloodmagic.util.handler.event.ClientHandler; -import wayoftime.bloodmagic.util.helper.TextHelper; - -public class ARCFurnaceRecipeCategory implements IRecipeCategory -{ - private static final int OUTPUT_SLOT = 0; - private static final int INPUT_SLOT = 1; - private static final int CATALYST_SLOT = 2; - public static final ResourceLocation UID = BloodMagic.rl(Constants.Compat.JEI_CATEGORY_ARC + "furnace"); - public static final ResourceLocation BACKGROUNDRL = BloodMagic.rl("gui/jei/arc.png"); - - @Nonnull - private final IDrawable background; - private final IDrawable icon; -// @Nonnull -// private final ICraftingGridHelper craftingGridHelper; - - public ARCFurnaceRecipeCategory(IGuiHelper guiHelper) - { - icon = guiHelper.createDrawableIngredient(new ItemStack(BloodMagicBlocks.ALCHEMICAL_REACTION_CHAMBER.get())); - background = guiHelper.createDrawable(BACKGROUNDRL, 0, 0, 157, 43); -// craftingGridHelper = guiHelper.createCraftingGridHelper(INPUT_SLOT); - } - - @Nonnull - @Override - public ResourceLocation getUid() - { - return UID; - } - - @Nonnull - @Override - public String getTitle() - { - return TextHelper.localize("jei.bloodmagic.recipe.arcfurnace"); - } - - @Nonnull - @Override - public IDrawable getBackground() - { - return background; - } - - @Nullable - @Override - public IDrawable getIcon() - { - return icon; - } - - @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull FurnaceRecipe recipe, @Nonnull IIngredients ingredients) - { - IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); - - recipeLayout.getItemStacks().init(OUTPUT_SLOT, false, 53, 16); - recipeLayout.getItemStacks().init(INPUT_SLOT, true, 0, 5); - recipeLayout.getItemStacks().init(CATALYST_SLOT, true, 21, 16); - - guiItemStacks.set(ingredients); - } - - @Override - public Class getRecipeClass() - { - return FurnaceRecipe.class; - } - - @Override - public void setIngredients(FurnaceRecipe recipe, IIngredients ingredients) - { - List inputIngList = recipe.getIngredients(); - inputIngList.add(Ingredient.fromTag(BloodMagicTags.ARC_TOOL_FURNACE)); - ingredients.setInputIngredients(inputIngList); - ingredients.setOutput(VanillaTypes.ITEM, recipe.getRecipeOutput()); - } - - @Override - public void draw(FurnaceRecipe recipe, MatrixStack matrixStack, double mouseX, double mouseY) - { - FluidStack outputStack = FluidStack.EMPTY; - ClientHandler.handleGuiTank(matrixStack, outputStack, outputStack.getAmount(), 140, 7, 16, 36, 157, 6, 18, 38, (int) mouseX, (int) mouseY, BACKGROUNDRL.toString(), null); - - FluidStack inputStack = FluidStack.EMPTY; - ClientHandler.handleGuiTank(matrixStack, inputStack, inputStack.getAmount(), 1, 26, 16, 16, 175, 26, 18, 18, (int) mouseX, (int) mouseY, BACKGROUNDRL.toString(), null); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/compat/jei/arc/ARCRecipeCategory.java b/src/main/java/wayoftime/bloodmagic/compat/jei/arc/ARCRecipeCategory.java deleted file mode 100644 index 668ebcb0..00000000 --- a/src/main/java/wayoftime/bloodmagic/compat/jei/arc/ARCRecipeCategory.java +++ /dev/null @@ -1,172 +0,0 @@ -package wayoftime.bloodmagic.compat.jei.arc; - -import java.awt.Color; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import com.mojang.blaze3d.matrix.MatrixStack; - -import mezz.jei.api.constants.VanillaTypes; -import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.gui.drawable.IDrawable; -import mezz.jei.api.gui.ingredient.IGuiItemStackGroup; -import mezz.jei.api.helpers.IGuiHelper; -import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.category.IRecipeCategory; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; -import net.minecraftforge.fluids.FluidStack; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.recipe.RecipeARC; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.util.Constants; -import wayoftime.bloodmagic.util.handler.event.ClientHandler; -import wayoftime.bloodmagic.util.helper.TextHelper; - -public class ARCRecipeCategory implements IRecipeCategory -{ - private static final int OUTPUT_SLOT = 0; - private static final int INPUT_SLOT = 4; - private static final int CATALYST_SLOT = 5; - public static final ResourceLocation UID = BloodMagic.rl(Constants.Compat.JEI_CATEGORY_ARC); - public static final ResourceLocation BACKGROUNDRL = BloodMagic.rl("gui/jei/arc.png"); - - @Nonnull - private final IDrawable background; - private final IDrawable icon; -// @Nonnull -// private final ICraftingGridHelper craftingGridHelper; - - public ARCRecipeCategory(IGuiHelper guiHelper) - { - icon = guiHelper.createDrawableIngredient(new ItemStack(BloodMagicBlocks.ALCHEMICAL_REACTION_CHAMBER.get())); - background = guiHelper.createDrawable(BACKGROUNDRL, 0, 0, 157, 43); -// craftingGridHelper = guiHelper.createCraftingGridHelper(INPUT_SLOT); - } - - @Nonnull - @Override - public ResourceLocation getUid() - { - return UID; - } - - @Nonnull - @Override - public String getTitle() - { - return TextHelper.localize("jei.bloodmagic.recipe.arc"); - } - - @Nonnull - @Override - public IDrawable getBackground() - { - return background; - } - - @Nullable - @Override - public IDrawable getIcon() - { - return icon; - } - - @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull RecipeARC recipe, @Nonnull IIngredients ingredients) - { - IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); - - recipeLayout.getItemStacks().init(OUTPUT_SLOT, false, 53, 16); - recipeLayout.getItemStacks().init(OUTPUT_SLOT + 1, false, 53 + 22 * 1, 16); - recipeLayout.getItemStacks().init(OUTPUT_SLOT + 2, false, 53 + 22 * 2, 16); - recipeLayout.getItemStacks().init(OUTPUT_SLOT + 3, false, 53 + 22 * 3, 16); - recipeLayout.getItemStacks().init(INPUT_SLOT, true, 0, 5); - recipeLayout.getItemStacks().init(CATALYST_SLOT, true, 21, 16); - - guiItemStacks.set(ingredients); - } - - @Override - public Class getRecipeClass() - { - return RecipeARC.class; - } - - @Override - public void setIngredients(RecipeARC recipe, IIngredients ingredients) - { - ingredients.setInputIngredients(recipe.getIngredients()); - ingredients.setOutputs(VanillaTypes.ITEM, recipe.getAllListedOutputs()); - } - - @Override - public void draw(RecipeARC recipe, MatrixStack matrixStack, double mouseX, double mouseY) - { - Minecraft mc = Minecraft.getInstance(); - double[] chanceArray = recipe.getAllOutputChances(); - - String[] infoString = new String[chanceArray.length]; - for (int i = 0; i < infoString.length; i++) - { - if (chanceArray[i] >= 1) - { - infoString[i] = ""; - } else if (chanceArray[i] < 0.01) - { - infoString[i] = "<1%"; - } else - { - infoString[i] = "" + (int) (chanceArray[i] * 100) + "%"; - } - - mc.fontRenderer.drawStringWithShadow(matrixStack, infoString[i], 86 + 22 * i - - mc.fontRenderer.getStringWidth(infoString[i]) / 2, 5, Color.white.getRGB()); - } - -// if (recipe.getFluidOutput() != null && !recipe.getFluidOutput().isEmpty()) - { - FluidStack outputStack = recipe.getFluidOutput(); - ClientHandler.handleGuiTank(matrixStack, outputStack, outputStack.getAmount(), 140, 7, 16, 36, 157, 6, 18, 38, (int) mouseX, (int) mouseY, BACKGROUNDRL.toString(), null); - } - - if (recipe.getFluidIngredient() != null) - { - List inputFluids = recipe.getFluidIngredient().getRepresentations(); - FluidStack inputStack = inputFluids.get(0); - ClientHandler.handleGuiTank(matrixStack, inputStack, inputStack.getAmount(), 1, 26, 16, 16, 175, 26, 18, 18, (int) mouseX, (int) mouseY, BACKGROUNDRL.toString(), null); - } - -// { TextHelper.localize("jei.bloodmagic.recipe.requiredtier", NumeralHelper.toRoman(recipe.getMinimumTier().toInt())), -// TextHelper.localize("jei.bloodmagic.recipe.requiredlp", recipe.getSyphon()) }; -// mc.fontRenderer.drawString(matrixStack, infoString[0], 90 -// - mc.fontRenderer.getStringWidth(infoString[0]) / 2, 0, Color.gray.getRGB()); -// mc.fontRenderer.drawString(matrixStack, infoString[1], 90 -// - mc.fontRenderer.getStringWidth(infoString[1]) / 2, 10, Color.gray.getRGB()); - } - - @Override - public List getTooltipStrings(RecipeARC recipe, double mouseX, double mouseY) - { - List tooltip = new ArrayList<>(); - FluidStack outputStack = recipe.getFluidOutput(); - if (!outputStack.isEmpty()) - { - ClientHandler.handleGuiTank(null, outputStack, -1, 140, 8, 16, 34, 157, 7, 18, 36, (int) mouseX, (int) mouseY, BACKGROUNDRL.toString(), tooltip); - } - - if (recipe.getFluidIngredient() != null) - { - List inputFluids = recipe.getFluidIngredient().getRepresentations(); - FluidStack inputStack = inputFluids.get(0); - ClientHandler.handleGuiTank(null, inputStack, -1, 1, 26, 16, 16, 175, 26, 18, 18, (int) mouseX, (int) mouseY, BACKGROUNDRL.toString(), tooltip); - } - - return tooltip; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/compat/jei/array/AlchemyArrayCraftingCategory.java b/src/main/java/wayoftime/bloodmagic/compat/jei/array/AlchemyArrayCraftingCategory.java deleted file mode 100644 index 45d9d511..00000000 --- a/src/main/java/wayoftime/bloodmagic/compat/jei/array/AlchemyArrayCraftingCategory.java +++ /dev/null @@ -1,101 +0,0 @@ -package wayoftime.bloodmagic.compat.jei.array; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import mezz.jei.api.constants.VanillaTypes; -import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.gui.drawable.IDrawable; -import mezz.jei.api.gui.ingredient.IGuiItemStackGroup; -import mezz.jei.api.helpers.IGuiHelper; -import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.category.IRecipeCategory; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.common.item.BloodMagicItems; -import wayoftime.bloodmagic.recipe.RecipeAlchemyArray; -import wayoftime.bloodmagic.util.Constants; -import wayoftime.bloodmagic.util.helper.TextHelper; - -public class AlchemyArrayCraftingCategory implements IRecipeCategory -{ - private static final int OUTPUT_SLOT = 0; - private static final int INPUT_SLOT = 1; - private static final int CATALYST_SLOT = 2; - public static final ResourceLocation UID = BloodMagic.rl(Constants.Compat.JEI_CATEGORY_ALCHEMYARRAY); - - @Nonnull - private final IDrawable background; - private final IDrawable icon; -// @Nonnull -// private final ICraftingGridHelper craftingGridHelper; - - public AlchemyArrayCraftingCategory(IGuiHelper guiHelper) - { - icon = guiHelper.createDrawableIngredient(new ItemStack(BloodMagicItems.ARCANE_ASHES.get())); - background = guiHelper.createDrawable(BloodMagic.rl("gui/jei/binding.png"), 0, 0, 100, 30); -// craftingGridHelper = guiHelper.createCraftingGridHelper(INPUT_SLOT); - } - - @Nonnull - @Override - public ResourceLocation getUid() - { - return UID; - } - - @Nonnull - @Override - public String getTitle() - { - return TextHelper.localize("jei.bloodmagic.recipe.alchemyarraycrafting"); - } - - @Nonnull - @Override - public IDrawable getBackground() - { - return background; - } - - @Nullable - @Override - public IDrawable getIcon() - { - return icon; - } - - @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull RecipeAlchemyArray recipe, @Nonnull IIngredients ingredients) - { - IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); - - recipeLayout.getItemStacks().init(OUTPUT_SLOT, false, 73, 5); - recipeLayout.getItemStacks().init(INPUT_SLOT, true, 0, 5); - recipeLayout.getItemStacks().init(CATALYST_SLOT, true, 29, 3); - - guiItemStacks.set(ingredients); - } - - @Override - public Class getRecipeClass() - { - return RecipeAlchemyArray.class; - } - - @Override - public void setIngredients(RecipeAlchemyArray recipe, IIngredients ingredients) - { - ingredients.setInputIngredients(recipe.getIngredients()); - if (recipe.getOutput().isEmpty()) - { - ingredients.setOutput(VanillaTypes.ITEM, new ItemStack(BloodMagicItems.ARCANE_ASHES.get())); -// ingredients.setOutput(VanillaTypes.ITEM, new ItemStack(BloodMagicBlocks.ALCHEMY_ARRAY.get())); - } else - { - ingredients.setOutput(VanillaTypes.ITEM, recipe.getOutput()); - } - - } -} diff --git a/src/main/java/wayoftime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java b/src/main/java/wayoftime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java deleted file mode 100644 index 27061b92..00000000 --- a/src/main/java/wayoftime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java +++ /dev/null @@ -1,172 +0,0 @@ -package wayoftime.bloodmagic.compat.jei.forge; - -import java.util.List; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import com.google.common.collect.Lists; - -import mezz.jei.api.constants.VanillaTypes; -import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.gui.drawable.IDrawable; -import mezz.jei.api.gui.ingredient.IGuiItemStackGroup; -import mezz.jei.api.helpers.IGuiHelper; -import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.category.IRecipeCategory; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.recipe.RecipeTartaricForge; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.common.item.BloodMagicItems; -import wayoftime.bloodmagic.util.ChatUtil; -import wayoftime.bloodmagic.util.Constants; -import wayoftime.bloodmagic.util.helper.TextHelper; - -public class TartaricForgeRecipeCategory implements IRecipeCategory -{ - private static final int OUTPUT_SLOT = 0; - private static final int GEM_SLOT = 1; - private static final int INPUT_SLOT = 2; - public static final ResourceLocation UID = BloodMagic.rl(Constants.Compat.JEI_CATEGORY_SOULFORGE); - - @Nonnull - private final IDrawable background; - private final IDrawable icon; -// @Nonnull -// private final ICraftingGridHelper craftingGridHelper; - - public TartaricForgeRecipeCategory(IGuiHelper guiHelper) - { - icon = guiHelper.createDrawableIngredient(new ItemStack(BloodMagicBlocks.SOUL_FORGE.get())); - background = guiHelper.createDrawable(BloodMagic.rl("gui/jei/soulforge.png"), 0, 0, 100, 40); -// craftingGridHelper = guiHelper.createCraftingGridHelper(INPUT_SLOT); - } - - @Nonnull - @Override - public ResourceLocation getUid() - { - return UID; - } - - @Override - public List getTooltipStrings(RecipeTartaricForge recipe, double mouseX, double mouseY) - { - List tooltip = Lists.newArrayList(); - if (mouseX >= 40 && mouseX <= 60 && mouseY >= 21 && mouseY <= 34) - { - tooltip.add(new TranslationTextComponent("jei.bloodmagic.recipe.minimumsouls", ChatUtil.DECIMAL_FORMAT.format(recipe.getMinimumSouls()))); - tooltip.add(new TranslationTextComponent("jei.bloodmagic.recipe.soulsdrained", ChatUtil.DECIMAL_FORMAT.format(recipe.getSoulDrain()))); - } - return tooltip; - } - - @Nonnull - @Override - public String getTitle() - { - return TextHelper.localize("jei.bloodmagic.recipe.soulforge"); - } - - @Nonnull - @Override - public IDrawable getBackground() - { - return background; - } - - @Nullable - @Override - public IDrawable getIcon() - { - return icon; - } - - @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull RecipeTartaricForge recipe, @Nonnull IIngredients ingredients) - { - List validGems = Lists.newArrayList(); - for (DefaultWill will : DefaultWill.values()) - { - if (will.minSouls >= recipe.getMinimumSouls()) - { - validGems.add(will.willStack); - } - } - - IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); - - guiItemStacks.init(OUTPUT_SLOT, false, 73, 13); - - guiItemStacks.init(GEM_SLOT, true, 42, 0); - - for (int y = 0; y < 2; ++y) - { - for (int x = 0; x < 2; ++x) - { - int index = INPUT_SLOT + x + (y * 2); - guiItemStacks.init(index, true, x * 18, y * 18); - } - } - - guiItemStacks.set(GEM_SLOT, validGems); - guiItemStacks.set(OUTPUT_SLOT, ingredients.getOutputs(VanillaTypes.ITEM).get(0)); - guiItemStacks.set(ingredients); - } - - @Override - public Class getRecipeClass() - { - return RecipeTartaricForge.class; - } - - @Override - public void setIngredients(RecipeTartaricForge recipe, IIngredients ingredients) - { - List validGems = Lists.newArrayList(); - for (DefaultWill will : DefaultWill.values()) - { - if (will.minSouls >= recipe.getMinimumSouls()) - { - validGems.add(will.willStack); - } - } - - ItemStack[] validGemStacks = new ItemStack[validGems.size()]; - for (int i = 0; i < validGemStacks.length; i++) - { - validGemStacks[i] = validGems.get(i); - } - - List ingList = Lists.newArrayList(); - ingList.add(Ingredient.fromStacks(validGemStacks)); - ingList.addAll(recipe.getInput()); - - ingredients.setInputIngredients(ingList); - ingredients.setOutput(VanillaTypes.ITEM, recipe.getOutput()); - } - - public enum DefaultWill - { - SOUL(new ItemStack(BloodMagicItems.MONSTER_SOUL_RAW.get()), 16), - PETTY(new ItemStack(BloodMagicItems.PETTY_GEM.get()), 64), - LESSER(new ItemStack(BloodMagicItems.LESSER_GEM.get()), 256), - COMMON(new ItemStack(BloodMagicItems.COMMON_GEM.get()), 1024), - GREATER(new ItemStack(BloodMagicItems.GREATER_GEM.get()), 4096); -// GRAND(new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, 4), 16384); - - public final ItemStack willStack; - public final double minSouls; - - DefaultWill(ItemStack willStack, double minSouls) - { - this.willStack = willStack; - this.minSouls = minSouls; - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/compat/patchouli/processors/ARCProcessor.java b/src/main/java/wayoftime/bloodmagic/compat/patchouli/processors/ARCProcessor.java deleted file mode 100644 index 1cd3fa4d..00000000 --- a/src/main/java/wayoftime/bloodmagic/compat/patchouli/processors/ARCProcessor.java +++ /dev/null @@ -1,109 +0,0 @@ -package wayoftime.bloodmagic.compat.patchouli.processors; - -import java.util.Arrays; -import java.util.Optional; -import java.util.stream.Collectors; - -import org.apache.logging.log4j.LogManager; - -import net.minecraft.client.Minecraft; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fluids.FluidStack; -import vazkii.patchouli.api.IComponentProcessor; -import vazkii.patchouli.api.IVariable; -import vazkii.patchouli.api.IVariableProvider; -import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType; -import wayoftime.bloodmagic.recipe.RecipeARC; - -public class ARCProcessor implements IComponentProcessor -{ - private RecipeARC recipe; - - @Override - public void setup(IVariableProvider variables) - { - ResourceLocation id = new ResourceLocation(variables.get("recipe").asString()); - Optional> recipeHandler = Minecraft.getInstance().world.getRecipeManager().getRecipe(id); - if (recipeHandler.isPresent()) - { - IRecipe recipe = recipeHandler.get(); - if (recipe.getType().equals(BloodMagicRecipeType.ARC)) - { - this.recipe = (RecipeARC) recipe; - } - } - if (this.recipe == null) - { - LogManager.getLogger().warn("Guidebook missing Alchemical Reaction Chamber recipe {}", id); - } - } - - @Override - public IVariable process(String key) - { - if (recipe == null) - { - return null; - } else if (key.startsWith("output")) - { - int index = Integer.parseInt(key.substring(6)) - 1; - if (recipe.getAllListedOutputs().size() > index) - { - return IVariable.from(recipe.getAllListedOutputs().get(index)); - } else - { - return null; - } - } else if (key.startsWith("chance")) - { - int index = Integer.parseInt(key.substring(6)) - 2; // Index 0 = 2nd output. - if (recipe.getAllOutputChances().length > index) - { - double chance = recipe.getAllOutputChances()[index] * 100; - if (chance < 1) - { - return IVariable.wrap("<1"); - } - return IVariable.wrap(Math.round(chance)); - } - } else if (key.startsWith("show_chance")) - { - int index = Integer.parseInt(key.substring(11)) - 2; // Index 0 = 2nd output. - if (recipe.getAllOutputChances().length > index) - { - return IVariable.wrap(true); - } - } - switch (key) - { - case "show_fluid_tooltip": - if (recipe.getFluidIngredient() != null || recipe.getFluidOutput() != FluidStack.EMPTY) - { - return IVariable.wrap(true); - } - return IVariable.wrap(false); - case "input": - return IVariable.wrapList(Arrays.stream(recipe.getInput().getMatchingStacks()).map(IVariable::from).collect(Collectors.toList())); - case "tool": - return IVariable.wrapList(Arrays.stream(recipe.getTool().getMatchingStacks()).map(IVariable::from).collect(Collectors.toList())); - case "tooltip_fluid_input": - if (recipe.getFluidIngredient() != null) - { - FluidStack fluid = recipe.getFluidIngredient().getRepresentations().get(0); - return IVariable.wrap(fluid.getAmount() + "mb of " + fluid.getTranslationKey()); - } - return IVariable.wrap("None"); - case "tooltip_fluid_output": - if (recipe.getFluidOutput() != FluidStack.EMPTY) - { - FluidStack fluid = recipe.getFluidOutput(); - return IVariable.wrap(fluid.getAmount() + "mb of " + fluid.getTranslationKey()); - } - return IVariable.wrap("None"); - default: - return null; - } - } - -} diff --git a/src/main/java/wayoftime/bloodmagic/compat/patchouli/processors/AlchemyArrayProcessor.java b/src/main/java/wayoftime/bloodmagic/compat/patchouli/processors/AlchemyArrayProcessor.java deleted file mode 100644 index 5abc768b..00000000 --- a/src/main/java/wayoftime/bloodmagic/compat/patchouli/processors/AlchemyArrayProcessor.java +++ /dev/null @@ -1,61 +0,0 @@ -package wayoftime.bloodmagic.compat.patchouli.processors; - -import java.util.Arrays; -import java.util.Optional; -import java.util.stream.Collectors; - -import org.apache.logging.log4j.LogManager; - -import net.minecraft.client.Minecraft; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.ResourceLocation; -import vazkii.patchouli.api.IComponentProcessor; -import vazkii.patchouli.api.IVariable; -import vazkii.patchouli.api.IVariableProvider; -import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType; -import wayoftime.bloodmagic.recipe.RecipeAlchemyArray; - -public class AlchemyArrayProcessor implements IComponentProcessor -{ - private RecipeAlchemyArray recipe; - - @Override - public void setup(IVariableProvider variables) - { - ResourceLocation id = new ResourceLocation(variables.get("recipe").asString()); - Optional> recipeHandler = Minecraft.getInstance().world.getRecipeManager().getRecipe(id); - if (recipeHandler.isPresent()) - { - IRecipe recipe = Minecraft.getInstance().world.getRecipeManager().getRecipe(id).get(); - if (recipe.getType().equals(BloodMagicRecipeType.ARRAY)) - { - this.recipe = (RecipeAlchemyArray) recipe; - } - } - if (this.recipe == null) - { - LogManager.getLogger().warn("Guidebook missing Alchemy Array recipe {}", id); - } - } - - @Override - public IVariable process(String key) - { - if (recipe == null) - { - return null; - } - switch (key) - { - case "baseinput": - return IVariable.wrapList(Arrays.stream(recipe.getBaseInput().getMatchingStacks()).map(IVariable::from).collect(Collectors.toList())); - case "addedinput": - return IVariable.wrapList(Arrays.stream(recipe.getAddedInput().getMatchingStacks()).map(IVariable::from).collect(Collectors.toList())); - case "output": - return IVariable.from(recipe.getOutput()); - default: - return null; - } - } - -} diff --git a/src/main/java/wayoftime/bloodmagic/compat/patchouli/processors/AlchemyTableProcessor.java b/src/main/java/wayoftime/bloodmagic/compat/patchouli/processors/AlchemyTableProcessor.java deleted file mode 100644 index a62f02b5..00000000 --- a/src/main/java/wayoftime/bloodmagic/compat/patchouli/processors/AlchemyTableProcessor.java +++ /dev/null @@ -1,94 +0,0 @@ -package wayoftime.bloodmagic.compat.patchouli.processors; - -import java.util.Arrays; -import java.util.Optional; -import java.util.stream.Collectors; - -import org.apache.logging.log4j.LogManager; - -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.ResourceLocation; -import vazkii.patchouli.api.IComponentProcessor; -import vazkii.patchouli.api.IVariable; -import vazkii.patchouli.api.IVariableProvider; -import wayoftime.bloodmagic.common.item.BloodMagicItems; -import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType; -import wayoftime.bloodmagic.recipe.RecipeAlchemyTable; - -public class AlchemyTableProcessor implements IComponentProcessor -{ - private RecipeAlchemyTable recipe; - - @Override - public void setup(IVariableProvider variables) - { - ResourceLocation id = new ResourceLocation(variables.get("recipe").asString()); - Optional> recipeHandler = Minecraft.getInstance().world.getRecipeManager().getRecipe(id); - if (recipeHandler.isPresent()) - { - IRecipe recipe = recipeHandler.get(); - if (recipe.getType().equals(BloodMagicRecipeType.ALCHEMYTABLE)) - { - this.recipe = (RecipeAlchemyTable) recipe; - } - } - if (this.recipe == null) - { - LogManager.getLogger().warn("Guidebook missing Alchemy Table recipe {}", id); - } - } - - @Override - public IVariable process(String key) - { - if (recipe == null) - { - return null; - } else if (key.startsWith("input")) - { - int index = Integer.parseInt(key.substring(5)) - 1; - if (recipe.getInput().size() > index) - { - return IVariable.wrapList(Arrays.stream(recipe.getInput().get(index).getMatchingStacks()).map(IVariable::from).collect(Collectors.toList())); - } else - { - return null; - } - } - switch (key) - { - case "output": - return IVariable.from(recipe.getOutput()); - case "syphon": - return IVariable.wrap(recipe.getSyphon()); - case "time": - return IVariable.wrap(recipe.getTicks()); - case "orb": - switch (recipe.getMinimumTier()) - { - case 0: // same as Case 1 - case 1: - return IVariable.from(new ItemStack(BloodMagicItems.WEAK_BLOOD_ORB.get())); - case 2: - return IVariable.from(new ItemStack(BloodMagicItems.APPRENTICE_BLOOD_ORB.get())); - case 3: - return IVariable.from(new ItemStack(BloodMagicItems.MAGICIAN_BLOOD_ORB.get())); - case 4: - return IVariable.from(new ItemStack(BloodMagicItems.MASTER_BLOOD_ORB.get())); - // case 5: return IVariable.from(new - // ItemStack(BloodMagicItems.ARCHMAGES_BLOOD_ORB.get())); - // case 6: return IVariable.from(new - // ItemStack(BloodMagicItems.TRANSCENDENT_BLOOD_ORB.get())); - default: - LogManager.getLogger().warn("Guidebook unable to find large enough Blood Orb for {}", recipe.getId()); - return IVariable.from(new ItemStack(Items.BARRIER)); - } - default: - return null; - } - } - -} diff --git a/src/main/java/wayoftime/bloodmagic/compat/patchouli/processors/BloodAltarProcessor.java b/src/main/java/wayoftime/bloodmagic/compat/patchouli/processors/BloodAltarProcessor.java deleted file mode 100644 index 81476136..00000000 --- a/src/main/java/wayoftime/bloodmagic/compat/patchouli/processors/BloodAltarProcessor.java +++ /dev/null @@ -1,63 +0,0 @@ -package wayoftime.bloodmagic.compat.patchouli.processors; - -import java.util.Arrays; -import java.util.Optional; -import java.util.stream.Collectors; - -import org.apache.logging.log4j.LogManager; - -import net.minecraft.client.Minecraft; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.ResourceLocation; -import vazkii.patchouli.api.IComponentProcessor; -import vazkii.patchouli.api.IVariable; -import vazkii.patchouli.api.IVariableProvider; -import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType; -import wayoftime.bloodmagic.recipe.RecipeBloodAltar; - -public class BloodAltarProcessor implements IComponentProcessor -{ - private RecipeBloodAltar recipe; - - @Override - public void setup(IVariableProvider variables) - { - ResourceLocation id = new ResourceLocation(variables.get("recipe").asString()); - Optional> recipeHandler = Minecraft.getInstance().world.getRecipeManager().getRecipe(id); - if (recipeHandler.isPresent()) - { - IRecipe recipe = recipeHandler.get(); - if (recipe.getType().equals(BloodMagicRecipeType.ALTAR)) - { - this.recipe = (RecipeBloodAltar) recipe; - } - } - if (this.recipe == null) - { - LogManager.getLogger().warn("Guidebook missing Blood Altar recipe {}", id); - } - } - - @Override - public IVariable process(String key) - { - if (recipe == null) - { - return null; - } - switch (key) - { - case "input": - return IVariable.wrapList(Arrays.stream(recipe.getInput().getMatchingStacks()).map(IVariable::from).collect(Collectors.toList())); - case "output": - return IVariable.from(recipe.getOutput()); - case "tier": - return IVariable.wrap(recipe.getMinimumTier() + 1); - case "lp": - return IVariable.wrap(recipe.getSyphon()); - default: - return null; - } - } - -} diff --git a/src/main/java/wayoftime/bloodmagic/compat/patchouli/processors/TartaricForgeProcessor.java b/src/main/java/wayoftime/bloodmagic/compat/patchouli/processors/TartaricForgeProcessor.java deleted file mode 100644 index 6815812f..00000000 --- a/src/main/java/wayoftime/bloodmagic/compat/patchouli/processors/TartaricForgeProcessor.java +++ /dev/null @@ -1,100 +0,0 @@ -package wayoftime.bloodmagic.compat.patchouli.processors; - -import java.util.Arrays; -import java.util.Optional; -import java.util.stream.Collectors; - -import org.apache.logging.log4j.LogManager; - -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.ResourceLocation; -import vazkii.patchouli.api.IComponentProcessor; -import vazkii.patchouli.api.IVariable; -import vazkii.patchouli.api.IVariableProvider; -import wayoftime.bloodmagic.common.item.BloodMagicItems; -import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType; -import wayoftime.bloodmagic.recipe.RecipeTartaricForge; - -public class TartaricForgeProcessor implements IComponentProcessor -{ - private RecipeTartaricForge recipe; - - @Override - public void setup(IVariableProvider variables) - { - ResourceLocation id = new ResourceLocation(variables.get("recipe").asString()); - Optional> recipeHandler = Minecraft.getInstance().world.getRecipeManager().getRecipe(id); - if (recipeHandler.isPresent()) - { - IRecipe recipe = recipeHandler.get(); - if (recipe.getType().equals(BloodMagicRecipeType.TARTARICFORGE)) - { - this.recipe = (RecipeTartaricForge) recipe; - } - } - if (this.recipe == null) - { - LogManager.getLogger().warn("Guidebook missing Hellfire Forge recipe {}", id); - } - } - - @Override - public IVariable process(String key) - { - if (recipe == null) - { - return null; - } - if (key.startsWith("input")) - { - int index = Integer.parseInt(key.substring(5)) - 1; - if (recipe.getInput().size() > index) - { - return IVariable.wrapList(Arrays.stream(recipe.getInput().get(index).getMatchingStacks()).map(IVariable::from).collect(Collectors.toList())); - } else - { - return null; - } - } - switch (key) - { - case "output": - return IVariable.from(recipe.getOutput()); - case "willrequired": - return IVariable.wrap(recipe.getMinimumSouls()); - case "willdrain": - return IVariable.wrap(recipe.getSoulDrain()); - case "will": - if (recipe.getMinimumSouls() <= 1) - { - return IVariable.from(new ItemStack(BloodMagicItems.MONSTER_SOUL_RAW.get())); - } else if (recipe.getMinimumSouls() <= 64) - { - return IVariable.from(new ItemStack(BloodMagicItems.PETTY_GEM.get())); - } else if (recipe.getMinimumSouls() <= 256) - { - return IVariable.from(new ItemStack(BloodMagicItems.LESSER_GEM.get())); - } else if (recipe.getMinimumSouls() <= 1024) - { - return IVariable.from(new ItemStack(BloodMagicItems.COMMON_GEM.get())); - } else if (recipe.getMinimumSouls() <= 4096) - { - return IVariable.from(new ItemStack(BloodMagicItems.GREATER_GEM.get())); - // } else if (recipe.getMinimumSouls() <= 16384) { - // return IVariable.from(new ItemStack(BloodMagicItems.GRAND_GEM.get())); - // } - } else - { - LogManager.getLogger().warn("Guidebook could not find a large enough Tartaric Gem for {}", recipe.getId()); - return IVariable.from(new ItemStack(Items.BARRIER)); - - } - default: - return null; - } - } - -} diff --git a/src/main/java/wayoftime/bloodmagic/core/AnointmentRegistrar.java b/src/main/java/wayoftime/bloodmagic/core/AnointmentRegistrar.java deleted file mode 100644 index 4ae45c7f..00000000 --- a/src/main/java/wayoftime/bloodmagic/core/AnointmentRegistrar.java +++ /dev/null @@ -1,136 +0,0 @@ -package wayoftime.bloodmagic.core; - -import java.net.URL; -import java.util.HashMap; -import java.util.Map; -import java.util.function.Supplier; - -import com.google.common.base.Charsets; -import com.google.common.io.Resources; - -import net.minecraft.util.ResourceLocation; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.anointment.Anointment; -import wayoftime.bloodmagic.common.registration.impl.AnointmentDeferredRegister; -import wayoftime.bloodmagic.common.registration.impl.AnointmentRegistryObject; -import wayoftime.bloodmagic.gson.Serializers; - -public class AnointmentRegistrar -{ - public static final AnointmentDeferredRegister ANOINTMENTS = new AnointmentDeferredRegister(BloodMagic.MODID); - - public static final Map ANOINTMENT_MAP = new HashMap<>(); - - private static final Map DEFINITIONS = ((Supplier>) () -> { - Map def = new HashMap<>(); - def.put("melee_damage", BloodMagic.rl("melee_damage")); - def.put("holy_water", BloodMagic.rl("holy_water")); - def.put("hidden_knowledge", BloodMagic.rl("hidden_knowledge")); - def.put("quick_draw", BloodMagic.rl("quick_draw")); - def.put("bow_power", BloodMagic.rl("bow_power")); -// def.put("arrow_shot", BloodMagic.rl("arrow_shot")); -// def.put("critical_strike", BloodMagic.rl("critical_strike")); -// def.put("digging", BloodMagic.rl("digging")); -// def.put("experienced", BloodMagic.rl("experienced")); -// def.put("fall_protect", BloodMagic.rl("fall_protect")); -// def.put("fire_resist", BloodMagic.rl("fire_resist")); -// def.put("grave_digger", BloodMagic.rl("grave_digger")); -// def.put("health", BloodMagic.rl("health")); -// def.put("jump", BloodMagic.rl("jump")); -// def.put("knockback_resist", BloodMagic.rl("knockback_resist")); -// def.put("melee_damage", BloodMagic.rl("melee_damage")); -// def.put("physical_protect", BloodMagic.rl("physical_protect")); -// def.put("poison_resist", BloodMagic.rl("poison_resist")); -// def.put("sprint_attack", BloodMagic.rl("sprint_attack")); -// def.put("speed", BloodMagic.rl("speed")); -// def.put("self_sacrifice", BloodMagic.rl("self_sacrifice")); - return def; - }).get(); - -// public static final AnointmentRegistryObject ANOINTMENT_MELEE_DAMAGE = ANOINTMENTS.register("melee_damage", () -> parseDefinition("melee_damage").withAttributeProvider((stats, attributeMap, uuid, upgrade, level) -> { -// attributeMap.put(Attributes.ATTACK_DAMAGE, new AttributeModifier(uuid, "Weapon modifier", upgrade.getBonusValue("damage", level).intValue(), AttributeModifier.Operation.ADDITION)); -// }).setConsumeOnAttack()); - - public static final AnointmentRegistryObject ANOINTMENT_MELEE_DAMAGE = ANOINTMENTS.register("melee_damage", () -> parseDefinition("melee_damage").withDamageProvider((player, weapon, damage, holder, attacked, anoint, level) -> { - return anoint.getBonusValue("damage", level).doubleValue(); - }).setConsumeOnAttack().addIncompatibility(BloodMagic.rl("holy_water"))); - - public static final AnointmentRegistryObject ANOINTMENT_SILK_TOUCH = ANOINTMENTS.register("silk_touch", () -> new Anointment(BloodMagic.rl("silk_touch")).setConsumeOnHarvest().addIncompatibility(BloodMagic.rl("fortune"))); - - public static final AnointmentRegistryObject ANOINTMENT_FORTUNE = ANOINTMENTS.register("fortune", () -> new Anointment(BloodMagic.rl("fortune")).setConsumeOnHarvest().addIncompatibility(BloodMagic.rl("silk_touch"))); - - public static final AnointmentRegistryObject ANOINTMENT_HOLY_WATER = ANOINTMENTS.register("holy_water", () -> parseDefinition("holy_water").withDamageProvider((player, weapon, damage, holder, attacked, anoint, level) -> { - if (attacked.isEntityUndead()) - return anoint.getBonusValue("damage", level).doubleValue(); - else - return 0; - }).setConsumeOnAttack().addIncompatibility(BloodMagic.rl("melee_damage"))); - - public static final AnointmentRegistryObject ANOINTMENT_HIDDEN_KNOWLEDGE = ANOINTMENTS.register("hidden_knowledge", () -> parseDefinition("hidden_knowledge").setConsumeOnHarvest()); - - public static final AnointmentRegistryObject ANOINTMENT_QUICK_DRAW = ANOINTMENTS.register("quick_draw", () -> parseDefinition("quick_draw").setConsumeOnUseFinish()); - - public static final AnointmentRegistryObject ANOINTMENT_LOOTING = ANOINTMENTS.register("looting", () -> new Anointment(BloodMagic.rl("looting")).setConsumeOnAttack()); - - public static final AnointmentRegistryObject ANOINTMENT_BOW_POWER = ANOINTMENTS.register("bow_power", () -> parseDefinition("bow_power").setConsumeOnUseFinish()); - - public static final AnointmentRegistryObject ANOINTMENT_WILL_POWER = ANOINTMENTS.register("will_power", () -> new Anointment(BloodMagic.rl("will_power")).setConsumeOnAttack()); - - public static final AnointmentRegistryObject ANOINTMENT_SMELTING = ANOINTMENTS.register("smelting", () -> new Anointment(BloodMagic.rl("smelting")).setConsumeOnHarvest()); - - public static void register() - { - registerAnointment(ANOINTMENT_MELEE_DAMAGE.get()); - registerAnointment(ANOINTMENT_SILK_TOUCH.get()); - registerAnointment(ANOINTMENT_FORTUNE.get()); - registerAnointment(ANOINTMENT_HOLY_WATER.get()); - registerAnointment(ANOINTMENT_HIDDEN_KNOWLEDGE.get()); - registerAnointment(ANOINTMENT_QUICK_DRAW.get()); - registerAnointment(ANOINTMENT_LOOTING.get()); - registerAnointment(ANOINTMENT_BOW_POWER.get()); - registerAnointment(ANOINTMENT_WILL_POWER.get()); - registerAnointment(ANOINTMENT_SMELTING.get()); - -// Registry.register(UPGRADES, UPGRADE_ARROW_PROTECT.getKey(), UPGRADE_ARROW_PROTECT); -// Registry.register(UPGRADES, UPGRADE_ARROW_SHOT.getKey(), UPGRADE_ARROW_SHOT); -// Registry.register(UPGRADES, UPGRADE_CRITICAL_STRIKE.getKey(), UPGRADE_CRITICAL_STRIKE); -// Registry.register(UPGRADES, UPGRADE_JUMP.getKey(), UPGRADE_JUMP); - -// Registry.register(Registry.ITEM, new ResourceLocation("livingarmor", "living_helmet"), LIVING_HELMET); -// Registry.register(Registry.ITEM, new Identifier("livingarmor", "living_chestplate"), LIVING_CHESTPLATE); -// Registry.register(Registry.ITEM, new Identifier("livingarmor", "living_leggings"), LIVING_LEGGINGS); -// Registry.register(Registry.ITEM, new Identifier("livingarmor", "living_boots"), LIVING_BOOTS); -// Registry.register(Registry.ITEM, new Identifier("livingarmor", "trainer"), TRAINER); -// Registry.register(Registry.ITEM, new Identifier("livingarmor", "tome"), TOME); - } - - public static void registerAnointment(Anointment anoint) - { - ANOINTMENT_MAP.put(anoint.getKey(), anoint); - } - - public static Anointment parseDefinition(String fileName) - { -// System.out.println("Attempting to parse Anointment: " + fileName); - ResourceLocation path = DEFINITIONS.get(fileName); - if (path == null) - return Anointment.DUMMY; - - try - { - URL schematicURL = Anointment.class.getResource(resLocToResourcePath(path)); - System.out.println("Attempting to load Anointment: " + schematicURL + ", path: " + resLocToResourcePath(path)); - return Serializers.GSON.fromJson(Resources.toString(schematicURL, Charsets.UTF_8), Anointment.class); -// return GSON.fromJson(IOUtils.toString(path.toUri(), StandardCharsets.UTF_8), LivingUpgrade.class); - } catch (Exception e) - { - e.printStackTrace(); - return Anointment.DUMMY; - } - } - - public static String resLocToResourcePath(ResourceLocation resourceLocation) - { - return "/data/" + resourceLocation.getNamespace() + "/anointment/" + resourceLocation.getPath() + ".json"; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/core/LivingArmorRegistrar.java b/src/main/java/wayoftime/bloodmagic/core/LivingArmorRegistrar.java deleted file mode 100644 index 80bd8035..00000000 --- a/src/main/java/wayoftime/bloodmagic/core/LivingArmorRegistrar.java +++ /dev/null @@ -1,221 +0,0 @@ -package wayoftime.bloodmagic.core; - -import java.net.URL; -import java.util.HashMap; -import java.util.Map; -import java.util.function.Supplier; - -import com.google.common.base.Charsets; -import com.google.common.io.Resources; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; - -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.ai.attributes.Attributes; -import net.minecraft.util.DamageSource; -import net.minecraft.util.ResourceLocation; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.common.registration.impl.LivingUpgradeDeferredRegister; -import wayoftime.bloodmagic.common.registration.impl.LivingUpgradeRegistryObject; -import wayoftime.bloodmagic.core.living.LivingUpgrade; -import wayoftime.bloodmagic.gson.Serializers; - -public class LivingArmorRegistrar -{ - - public static final LivingUpgradeDeferredRegister UPGRADES = new LivingUpgradeDeferredRegister(BloodMagic.MODID); - - public static final Map UPGRADE_MAP = new HashMap<>(); - -// public static final DefaultedRegistry UPGRADES = (DefaultedRegistry) createRegistry("livingarmor:upgrades", LivingUpgrade.DUMMY.getKey().toString(), () -> LivingUpgrade.DUMMY); -// private static final Map DEFINITIONS = ((Supplier>) () -> { -// Map def = new HashMap<>(); -// def.put("arrow_protect", Paths.get(MinecraftForge.getInstance().getConfigDirectory().getAbsolutePath(), "livingarmor", "arrow_protect.json")); -// def.put("arrow_shot", Paths.get(FabricLoader.getInstance().getConfigDirectory().getAbsolutePath(), "livingarmor", "arrow_shot.json")); -// def.put("critical_strike", Paths.get(FabricLoader.getInstance().getConfigDirectory().getAbsolutePath(), "livingarmor", "critical_strike.json")); -// def.put("jump", Paths.get(FabricLoader.getInstance().getConfigDirectory().getAbsolutePath(), "livingarmor", "jump.json")); -// return def; -// }).get(); - private static final Map DEFINITIONS = ((Supplier>) () -> { - Map def = new HashMap<>(); - def.put("arrow_protect", BloodMagic.rl("arrow_protect")); - def.put("arrow_shot", BloodMagic.rl("arrow_shot")); - def.put("critical_strike", BloodMagic.rl("critical_strike")); - def.put("digging", BloodMagic.rl("digging")); - def.put("experienced", BloodMagic.rl("experienced")); - def.put("fall_protect", BloodMagic.rl("fall_protect")); - def.put("fire_resist", BloodMagic.rl("fire_resist")); - def.put("grave_digger", BloodMagic.rl("grave_digger")); - def.put("health", BloodMagic.rl("health")); - def.put("jump", BloodMagic.rl("jump")); - def.put("knockback_resist", BloodMagic.rl("knockback_resist")); - def.put("melee_damage", BloodMagic.rl("melee_damage")); - def.put("physical_protect", BloodMagic.rl("physical_protect")); - def.put("poison_resist", BloodMagic.rl("poison_resist")); - def.put("sprint_attack", BloodMagic.rl("sprint_attack")); - def.put("speed", BloodMagic.rl("speed")); - def.put("self_sacrifice", BloodMagic.rl("self_sacrifice")); - return def; - }).get(); - // private static final Map DEFINITIONS = - // ResourceUtil.gatherResources("/data", "living_armor", p -> - // FilenameUtils.getExtension(p.toFile().getName()).equals("json")) -// .stream() -// .collect(Collectors.toMap(key -> FilenameUtils.getBaseName(key.toFile().getName()), value -> value)); - private static final Gson GSON = new GsonBuilder().serializeNulls().create(); - -// public static final ItemLivingArmor LIVING_HELMET = new ItemLivingArmor(EquipmentSlotType.HEAD); -// public static final ItemLivingArmor LIVING_CHESTPLATE = new ItemLivingArmor(EquipmentSlotType.CHEST); -// public static final ItemLivingArmor LIVING_LEGGINGS = new ItemLivingArmor(EquipmentSlotType.LEGS); -// public static final ItemLivingArmor LIVING_BOOTS = new ItemLivingArmor(EquipmentSlotType.FEET); -// public static final ItemLivingTrainer TRAINER = new ItemLivingTrainer(); -// public static final ItemLivingTome TOME = new ItemLivingTome(); - - public static final LivingUpgradeRegistryObject UPGRADE_ARROW_PROTECT = UPGRADES.register("arrow_protect", () -> parseDefinition("arrow_protect").withArmorProvider((player, stats, source, upgrade, level) -> { - if (source.isProjectile()) - { - return upgrade.getBonusValue("protection", level).doubleValue(); - } - return 0; - })); - public static final LivingUpgradeRegistryObject UPGRADE_FALL_PROTECT = UPGRADES.register("fall_protect", () -> parseDefinition("fall_protect").withArmorProvider((player, stats, source, upgrade, level) -> { - if (source == DamageSource.FALL) - { - return upgrade.getBonusValue("protection", level).doubleValue(); - } - return 0; - })); - public static final LivingUpgradeRegistryObject UPGRADE_PHYSICAL_PROTECT = UPGRADES.register("physical_protect", () -> parseDefinition("physical_protect").withArmorProvider((player, stats, source, upgrade, level) -> { - if (!source.isProjectile()) - { - return upgrade.getBonusValue("protection", level).doubleValue(); - } - return 0; - })); - public static final LivingUpgradeRegistryObject UPGRADE_JUMP = UPGRADES.register("jump", () -> parseDefinition("jump")); - - public static final LivingUpgradeRegistryObject UPGRADE_HEALTH = UPGRADES.register("health", () -> parseDefinition("health").withAttributeProvider((stats, attributeMap, uuid, upgrade, level) -> { - attributeMap.put(Attributes.MAX_HEALTH, new AttributeModifier(uuid, "Health Modifier", upgrade.getBonusValue("hp", level).intValue(), AttributeModifier.Operation.ADDITION)); - })); - - public static final LivingUpgradeRegistryObject UPGRADE_EXPERIENCE = UPGRADES.register("experienced", () -> parseDefinition("experienced")); - public static final LivingUpgradeRegistryObject UPGRADE_SPRINT_ATTACK = UPGRADES.register("sprint_attack", () -> parseDefinition("sprint_attack").withDamageProvider((player, weapon, damage, stats, attackedEntity, upgrade, level) -> { - if (player.isSprinting()) - { - return damage * upgrade.getBonusValue("damage_boost", level).doubleValue(); - } - return 0; - })); - public static final LivingUpgradeRegistryObject UPGRADE_SELF_SACRIFICE = UPGRADES.register("self_sacrifice", () -> parseDefinition("self_sacrifice")); - public static final LivingUpgradeRegistryObject UPGRADE_SPEED = UPGRADES.register("speed", () -> parseDefinition("speed").withAttributeProvider((stats, attributeMap, uuid, upgrade, level) -> { - attributeMap.put(Attributes.MOVEMENT_SPEED, new AttributeModifier(uuid, "Movement Modifier 2", upgrade.getBonusValue("speed_modifier", level).doubleValue(), AttributeModifier.Operation.MULTIPLY_BASE)); - })); - public static final LivingUpgradeRegistryObject UPGRADE_POISON_RESIST = UPGRADES.register("poison_resist", () -> parseDefinition("poison_resist")); - public static final LivingUpgradeRegistryObject UPGRADE_FIRE_RESIST = UPGRADES.register("fire_resist", () -> parseDefinition("fire_resist")); - public static final LivingUpgradeRegistryObject UPGRADE_DIGGING = UPGRADES.register("digging", () -> parseDefinition("digging")); - public static final LivingUpgradeRegistryObject UPGRADE_KNOCKBACK_RESIST = UPGRADES.register("knockback_resist", () -> parseDefinition("knockback_resist").withAttributeProvider((stats, attributeMap, uuid, upgrade, level) -> { - attributeMap.put(Attributes.KNOCKBACK_RESISTANCE, new AttributeModifier(uuid, "KB Modifier", upgrade.getBonusValue("kb", level).doubleValue(), AttributeModifier.Operation.ADDITION)); - attributeMap.put(Attributes.MAX_HEALTH, new AttributeModifier(uuid, "Health Modifier 2", upgrade.getBonusValue("hp", level).intValue(), AttributeModifier.Operation.ADDITION)); - })); -// public static final LivingUpgrade UPGRADE_ARROW_PROTECT = parseDefinition("arrow_protect").withArmorProvider((player, stats, source, upgrade, level) -> { -// if (source.isProjectile()) -// { -// return upgrade.getBonusValue("protection", level).doubleValue(); -// } -// return 0; -// }); -// public static final LivingUpgrade UPGRADE_ARROW_SHOT = parseDefinition("arrow_shot"); -// public static final LivingUpgrade UPGRADE_CRITICAL_STRIKE = parseDefinition("critical_strike").withAttributeProvider((stats, attributeMap, uuid, upgrade, level) -> { -// attributeMap.put(Attributes.ATTACK_DAMAGE, new AttributeModifier(uuid, "Weapon modifier", upgrade.getBonusValue("damage_boost", level).doubleValue(), AttributeModifier.Operation.ADDITION)); -//// attributeMap.put(EntityAttributes.ATTACK_DAMAGE.getId(), AttributeModifiers.create(upgrade, "damage_boost", upgrade.getBonusValue("damage_boost", level).doubleValue(), EntityAttributeModifier.Operation.ADDITION)); -//// attributeMap.put(EntityAttributes.ATTACK_DAMAGE.getId(), AttributeModifiers.create(upgrade, "damage_boost", level, EntityAttributeModifier.Operation.ADDITION)); -// }); -// public static final LivingUpgrade UPGRADE_JUMP = parseDefinition("jump"); - - public static void register() - { - registerUpgrade(UPGRADE_ARROW_PROTECT.get()); - registerUpgrade(UPGRADE_HEALTH.get()); - registerUpgrade(UPGRADE_EXPERIENCE.get()); - registerUpgrade(UPGRADE_SPRINT_ATTACK.get()); - registerUpgrade(UPGRADE_SELF_SACRIFICE.get()); - registerUpgrade(UPGRADE_SPEED.get()); - registerUpgrade(UPGRADE_POISON_RESIST.get()); - registerUpgrade(UPGRADE_DIGGING.get()); - registerUpgrade(UPGRADE_FALL_PROTECT.get()); - registerUpgrade(UPGRADE_PHYSICAL_PROTECT.get()); - registerUpgrade(UPGRADE_JUMP.get()); - registerUpgrade(UPGRADE_KNOCKBACK_RESIST.get()); - registerUpgrade(UPGRADE_FIRE_RESIST.get()); -// Registry.register(UPGRADES, UPGRADE_ARROW_PROTECT.getKey(), UPGRADE_ARROW_PROTECT); -// Registry.register(UPGRADES, UPGRADE_ARROW_SHOT.getKey(), UPGRADE_ARROW_SHOT); -// Registry.register(UPGRADES, UPGRADE_CRITICAL_STRIKE.getKey(), UPGRADE_CRITICAL_STRIKE); -// Registry.register(UPGRADES, UPGRADE_JUMP.getKey(), UPGRADE_JUMP); - -// Registry.register(Registry.ITEM, new ResourceLocation("livingarmor", "living_helmet"), LIVING_HELMET); -// Registry.register(Registry.ITEM, new Identifier("livingarmor", "living_chestplate"), LIVING_CHESTPLATE); -// Registry.register(Registry.ITEM, new Identifier("livingarmor", "living_leggings"), LIVING_LEGGINGS); -// Registry.register(Registry.ITEM, new Identifier("livingarmor", "living_boots"), LIVING_BOOTS); -// Registry.register(Registry.ITEM, new Identifier("livingarmor", "trainer"), TRAINER); -// Registry.register(Registry.ITEM, new Identifier("livingarmor", "tome"), TOME); - } - - public static void registerUpgrade(LivingUpgrade upgrade) - { - UPGRADE_MAP.put(upgrade.getKey(), upgrade); - } - - public static LivingUpgrade parseDefinition(String fileName) - { - ResourceLocation path = DEFINITIONS.get(fileName); - if (path == null) - return LivingUpgrade.DUMMY; - - try - { - URL schematicURL = LivingUpgrade.class.getResource(resLocToResourcePath(path)); - System.out.println("Attempting to load Living Armour Upgrade: " + schematicURL + ", path: " + resLocToResourcePath(path)); - return Serializers.GSON.fromJson(Resources.toString(schematicURL, Charsets.UTF_8), LivingUpgrade.class); -// return GSON.fromJson(IOUtils.toString(path.toUri(), StandardCharsets.UTF_8), LivingUpgrade.class); - } catch (Exception e) - { - e.printStackTrace(); - return LivingUpgrade.DUMMY; - } -// Path path = DEFINITIONS.get(fileName); -// if (path == null) -// return LivingUpgrade.DUMMY; -// -// try -// { -// return GSON.fromJson(IOUtils.toString(path.toUri(), StandardCharsets.UTF_8), LivingUpgrade.class); -// } catch (Exception e) -// { -// e.printStackTrace(); -// return LivingUpgrade.DUMMY; -// } - } - - public static String resLocToResourcePath(ResourceLocation resourceLocation) - { - return "/data/" + resourceLocation.getNamespace() + "/living_armor/" + resourceLocation.getPath() + ".json"; - } - -// private static Registry createRegistry(String registryId, String defaultId, Supplier defaultProvider) -// { -// try -// { -// Method _createRegistry = Registry.class.getDeclaredMethod("create", String.class, String.class, Supplier.class); // FIXME -// // yarn -// // name -// _createRegistry.setAccessible(true); -// return (Registry) _createRegistry.invoke(null, registryId, defaultId, defaultProvider); -// } catch (Exception e) -// { -// e.printStackTrace(); -// MutableRegistry registry = new DefaultedRegistry(defaultId, null, null); -// registry.add(new ResourceLocation(defaultId), defaultProvider.get()); -// return registry; -// } -// } -} diff --git a/src/main/java/wayoftime/bloodmagic/core/RegistrarBloodMagic.java b/src/main/java/wayoftime/bloodmagic/core/RegistrarBloodMagic.java deleted file mode 100644 index 521fba53..00000000 --- a/src/main/java/wayoftime/bloodmagic/core/RegistrarBloodMagic.java +++ /dev/null @@ -1,30 +0,0 @@ -package wayoftime.bloodmagic.core; - -import net.minecraftforge.fml.common.Mod; -import wayoftime.bloodmagic.BloodMagic; - -@Mod.EventBusSubscriber(modid = BloodMagic.MODID) -public class RegistrarBloodMagic -{ - private RegistrarBloodMagic() - { - - } - -// public static final BloodOrbDeferredRegister BLOOD_ORBS = new BloodOrbDeferredRegister(BloodMagic.MODID); -// -// public static final BloodOrbRegistryObject ORB_WEAK = BLOOD_ORBS.register("weakbloodorb", () -> new BloodOrb(new ResourceLocation(BloodMagic.MODID, "weakbloodorb"), 0, 5000, 10)); - -// public static IForgeRegistry BLOOD_ORBS = new RegistryBuilder().setName(new ResourceLocation(BloodMagic.MODID, "blood_orb")).setIDRange(0, Short.MAX_VALUE).setType(BloodOrb.class).addCallback((IForgeRegistry.AddCallback) ( -// owner, stage, id, obj, -// oldObj) -> OrbRegistry.tierMap.put(obj.getTier(), OrbRegistry.getOrbStack(obj))).create(); - -// @SubscribeEvent -// public static void onRegistryCreation(RegistryEvent.NewRegistry event) -// { -// System.out.println("Testification3"); -// BLOOD_ORBS = new RegistryBuilder().setName(new ResourceLocation(BloodMagic.MODID, "blood_orb")).setIDRange(0, Short.MAX_VALUE).setType(BloodOrb.class).addCallback((IForgeRegistry.AddCallback) ( -// owner, stage, id, obj, -// oldObj) -> OrbRegistry.tierMap.put(obj.getTier(), OrbRegistry.getOrbStack(obj))).create(); -// } -} diff --git a/src/main/java/wayoftime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/wayoftime/bloodmagic/core/RegistrarBloodMagicRecipes.java deleted file mode 100644 index 87cd3843..00000000 --- a/src/main/java/wayoftime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ /dev/null @@ -1,71 +0,0 @@ -package wayoftime.bloodmagic.core; - -import wayoftime.bloodmagic.impl.BloodMagicRecipeRegistrar; - -public class RegistrarBloodMagicRecipes -{ - -// @SubscribeEvent -// public static void registerRecipes(RegistryEvent.Register event) { -// for (int i = 0; i < ItemSoulGem.names.length; i++) { -// for (EnumDemonWillType willType : EnumDemonWillType.values()) { -// ItemStack baseGemStack = new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, i); -// ItemStack newGemStack = new ItemStack(RegistrarBloodMagicItems.SOUL_GEM, 1, i); -// -// ((ItemSoulGem) RegistrarBloodMagicItems.SOUL_GEM).setCurrentType(willType, newGemStack); -// ShapelessOreRecipe shapeless = new ShapelessOreRecipe(new ResourceLocation(BloodMagic.MODID, "soul_gem"), newGemStack, baseGemStack, willType.getStack()); -// event.getRegistry().register(shapeless.setRegistryName("soul_gem_" + willType.getName())); -// } -// } -// -// OreDictionary.registerOre("dustIron", ComponentTypes.SAND_IRON.getStack()); -// OreDictionary.registerOre("dustGold", ComponentTypes.SAND_GOLD.getStack()); -// OreDictionary.registerOre("dustCoal", ComponentTypes.SAND_COAL.getStack()); -// -// PluginUtil.handlePluginStep(PluginUtil.RegistrationStep.RECIPE_REGISTER); -// -// RegistrarBloodMagicItems.SOUL_TOOL_MATERIAL.setRepairItem(EnumDemonWillType.DEFAULT.getStack()); -// } - - public static void registerAltarRecipes(BloodMagicRecipeRegistrar registrar) - { -// Ingredient d; - // ONE -// registrar.addBloodAltar(new OreIngredient("gemDiamond"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK), AltarTier.ONE.ordinal(), 2000, 2, 1); -// registrar.addBloodAltar(new OreIngredient("stone"), ItemSlate.SlateType.BLANK.getStack(), AltarTier.ONE.ordinal(), 1000, 5, 5); -// registrar.addBloodAltar(Ingredient.fromItem(Items.BUCKET), FluidUtil.getFilledBucket(new FluidStack(BlockLifeEssence.getLifeEssence(), Fluid.BUCKET_VOLUME)), AltarTier.ONE.ordinal(), 1000, 5, 0); -// registrar.addBloodAltar(Ingredient.fromItem(Items.BOOK), new ItemStack(RegistrarBloodMagicItems.SANGUINE_BOOK), AltarTier.ONE.ordinal(), 1000, 20, 0); -// -// // TWO -// registrar.addBloodAltar(new OreIngredient("blockRedstone"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_APPRENTICE), AltarTier.TWO.ordinal(), 5000, 5, 5); -// registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.BLANK.getStack()), ItemSlate.SlateType.REINFORCED.getStack(), AltarTier.TWO.ordinal(), 2000, 5, 5); -// registrar.addBloodAltar(Ingredient.fromItem(Items.IRON_SWORD), new ItemStack(RegistrarBloodMagicItems.DAGGER_OF_SACRIFICE), AltarTier.TWO.ordinal(), 3000, 5, 5); -// -// // THREE -// registrar.addBloodAltar(new OreIngredient("blockGold"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN), AltarTier.THREE.ordinal(), 25000, 20, 20); -// registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.REINFORCED.getStack()), ItemSlate.SlateType.IMBUED.getStack(), AltarTier.THREE.ordinal(), 5000, 15, 10); -// registrar.addBloodAltar(new OreIngredient("obsidian"), EnumRuneType.EARTH.getStack(), AltarTier.THREE.ordinal(), 1000, 5, 5); -// registrar.addBloodAltar(new OreIngredient("blockLapis"), EnumRuneType.WATER.getStack(), AltarTier.THREE.ordinal(), 1000, 5, 5); -// registrar.addBloodAltar(Ingredient.fromItem(Items.MAGMA_CREAM), EnumRuneType.FIRE.getStack(), AltarTier.THREE.ordinal(), 1000, 5, 5); -// registrar.addBloodAltar(Ingredient.fromItem(Items.GHAST_TEAR), EnumRuneType.AIR.getStack(), AltarTier.THREE.ordinal(), 1000, 5, 5); -// registrar.addBloodAltar(Ingredient.fromItem(RegistrarBloodMagicItems.LAVA_CRYSTAL), new ItemStack(RegistrarBloodMagicItems.ACTIVATION_CRYSTAL), AltarTier.THREE.ordinal(), 10000, 20, 10); -// -// // FOUR -// registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.BLOOD_SHARD)), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER), AltarTier.FOUR.ordinal(), 40000, 30, 50); -// registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.IMBUED.getStack()), ItemSlate.SlateType.DEMONIC.getStack(), AltarTier.FOUR.ordinal(), 15000, 20, 20); -// registrar.addBloodAltar(new OreIngredient("blockCoal"), EnumRuneType.DUSK.getStack(), AltarTier.FOUR.ordinal(), 2000, 20, 10); -// registrar.addBloodAltar(new OreIngredient("enderpearl"), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS), AltarTier.FOUR.ordinal(), 2000, 10, 10); -// registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS)), new ItemStack(RegistrarBloodMagicItems.TELEPOSITION_FOCUS, 1, 1), AltarTier.FOUR.ordinal(), 10000, 20, 10); -// -// // FIVE -// registrar.addBloodAltar(new OreIngredient("netherStar"), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_ARCHMAGE), AltarTier.FIVE.ordinal(), 80000, 50, 100); -// registrar.addBloodAltar(Ingredient.fromStacks(ItemSlate.SlateType.DEMONIC.getStack()), ItemSlate.SlateType.ETHEREAL.getStack(), AltarTier.FIVE.ordinal(), 30000, 40, 100); - -// // SIX -// if (ConfigHandler.general.enableTierSixEvenThoughThereIsNoContent) -// { -// registrar.addBloodAltar(Ingredient.fromStacks(new ItemStack(RegistrarBloodMagicBlocks.DECORATIVE_BRICK, 1, 2)), OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_TRANSCENDENT), AltarTier.SIX.ordinal(), 200000, 100, 200); -// registrar.addBloodAltar(new OreIngredient("glowstone"), EnumRuneType.DAWN.getStack(), AltarTier.SIX.ordinal(), 200000, 100, 200); -// } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/core/data/BMWorldSavedData.java b/src/main/java/wayoftime/bloodmagic/core/data/BMWorldSavedData.java deleted file mode 100644 index 02ad80a4..00000000 --- a/src/main/java/wayoftime/bloodmagic/core/data/BMWorldSavedData.java +++ /dev/null @@ -1,66 +0,0 @@ -package wayoftime.bloodmagic.core.data; - -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.ListNBT; -import net.minecraft.world.storage.WorldSavedData; -import wayoftime.bloodmagic.util.helper.PlayerHelper; - -public class BMWorldSavedData extends WorldSavedData -{ - public static final String ID = "BloodMagic-SoulNetworks"; - - private Map soulNetworks = new HashMap<>(); - - public BMWorldSavedData(String id) - { - super(id); - } - - public BMWorldSavedData() - { - this(ID); - } - - public SoulNetwork getNetwork(PlayerEntity player) - { - return getNetwork(PlayerHelper.getUUIDFromPlayer(player)); - } - - public SoulNetwork getNetwork(UUID playerId) - { - if (!soulNetworks.containsKey(playerId)) - soulNetworks.put(playerId, SoulNetwork.newEmpty(playerId).setParent(this)); - return soulNetworks.get(playerId); - } - - @Override - public void read(CompoundNBT tagCompound) - { - ListNBT networkData = tagCompound.getList("networkData", 10); - - for (int i = 0; i < networkData.size(); i++) - { - CompoundNBT data = networkData.getCompound(i); - SoulNetwork network = SoulNetwork.fromNBT(data); - network.setParent(this); - soulNetworks.put(network.getPlayerId(), network); - } - } - - @Override - public CompoundNBT write(CompoundNBT tagCompound) - { - ListNBT networkData = new ListNBT(); - for (SoulNetwork soulNetwork : soulNetworks.values()) - networkData.add(soulNetwork.serializeNBT()); - - tagCompound.put("networkData", networkData); - - return tagCompound; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/core/data/Binding.java b/src/main/java/wayoftime/bloodmagic/core/data/Binding.java deleted file mode 100644 index e6a4bbc8..00000000 --- a/src/main/java/wayoftime/bloodmagic/core/data/Binding.java +++ /dev/null @@ -1,89 +0,0 @@ -package wayoftime.bloodmagic.core.data; - -import java.util.UUID; - -import javax.annotation.Nullable; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.INBT; -import net.minecraft.nbt.NBTUtil; -import net.minecraftforge.common.util.INBTSerializable; - -public class Binding implements INBTSerializable -{ - private UUID uuid; - private String name; - - public Binding(UUID uuid, String name) - { - this.uuid = uuid; - this.name = name; - } - - private Binding() - { - // No-op - } - - @Override - public CompoundNBT serializeNBT() - { - CompoundNBT tag = new CompoundNBT(); -// tag.put("id", NBTUtil.writeUniqueId(uuid)); - tag.put("id", NBTUtil.func_240626_a_(uuid)); - tag.putString("name", name); - return tag; - } - - @Override - public void deserializeNBT(CompoundNBT nbt) - { - this.uuid = NBTUtil.readUniqueId(nbt.get("id")); - this.name = nbt.getString("name"); - } - - public UUID getOwnerId() - { - return uuid; - } - - public Binding setOwnerId(UUID uuid) - { - this.uuid = uuid; - return this; - } - - public String getOwnerName() - { - return name; - } - - public Binding setOwnerName(String name) - { - this.name = name; - return this; - } - - @Nullable - public static Binding fromStack(ItemStack stack) - { - if (!stack.hasTag()) // Definitely hasn't been bound yet. - return null; - - INBT bindingTag = stack.getTag().get("binding"); - if (bindingTag == null || bindingTag.getId() != 10) // Make sure it's both a tag compound and that it has actual - // data. - return null; - - Binding binding = new Binding(); - binding.deserializeNBT((CompoundNBT) bindingTag); - return binding; - } - - @Override - public String toString() - { - return "Binding{" + "uuid=" + uuid + ", name='" + name + '\'' + '}'; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/core/data/SoulNetwork.java b/src/main/java/wayoftime/bloodmagic/core/data/SoulNetwork.java deleted file mode 100644 index aa63bc1e..00000000 --- a/src/main/java/wayoftime/bloodmagic/core/data/SoulNetwork.java +++ /dev/null @@ -1,293 +0,0 @@ -package wayoftime.bloodmagic.core.data; - -import java.util.List; -import java.util.Queue; -import java.util.UUID; - -import javax.annotation.Nullable; - -import com.google.common.collect.EvictingQueue; -import com.google.common.collect.ImmutableList; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.INBTSerializable; -import wayoftime.bloodmagic.event.SoulNetworkEvent; -import wayoftime.bloodmagic.util.BMLog; -import wayoftime.bloodmagic.util.BooleanResult; -import wayoftime.bloodmagic.util.DamageSourceBloodMagic; -import wayoftime.bloodmagic.util.helper.PlayerHelper; - -public class SoulNetwork implements INBTSerializable -{ - - private final Queue ticketHistory; - private BMWorldSavedData parent; - private PlayerEntity cachedPlayer; - private UUID playerId; - private int currentEssence; - private int orbTier; - - private SoulNetwork() - { - // No-op - For creation via NBT only - ticketHistory = EvictingQueue.create(16); - } - - public void clear() - { - ticketHistory.clear(); - } - - public int add(SoulTicket ticket, int maximum) - { - SoulNetworkEvent.Fill event = new SoulNetworkEvent.Fill(this, ticket, maximum); - if (MinecraftForge.EVENT_BUS.post(event)) - return 0; - - int currEss = getCurrentEssence(); - - if (currEss >= event.getMaximum()) - return 0; - - int newEss = Math.min(event.getMaximum(), currEss + event.getTicket().getAmount()); - setCurrentEssence(newEss); - - if (ticketHistory.contains(ticket)) - ticketHistory.remove(ticket); // "Pops" the existing ticket to the top of the queue - - ticketHistory.add(ticket); - - return newEss - currEss; - } - - /** - * @deprecated For future proofing, use {@link #add(SoulTicket, int)} instead. - */ - @Deprecated - public int add(int toAdd, int maximum) - { - return add(new SoulTicket(toAdd), maximum); - } - - /** - * @deprecated Use {@link #add(SoulTicket, int)} instead. - */ - @Deprecated - public int addLifeEssence(int toAdd, int maximum) - { - return add(toAdd, maximum); - } - - public int syphon(SoulTicket ticket) - { - return syphon(ticket, false); - } - - public int syphon(SoulTicket ticket, boolean skipEvent) - { - SoulNetworkEvent.Syphon event = new SoulNetworkEvent.Syphon(this, ticket); - if (!skipEvent && MinecraftForge.EVENT_BUS.post(event)) - return 0; - - int syphon = event.getTicket().getAmount(); - if (getCurrentEssence() >= syphon) - { - setCurrentEssence(getCurrentEssence() - syphon); - if (ticketHistory.contains(ticket)) - ticketHistory.remove(ticket); - - ticketHistory.add(ticket); - return syphon; - } - - return 0; - } - - /** - * @deprecated For future proofing, use {@link #syphon(SoulTicket)} instead. - */ - @Deprecated - public int syphon(int amount) - { - return syphon(new SoulTicket(amount)); - } - - public BooleanResult syphonAndDamage(PlayerEntity user, SoulTicket ticket) - { - if (user.getEntityWorld().isRemote) - return BooleanResult.newResult(false, 0); - - SoulNetworkEvent.Syphon.User event = new SoulNetworkEvent.Syphon.User(this, ticket, user); - - if (MinecraftForge.EVENT_BUS.post(event)) - return BooleanResult.newResult(false, 0); - - int drainAmount = syphon(event.getTicket(), true); - - if (drainAmount <= 0 || event.shouldDamage()) - hurtPlayer(user, event.getTicket().getAmount()); - - if (ticketHistory.contains(ticket)) - ticketHistory.remove(ticket); - - ticketHistory.add(ticket); - - return BooleanResult.newResult(true, event.getTicket().getAmount()); - } - - /** - * @deprecated Use {@link #syphonAndDamage(PlayerEntity, SoulTicket)} instead. - */ - @Deprecated - public boolean syphonAndDamage(PlayerEntity user, int amount) - { - return syphonAndDamage(user, new SoulTicket(amount)).isSuccess(); - } - - public void causeNausea() - { - if (getPlayer() != null) - getPlayer().addPotionEffect(new EffectInstance(Effects.NAUSEA, 99)); - } - - /** - * @deprecated - Please use {@link #causeNausea()} - */ - @Deprecated - public void causeNauseaToPlayer() - { - causeNausea(); - } - - public void hurtPlayer(PlayerEntity user, float syphon) - { - if (user != null) - { - if (syphon < 100 && syphon > 0) - { - if (!user.isCreative()) - { - user.hurtResistantTime = 0; - user.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 1.0F); - } - - } else if (syphon >= 100) - { - if (!user.isCreative()) - { - for (int i = 0; i < ((syphon + 99) / 100); i++) - { - user.hurtResistantTime = 0; - user.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 1.0F); - } - } - } - } - } - - private void markDirty() - { - if (getParent() != null) - getParent().markDirty(); - else - BMLog.DEFAULT.error("A SoulNetwork was created, but a parent was not set to allow saving."); - } - - @Nullable - public PlayerEntity getPlayer() - { - if (cachedPlayer == null) - cachedPlayer = PlayerHelper.getPlayerFromUUID(playerId); - - return cachedPlayer; - } - - public BMWorldSavedData getParent() - { - return parent; - } - - public SoulNetwork setParent(BMWorldSavedData parent) - { - this.parent = parent; - markDirty(); - return this; - } - - public PlayerEntity getCachedPlayer() - { - return cachedPlayer; - } - - public UUID getPlayerId() - { - return playerId; - } - - public int getCurrentEssence() - { - return currentEssence; - } - - public SoulNetwork setCurrentEssence(int currentEssence) - { - this.currentEssence = currentEssence; - markDirty(); - return this; - } - - public int getOrbTier() - { - return orbTier; - } - - public SoulNetwork setOrbTier(int orbTier) - { - this.orbTier = orbTier; - markDirty(); - return this; - } - - public List getTicketHistory() - { - return ImmutableList.copyOf(ticketHistory); - } - - // INBTSerializable - - @Override - public CompoundNBT serializeNBT() - { - CompoundNBT tagCompound = new CompoundNBT(); - tagCompound.putString("playerId", getPlayerId().toString()); - tagCompound.putInt("currentEssence", getCurrentEssence()); - tagCompound.putInt("orbTier", getOrbTier()); - return tagCompound; - } - - @Override - public void deserializeNBT(CompoundNBT nbt) - { - this.playerId = UUID.fromString(nbt.getString("playerId")); - this.currentEssence = nbt.getInt("currentEssence"); - this.orbTier = nbt.getInt("orbTier"); - } - - public static SoulNetwork fromNBT(CompoundNBT tagCompound) - { - SoulNetwork soulNetwork = new SoulNetwork(); - soulNetwork.deserializeNBT(tagCompound); - return soulNetwork; - } - - public static SoulNetwork newEmpty(UUID uuid) - { - SoulNetwork network = new SoulNetwork(); - network.playerId = uuid; - return network; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/core/data/SoulTicket.java b/src/main/java/wayoftime/bloodmagic/core/data/SoulTicket.java deleted file mode 100644 index fd20d500..00000000 --- a/src/main/java/wayoftime/bloodmagic/core/data/SoulTicket.java +++ /dev/null @@ -1,107 +0,0 @@ -package wayoftime.bloodmagic.core.data; - -import net.minecraft.command.ICommandSource; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.world.World; - -/** - * Wrapper for any interactions with the SoulNetwork - * Contains a description on what the interaction is and any extra data - */ -public class SoulTicket -{ - private static final ITextComponent EMPTY = new StringTextComponent(""); - - private final ITextComponent description; - private final int amount; - - public SoulTicket(ITextComponent description, int amount) - { - this.description = description; - this.amount = amount; - } - - public SoulTicket(int amount) - { - this(EMPTY, amount); - } - - public boolean isSyphon() - { - return amount < 0; - } - - public ITextComponent getDescription() - { - return description; - } - - public int getAmount() - { - return amount; - } - - /** - * @return A description in the format block|dimensionID|pos - */ - public static SoulTicket block(World world, BlockPos pos, int amount) - { - // func_234923_W_() = getDimension - return new SoulTicket(new StringTextComponent("block|" + world.getDimensionKey().getRegistryName() + "|" - + pos.toLong()), amount); - } - - /** - * @return A description in the format item|item registry - * name|dimensionID|entityName|entityPos - */ - public static SoulTicket item(ItemStack itemStack, World world, Entity entity, int amount) - { - return new SoulTicket(new StringTextComponent("item|" + itemStack.getItem().getRegistryName() + "|" - + world.getDimensionKey().getRegistryName() + "|" + entity.getCachedUniqueIdString()), amount); - } - - /** - * @return A description in the format item|item registry name|dimensionID|pos - */ - public static SoulTicket item(ItemStack itemStack, World world, BlockPos pos, int amount) - { - return new SoulTicket(new StringTextComponent("item|" + itemStack.getItem().getRegistryName() + "|" - + world.getDimensionKey().getRegistryName() + "|" + pos.toLong()), amount); - } - - /** - * @return A description in the format item|item registry name|dimensionID - */ - public static SoulTicket item(ItemStack itemStack, int amount) - { - return new SoulTicket(new StringTextComponent("item|" + itemStack.getItem().getRegistryName()), amount); - } - - public static SoulTicket command(ICommandSource sender, String command, int amount) - { - return new SoulTicket(new StringTextComponent("command|" + command + "|" + sender.toString()), amount); - } - - // TODO maybe make it check the amount?? - @Override - public boolean equals(Object o) - { - if (this == o) - return true; - if (o instanceof SoulTicket) - return ((SoulTicket) o).getDescription().equals(description); - - return false; - } - - @Override - public int hashCode() - { - return description.hashCode(); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/core/living/ILivingContainer.java b/src/main/java/wayoftime/bloodmagic/core/living/ILivingContainer.java deleted file mode 100644 index 0e6db181..00000000 --- a/src/main/java/wayoftime/bloodmagic/core/living/ILivingContainer.java +++ /dev/null @@ -1,60 +0,0 @@ -package wayoftime.bloodmagic.core.living; - -import java.util.List; - -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -public interface ILivingContainer -{ - default LivingStats getLivingStats(ItemStack stack) - { - if (!stack.hasTag() || !stack.getTag().contains("livingStats")) - return null; - - return LivingStats.fromNBT(stack.getTag().getCompound("livingStats")); - } - - default void updateLivingStats(ItemStack stack, LivingStats stats) - { - if (stats == null) - { - if (stack.hasTag()) - stack.getTag().remove("livingStats"); - return; - } - - if (!stack.hasTag()) - stack.setTag(new CompoundNBT()); - - stack.getTag().put("livingStats", stats.serialize()); - } - - @OnlyIn(Dist.CLIENT) - static void appendLivingTooltip(LivingStats stats, List tooltip, boolean trainable) - { - if (stats != null) - { - if (trainable) - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.livingarmour.upgrade.points", stats.getUsedPoints(), stats.getMaxPoints()).mergeStyle(TextFormatting.GOLD)); - - stats.getUpgrades().forEach((k, v) -> { - if (k.getLevel(v.intValue()) <= 0) - return; - - boolean sneaking = Screen.hasShiftDown(); -// if (!InputUtil.isKeyPressed(MinecraftClient.getInstance().getWindow().getHandle(), 340) || k.getNextRequirement(v) == 0) - if (!sneaking || k.getNextRequirement(v.intValue()) == 0) - tooltip.add(new TranslationTextComponent("%s %s", new TranslationTextComponent(k.getTranslationKey()), new TranslationTextComponent("enchantment.level." + k.getLevel(v.intValue()))).mergeStyle(TextFormatting.GRAY)); - else - tooltip.add(new TranslationTextComponent("%s %s", new TranslationTextComponent(k.getTranslationKey()), (": " + v.intValue() + "/" + k.getNextRequirement(v.intValue()))).mergeStyle(TextFormatting.GRAY)); - }); - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/core/living/LivingStats.java b/src/main/java/wayoftime/bloodmagic/core/living/LivingStats.java deleted file mode 100644 index 3e158c7d..00000000 --- a/src/main/java/wayoftime/bloodmagic/core/living/LivingStats.java +++ /dev/null @@ -1,163 +0,0 @@ -package wayoftime.bloodmagic.core.living; - -import java.util.Map; - -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.ListNBT; -import net.minecraft.util.ResourceLocation; -import wayoftime.bloodmagic.core.LivingArmorRegistrar; - -public class LivingStats -{ - - public static final int DEFAULT_UPGRADE_POINTS = 100; - - private final Map upgrades; - private int maxPoints = DEFAULT_UPGRADE_POINTS; - - public LivingStats(Map upgrades) - { - this.upgrades = upgrades; - } - - public LivingStats() - { - this(Maps.newHashMap()); - } - - public Map getUpgrades() - { - return ImmutableMap.copyOf(upgrades); - } - - public LivingStats addExperience(ResourceLocation key, double experience) - { -// LivingUpgrade upgrade = LivingArmorRegistrar.UPGRADES.getOrDefault(key); - LivingUpgrade upgrade = LivingArmorRegistrar.UPGRADE_MAP.getOrDefault(key, LivingUpgrade.DUMMY); - double current = upgrades.getOrDefault(upgrade, 0d); - -// System.out.println("Upgrade: " + upgrade); - - if (upgrade.getNextRequirement((int) current) == 0) - return this; - - upgrades.put(upgrade, current + experience); - return this; - } - - public LivingStats resetExperience(ResourceLocation key) - { - LivingUpgrade upgrade = LivingArmorRegistrar.UPGRADE_MAP.getOrDefault(key, LivingUpgrade.DUMMY); - double current = upgrades.getOrDefault(upgrade, 0d); - - if (upgrade.getNextRequirement((int) current) == 0) - return this; - - upgrades.put(upgrade, 0d); - - return this; - } - - public int getLevel(ResourceLocation key) - { - LivingUpgrade upgrade = LivingArmorRegistrar.UPGRADE_MAP.getOrDefault(key, LivingUpgrade.DUMMY); -// LivingUpgrade upgrade = LivingArmorRegistrar.UPGRADES.getOrDefault(key); - return upgrade.getLevel(upgrades.getOrDefault(upgrade, 0d).intValue()); - } - - public int getUsedPoints() - { - int total = 0; - for (Map.Entry applied : upgrades.entrySet()) - { - double experience = applied.getValue(); - int level = applied.getKey().getLevel((int) experience); - int cost = applied.getKey().getLevelCost(level); - total += cost; - } - - return total; - } - - public int getMaxPoints() - { - return maxPoints; - } - - public LivingStats setMaxPoints(int maxPoints) - { - this.maxPoints = maxPoints; - return this; - } - - public CompoundNBT serialize() - { - CompoundNBT compound = new CompoundNBT(); - ListNBT statList = new ListNBT(); - upgrades.forEach((k, v) -> { - CompoundNBT upgrade = new CompoundNBT(); - upgrade.putString("key", k.getKey().toString()); - upgrade.putDouble("exp", v); - statList.add(upgrade); - }); - compound.put("upgrades", statList); - - compound.putInt("maxPoints", maxPoints); - - return compound; - } - - public void deserialize(CompoundNBT nbt) - { - ListNBT statList = nbt.getList("upgrades", 10); - statList.forEach(tag -> { - if (!(tag instanceof CompoundNBT)) - return; - - LivingUpgrade upgrade = LivingArmorRegistrar.UPGRADE_MAP.getOrDefault(new ResourceLocation(((CompoundNBT) tag).getString("key")), LivingUpgrade.DUMMY); - if (upgrade == LivingUpgrade.DUMMY) - return; - double experience = ((CompoundNBT) tag).getDouble("exp"); - upgrades.put(upgrade, experience); - }); - - maxPoints = nbt.getInt("maxPoints"); - } - - public static LivingStats fromNBT(CompoundNBT statTag) - { - LivingStats stats = new LivingStats(); - stats.deserialize(statTag); - return stats; - } - - public static LivingStats fromPlayer(PlayerEntity player) - { - return fromPlayer(player, false); - } - - public static LivingStats fromPlayer(PlayerEntity player, boolean createNew) - { - if (!LivingUtil.hasFullSet(player)) - return null; - - ItemStack chest = player.getItemStackFromSlot(EquipmentSlotType.CHEST); - LivingStats stats = ((ILivingContainer) chest.getItem()).getLivingStats(chest); - return stats == null && createNew ? new LivingStats() : stats; - } - - public static void toPlayer(PlayerEntity player, LivingStats stats) - { - if (!LivingUtil.hasFullSet(player)) - return; - - ItemStack chest = player.getItemStackFromSlot(EquipmentSlotType.CHEST); - ((ILivingContainer) chest.getItem()).updateLivingStats(chest, stats); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/core/living/LivingUpgrade.java b/src/main/java/wayoftime/bloodmagic/core/living/LivingUpgrade.java deleted file mode 100644 index 8f6b0e82..00000000 --- a/src/main/java/wayoftime/bloodmagic/core/living/LivingUpgrade.java +++ /dev/null @@ -1,267 +0,0 @@ -package wayoftime.bloodmagic.core.living; - -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; -import java.util.UUID; -import java.util.function.Consumer; - -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Multimap; -import com.google.common.collect.Sets; -import com.google.common.reflect.TypeToken; -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonDeserializer; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; -import com.google.gson.annotations.JsonAdapter; -import com.google.gson.annotations.SerializedName; - -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.attributes.Attribute; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.DamageSource; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Util; -import net.minecraftforge.registries.ForgeRegistryEntry; - -@JsonAdapter(LivingUpgrade.Deserializer.class) -public class LivingUpgrade extends ForgeRegistryEntry -{ - public static final LivingUpgrade DUMMY = new LivingUpgrade(new ResourceLocation("dummy"), levels -> levels.add(new Level(0, 0))); - - private final ResourceLocation key; - private final Set incompatible; - private final TreeMap experienceToLevel; - private final Map levelToCost; - private final Map bonuses; - private boolean isNegative; - private String translationKey = null; - private IAttributeProvider attributeProvider; - private IArmorProvider armorProvider; - private IDamageProvider damageProvider; - - public LivingUpgrade(ResourceLocation key, Consumer> experienceMapper) - { - this.key = key; - this.incompatible = Sets.newHashSet(); - this.experienceToLevel = Maps.newTreeMap(); - this.levelToCost = Maps.newHashMap(); - this.bonuses = Maps.newHashMap(); - - List levels = Lists.newArrayList(); - experienceMapper.accept(levels); - - for (int i = 0; i < levels.size(); i++) - { - Level level = levels.get(i); - experienceToLevel.put(level.experienceNeeded, i + 1); - levelToCost.put(i + 1, level.upgradeCost); - } - } - - public LivingUpgrade withBonusSet(String id, Consumer> modifiers) - { -// List values = DefaultedList.of(); - List values = new ArrayList(); - modifiers.accept(values); - if (values.size() != levelToCost.size()) - throw new RuntimeException("Bonus size and level size must be the same."); - - bonuses.put(id, new Bonus(id, values)); - return this; - } - - public Number getBonusValue(String id, int level) - { - List modifiers = bonuses.getOrDefault(id, Bonus.DEFAULT).modifiers; - if (modifiers.isEmpty() || level == 0) - return 0; - - return modifiers.get(level - 1); - } - - public LivingUpgrade withAttributeProvider(IAttributeProvider attributeProvider) - { - this.attributeProvider = attributeProvider; - return this; - } - - public IAttributeProvider getAttributeProvider() - { - return attributeProvider; - } - - public LivingUpgrade withArmorProvider(IArmorProvider armorProvider) - { - this.armorProvider = armorProvider; - return this; - } - - public IArmorProvider getArmorProvider() - { - return armorProvider; - } - - public LivingUpgrade withDamageProvider(IDamageProvider damageProvider) - { - this.damageProvider = damageProvider; - return this; - } - - public IDamageProvider getDamageProvider() - { - return damageProvider; - } - - public String getTranslationKey() - { - return translationKey == null ? translationKey = Util.makeTranslationKey("living_upgrade", key) - : translationKey; - } - - public boolean isNegative() - { - return isNegative; - } - - public boolean isCompatible(ResourceLocation otherUpgrade) - { - return !incompatible.contains(otherUpgrade); - } - - public LivingUpgrade addIncompatibility(ResourceLocation key, ResourceLocation... otherKeys) - { - incompatible.add(key); - Collections.addAll(incompatible, otherKeys); - return this; - } - - public int getLevel(int experience) - { - Map.Entry floor = experienceToLevel.floorEntry(experience); - return floor == null ? 0 : floor.getValue(); - } - - public int getNextRequirement(int experience) - { - Integer ret = experienceToLevel.ceilingKey(experience + 1); - return ret == null ? 0 : ret; - } - - public int getLevelCost(int level) - { - return levelToCost.getOrDefault(level, 0); - } - - public ResourceLocation getKey() - { - return key; - } - - public LivingUpgrade asDowngrade() - { - this.isNegative = true; - return this; - } - - @Override - public String toString() - { - return key.toString(); - } - - public interface IAttributeProvider - { - void handleAttributes(LivingStats stats, Multimap modifiers, UUID uuid, LivingUpgrade upgrade, int level); - } - - public interface IArmorProvider - { - double getProtection(PlayerEntity player, LivingStats stats, DamageSource source, LivingUpgrade upgrade, int level); - } - - public interface IDamageProvider - { - double getAdditionalDamage(PlayerEntity player, ItemStack weapon, double damage, LivingStats stats, LivingEntity attacked, LivingUpgrade upgrade, int level); - } - - public static class Level - { - @SerializedName("xp") - private final int experienceNeeded; - @SerializedName("cost") - private final int upgradeCost; - - public Level(int experienceNeeded, int upgradeCost) - { - this.experienceNeeded = experienceNeeded; - this.upgradeCost = upgradeCost; - } - } - - public static class Bonus - { - - private static final Bonus DEFAULT = new Bonus("null", Collections.emptyList()); - - private final String id; - private final List modifiers; - - public Bonus(String id, List modifiers) - { - this.id = id; - this.modifiers = modifiers; - } - - public String getId() - { - return id; - } - } - - public static class Deserializer implements JsonDeserializer - { - @Override - public LivingUpgrade deserialize(JsonElement element, Type typeOfT, JsonDeserializationContext context) - throws JsonParseException - { - JsonObject json = element.getAsJsonObject(); - ResourceLocation id = new ResourceLocation(json.getAsJsonPrimitive("id").getAsString()); - List levels = context.deserialize(json.getAsJsonArray("levels"), new TypeToken>() - { - }.getType()); - boolean negative = json.has("negative") && json.getAsJsonPrimitive("negative").getAsBoolean(); - - LivingUpgrade upgrade = new LivingUpgrade(id, upgradeLevels -> upgradeLevels.addAll(levels)); - if (negative) - upgrade.asDowngrade(); - - if (json.has("incompatibilities")) - { - String[] incompatibilities = context.deserialize(json.getAsJsonArray("incompatibilities"), String[].class); - for (String incompatible : incompatibilities) - upgrade.addIncompatibility(new ResourceLocation(incompatible)); - } - - if (json.has("bonuses")) - { - Map bonuses = context.deserialize(json.getAsJsonObject("bonuses"), new TypeToken>() - { - }.getType()); - bonuses.forEach((k, v) -> upgrade.withBonusSet(k, numbers -> Collections.addAll(numbers, v))); - } - - return upgrade; - } - } - -} diff --git a/src/main/java/wayoftime/bloodmagic/core/living/LivingUtil.java b/src/main/java/wayoftime/bloodmagic/core/living/LivingUtil.java deleted file mode 100644 index 605d8616..00000000 --- a/src/main/java/wayoftime/bloodmagic/core/living/LivingUtil.java +++ /dev/null @@ -1,191 +0,0 @@ -package wayoftime.bloodmagic.core.living; - -import java.util.Map; -import java.util.Map.Entry; - -import org.apache.commons.lang3.tuple.Pair; - -import com.google.common.collect.Multimap; - -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.attributes.Attribute; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ArmorItem; -import net.minecraft.item.ItemStack; -import net.minecraft.util.DamageSource; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraftforge.common.MinecraftForge; -import wayoftime.bloodmagic.common.item.ItemLivingTrainer; -import wayoftime.bloodmagic.core.util.PlayerUtil; -import wayoftime.bloodmagic.event.LivingEquipmentEvent; - -public class LivingUtil -{ - // @return Pair containing the LivingStats of the player, and if the LivingStats - // upgraded due to the applied EXP. - public static Pair applyNewExperience(PlayerEntity player, LivingUpgrade upgrade, double experience) - { - LivingStats stats = LivingStats.fromPlayer(player, true); - if (stats == null) - return Pair.of(null, false); - - if (!canTrain(player, upgrade, upgrade.getLevel((int) experience))) - return Pair.of(stats, false); - - LivingEquipmentEvent.GainExperience event = new LivingEquipmentEvent.GainExperience(player, stats, upgrade, experience); -// EventResult result = LivingEquipmentEvent.EXPERIENCE_GAIN.invoker().gainExperience(event); - MinecraftForge.EVENT_BUS.post(event); - if (event.isCanceled()) - return Pair.of(stats, false); - - experience = event.getExperience(); - - double currentExperience = stats.getUpgrades().getOrDefault(upgrade, 0d); - double requiredForLevel = upgrade.getNextRequirement((int) currentExperience) - currentExperience; - - // If we're going to level up from this, check points - if (requiredForLevel <= experience) - { - int currentPoints = stats.getUsedPoints(); - // If we're already capped or somehow over the cap, we don't want to add - // experience - if (currentPoints >= stats.getMaxPoints()) - return Pair.of(stats, false); - - int currentPointCost = upgrade.getLevelCost(upgrade.getLevel((int) currentExperience)); - int nextPointCost = upgrade.getLevelCost(upgrade.getLevel((int) (currentExperience + experience))); - -// System.out.println("Current point cost: " + currentPointCost + ", Next point cost: " + nextPointCost); - // If there's no more levels in this upgrade, we don't want to add experience - if (nextPointCost == -1) - return Pair.of(stats, false); - - int pointDif = nextPointCost - currentPointCost; - if (pointDif < 0) - { - return Pair.of(stats, false); - } - - // If applying this new level will go over our cap, we don't want to add - // experience - if (currentPoints + pointDif > stats.getMaxPoints()) - return Pair.of(stats, false); - } - - int newLevel = upgrade.getLevel((int) (currentExperience + experience)); - boolean didUpgrade = false; - if (upgrade.getLevel((int) currentExperience) != newLevel) - { - LivingEquipmentEvent.LevelUp levelUpEvent = new LivingEquipmentEvent.LevelUp(player, stats, upgrade); -// LivingEquipmentEvent.LEVEL_UP.invoker().levelUp(levelUpEvent); - MinecraftForge.EVENT_BUS.post(levelUpEvent); - didUpgrade = true; - - player.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.living_upgrade_level_increase", new TranslationTextComponent(upgrade.getTranslationKey()), newLevel), true); - } - -// System.out.println("Adding experience! Total experience is: " + currentExperience); - - stats.addExperience(upgrade.getKey(), experience); - LivingStats.toPlayer(player, stats); - return Pair.of(stats, didUpgrade); - } - - public static double getDamageReceivedForArmour(PlayerEntity player, DamageSource source, double damage) - { -// System.out.println("Initial damage from " + source + ": " + damage); - LivingStats stats = LivingStats.fromPlayer(player, true); - if (stats == null) - return damage; - - Map upgrades = stats.getUpgrades(); - for (Entry entry : upgrades.entrySet()) - { - LivingUpgrade upgrade = entry.getKey(); - if (upgrade.getArmorProvider() == null) - { - continue; - } - - int level = upgrade.getLevel(entry.getValue().intValue()); - damage *= 1 - upgrade.getArmorProvider().getProtection(player, stats, source, upgrade, level); - } - -// System.out.println("Final damage: " + damage); - - return damage; - } - - public static double getAdditionalDamage(PlayerEntity player, ItemStack weapon, LivingEntity attackedEntity, double damage) - { -// System.out.println("Initial damage from " + source + ": " + damage); - LivingStats stats = LivingStats.fromPlayer(player, true); - if (stats == null) - return 0; - - double additionalDamage = 0; - - Map upgrades = stats.getUpgrades(); - for (Entry entry : upgrades.entrySet()) - { - LivingUpgrade upgrade = entry.getKey(); - if (upgrade.getArmorProvider() == null) - { - continue; - } - - int level = upgrade.getLevel(entry.getValue().intValue()); - if (upgrade.getDamageProvider() == null) - { - continue; - } - additionalDamage += upgrade.getDamageProvider().getAdditionalDamage(player, weapon, damage, stats, attackedEntity, upgrade, level); - } - -// System.out.println("Final damage: " + damage); - - return additionalDamage; - } - - public static boolean canTrain(PlayerEntity player, LivingUpgrade upgrade, int currentLevel) - { - ItemStack trainer = PlayerUtil.findItem(player, stack -> stack.getItem() instanceof ItemLivingTrainer && stack.hasTag() && stack.getTag().contains("livingStats")); - if (trainer.isEmpty()) - return true; - - String mode = trainer.getTag().getString("livingLock"); - LivingStats stats = ((ILivingContainer) trainer.getItem()).getLivingStats(trainer); - - int levelLimit = stats.getLevel(upgrade.getKey()); - if (mode.equalsIgnoreCase("whitelist")) - { - return levelLimit != 0 && levelLimit > currentLevel; - } else if (mode.equalsIgnoreCase("blacklist")) - { - return levelLimit == 0; - } - - return true; - } - - public static boolean hasFullSet(PlayerEntity player) - { - for (ItemStack stack : player.inventory.armorInventory) - if (stack.isEmpty() || !(stack.getItem() instanceof ILivingContainer)) - return false; - - return true; - } - - public static void applyAttributes(Multimap attributes, ItemStack stack, PlayerEntity player, EquipmentSlotType slot) - { - if (player == null || !hasFullSet(player)) - return; - - Multimap newAttributes = ((ArmorItem) stack.getItem()).getAttributeModifiers(slot, stack); -// newAttributes.values().forEach(e -> e.setSerialize(false)); - attributes.putAll(newAttributes); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/core/living/ProjectileArmorProvider.java b/src/main/java/wayoftime/bloodmagic/core/living/ProjectileArmorProvider.java deleted file mode 100644 index f1b10b44..00000000 --- a/src/main/java/wayoftime/bloodmagic/core/living/ProjectileArmorProvider.java +++ /dev/null @@ -1,15 +0,0 @@ -package wayoftime.bloodmagic.core.living; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.DamageSource; - -public class ProjectileArmorProvider implements LivingUpgrade.IArmorProvider -{ - @Override - public double getProtection(PlayerEntity player, LivingStats stats, DamageSource source, LivingUpgrade upgrade, int level) - { - // TODO Auto-generated method stub - return 0; - } - -} diff --git a/src/main/java/wayoftime/bloodmagic/core/recipe/IngredientBloodOrb.java b/src/main/java/wayoftime/bloodmagic/core/recipe/IngredientBloodOrb.java deleted file mode 100644 index 9e69b0f2..00000000 --- a/src/main/java/wayoftime/bloodmagic/core/recipe/IngredientBloodOrb.java +++ /dev/null @@ -1,83 +0,0 @@ -package wayoftime.bloodmagic.core.recipe; - -import java.util.Collection; -import java.util.List; -import java.util.stream.Stream; - -import com.google.gson.JsonObject; - -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.util.JSONUtils; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.crafting.IIngredientSerializer; -import net.minecraftforge.common.crafting.VanillaIngredientSerializer; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.core.registry.OrbRegistry; -import wayoftime.bloodmagic.common.item.BloodOrb; - -public class IngredientBloodOrb extends Ingredient -{ - public static final ResourceLocation NAME = new ResourceLocation(BloodMagic.MODID, "bloodorb"); - - public final int orbTier; - - public static IngredientBloodOrb fromTier(int orbTier) - { - return new IngredientBloodOrb(orbTier); - } - - public static IngredientBloodOrb fromOrb(BloodOrb orb) - { - return new IngredientBloodOrb(orb.getTier()); - } - - protected IngredientBloodOrb(int orbTier) - { - super(Stream.of(new ItemList(orbTier))); - this.orbTier = orbTier; - } - - public net.minecraftforge.common.crafting.IIngredientSerializer getSerializer() - { - return Serializer.INSTANCE; - } - - private static class ItemList implements IItemList - { - private final int orbTier; - - public ItemList(int orbTier) - { - this.orbTier = orbTier; - } - - @Override - public Collection getStacks() - { - List orbGet = OrbRegistry.getOrbsDownToTier(orbTier); - - return orbGet; - } - - @Override - public JsonObject serialize() - { - JsonObject object = new JsonObject(); - object.addProperty("type", NAME.toString()); - object.addProperty("orb_tier", orbTier); - return object; - } - } - - public static class Serializer extends VanillaIngredientSerializer - { - public static final IIngredientSerializer INSTANCE = new Serializer(); - - @Override - public Ingredient parse(JsonObject json) - { - return new IngredientBloodOrb(JSONUtils.getInt(json, "orb_tier")); - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRegistry.java b/src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRegistry.java deleted file mode 100644 index 93dd38c6..00000000 --- a/src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRegistry.java +++ /dev/null @@ -1,77 +0,0 @@ -package wayoftime.bloodmagic.core.registry; - -import java.util.HashMap; -import java.util.Map; - -import org.apache.commons.lang3.tuple.Pair; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffect; -import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffectBinding; -import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffectBounce; -import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffectCrafting; -import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffectDay; -import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffectMovement; -import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffectNight; -import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffectSpike; -import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffectUpdraft; -import wayoftime.bloodmagic.impl.BloodMagicAPI; -import wayoftime.bloodmagic.recipe.RecipeAlchemyArray; - -public class AlchemyArrayRegistry -{ - public static Map effectMap = new HashMap(); - public static final ResourceLocation BINDING_ARRAY = BloodMagic.rl("textures/models/alchemyarrays/bindingarray.png"); - - public static boolean registerEffect(ResourceLocation rl, AlchemyArrayEffect effect) - { - boolean hadKey = effectMap.containsKey(rl); - - effectMap.put(rl, effect); - - return hadKey; - } - - public static void registerBaseArrays() - { - registerEffect(BloodMagic.rl("array/movement"), new AlchemyArrayEffectMovement()); - registerEffect(BloodMagic.rl("array/updraft"), new AlchemyArrayEffectUpdraft()); - registerEffect(BloodMagic.rl("array/spike"), new AlchemyArrayEffectSpike()); - registerEffect(BloodMagic.rl("array/day"), new AlchemyArrayEffectDay()); - registerEffect(BloodMagic.rl("array/night"), new AlchemyArrayEffectNight()); - registerEffect(BloodMagic.rl("array/bounce"), new AlchemyArrayEffectBounce()); - } - - public static AlchemyArrayEffect getEffect(World world, ResourceLocation rl, RecipeAlchemyArray recipe) - { - if (effectMap.containsKey(rl)) - { - return effectMap.get(rl).getNewCopy(); - } - - if (!recipe.getOutput().isEmpty()) - { - if (recipe.getTexture().equals(BINDING_ARRAY)) - { - return new AlchemyArrayEffectBinding(recipe.getOutput()); - } - // Return a new instance of AlchemyEffectCrafting - return new AlchemyArrayEffectCrafting(recipe.getOutput()); - } - - return null; - } - - public static AlchemyArrayEffect getEffect(World world, ItemStack input, ItemStack catalyst) - { - Pair array = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyArray(world, input, catalyst); - if (array == null || array.getRight() == null || !array.getLeft()) - return null; - - return getEffect(world, array.getRight().getId(), array.getRight()); - } - -} diff --git a/src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRendererRegistry.java b/src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRendererRegistry.java deleted file mode 100644 index e650f454..00000000 --- a/src/main/java/wayoftime/bloodmagic/core/registry/AlchemyArrayRendererRegistry.java +++ /dev/null @@ -1,71 +0,0 @@ -package wayoftime.bloodmagic.core.registry; - -import java.util.HashMap; -import java.util.Map; - -import org.apache.commons.lang3.tuple.Pair; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wayoftime.bloodmagic.client.render.alchemyarray.AlchemyArrayRenderer; -import wayoftime.bloodmagic.client.render.alchemyarray.BindingAlchemyCircleRenderer; -import wayoftime.bloodmagic.impl.BloodMagicAPI; -import wayoftime.bloodmagic.recipe.RecipeAlchemyArray; - -public class AlchemyArrayRendererRegistry -{ - @OnlyIn(Dist.CLIENT) - public static final AlchemyArrayRenderer DEFAULT_RENDERER = new AlchemyArrayRenderer(new ResourceLocation("bloodmagic", "textures/models/alchemyarrays/basearray.png")); - - @OnlyIn(Dist.CLIENT) - public static Map rendererMap = new HashMap(); - - /** - * - * @param rl - * @param renderer - * @return True if there was already a renderer registered for this rl. - */ - @OnlyIn(Dist.CLIENT) - public static boolean registerRenderer(ResourceLocation rl, AlchemyArrayRenderer renderer) - { - boolean hadKey = rendererMap.containsKey(rl); - - rendererMap.put(rl, renderer); - - return hadKey; - } - - @OnlyIn(Dist.CLIENT) - public static AlchemyArrayRenderer getRenderer(World world, ResourceLocation rl, RecipeAlchemyArray recipe) - { - if (rendererMap.containsKey(rl)) - { - return rendererMap.get(rl); - } - - ResourceLocation texture = recipe.getTexture(); - if (AlchemyArrayRegistry.BINDING_ARRAY.equals(texture)) - return new BindingAlchemyCircleRenderer(); - - if (texture != null) - return new AlchemyArrayRenderer(texture); - - return null; - } - - @OnlyIn(Dist.CLIENT) - public static AlchemyArrayRenderer getRenderer(World world, ItemStack input, ItemStack catalyst) - { - Pair array = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyArray(world, input, catalyst); - if (array == null || array.getRight() == null) - { - return null; - } - - return getRenderer(world, array.getRight().getId(), array.getRight()); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/core/registry/OrbRegistry.java b/src/main/java/wayoftime/bloodmagic/core/registry/OrbRegistry.java deleted file mode 100644 index 9db6a683..00000000 --- a/src/main/java/wayoftime/bloodmagic/core/registry/OrbRegistry.java +++ /dev/null @@ -1,63 +0,0 @@ -package wayoftime.bloodmagic.core.registry; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import com.google.common.collect.ArrayListMultimap; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.registries.ForgeRegistries; -import wayoftime.bloodmagic.altar.AltarTier; -import wayoftime.bloodmagic.common.item.BloodOrb; - -/** - * This is only for those who wish to add a basic {@link BloodOrb}. If you need - * custom handling, you will need your own item class. - */ -public class OrbRegistry -{ - public static ArrayListMultimap tierMap = ArrayListMultimap.create(); - private static List orbs = new ArrayList<>(); - - public static List getOrbsForTier(int tier) - { - if (getTierMap().containsKey(tier)) - return getTierMap().get(tier); - - return Collections.emptyList(); - } - - public static List getOrbsUpToTier(int tier) - { - List ret = new ArrayList<>(); - - for (int i = 1; i <= tier; i++) ret.addAll(getOrbsForTier(i)); - - return ret; - } - - public static List getOrbsDownToTier(int tier) - { - List ret = new ArrayList<>(); - - for (int i = AltarTier.MAXTIERS; i >= tier; i--) ret.addAll(getOrbsForTier(i)); - - return ret; - } - - public static ItemStack getOrbStack(BloodOrb orb) - { - Item orbItem = ForgeRegistries.ITEMS.getValue(orb.getResourceLocation()); - if (orbItem == null) - return null; - - return new ItemStack(orbItem); - } - - public static ArrayListMultimap getTierMap() - { - return ArrayListMultimap.create(tierMap); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/core/util/PlayerUtil.java b/src/main/java/wayoftime/bloodmagic/core/util/PlayerUtil.java deleted file mode 100644 index 5c6e2f42..00000000 --- a/src/main/java/wayoftime/bloodmagic/core/util/PlayerUtil.java +++ /dev/null @@ -1,57 +0,0 @@ -package wayoftime.bloodmagic.core.util; - -import java.util.function.Predicate; - -import com.google.common.collect.Multimap; - -import net.minecraft.entity.ai.attributes.Attribute; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ItemStack; -import wayoftime.bloodmagic.common.item.ExpandedArmor; -import wayoftime.bloodmagic.core.living.LivingUtil; - -public class PlayerUtil -{ - - public static ItemStack findItem(PlayerEntity player, Predicate requirements) - { - - // Check offhand first - ItemStack offHand = player.getHeldItemOffhand(); - if (requirements.test(offHand)) - return offHand; - - // Check inventory next - for (int slot = 0; slot < player.inventory.getSizeInventory(); slot++) - { - ItemStack foundStack = player.inventory.getStackInSlot(slot); - if (!foundStack.isEmpty() && requirements.test(foundStack)) - return foundStack; - } - - return ItemStack.EMPTY; - } - - public static Multimap handle(PlayerEntity player, Multimap existing) - { - - ItemStack chest = player.getItemStackFromSlot(EquipmentSlotType.CHEST); - boolean hasFullSet = LivingUtil.hasFullSet(player); - - if (hasFullSet && existing == null) - { - existing = ((ExpandedArmor) chest.getItem()).getAttributeModifiers(EquipmentSlotType.CHEST, chest); - player.getAttributeManager().reapplyModifiers(existing); - } - - if (!hasFullSet && existing != null) - { - player.getAttributeManager().removeModifiers(existing); - existing = null; - } - - return existing; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/core/util/ResourceUtil.java b/src/main/java/wayoftime/bloodmagic/core/util/ResourceUtil.java deleted file mode 100644 index 81f6b0d1..00000000 --- a/src/main/java/wayoftime/bloodmagic/core/util/ResourceUtil.java +++ /dev/null @@ -1,78 +0,0 @@ -package wayoftime.bloodmagic.core.util; - -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URL; -import java.nio.file.FileSystem; -import java.nio.file.FileSystemAlreadyExistsException; -import java.nio.file.FileSystems; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Collections; -import java.util.Set; -import java.util.function.Predicate; -import java.util.stream.Collectors; - -import org.apache.commons.io.IOUtils; - -import net.minecraft.util.ResourceLocation; -import wayoftime.bloodmagic.BloodMagic; - -public class ResourceUtil -{ - public static Set gatherResources(String home, String following, Predicate predicate) - { - FileSystem fileSystem = null; - try - { - URL url = ResourceUtil.class.getResource(home); - if (url != null) - { - URI uri = url.toURI(); - Path path; - if (uri.getScheme().equals("file")) - { - path = Paths.get(ResourceUtil.class.getResource(home + "/" + following).toURI()); - } else - { - if (!uri.getScheme().equals("jar")) - { - BloodMagic.LOGGER.error("Unsupported URI scheme {}", uri.getScheme()); - return Collections.emptySet(); - } - - try - { - fileSystem = FileSystems.newFileSystem(uri, Collections.emptyMap()); - } catch (FileSystemAlreadyExistsException e) - { - fileSystem = FileSystems.getFileSystem(uri); - } - path = fileSystem.getPath(home + "/" + following); - } - - return Files.walk(path).filter(predicate).collect(Collectors.toSet()); - } - } catch (IOException | URISyntaxException e) - { - e.printStackTrace(); - } finally - { - IOUtils.closeQuietly(fileSystem); - } - - return Collections.emptySet(); - } - - public static Set gatherResources(String home, String following) - { - return gatherResources(home, following, p -> true); - } - - public static ResourceLocation addContext(ResourceLocation rl, String context) - { - return new ResourceLocation(rl.getNamespace(), context + rl.getPath()); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/core/util/Value.java b/src/main/java/wayoftime/bloodmagic/core/util/Value.java deleted file mode 100644 index 4ffbd20f..00000000 --- a/src/main/java/wayoftime/bloodmagic/core/util/Value.java +++ /dev/null @@ -1,27 +0,0 @@ -package wayoftime.bloodmagic.core.util; - -public final class Value -{ - private T value; - - private Value(T t) - { - this.value = t; - } - - public T get() - { - return value; - } - - public Value set(T t) - { - this.value = t; - return this; - } - - public static Value of(T t) - { - return new Value<>(t); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/demonaura/PosXY.java b/src/main/java/wayoftime/bloodmagic/demonaura/PosXY.java deleted file mode 100644 index 2e2fd6da..00000000 --- a/src/main/java/wayoftime/bloodmagic/demonaura/PosXY.java +++ /dev/null @@ -1,76 +0,0 @@ -package wayoftime.bloodmagic.demonaura; - -import org.apache.commons.lang3.builder.ToStringBuilder; - -public class PosXY implements Comparable -{ - public int x; - public int y; - - public PosXY() - { - } - - public PosXY(int x, int y) - { - this.x = x; - this.y = y; - } - - @Override - public int compareTo(PosXY c) - { - return this.y == c.y ? this.x - c.x : this.y - c.y; - } - - public float getDistanceSquared(int x, int z) - { - float f = this.x - x; - float f2 = this.y - z; - return f * f + f2 * f2; - } - - public float getDistanceSquaredToChunkCoordinates(PosXY c) - { - return getDistanceSquared(c.x, c.y); - } - - public void setX(int x) - { - this.x = x; - } - - public void setY(int y) - { - this.y = y; - } - - @Override - public String toString() - { - return new ToStringBuilder(this).append("x", x).append("y", y).toString(); - } - - @Override - public boolean equals(Object o) - { - if (this == o) - return true; - if (!(o instanceof PosXY)) - return false; - - PosXY posXY = (PosXY) o; - - if (x != posXY.x) - return false; - return y == posXY.y; - } - - @Override - public int hashCode() - { - int result = x; - result = 31 * result + y; - return result; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/demonaura/WillChunk.java b/src/main/java/wayoftime/bloodmagic/demonaura/WillChunk.java deleted file mode 100644 index 14cb3f02..00000000 --- a/src/main/java/wayoftime/bloodmagic/demonaura/WillChunk.java +++ /dev/null @@ -1,72 +0,0 @@ -package wayoftime.bloodmagic.demonaura; - -import java.lang.ref.WeakReference; - -import net.minecraft.world.chunk.IChunk; -import wayoftime.bloodmagic.will.DemonWillHolder; - -public class WillChunk -{ - PosXY loc; - private short base; - private DemonWillHolder currentWill = new DemonWillHolder(); - private WeakReference chunkRef; - - public WillChunk(PosXY loc) - { - this.loc = loc; - } - - public WillChunk(IChunk chunk, short base, DemonWillHolder currentWill) - { - this.loc = new PosXY(chunk.getPos().x, chunk.getPos().z); - this.chunkRef = new WeakReference(chunk); - this.base = base; - this.currentWill = currentWill; - } - - public boolean isModified() - { - return (this.chunkRef != null) && (this.chunkRef.get() != null) && this.chunkRef.get().isModified(); - } - - public PosXY getLoc() - { - return loc; - } - - public void setLoc(PosXY loc) - { - this.loc = loc; - } - - public short getBase() - { - return base; - } - - public void setBase(short base) - { - this.base = base; - } - - public DemonWillHolder getCurrentWill() - { - return currentWill; - } - - public void setCurrentWill(DemonWillHolder currentWill) - { - this.currentWill = currentWill; - } - - public WeakReference getChunkRef() - { - return chunkRef; - } - - public void setChunkRef(WeakReference chunkRef) - { - this.chunkRef = chunkRef; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/demonaura/WillWorld.java b/src/main/java/wayoftime/bloodmagic/demonaura/WillWorld.java deleted file mode 100644 index b1f92d9a..00000000 --- a/src/main/java/wayoftime/bloodmagic/demonaura/WillWorld.java +++ /dev/null @@ -1,49 +0,0 @@ -package wayoftime.bloodmagic.demonaura; - -import java.util.concurrent.ConcurrentHashMap; - -import net.minecraft.util.ResourceLocation; - -public class WillWorld -{ - // TODO: It was noted I may need to use RegistryKey instead. - ResourceLocation dim; - ConcurrentHashMap willChunks = new ConcurrentHashMap<>(); - -// private static ConcurrentHashMap nodeTickets = new ConcurrentHashMap(); - - public WillWorld(ResourceLocation resourceLocation) - { - this.dim = resourceLocation; - } - - public WillChunk getWillChunkAt(int x, int y) - { - return getWillChunkAt(new PosXY(x, y)); - } - - public WillChunk getWillChunkAt(PosXY loc) - { - return this.willChunks.get(loc); - } - - public ConcurrentHashMap getWillChunks() - { - return willChunks; - } - - public void setWillChunks(ConcurrentHashMap willChunks) - { - this.willChunks = willChunks; - } - -// public static ConcurrentHashMap getNodeTickets() -// { -// return nodeTickets; -// } -// -// public static void setNodeTickets(ConcurrentHashMap nodeTickets) -// { -// nodeTickets = nodeTickets; -// } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/demonaura/WorldDemonWillHandler.java b/src/main/java/wayoftime/bloodmagic/demonaura/WorldDemonWillHandler.java deleted file mode 100644 index eccb6748..00000000 --- a/src/main/java/wayoftime/bloodmagic/demonaura/WorldDemonWillHandler.java +++ /dev/null @@ -1,220 +0,0 @@ -package wayoftime.bloodmagic.demonaura; - -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentLinkedQueue; - -import javax.annotation.Nullable; - -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.chunk.Chunk; -import net.minecraft.world.chunk.IChunk; -import wayoftime.bloodmagic.util.BMLog; -import wayoftime.bloodmagic.will.DemonWillHolder; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; - -public class WorldDemonWillHandler -{ - public static ConcurrentHashMap> dirtyChunks = new ConcurrentHashMap<>(); - static ConcurrentHashMap containedWills = new ConcurrentHashMap<>(); - - @Nullable - public static DemonWillHolder getWillHolder(ResourceLocation resourceLocation, int x, int y) - { - WillChunk chunk = getWillChunk(resourceLocation, x, y); - if (chunk != null) - { - return chunk.getCurrentWill(); - } - - return null; - } - - public static DemonWillHolder getWillHolder(World world, BlockPos pos) - { - return getWillHolder(getDimensionResourceLocation(world), pos.getX() >> 4, pos.getZ() >> 4); - } - - public static WillWorld getWillWorld(ResourceLocation rl) - { - return containedWills.get(rl); - } - - @Nullable - public static WillChunk getWillChunk(ResourceLocation resourceLocation, int x, int y) - { - if (!containedWills.containsKey(resourceLocation)) - { - addWillWorld(resourceLocation); - } - - return (containedWills.get(resourceLocation)).getWillChunkAt(x, y); - } - - public static void addWillWorld(ResourceLocation resourceLocation) - { - if (!containedWills.containsKey(resourceLocation)) - { - containedWills.put(resourceLocation, new WillWorld(resourceLocation)); - BMLog.DEBUG.info("Creating demon will cache for world {}", resourceLocation); - } - } - - public static void removeWillWorld(ResourceLocation rl) - { - containedWills.remove(rl); - BMLog.DEBUG.info("Removing demon will cache for world {}", rl); - } - - public static void addWillChunk(ResourceLocation resourceLocation, IChunk chunk, short base, DemonWillHolder currentWill) - { - WillWorld aw = containedWills.get(resourceLocation); - if (aw == null) - { - aw = new WillWorld(resourceLocation); - } - aw.getWillChunks().put(new PosXY(chunk.getPos().x, chunk.getPos().z), new WillChunk(chunk, base, currentWill)); - - containedWills.put(resourceLocation, aw); - } - - public static void removeWillChunk(ResourceLocation resourceLocation, int x, int y) - { - WillWorld aw = containedWills.get(resourceLocation); - if (aw != null) - { - WillChunk chunk = aw.getWillChunks().remove(new PosXY(x, y)); - if (chunk != null) - { - markChunkAsDirty(chunk, resourceLocation); - } - } - } - - public static EnumDemonWillType getHighestDemonWillType(World world, BlockPos pos) - { - double currentMax = 0; - EnumDemonWillType currentHighest = EnumDemonWillType.DEFAULT; - - WillChunk willChunk = getWillChunk(world, pos); - - DemonWillHolder currentWill = willChunk.getCurrentWill(); - for (EnumDemonWillType type : EnumDemonWillType.values()) - { - if (currentWill.getWill(type) > currentMax) - { - currentMax = currentWill.getWill(type); - currentHighest = type; - } - } - - return currentHighest; - } - - public static double drainWill(World world, BlockPos pos, EnumDemonWillType type, double amount, boolean doDrain) - { - WillChunk willChunk = getWillChunk(world, pos); - - DemonWillHolder currentWill = willChunk.getCurrentWill(); - double drain = Math.min(currentWill.getWill(type), amount); - if (!doDrain) - { - return drain; - } - - drain = currentWill.drainWill(type, drain); - markChunkAsDirty(willChunk, getDimensionResourceLocation(world)); - - return drain; - } - - public static double fillWillToMaximum(World world, BlockPos pos, EnumDemonWillType type, double amount, double max, boolean doFill) - { - WillChunk willChunk = getWillChunk(world, pos); - - DemonWillHolder currentWill = willChunk.getCurrentWill(); - double fill = Math.min(amount, max - currentWill.getWill(type)); - if (!doFill || fill <= 0) - { - return fill > 0 ? fill : 0; - } - - fill = currentWill.addWill(type, amount, max); - markChunkAsDirty(willChunk, getDimensionResourceLocation(world)); - - return fill; - } - - public static double fillWill(World world, BlockPos pos, EnumDemonWillType type, double amount, boolean doFill) - { - WillChunk willChunk = getWillChunk(world, pos); - - DemonWillHolder currentWill = willChunk.getCurrentWill(); - if (!doFill) - { - return amount; - } - - currentWill.addWill(type, amount); - markChunkAsDirty(willChunk, getDimensionResourceLocation(world)); - - return amount; - } - - public static WillChunk getWillChunk(World world, BlockPos pos) - { - WillChunk willChunk = getWillChunk(getDimensionResourceLocation(world), pos.getX() >> 4, pos.getZ() >> 4); - if (willChunk == null) - { - Chunk chunk = world.getChunk(pos.getX() >> 4, pos.getZ() >> 4); - generateWill(chunk, world); - - willChunk = getWillChunk(getDimensionResourceLocation(world), pos.getX() >> 4, pos.getZ() >> 4); - } - - return willChunk; - } - - public static double getCurrentWill(World world, BlockPos pos, EnumDemonWillType type) - { - WillChunk willChunk = getWillChunk(world, pos); - - if (willChunk == null) - { - return 0; - } - - DemonWillHolder currentWill = willChunk.getCurrentWill(); - return currentWill.getWill(type); - } - - private static void markChunkAsDirty(WillChunk chunk, ResourceLocation resourceLocation) - { - if (chunk.isModified()) - { - return; - } - PosXY pos = new PosXY(chunk.loc.x, chunk.loc.y); - if (!dirtyChunks.containsKey(resourceLocation)) - { - dirtyChunks.put(resourceLocation, new ConcurrentLinkedQueue<>()); - } - ConcurrentLinkedQueue dc = dirtyChunks.get(resourceLocation); - if (!dc.contains(pos)) - { - dc.add(pos); - } - } - - public static void generateWill(IChunk chunk, World world) - { - addWillChunk(getDimensionResourceLocation(world), chunk, (short) 1, new DemonWillHolder()); - } - - public static ResourceLocation getDimensionResourceLocation(World world) - { - return world.getDimensionKey().getLocation(); - } - -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/entity/BloodMagicEntities.java b/src/main/java/wayoftime/bloodmagic/entity/BloodMagicEntities.java deleted file mode 100644 index 9ae8814d..00000000 --- a/src/main/java/wayoftime/bloodmagic/entity/BloodMagicEntities.java +++ /dev/null @@ -1,30 +0,0 @@ -package wayoftime.bloodmagic.entity; - -import net.minecraft.entity.EntityType; -import net.minecraftforge.client.event.ModelRegistryEvent; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import wayoftime.bloodmagic.BloodMagic; - -@Mod.EventBusSubscriber(modid = BloodMagic.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) -public class BloodMagicEntities -{ - private BloodMagicEntities() - { - } - - @SubscribeEvent - public static void registerEntities(RegistryEvent.Register> event) - { -// System.out.println("Ow O"); -// event.getRegistry().register(EntityType.Builder.create(EntitySoulSnare::new, EntityClassification.MISC).setTrackingRange(64).setUpdateInterval(1).setShouldReceiveVelocityUpdates(false).setCustomClientFactory(((spawnEntity, world) -> new EntitySoulSnare(EntitySoulSnare.TYPE, world))).build("").setRegistryName(BloodMagic.rl("entitysoulsnare"))); - } - - @SubscribeEvent - public static void registerModels(ModelRegistryEvent evt) - { -// System.out.println("O wO"); -// RenderingRegistry.registerEntityRenderingHandler(BloodMagicEntityTypes.SNARE.getEntityType(), SoulSnareRenderer::new); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/entity/projectile/AbstractEntityThrowingDagger.java b/src/main/java/wayoftime/bloodmagic/entity/projectile/AbstractEntityThrowingDagger.java deleted file mode 100644 index ad24d4ba..00000000 --- a/src/main/java/wayoftime/bloodmagic/entity/projectile/AbstractEntityThrowingDagger.java +++ /dev/null @@ -1,687 +0,0 @@ -package wayoftime.bloodmagic.entity.projectile; - -import java.util.List; - -import javax.annotation.Nullable; - -import com.google.common.collect.Lists; - -import it.unimi.dsi.fastutil.ints.IntOpenHashSet; -import net.minecraft.block.BlockState; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityType; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.MoverType; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.entity.projectile.AbstractArrowEntity; -import net.minecraft.entity.projectile.ProjectileHelper; -import net.minecraft.entity.projectile.ProjectileItemEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.NBTUtil; -import net.minecraft.network.IPacket; -import net.minecraft.network.play.server.SChangeGameStatePacket; -import net.minecraft.particles.IParticleData; -import net.minecraft.particles.ItemParticleData; -import net.minecraft.particles.ParticleTypes; -import net.minecraft.util.DamageSource; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvent; -import net.minecraft.util.SoundEvents; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.EntityRayTraceResult; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.RayTraceContext; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.util.registry.Registry; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.fml.network.NetworkHooks; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; -import wayoftime.bloodmagic.common.item.BloodMagicItems; -import wayoftime.bloodmagic.will.PlayerDemonWillHandler; - -public class AbstractEntityThrowingDagger extends ProjectileItemEntity -{ - @Nullable - private BlockState inBlockState; - protected boolean inGround; - protected int timeInGround; - public AbstractArrowEntity.PickupStatus pickupStatus = AbstractArrowEntity.PickupStatus.ALLOWED; - public int arrowShake; - private int ticksInGround; - private double damage = 2.0D; - private int knockbackStrength; - private SoundEvent hitSound = this.getHitEntitySound(); - private IntOpenHashSet piercedEntities; - private List hitEntities; - -// private ItemStack containedStack = ItemStack.EMPTY; - private double willDrop = 0; - private EnumDemonWillType willType = EnumDemonWillType.DEFAULT; - - public AbstractEntityThrowingDagger(EntityType type, World world) - { - super(type, world); - } - - public AbstractEntityThrowingDagger(EntityType type, ItemStack stack, World worldIn, LivingEntity throwerIn) - { - super(type, throwerIn, worldIn); - this.setItem(stack); - if (throwerIn instanceof PlayerEntity) - { - this.pickupStatus = AbstractArrowEntity.PickupStatus.ALLOWED; - } - } - - public AbstractEntityThrowingDagger(EntityType type, ItemStack stack, World worldIn, double x, double y, double z) - { - super(type, x, y, z, worldIn); - this.setItem(stack); - } - - @Override - public void setItem(ItemStack stack) - { - super.setItem(stack); -// this.containedStack = stack; - } - - protected Item getDefaultItem() - { - return BloodMagicItems.THROWING_DAGGER.get(); - } - - @Override - public IPacket createSpawnPacket() - { - return NetworkHooks.getEntitySpawningPacket(this); - } - - @Override - public void tick() - { -// super.tick(); -// RayTraceResult raytraceresult = ProjectileHelper.func_234618_a_(this, this::func_230298_a_); -//// boolean flag = false; -// if (raytraceresult.getType() == RayTraceResult.Type.BLOCK) -// { -// BlockPos blockpos = ((BlockRayTraceResult) raytraceresult).getPos().offset(((BlockRayTraceResult) raytraceresult).getFace()); -// BlockState blockstate = this.world.getBlockState(blockpos); -// Material material = blockstate.getMaterial(); -// if (blockstate.isAir() || blockstate.isIn(BlockTags.FIRE) || material.isLiquid() || material.isReplaceable()) -// { -// this.getEntityWorld().setBlockState(blockpos, BloodMagicBlocks.BLOOD_LIGHT.get().getDefaultState()); -// this.setDead(); -// } -// } - -// super.tick(); - this.baseTick(); - boolean flag = this.getNoClip(); - flag = false; - Vector3d vector3d = this.getMotion(); - if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) - { - float f = MathHelper.sqrt(horizontalMag(vector3d)); - this.rotationYaw = (float) (MathHelper.atan2(vector3d.x, vector3d.z) * (double) (180F / (float) Math.PI)); - this.rotationPitch = (float) (MathHelper.atan2(vector3d.y, (double) f) * (double) (180F / (float) Math.PI)); - this.prevRotationYaw = this.rotationYaw; - this.prevRotationPitch = this.rotationPitch; - } - - BlockPos blockpos = this.getPosition(); - BlockState blockstate = this.world.getBlockState(blockpos); - if (!blockstate.isAir(this.world, blockpos) && !flag) - { - VoxelShape voxelshape = blockstate.getCollisionShape(this.world, blockpos); - if (!voxelshape.isEmpty()) - { - Vector3d vector3d1 = this.getPositionVec(); - - for (AxisAlignedBB axisalignedbb : voxelshape.toBoundingBoxList()) - { - if (axisalignedbb.offset(blockpos).contains(vector3d1)) - { - this.inGround = true; - break; - } - } - } - } - - if (this.arrowShake > 0) - { - --this.arrowShake; - } - - if (this.isWet()) - { - this.extinguish(); - } - -// this.inBlockState.getBlock() - - if (this.inGround && !flag) - { - if (this.inBlockState != blockstate && this.func_234593_u_()) - { - this.func_234594_z_(); - } else if (!this.world.isRemote) - { - this.func_225516_i_(); - } - - ++this.timeInGround; - } else - { - this.timeInGround = 0; - Vector3d vector3d2 = this.getPositionVec(); - Vector3d vector3d3 = vector3d2.add(vector3d); - RayTraceResult raytraceresult = this.world.rayTraceBlocks(new RayTraceContext(vector3d2, vector3d3, RayTraceContext.BlockMode.COLLIDER, RayTraceContext.FluidMode.NONE, this)); - if (raytraceresult.getType() != RayTraceResult.Type.MISS) - { - vector3d3 = raytraceresult.getHitVec(); - } - - while (!this.removed) - { - EntityRayTraceResult entityraytraceresult = this.rayTraceEntities(vector3d2, vector3d3); - if (entityraytraceresult != null) - { - raytraceresult = entityraytraceresult; - } - - if (raytraceresult != null && raytraceresult.getType() == RayTraceResult.Type.ENTITY) - { - Entity entity = ((EntityRayTraceResult) raytraceresult).getEntity(); - Entity entity1 = this.func_234616_v_(); - if (entity instanceof PlayerEntity && entity1 instanceof PlayerEntity && !((PlayerEntity) entity1).canAttackPlayer((PlayerEntity) entity)) - { - raytraceresult = null; - entityraytraceresult = null; - } - } - - if (raytraceresult != null && raytraceresult.getType() != RayTraceResult.Type.MISS && !flag && !net.minecraftforge.event.ForgeEventFactory.onProjectileImpact(this, raytraceresult)) - { - this.onImpact(raytraceresult); - this.isAirBorne = true; - } - - if (entityraytraceresult == null || this.getPierceLevel() <= 0) - { - break; - } - - raytraceresult = null; - } - - vector3d = this.getMotion(); - double d3 = vector3d.x; - double d4 = vector3d.y; - double d0 = vector3d.z; - if (this.getIsCritical()) - { - for (int i = 0; i < 4; ++i) - { - this.world.addParticle(ParticleTypes.CRIT, this.getPosX() + d3 * (double) i / 4.0D, this.getPosY() + d4 * (double) i / 4.0D, this.getPosZ() + d0 * (double) i / 4.0D, -d3, -d4 + 0.2D, -d0); - } - } - - double d5 = this.getPosX() + d3; - double d1 = this.getPosY() + d4; - double d2 = this.getPosZ() + d0; - float f1 = MathHelper.sqrt(horizontalMag(vector3d)); - if (flag) - { - this.rotationYaw = (float) (MathHelper.atan2(-d3, -d0) * (double) (180F / (float) Math.PI)); - } else - { - this.rotationYaw = (float) (MathHelper.atan2(d3, d0) * (double) (180F / (float) Math.PI)); - } - - this.rotationPitch = (float) (MathHelper.atan2(d4, (double) f1) * (double) (180F / (float) Math.PI)); - this.rotationPitch = func_234614_e_(this.prevRotationPitch, this.rotationPitch); - this.rotationYaw = func_234614_e_(this.prevRotationYaw, this.rotationYaw); - float f2 = 0.99F; - float f3 = 0.05F; - if (this.isInWater()) - { - for (int j = 0; j < 4; ++j) - { - float f4 = 0.25F; - this.world.addParticle(ParticleTypes.BUBBLE, d5 - d3 * 0.25D, d1 - d4 * 0.25D, d2 - d0 * 0.25D, d3, d4, d0); - } - - f2 = this.getWaterDrag(); - } - - this.setMotion(vector3d.scale((double) f2)); - if (!this.hasNoGravity() && !flag) - { - Vector3d vector3d4 = this.getMotion(); - this.setMotion(vector3d4.x, vector3d4.y - (double) 0.05F, vector3d4.z); - } - - this.setPosition(d5, d1, d2); - this.doBlockCollisions(); - } - } - - @Override - public void move(MoverType typeIn, Vector3d pos) - { - super.move(typeIn, pos); - if (typeIn != MoverType.SELF && this.func_234593_u_()) - { - this.func_234594_z_(); - } - - } - - public void writeAdditional(CompoundNBT compound) - { - super.writeAdditional(compound); - compound.putShort("life", (short) this.ticksInGround); - if (this.inBlockState != null) - { - compound.put("inBlockState", NBTUtil.writeBlockState(this.inBlockState)); - } - - compound.putByte("shake", (byte) this.arrowShake); - compound.putBoolean("inGround", this.inGround); - compound.putByte("pickup", (byte) this.pickupStatus.ordinal()); - compound.putDouble("damage", this.damage); -// compound.putBoolean("crit", this.getIsCritical()); -// compound.putByte("PierceLevel", this.getPierceLevel()); - compound.putString("SoundEvent", Registry.SOUND_EVENT.getKey(this.hitSound).toString()); -// compound.putBoolean("ShotFromCrossbow", this.getShotFromCrossbow()); - compound.putDouble("willDrop", willDrop); -// this.containedStack.write(compound); - compound.putString("willType", this.willType.name); - } - - /** - * (abstract) Protected helper method to read subclass entity data from NBT. - */ - public void readAdditional(CompoundNBT compound) - { - super.readAdditional(compound); - this.ticksInGround = compound.getShort("life"); - if (compound.contains("inBlockState", 10)) - { - this.inBlockState = NBTUtil.readBlockState(compound.getCompound("inBlockState")); - } - - this.arrowShake = compound.getByte("shake") & 255; - this.inGround = compound.getBoolean("inGround"); - if (compound.contains("damage", 99)) - { - this.damage = compound.getDouble("damage"); - } - - if (compound.contains("pickup", 99)) - { - this.pickupStatus = AbstractArrowEntity.PickupStatus.getByOrdinal(compound.getByte("pickup")); - } else if (compound.contains("player", 99)) - { - this.pickupStatus = compound.getBoolean("player") ? AbstractArrowEntity.PickupStatus.ALLOWED - : AbstractArrowEntity.PickupStatus.DISALLOWED; - } - this.willDrop = compound.getDouble("willDrop"); -// this.containedStack = ItemStack.read(compound); - this.willType = EnumDemonWillType.getType(compound.getString("willType")); - -// this.setIsCritical(compound.getBoolean("crit")); -// this.setPierceLevel(compound.getByte("PierceLevel")); -// if (compound.contains("SoundEvent", 8)) { -// this.hitSound = Registry.SOUND_EVENT.getOptional(new ResourceLocation(compound.getString("SoundEvent"))).orElse(this.getHitEntitySound()); -// } -// -// this.setShotFromCrossbow(compound.getBoolean("ShotFromCrossbow")); - } - - public void setDamage(double damage) - { - this.damage = damage; - } - - public double getDamage() - { - return this.damage; - } - - protected void onEntityHit(EntityRayTraceResult p_213868_1_) - { - super.onEntityHit(p_213868_1_); - Entity entity = p_213868_1_.getEntity(); - float f = (float) this.getMotion().length(); - int i = MathHelper.ceil(MathHelper.clamp(this.damage, 0.0D, 2.147483647E9D)); - if (this.getPierceLevel() > 0) - { - if (this.piercedEntities == null) - { - this.piercedEntities = new IntOpenHashSet(5); - } - - if (this.hitEntities == null) - { - this.hitEntities = Lists.newArrayListWithCapacity(5); - } - - if (this.piercedEntities.size() >= this.getPierceLevel() + 1) - { - this.remove(); - return; - } - - this.piercedEntities.add(entity.getEntityId()); - } - - if (this.getIsCritical()) - { - long j = (long) this.rand.nextInt(i / 2 + 2); - i = (int) Math.min(j + (long) i, 2147483647L); - } - - Entity entity1 = this.func_234616_v_(); - DamageSource damagesource; - if (entity1 == null) - { - damagesource = DamageSource.causeThrownDamage(this, this); - } else - { - damagesource = DamageSource.causeThrownDamage(this, entity1); - if (entity1 instanceof LivingEntity) - { - ((LivingEntity) entity1).setLastAttackedEntity(entity); - } - } - - boolean flag = entity.getType() == EntityType.ENDERMAN; - int k = entity.getFireTimer(); - if (this.isBurning() && !flag) - { - entity.setFire(5); - } - - if (entity.attackEntityFrom(damagesource, (float) i)) - { - if (flag) - { - return; - } - - if (!entity.isAlive() && entity1 instanceof PlayerEntity && entity instanceof LivingEntity) - { - PlayerDemonWillHandler.addDemonWill(willType, (PlayerEntity) entity1, this.getWillDropForMobHealth(((LivingEntity) entity).getMaxHealth())); - } - - if (entity instanceof LivingEntity) - { - LivingEntity livingentity = (LivingEntity) entity; -// if (!this.world.isRemote && this.getPierceLevel() <= 0) -// { -// livingentity.setArrowCountInEntity(livingentity.getArrowCountInEntity() + 1); -// } - - if (this.knockbackStrength > 0) - { - Vector3d vector3d = this.getMotion().mul(1.0D, 0.0D, 1.0D).normalize().scale((double) this.knockbackStrength * 0.6D); - if (vector3d.lengthSquared() > 0.0D) - { - livingentity.addVelocity(vector3d.x, 0.1D, vector3d.z); - } - } - - if (!this.world.isRemote && entity1 instanceof LivingEntity) - { - EnchantmentHelper.applyThornEnchantments(livingentity, entity1); - EnchantmentHelper.applyArthropodEnchantments((LivingEntity) entity1, livingentity); - } - - this.daggerHit(livingentity); - if (entity1 != null && livingentity != entity1 && livingentity instanceof PlayerEntity && entity1 instanceof ServerPlayerEntity && !this.isSilent()) - { - ((ServerPlayerEntity) entity1).connection.sendPacket(new SChangeGameStatePacket(SChangeGameStatePacket.field_241770_g_, 0.0F)); - } - - if (!entity.isAlive() && this.hitEntities != null) - { - this.hitEntities.add(livingentity); - } - } - - this.playSound(this.hitSound, 1.0F, 1.2F / (this.rand.nextFloat() * 0.2F + 0.9F)); - if (this.getPierceLevel() <= 0) - { - this.remove(); - } - } else - { - entity.forceFireTicks(k); - this.setMotion(this.getMotion().scale(-0.1D)); - this.rotationYaw += 180.0F; - this.prevRotationYaw += 180.0F; - if (!this.world.isRemote && this.getMotion().lengthSquared() < 1.0E-7D) - { - if (this.pickupStatus == AbstractArrowEntity.PickupStatus.ALLOWED) - { - this.entityDropItem(this.getArrowStack(), 0.1F); - } - - this.remove(); - } - } - - } - - /** - * Called by a player entity when they collide with an entity - */ - @Override - public void onCollideWithPlayer(PlayerEntity entityIn) - { - if (!this.world.isRemote && (this.inGround || this.getNoClip()) && this.arrowShake <= 0) - { - boolean flag = this.pickupStatus == AbstractArrowEntity.PickupStatus.ALLOWED || this.pickupStatus == AbstractArrowEntity.PickupStatus.CREATIVE_ONLY && entityIn.abilities.isCreativeMode || this.getNoClip() && this.func_234616_v_().getUniqueID() == entityIn.getUniqueID(); - if (this.pickupStatus == AbstractArrowEntity.PickupStatus.ALLOWED && !entityIn.inventory.addItemStackToInventory(this.getArrowStack())) - { - flag = false; - } - - if (flag) - { -// System.out.println("Um test?"); - -// entityIn.onItemPickup(this, 1); - world.playSound(null, entityIn.getPosX(), entityIn.getPosY() + 0.5, entityIn.getPosZ(), SoundEvents.ENTITY_ITEM_PICKUP, SoundCategory.PLAYERS, 0.2F, ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); - this.remove(); - } - - } - } - - protected ItemStack getArrowStack() - { - // Gets the item from the data manager - return getItem(); - } - - // OnHitBlock - protected void func_230299_a_(BlockRayTraceResult p_230299_1_) - { - this.inBlockState = this.world.getBlockState(p_230299_1_.getPos()); - super.func_230299_a_(p_230299_1_); - Vector3d vector3d = p_230299_1_.getHitVec().subtract(this.getPosX(), this.getPosY(), this.getPosZ()); - this.setMotion(vector3d); - Vector3d vector3d1 = vector3d.normalize().scale((double) 0.05F); - this.setRawPosition(this.getPosX() - vector3d1.x, this.getPosY() - vector3d1.y, this.getPosZ() - vector3d1.z); - this.playSound(this.getHitGroundSound(), 1.0F, 1.2F / (this.rand.nextFloat() * 0.2F + 0.9F)); - this.inGround = true; - this.arrowShake = 7; -// this.setIsCritical(false); -// this.setPierceLevel((byte) 0); - this.setHitSound(SoundEvents.ENTITY_ARROW_HIT); -// this.setShotFromCrossbow(false); - this.func_213870_w(); - } - - private void func_234594_z_() - { - this.inGround = false; - Vector3d vector3d = this.getMotion(); - this.setMotion(vector3d.mul((double) (this.rand.nextFloat() * 0.2F), (double) (this.rand.nextFloat() * 0.2F), (double) (this.rand.nextFloat() * 0.2F))); - this.ticksInGround = 0; - } - - private boolean func_234593_u_() - { - return this.inGround && this.world.hasNoCollisions((new AxisAlignedBB(this.getPositionVec(), this.getPositionVec())).grow(0.06D)); - } - - protected void func_225516_i_() - { - ++this.ticksInGround; - if (this.ticksInGround >= 1200) - { - this.remove(); - } - - } - - protected void daggerHit(LivingEntity living) - { - } - - /** - * The sound made when an entity is hit by this projectile - */ - protected SoundEvent getHitEntitySound() - { - return SoundEvents.ENTITY_ARROW_HIT; - } - - protected final SoundEvent getHitGroundSound() - { - return this.hitSound; - } - - private void func_213870_w() - { - if (this.hitEntities != null) - { - this.hitEntities.clear(); - } - - if (this.piercedEntities != null) - { - this.piercedEntities.clear(); - } - - } - - public void setHitSound(SoundEvent soundIn) - { - this.hitSound = soundIn; - } - - public boolean getNoClip() - { - if (!this.world.isRemote) - { - return this.noClip; - } else - { - return false; -// return (this.dataManager.get(CRITICAL) & 2) != 0; - } - } - - public boolean getIsCritical() - { -// byte b0 = this.dataManager.get(CRITICAL); -// return (b0 & 1) != 0; - return false; - } - - public byte getPierceLevel() - { - return 0; -// return this.dataManager.get(PIERCE_LEVEL); - } - - protected float getWaterDrag() - { - return 0.6F; - } - - /** - * Gets the EntityRayTraceResult representing the entity hit - */ - @Nullable - protected EntityRayTraceResult rayTraceEntities(Vector3d startVec, Vector3d endVec) - { - return ProjectileHelper.rayTraceEntities(this.world, this, startVec, endVec, this.getBoundingBox().expand(this.getMotion()).grow(1.0D), this::func_230298_a_); - } - - protected boolean func_230298_a_(Entity p_230298_1_) - { - return super.func_230298_a_(p_230298_1_) && (this.piercedEntities == null || !this.piercedEntities.contains(p_230298_1_.getEntityId())); - } - -// protected float getGravityVelocity() -// { -// return 0; -// } - - public void setWillDrop(double willDrop) - { - this.willDrop = willDrop; - } - - public double getWillDropForMobHealth(double hp) - { - return this.willDrop * hp / 20D; - } - - public void setWillType(EnumDemonWillType type) - { - this.willType = type; - } - - @OnlyIn(Dist.CLIENT) - private IParticleData makeParticle() - { - ItemStack itemstack = this.func_213882_k(); - return (IParticleData) (itemstack.isEmpty() ? ParticleTypes.LAVA - : new ItemParticleData(ParticleTypes.ITEM, itemstack)); - } - - /** - * Handler for {@link World#setEntityState} - */ - @OnlyIn(Dist.CLIENT) - public void handleStatusUpdate(byte id) - { - if (id == 3) - { - IParticleData iparticledata = this.makeParticle(); - - for (int i = 0; i < 8; ++i) - { - this.world.addParticle(iparticledata, this.getPosX(), this.getPosY(), this.getPosZ(), 0.0D, 0.0D, 0.0D); - } - } - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/entity/projectile/EntityBloodLight.java b/src/main/java/wayoftime/bloodmagic/entity/projectile/EntityBloodLight.java deleted file mode 100644 index 2a82cb10..00000000 --- a/src/main/java/wayoftime/bloodmagic/entity/projectile/EntityBloodLight.java +++ /dev/null @@ -1,103 +0,0 @@ -package wayoftime.bloodmagic.entity.projectile; - -import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; -import net.minecraft.entity.EntityType; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.projectile.ProjectileHelper; -import net.minecraft.entity.projectile.ProjectileItemEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.network.IPacket; -import net.minecraft.particles.IParticleData; -import net.minecraft.particles.ItemParticleData; -import net.minecraft.particles.ParticleTypes; -import net.minecraft.tags.BlockTags; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.fml.network.NetworkHooks; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.common.item.BloodMagicItems; -import wayoftime.bloodmagic.common.registries.BloodMagicEntityTypes; - -public class EntityBloodLight extends ProjectileItemEntity -{ - public EntityBloodLight(EntityType p_i50159_1_, World p_i50159_2_) - { - super(p_i50159_1_, p_i50159_2_); - } - - public EntityBloodLight(World worldIn, LivingEntity throwerIn) - { - super(BloodMagicEntityTypes.BLOOD_LIGHT.getEntityType(), throwerIn, worldIn); - } - - public EntityBloodLight(World worldIn, double x, double y, double z) - { - super(BloodMagicEntityTypes.BLOOD_LIGHT.getEntityType(), x, y, z, worldIn); - } - - protected Item getDefaultItem() - { - return BloodMagicItems.REAGENT_BLOOD_LIGHT.get(); - } - - @Override - public IPacket createSpawnPacket() - { - return NetworkHooks.getEntitySpawningPacket(this); - } - - @Override - public void tick() - { - super.tick(); - RayTraceResult raytraceresult = ProjectileHelper.func_234618_a_(this, this::func_230298_a_); -// boolean flag = false; - if (raytraceresult.getType() == RayTraceResult.Type.BLOCK) - { - BlockPos blockpos = ((BlockRayTraceResult) raytraceresult).getPos().offset(((BlockRayTraceResult) raytraceresult).getFace()); - BlockState blockstate = this.world.getBlockState(blockpos); - Material material = blockstate.getMaterial(); - if (blockstate.isAir() || blockstate.isIn(BlockTags.FIRE) || material.isLiquid() || material.isReplaceable()) - { - this.getEntityWorld().setBlockState(blockpos, BloodMagicBlocks.BLOOD_LIGHT.get().getDefaultState()); - this.setDead(); - } - } - } - - protected float getGravityVelocity() - { - return 0; - } - - @OnlyIn(Dist.CLIENT) - private IParticleData makeParticle() - { - ItemStack itemstack = this.func_213882_k(); - return (IParticleData) (itemstack.isEmpty() ? ParticleTypes.LAVA - : new ItemParticleData(ParticleTypes.ITEM, itemstack)); - } - - /** - * Handler for {@link World#setEntityState} - */ - @OnlyIn(Dist.CLIENT) - public void handleStatusUpdate(byte id) - { - if (id == 3) - { - IParticleData iparticledata = this.makeParticle(); - - for (int i = 0; i < 8; ++i) - { - this.world.addParticle(iparticledata, this.getPosX(), this.getPosY(), this.getPosZ(), 0.0D, 0.0D, 0.0D); - } - } - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/entity/projectile/EntityShapedCharge.java b/src/main/java/wayoftime/bloodmagic/entity/projectile/EntityShapedCharge.java deleted file mode 100644 index 7c2304a2..00000000 --- a/src/main/java/wayoftime/bloodmagic/entity/projectile/EntityShapedCharge.java +++ /dev/null @@ -1,191 +0,0 @@ -package wayoftime.bloodmagic.entity.projectile; - -import java.util.Optional; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.material.Material; -import net.minecraft.entity.EntityType; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.projectile.ProjectileHelper; -import net.minecraft.entity.projectile.ThrowableEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.NBTUtil; -import net.minecraft.network.IPacket; -import net.minecraft.network.datasync.DataParameter; -import net.minecraft.network.datasync.DataSerializers; -import net.minecraft.network.datasync.EntityDataManager; -import net.minecraft.tags.BlockTags; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.fml.network.NetworkHooks; -import wayoftime.bloodmagic.anointment.AnointmentHolder; -import wayoftime.bloodmagic.common.block.BlockShapedExplosive; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.common.registries.BloodMagicEntityTypes; -import wayoftime.bloodmagic.tile.TileExplosiveCharge; - -public class EntityShapedCharge extends ThrowableEntity -{ - private static final DataParameter> ITEMSTACK_DATA = EntityDataManager.createKey(EntityShapedCharge.class, DataSerializers.OPTIONAL_BLOCK_STATE); -// private BlockState fallTile = BloodMagicBlocks.SHAPED_CHARGE.get().getDefaultState(); - private AnointmentHolder holder; - - public EntityShapedCharge(EntityType p_i50159_1_, World p_i50159_2_) - { - super(p_i50159_1_, p_i50159_2_); - } - - public EntityShapedCharge(World worldIn, Block block, LivingEntity throwerIn) - { - super(BloodMagicEntityTypes.SHAPED_CHARGE.getEntityType(), throwerIn, worldIn); -// this.fallTile = block.getDefaultState(); - this.setFallTile(block.getDefaultState()); - } - - public EntityShapedCharge(World worldIn, Block block, double x, double y, double z) - { - super(BloodMagicEntityTypes.SHAPED_CHARGE.getEntityType(), x, y, z, worldIn); -// this.fallTile = block.getDefaultState(); - this.setFallTile(block.getDefaultState()); - } - - public void setAnointmentHolder(AnointmentHolder holder) - { - this.holder = holder; - } - - public void setFallTile(BlockState state) - { - this.dataManager.set(ITEMSTACK_DATA, Optional.of(state)); - } - - @Override - public void tick() - { - super.tick(); - RayTraceResult raytraceresult = ProjectileHelper.func_234618_a_(this, this::func_230298_a_); -// boolean flag = false; - if (world.isRemote) - { - return; - } - if (raytraceresult.getType() == RayTraceResult.Type.BLOCK) - { - Direction faceHit = ((BlockRayTraceResult) raytraceresult).getFace(); - BlockPos blockpos = ((BlockRayTraceResult) raytraceresult).getPos().offset(((BlockRayTraceResult) raytraceresult).getFace()); - BlockState blockstate = this.world.getBlockState(blockpos); - Material material = blockstate.getMaterial(); -// return state.isAir() || state.isIn(BlockTags.FIRE) || material.isLiquid() || material.isReplaceable(); - BlockState fallTile = this.getBlockState(); - if (blockstate.isAir() || blockstate.isIn(BlockTags.FIRE) || material.isLiquid() || material.isReplaceable()) - { - this.getEntityWorld().setBlockState(blockpos, fallTile.with(BlockShapedExplosive.ATTACHED, faceHit)); - TileEntity tile = this.getEntityWorld().getTileEntity(blockpos); - if (tile instanceof TileExplosiveCharge) - { - ((TileExplosiveCharge) tile).setAnointmentHolder(holder); - } - this.setDead(); - } else - { -// BlockItem d; - this.entityDropItem(fallTile.getBlock()); - this.setDead(); -// blockstate.isReplaceable(BlockItemUseContext) - } - } - } - - @Override - protected void writeAdditional(CompoundNBT compound) - { - compound.put("BlockState", NBTUtil.writeBlockState(this.getBlockState())); - if (holder != null) - compound.put("holder", holder.serialize()); -// compound.putInt("Time", this.fallTime); -// compound.putBoolean("DropItem", this.shouldDropItem); -// compound.putBoolean("HurtEntities", this.hurtEntities); -// compound.putFloat("FallHurtAmount", this.fallHurtAmount); -// compound.putInt("FallHurtMax", this.fallHurtMax); -// if (this.tileEntityData != null) { -// compound.put("TileEntityData", this.tileEntityData); -// } - - } - - /** - * (abstract) Protected helper method to read subclass entity data from NBT. - */ - @Override - protected void readAdditional(CompoundNBT compound) - { - BlockState fallTile = NBTUtil.readBlockState(compound.getCompound("BlockState")); - this.setFallTile(fallTile); - if (compound.contains("holder")) - this.holder = AnointmentHolder.fromNBT(compound.getCompound("holder")); -// this.fallTime = compound.getInt("Time"); -// if (compound.contains("HurtEntities", 99)) { -// this.hurtEntities = compound.getBoolean("HurtEntities"); -// this.fallHurtAmount = compound.getFloat("FallHurtAmount"); -// this.fallHurtMax = compound.getInt("FallHurtMax"); -// } else if (this.fallTile.isIn(BlockTags.ANVIL)) { -// this.hurtEntities = true; -// } -// -// if (compound.contains("DropItem", 99)) { -// this.shouldDropItem = compound.getBoolean("DropItem"); -// } -// -// if (compound.contains("TileEntityData", 10)) { -// this.tileEntityData = compound.getCompound("TileEntityData"); -// } - - if (fallTile.isAir()) - { - fallTile = BloodMagicBlocks.SHAPED_CHARGE.get().getDefaultState(); - } - - } - - @Override - protected void registerData() - { -// FallingBlockEntity d; -// super.registerData(); - // TODO Auto-generated method stub -// super.registerData(); - this.dataManager.register(ITEMSTACK_DATA, Optional.of(Blocks.SAND.getDefaultState())); - } - - public BlockState getBlockState() - { - // TODO Auto-generated method stub - return this.dataManager.get(ITEMSTACK_DATA).get(); - } - - @OnlyIn(Dist.CLIENT) - public World getWorldObj() - { - return this.world; - } - -// @Override -// public IPacket createSpawnPacket() -// { -// return new SSpawnObjectPacket(this, Block.getStateId(this.getBlockState())); -// } - - @Override - public IPacket createSpawnPacket() - { - return NetworkHooks.getEntitySpawningPacket(this); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/entity/projectile/EntitySoulSnare.java b/src/main/java/wayoftime/bloodmagic/entity/projectile/EntitySoulSnare.java deleted file mode 100644 index 699f79a8..00000000 --- a/src/main/java/wayoftime/bloodmagic/entity/projectile/EntitySoulSnare.java +++ /dev/null @@ -1,95 +0,0 @@ -package wayoftime.bloodmagic.entity.projectile; - -import net.minecraft.entity.EntityType; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.projectile.ArrowEntity; -import net.minecraft.entity.projectile.ProjectileItemEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.network.IPacket; -import net.minecraft.particles.IParticleData; -import net.minecraft.particles.ItemParticleData; -import net.minecraft.particles.ParticleTypes; -import net.minecraft.potion.EffectInstance; -import net.minecraft.util.DamageSource; -import net.minecraft.util.math.EntityRayTraceResult; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.fml.network.NetworkHooks; -import wayoftime.bloodmagic.common.item.BloodMagicItems; -import wayoftime.bloodmagic.common.registries.BloodMagicEntityTypes; -import wayoftime.bloodmagic.potion.BloodMagicPotions; - -public class EntitySoulSnare extends ProjectileItemEntity -{ - public EntitySoulSnare(EntityType p_i50159_1_, World p_i50159_2_) - { - super(p_i50159_1_, p_i50159_2_); - } - - public EntitySoulSnare(World worldIn, LivingEntity throwerIn) - { - super(BloodMagicEntityTypes.SNARE.getEntityType(), throwerIn, worldIn); - } - - public EntitySoulSnare(World worldIn, double x, double y, double z) - { - super(BloodMagicEntityTypes.SNARE.getEntityType(), x, y, z, worldIn); - } - - protected Item getDefaultItem() - { - ArrowEntity d; - return BloodMagicItems.SOUL_SNARE.get(); - } - - @Override - public IPacket createSpawnPacket() - { - return NetworkHooks.getEntitySpawningPacket(this); - } - - /** - * Called when the arrow hits an entity - */ - protected void onEntityHit(EntityRayTraceResult result) - { - if (result.getEntity() == this.func_234616_v_() || this.ticksExisted < 2 || getEntityWorld().isRemote) - return; - - if (result.getEntity() instanceof LivingEntity) - { - ((LivingEntity) result.getEntity()).addPotionEffect(new EffectInstance(BloodMagicPotions.SOUL_SNARE, 300, 0)); - - result.getEntity().attackEntityFrom(DamageSource.causeThrownDamage(this, this.func_234616_v_()), (float) 0); - } - - this.setDead(); - } - - @OnlyIn(Dist.CLIENT) - private IParticleData makeParticle() - { - ItemStack itemstack = this.func_213882_k(); - return (IParticleData) (itemstack.isEmpty() ? ParticleTypes.ITEM_SNOWBALL - : new ItemParticleData(ParticleTypes.ITEM, itemstack)); - } - - /** - * Handler for {@link World#setEntityState} - */ - @OnlyIn(Dist.CLIENT) - public void handleStatusUpdate(byte id) - { - if (id == 3) - { - IParticleData iparticledata = this.makeParticle(); - - for (int i = 0; i < 8; ++i) - { - this.world.addParticle(iparticledata, this.getPosX(), this.getPosY(), this.getPosZ(), 0.0D, 0.0D, 0.0D); - } - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/entity/projectile/EntityThrowingDagger.java b/src/main/java/wayoftime/bloodmagic/entity/projectile/EntityThrowingDagger.java deleted file mode 100644 index 259d70f3..00000000 --- a/src/main/java/wayoftime/bloodmagic/entity/projectile/EntityThrowingDagger.java +++ /dev/null @@ -1,26 +0,0 @@ -package wayoftime.bloodmagic.entity.projectile; - -import net.minecraft.entity.EntityType; -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import wayoftime.bloodmagic.common.registries.BloodMagicEntityTypes; - -public class EntityThrowingDagger extends AbstractEntityThrowingDagger -{ - public EntityThrowingDagger(EntityType type, World world) - { - super(type, world); - } - - public EntityThrowingDagger(ItemStack stack, World worldIn, LivingEntity throwerIn) - { - super(BloodMagicEntityTypes.THROWING_DAGGER.get(), stack, worldIn, throwerIn); - - } - - public EntityThrowingDagger(ItemStack stack, World worldIn, double x, double y, double z) - { - super(BloodMagicEntityTypes.THROWING_DAGGER.get(), stack, worldIn, x, y, z); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/entity/projectile/EntityThrowingDaggerSyringe.java b/src/main/java/wayoftime/bloodmagic/entity/projectile/EntityThrowingDaggerSyringe.java deleted file mode 100644 index 96838084..00000000 --- a/src/main/java/wayoftime/bloodmagic/entity/projectile/EntityThrowingDaggerSyringe.java +++ /dev/null @@ -1,48 +0,0 @@ -package wayoftime.bloodmagic.entity.projectile; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityType; -import net.minecraft.entity.LivingEntity; -import net.minecraft.inventory.InventoryHelper; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.EntityRayTraceResult; -import net.minecraft.world.World; -import wayoftime.bloodmagic.common.item.BloodMagicItems; -import wayoftime.bloodmagic.common.registries.BloodMagicEntityTypes; - -public class EntityThrowingDaggerSyringe extends AbstractEntityThrowingDagger -{ - public EntityThrowingDaggerSyringe(EntityType type, World world) - { - super(type, world); - } - - public EntityThrowingDaggerSyringe(ItemStack stack, World worldIn, LivingEntity throwerIn) - { - super(BloodMagicEntityTypes.THROWING_DAGGER.get(), stack, worldIn, throwerIn); - - } - - public EntityThrowingDaggerSyringe(ItemStack stack, World worldIn, double x, double y, double z) - { - super(BloodMagicEntityTypes.THROWING_DAGGER.get(), stack, worldIn, x, y, z); - } - - @Override - protected void onEntityHit(EntityRayTraceResult p_213868_1_) - { - super.onEntityHit(p_213868_1_); - Entity entity = p_213868_1_.getEntity(); - - if (entity instanceof LivingEntity) - { - double maxHealth = ((LivingEntity) entity).getMaxHealth(); - if (!entity.isAlive()) - { - int count = (int) (maxHealth / 20D) + (world.rand.nextDouble() < ((maxHealth % 20D) / 20D) ? 1 : 0); - if (count > 0) - InventoryHelper.spawnItemStack(world, this.getPosX(), this.getPosY(), this.getPosZ(), new ItemStack(BloodMagicItems.SLATE_AMPOULE.get(), count)); - } - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/event/ItemBindEvent.java b/src/main/java/wayoftime/bloodmagic/event/ItemBindEvent.java deleted file mode 100644 index 80e11c1c..00000000 --- a/src/main/java/wayoftime/bloodmagic/event/ItemBindEvent.java +++ /dev/null @@ -1,39 +0,0 @@ -package wayoftime.bloodmagic.event; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraftforge.eventbus.api.Cancelable; -import net.minecraftforge.eventbus.api.Event; -import wayoftime.bloodmagic.common.item.IBindable; - -@Cancelable -public class ItemBindEvent extends Event -{ - private final PlayerEntity player; - private final ItemStack itemStack; - - /** - * This event is called whenever a player attempts to bind a - * {@link IBindable} item. - * - * @param player The player doing the binding - * @param itemStack The {@link ItemStack} that the player is binding - *

- * This event is {@link Cancelable}.
- */ - public ItemBindEvent(PlayerEntity player, ItemStack itemStack) - { - this.player = player; - this.itemStack = itemStack; - } - - public PlayerEntity getNewOwner() - { - return player; - } - - public ItemStack getBindingStack() - { - return itemStack; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/event/LivingEquipmentEvent.java b/src/main/java/wayoftime/bloodmagic/event/LivingEquipmentEvent.java deleted file mode 100644 index 82d9e007..00000000 --- a/src/main/java/wayoftime/bloodmagic/event/LivingEquipmentEvent.java +++ /dev/null @@ -1,96 +0,0 @@ -package wayoftime.bloodmagic.event; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraftforge.eventbus.api.Event; -import wayoftime.bloodmagic.core.living.LivingStats; -import wayoftime.bloodmagic.core.living.LivingUpgrade; - -public class LivingEquipmentEvent extends Event -{ - -// public static final Event EXPERIENCE_GAIN = EventFactory.createArrayBacked(OnExperienceGain.class, handlers -> e -> { -// for (OnExperienceGain gain : handlers) if (gain.gainExperience(e) == EventResult.CANCEL) -// return EventResult.CANCEL; -// -// return EventResult.PASS; -// }); -// public static final Event LEVEL_UP = EventFactory.createArrayBacked(OnLevelUp.class, handlers -> e -> { -// for (OnLevelUp levelUp : handlers) levelUp.levelUp(e); -// }); -// -// public interface OnExperienceGain -// { -// EventResult gainExperience(GainExperience event); -// } -// -// public interface OnLevelUp -// { -// void levelUp(LevelUp event); -// } - - private final PlayerEntity player; - private final LivingStats stats; - - private LivingEquipmentEvent(PlayerEntity player, LivingStats stats) - { - this.player = player; - this.stats = stats; - } - - public PlayerEntity getPlayer() - { - return player; - } - - public LivingStats getStats() - { - return stats; - } - - public static class GainExperience extends LivingEquipmentEvent - { - - private final LivingUpgrade upgrade; - private double experience; - - public GainExperience(PlayerEntity player, LivingStats stats, LivingUpgrade upgrade, double experience) - { - super(player, stats); - this.upgrade = upgrade; - this.experience = experience; - } - - public LivingUpgrade getUpgrade() - { - return upgrade; - } - - public double getExperience() - { - return experience; - } - - public void setExperience(double experience) - { - this.experience = experience; - } - } - - public static class LevelUp extends LivingEquipmentEvent - { - - private final LivingUpgrade upgrade; - - public LevelUp(PlayerEntity player, LivingStats stats, LivingUpgrade upgrade) - { - super(player, stats); - - this.upgrade = upgrade; - } - - public LivingUpgrade getUpgrade() - { - return upgrade; - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/event/LivingEvent.java b/src/main/java/wayoftime/bloodmagic/event/LivingEvent.java deleted file mode 100644 index 57172317..00000000 --- a/src/main/java/wayoftime/bloodmagic/event/LivingEvent.java +++ /dev/null @@ -1,30 +0,0 @@ -package wayoftime.bloodmagic.event; - -import net.minecraftforge.eventbus.api.Event; - -public class LivingEvent extends Event -{ - -// public static final Event JUMP = EventFactory.createArrayBacked(Jump.class, handlers -> e -> { -// for (Jump handler : handlers) if (handler.onJump(e) == EventResult.CANCEL) -// return EventResult.CANCEL; -// -// return EventResult.PASS; -// }); -// public static final Event DAMAGE = EventFactory.createArrayBacked(Damage.class, handlers -> (e, s, d) -> { -// for (Damage handler : handlers) if (handler.onDamage(e, s, d) == EventResult.CANCEL) -// return EventResult.CANCEL; -// -// return EventResult.PASS; -// }); -// -// public interface Jump -// { -// EventResult onJump(LivingEntity livingEntity); -// } -// -// public interface Damage -// { -// EventResult onDamage(LivingEntity livingEntity, DamageSource source, Value damage); -// } -} diff --git a/src/main/java/wayoftime/bloodmagic/event/RitualEvent.java b/src/main/java/wayoftime/bloodmagic/event/RitualEvent.java deleted file mode 100644 index f5356ec8..00000000 --- a/src/main/java/wayoftime/bloodmagic/event/RitualEvent.java +++ /dev/null @@ -1,151 +0,0 @@ -package wayoftime.bloodmagic.event; - -import java.util.UUID; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.eventbus.api.Cancelable; -import net.minecraftforge.eventbus.api.Event; -import wayoftime.bloodmagic.ritual.IMasterRitualStone; -import wayoftime.bloodmagic.ritual.Ritual; -import wayoftime.bloodmagic.ritual.imperfect.IImperfectRitualStone; -import wayoftime.bloodmagic.ritual.imperfect.ImperfectRitual; - -public class RitualEvent extends Event -{ - private final IMasterRitualStone mrs; - private final UUID ownerId; - private final Ritual ritual; - - private RitualEvent(IMasterRitualStone mrs, UUID ownerId, Ritual ritual) - { - this.mrs = mrs; - this.ownerId = ownerId; - this.ritual = ritual; - } - - public IMasterRitualStone getRitualStone() - { - return mrs; - } - - public UUID getOwnerId() - { - return ownerId; - } - - public Ritual getRitual() - { - return ritual; - } - - /** - * This event is called when a ritual is activated. If cancelled, it will not - * activate. - *

- * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#activateRitual(ItemStack, PlayerEntity, Ritual)} - */ - @Cancelable - public static class RitualActivatedEvent extends RitualEvent - { - - private final PlayerEntity player; - private final ItemStack crystalStack; - private final int crystalTier; - - public RitualActivatedEvent(IMasterRitualStone mrs, UUID ownerId, Ritual ritual, PlayerEntity player, ItemStack activationCrystal, int crystalTier) - { - super(mrs, ownerId, ritual); - - this.player = player; - this.crystalStack = activationCrystal; - this.crystalTier = crystalTier; - } - - public PlayerEntity getPlayer() - { - return player; - } - - public ItemStack getCrystalStack() - { - return crystalStack; - } - - public int getCrystalTier() - { - return crystalTier; - } - } - - /** - * This event is called when a Ritual effect is performed. If cancelled, the - * effect will not happen. - *

- * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#performRitual(World, net.minecraft.util.math.BlockPos)} - */ - @Cancelable - public static class RitualRunEvent extends RitualEvent - { - - public RitualRunEvent(IMasterRitualStone mrs, UUID ownerId, Ritual ritual) - { - super(mrs, ownerId, ritual); - } - } - - /** - * This event is called when a Ritual is stopped by a {@link Ritual.BreakType}. - *

- * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#stopRitual(Ritual.BreakType)} - */ - public static class RitualStopEvent extends RitualEvent - { - - private final Ritual.BreakType method; - - public RitualStopEvent(IMasterRitualStone mrs, UUID ownerId, Ritual ritual, Ritual.BreakType method) - { - super(mrs, ownerId, ritual); - - this.method = method; - } - - public Ritual.BreakType getMethod() - { - return method; - } - } - - @Cancelable - public static class ImperfectRitualActivatedEvent extends Event - { - - private final IImperfectRitualStone ims; - private final PlayerEntity activator; - private final ImperfectRitual imperfectRitual; - - public ImperfectRitualActivatedEvent(IImperfectRitualStone ims, PlayerEntity activator, ImperfectRitual imperfectRitual) - { - this.ims = ims; - this.activator = activator; - this.imperfectRitual = imperfectRitual; - } - - public IImperfectRitualStone getRitualStone() - { - return ims; - } - - public PlayerEntity getActivator() - { - return activator; - } - - public ImperfectRitual getImperfectRitual() - { - return imperfectRitual; - } - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/event/SacrificeKnifeUsedEvent.java b/src/main/java/wayoftime/bloodmagic/event/SacrificeKnifeUsedEvent.java deleted file mode 100644 index 6fc6bbd4..00000000 --- a/src/main/java/wayoftime/bloodmagic/event/SacrificeKnifeUsedEvent.java +++ /dev/null @@ -1,37 +0,0 @@ -package wayoftime.bloodmagic.event; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraftforge.eventbus.api.Cancelable; -import net.minecraftforge.eventbus.api.Event; - -@Cancelable -public class SacrificeKnifeUsedEvent extends Event -{ - public final PlayerEntity player; - public final int healthDrained; - public int lpAdded; - public boolean shouldDrainHealth; - public boolean shouldFillAltar; - - /** - * This event is called whenever a player attempts to use a - * {@link WayofTime.bloodmagic.item.ItemSacrificialDagger} to self-sacrifice - * near an altar. - * - * @param player The player doing the sacrificing - * @param shouldDrainHealth Determines whether or not health is lost - * @param shouldFillAltar Determines whether or not an altar should be filled - * @param hp Amount of health lost - * @param lpAdded Amount of LP added to the altar - *

- * This event is {@link Cancelable}.
- */ - public SacrificeKnifeUsedEvent(PlayerEntity player, boolean shouldDrainHealth, boolean shouldFillAltar, int hp, int lpAdded) - { - this.player = player; - this.shouldDrainHealth = shouldDrainHealth; - this.shouldFillAltar = shouldFillAltar; - this.healthDrained = hp; - this.lpAdded = lpAdded; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/event/SoulNetworkEvent.java b/src/main/java/wayoftime/bloodmagic/event/SoulNetworkEvent.java deleted file mode 100644 index c4079c4d..00000000 --- a/src/main/java/wayoftime/bloodmagic/event/SoulNetworkEvent.java +++ /dev/null @@ -1,116 +0,0 @@ -package wayoftime.bloodmagic.event; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraftforge.eventbus.api.Cancelable; -import net.minecraftforge.eventbus.api.Event; -import wayoftime.bloodmagic.core.data.SoulNetwork; -import wayoftime.bloodmagic.core.data.SoulTicket; - -public class SoulNetworkEvent extends Event -{ - private final SoulNetwork network; - private SoulTicket ticket; - - public SoulNetworkEvent(SoulNetwork network, SoulTicket ticket) - { - this.network = network; - this.ticket = ticket; - } - - public SoulNetwork getNetwork() - { - return network; - } - - public SoulTicket getTicket() - { - return ticket; - } - - public void setTicket(SoulTicket ticket) - { - this.ticket = ticket; - } - - @Cancelable - public static class Syphon extends SoulNetworkEvent - { - private boolean shouldDamage; - - public Syphon(SoulNetwork network, SoulTicket ticket) - { - super(network, ticket); - } - - public boolean shouldDamage() - { - return shouldDamage; - } - - public void setShouldDamage(boolean shouldDamage) - { - this.shouldDamage = shouldDamage; - } - - public static class Item extends Syphon - { - - private final ItemStack stack; - - public Item(SoulNetwork network, SoulTicket ticket, ItemStack stack) - { - super(network, ticket); - - this.stack = stack; - } - - public ItemStack getStack() - { - return stack; - } - } - - public static class User extends Syphon - { - - private final PlayerEntity user; - - public User(SoulNetwork network, SoulTicket ticket, PlayerEntity user) - { - super(network, ticket); - - this.user = user; - } - - public PlayerEntity getUser() - { - return user; - } - } - } - - @Cancelable - public static class Fill extends SoulNetworkEvent - { - - private int maximum; - - public Fill(SoulNetwork network, SoulTicket ticket, int maximum) - { - super(network, ticket); - - this.maximum = maximum; - } - - public int getMaximum() - { - return maximum; - } - - public void setMaximum(int maximum) - { - this.maximum = maximum; - } - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/gson/SerializerBase.java b/src/main/java/wayoftime/bloodmagic/gson/SerializerBase.java deleted file mode 100644 index 80bd8135..00000000 --- a/src/main/java/wayoftime/bloodmagic/gson/SerializerBase.java +++ /dev/null @@ -1,28 +0,0 @@ -package wayoftime.bloodmagic.gson; - -import java.lang.reflect.Type; - -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonDeserializer; -import com.google.gson.JsonElement; -import com.google.gson.JsonParseException; -import com.google.gson.JsonSerializationContext; -import com.google.gson.JsonSerializer; - -public abstract class SerializerBase implements JsonDeserializer, JsonSerializer -{ - @Override - public T deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) - throws JsonParseException - { - return context.deserialize(json, getType()); - } - - @Override - public JsonElement serialize(T src, Type typeOfSrc, JsonSerializationContext context) - { - return context.serialize(src); - } - - public abstract Class getType(); -} diff --git a/src/main/java/wayoftime/bloodmagic/gson/Serializers.java b/src/main/java/wayoftime/bloodmagic/gson/Serializers.java deleted file mode 100644 index f5546799..00000000 --- a/src/main/java/wayoftime/bloodmagic/gson/Serializers.java +++ /dev/null @@ -1,128 +0,0 @@ -package wayoftime.bloodmagic.gson; - -import java.lang.reflect.Type; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; -import com.google.gson.JsonSerializationContext; - -import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; -import net.minecraft.network.datasync.DataParameter; -import net.minecraft.network.datasync.DataSerializers; -import net.minecraft.network.datasync.IDataSerializer; -import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.registries.ForgeRegistries; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; - -public class Serializers -{ - // Data serializers - public static final IDataSerializer WILL_TYPE_SERIALIZER = new IDataSerializer() - { - @Override - public void write(PacketBuffer buf, EnumDemonWillType value) - { - buf.writeEnumValue(value); - } - - @Override - public EnumDemonWillType read(PacketBuffer buf) - { - return buf.readEnumValue(EnumDemonWillType.class); - } - - @Override - public DataParameter createKey(int id) - { - return new DataParameter<>(id, this); - } - - @Override - public EnumDemonWillType copyValue(EnumDemonWillType value) - { - return EnumDemonWillType.valueOf(value.name()); - } - }; - - // Serializers - public static final SerializerBase FACING_SERIALIZER = new SerializerBase() - { - @Override - public Class getType() - { - return Direction.class; - } - - @Override - public Direction deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) - throws JsonParseException - { - return Direction.byName(json.getAsString()); - } - }; - public static final SerializerBase RESOURCELOCATION_SERIALIZER = new SerializerBase() - { - @Override - public Class getType() - { - return ResourceLocation.class; - } - - @Override - public ResourceLocation deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) - throws JsonParseException - { - String domain = json.getAsJsonObject().get("domain").getAsString(); - String path = json.getAsJsonObject().get("path").getAsString(); - return new ResourceLocation(domain, path); - } - - @Override - public JsonElement serialize(ResourceLocation src, Type typeOfSrc, JsonSerializationContext context) - { - JsonObject object = new JsonObject(); - object.addProperty("domain", src.getNamespace()); - object.addProperty("path", src.getPath()); - return object; - } - }; - public static final SerializerBase ITEMMETA_SERIALIZER = new SerializerBase() - { - @Override - public Class getType() - { - return ItemStack.class; - } - - @Override - public ItemStack deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) - throws JsonParseException - { - ResourceLocation registryName = context.deserialize(json.getAsJsonObject().get("registryName").getAsJsonObject(), ResourceLocation.class); - int meta = json.getAsJsonObject().get("meta").getAsInt(); - return new ItemStack(ForgeRegistries.ITEMS.getValue(registryName), 1); - } - - @Override - public JsonElement serialize(ItemStack src, Type typeOfSrc, JsonSerializationContext context) - { - JsonObject jsonObject = new JsonObject(); - jsonObject.add("registryName", context.serialize(src.getItem().getRegistryName())); - jsonObject.addProperty("meta", src.getDamage()); - return jsonObject; - } - }; - - public static final Gson GSON = new GsonBuilder().serializeNulls().setPrettyPrinting().disableHtmlEscaping().registerTypeAdapter(FACING_SERIALIZER.getType(), FACING_SERIALIZER).registerTypeAdapter(RESOURCELOCATION_SERIALIZER.getType(), RESOURCELOCATION_SERIALIZER).registerTypeAdapter(ITEMMETA_SERIALIZER.getType(), ITEMMETA_SERIALIZER).create(); - - static - { - DataSerializers.registerSerializer(WILL_TYPE_SERIALIZER); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/impl/BloodMagicAPI.java b/src/main/java/wayoftime/bloodmagic/impl/BloodMagicAPI.java deleted file mode 100644 index 2b4b1143..00000000 --- a/src/main/java/wayoftime/bloodmagic/impl/BloodMagicAPI.java +++ /dev/null @@ -1,114 +0,0 @@ -package wayoftime.bloodmagic.impl; - -import java.util.List; -import java.util.function.Predicate; - -import javax.annotation.Nonnull; - -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.Multimap; - -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import wayoftime.bloodmagic.altar.ComponentType; -import wayoftime.bloodmagic.api.IBloodMagicAPI; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; -import wayoftime.bloodmagic.incense.EnumTranquilityType; -import wayoftime.bloodmagic.incense.IncenseTranquilityRegistry; -import wayoftime.bloodmagic.incense.TranquilityStack; -import wayoftime.bloodmagic.util.BMLog; -import wayoftime.bloodmagic.will.PlayerDemonWillHandler; - -public class BloodMagicAPI implements IBloodMagicAPI -{ - - public static final BloodMagicAPI INSTANCE = new BloodMagicAPI(); - - private final BloodMagicBlacklist blacklist; - private final BloodMagicRecipeRegistrar recipeRegistrar; - private final BloodMagicValueManager valueManager; - private final Multimap altarComponents; - - public BloodMagicAPI() - { - this.blacklist = new BloodMagicBlacklist(); - this.recipeRegistrar = new BloodMagicRecipeRegistrar(); - this.valueManager = new BloodMagicValueManager(); - this.altarComponents = ArrayListMultimap.create(); - } - - @Nonnull - @Override - public BloodMagicBlacklist getBlacklist() - { - return blacklist; - } - - @Nonnull - public BloodMagicRecipeRegistrar getRecipeRegistrar() - { - return recipeRegistrar; - } - -// - @Nonnull - @Override - public BloodMagicValueManager getValueManager() - { - return valueManager; - } - - @Override - public void registerAltarComponent(@Nonnull BlockState state, @Nonnull String componentType) - { - ComponentType component = ComponentType.getType(componentType); - - if (component != null) - { - BMLog.API_VERBOSE.info("Registered {} as a {} altar component.", state, componentType); - altarComponents.put(component, state); - } else - BMLog.API.warn("Invalid Altar component type: {}.", componentType); - } - - @Override - public void unregisterAltarComponent(@Nonnull BlockState state, @Nonnull String componentType) - { - ComponentType component = ComponentType.getType(componentType); - - if (component != null) - { - BMLog.API_VERBOSE.info("Unregistered {} from being a {} altar component.", state, componentType); - altarComponents.remove(component, state); - } else - BMLog.API.warn("Invalid Altar component type: {}.", componentType); - } - - @Override - public void registerTranquilityHandler(@Nonnull Predicate blockState, @Nonnull String tranquilityType, double value) - { - EnumTranquilityType type = EnumTranquilityType.getType(tranquilityType); - - if (type != null) - { - IncenseTranquilityRegistry.registerTranquilityHandler((world, pos, block, state) -> blockState.test(state) - ? new TranquilityStack(type, value) - : null); - } else - { - BMLog.API.warn("Invalid Tranquility type: {}.", tranquilityType); - } - } - - @Override - public double getTotalDemonWill(String willType, PlayerEntity player) - { - return PlayerDemonWillHandler.getTotalDemonWill(EnumDemonWillType.getType(willType), player); - } - - @Nonnull - public List getComponentStates(ComponentType component) - { - return (List) altarComponents.get(component); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/impl/BloodMagicBlacklist.java b/src/main/java/wayoftime/bloodmagic/impl/BloodMagicBlacklist.java deleted file mode 100644 index e9d5d81b..00000000 --- a/src/main/java/wayoftime/bloodmagic/impl/BloodMagicBlacklist.java +++ /dev/null @@ -1,125 +0,0 @@ -package wayoftime.bloodmagic.impl; - -import java.util.Set; - -import javax.annotation.Nonnull; - -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.util.ResourceLocation; -import wayoftime.bloodmagic.api.IBloodMagicBlacklist; -import wayoftime.bloodmagic.util.BMLog; - -public class BloodMagicBlacklist implements IBloodMagicBlacklist -{ - - private final Set teleposer; - private final Set teleposerEntities; - private final Set transposition; - private final Set greenGrove; - private final Set sacrifice; - - public BloodMagicBlacklist() - { - this.teleposer = Sets.newHashSet(); - this.teleposerEntities = Sets.newHashSet(); - this.transposition = Sets.newHashSet(); - this.greenGrove = Sets.newHashSet(); - this.sacrifice = Sets.newHashSet(); - } - - @Override - public void addTeleposer(@Nonnull BlockState state) - { - if (!teleposer.contains(state)) - { - BMLog.API_VERBOSE.info("Blacklist: Added {} to the Teleposer blacklist.", state); - teleposer.add(state); - } - } - - public void addTeleposer(@Nonnull Block block) - { - for (BlockState state : block.getStateContainer().getValidStates()) addTeleposer(state); - } - - @Override - public void addTeleposer(@Nonnull ResourceLocation entityId) - { - if (!teleposerEntities.contains(entityId)) - { - BMLog.API_VERBOSE.info("Blacklist: Added {} to the Teleposer blacklist.", entityId); - teleposerEntities.add(entityId); - } - } - - @Override - public void addTransposition(@Nonnull BlockState state) - { - if (!transposition.contains(state)) - { - BMLog.API_VERBOSE.info("Blacklist: Added {} to the Transposition blacklist.", state); - transposition.add(state); - } - } - - public void addTransposition(@Nonnull Block block) - { - for (BlockState state : block.getStateContainer().getValidStates()) addTransposition(state); - } - - @Override - public void addGreenGrove(@Nonnull BlockState state) - { - if (!greenGrove.contains(state)) - { - BMLog.API_VERBOSE.info("Blacklist: Added {} to the Green Grove blacklist.", state); - greenGrove.add(state); - } - } - - public void addGreenGrove(@Nonnull Block block) - { - for (BlockState state : block.getStateContainer().getValidStates()) addGreenGrove(state); - } - - @Override - public void addWellOfSuffering(@Nonnull ResourceLocation entityId) - { - if (!sacrifice.contains(entityId)) - { - BMLog.API_VERBOSE.info("Blacklist: Added {} to the Well of Suffering blacklist.", entityId); - sacrifice.add(entityId); - } - } - - // Internal use getters - - public Set getTeleposer() - { - return ImmutableSet.copyOf(teleposer); - } - - public Set getTeleposerEntities() - { - return ImmutableSet.copyOf(teleposerEntities); - } - - public Set getTransposition() - { - return ImmutableSet.copyOf(transposition); - } - - public Set getGreenGrove() - { - return ImmutableSet.copyOf(greenGrove); - } - - public Set getSacrifice() - { - return ImmutableSet.copyOf(sacrifice); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/impl/BloodMagicCorePlugin.java b/src/main/java/wayoftime/bloodmagic/impl/BloodMagicCorePlugin.java deleted file mode 100644 index 20d58bb1..00000000 --- a/src/main/java/wayoftime/bloodmagic/impl/BloodMagicCorePlugin.java +++ /dev/null @@ -1,60 +0,0 @@ -package wayoftime.bloodmagic.impl; - -import net.minecraft.block.Blocks; -import net.minecraft.block.FireBlock; -import net.minecraft.block.GrassBlock; -import net.minecraft.block.LeavesBlock; -import net.minecraft.tags.BlockTags; -import wayoftime.bloodmagic.altar.ComponentType; -import wayoftime.bloodmagic.api.IBloodMagicAPI; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.incense.EnumTranquilityType; -import wayoftime.bloodmagic.incense.IncenseTranquilityRegistry; -import wayoftime.bloodmagic.incense.TranquilityStack; - -public class BloodMagicCorePlugin -{ - public static final BloodMagicCorePlugin INSTANCE = new BloodMagicCorePlugin(); - - public void register(IBloodMagicAPI apiInterface) - { - BloodMagicAPI api = (BloodMagicAPI) apiInterface; - api.getValueManager().setTranquility(Blocks.LAVA, new TranquilityStack(EnumTranquilityType.LAVA, 1.2D)); -// api.getValueManager().setTranquility(Blocks.FLOWING_LAVA, new TranquilityStack(EnumTranquilityType.LAVA, 1.2D)); - api.getValueManager().setTranquility(Blocks.WATER, new TranquilityStack(EnumTranquilityType.WATER, 1.0D)); -// api.getValueManager().setTranquility(Blocks.water, new TranquilityStack(EnumTranquilityType.WATER, 1.0D)); - api.getValueManager().setTranquility(BloodMagicBlocks.LIFE_ESSENCE_BLOCK.get(), new TranquilityStack(EnumTranquilityType.WATER, 1.5D)); - api.getValueManager().setTranquility(Blocks.NETHERRACK, new TranquilityStack(EnumTranquilityType.FIRE, 0.5D)); - api.getValueManager().setTranquility(Blocks.DIRT, new TranquilityStack(EnumTranquilityType.EARTHEN, 0.25D)); - api.getValueManager().setTranquility(Blocks.FARMLAND, new TranquilityStack(EnumTranquilityType.EARTHEN, 1.0D)); - api.getValueManager().setTranquility(Blocks.POTATOES, new TranquilityStack(EnumTranquilityType.CROP, 1.0D)); - api.getValueManager().setTranquility(Blocks.CARROTS, new TranquilityStack(EnumTranquilityType.CROP, 1.0D)); - api.getValueManager().setTranquility(Blocks.WHEAT, new TranquilityStack(EnumTranquilityType.CROP, 1.0D)); - api.getValueManager().setTranquility(Blocks.NETHER_WART, new TranquilityStack(EnumTranquilityType.CROP, 1.0D)); - api.getValueManager().setTranquility(Blocks.BEETROOTS, new TranquilityStack(EnumTranquilityType.CROP, 1.0D)); - - apiInterface.registerTranquilityHandler(state -> state.getBlock() instanceof LeavesBlock, EnumTranquilityType.PLANT.name(), 1.0D); - apiInterface.registerTranquilityHandler(state -> state.getBlock() instanceof FireBlock, EnumTranquilityType.FIRE.name(), 1.0D); - apiInterface.registerTranquilityHandler(state -> state.getBlock() instanceof GrassBlock, EnumTranquilityType.EARTHEN.name(), 0.5D); - apiInterface.registerTranquilityHandler(state -> BlockTags.LOGS.contains(state.getBlock()), EnumTranquilityType.TREE.name(), 1.0D); - - IncenseTranquilityRegistry.registerTranquilityHandler((world, pos, block, state) -> BloodMagicAPI.INSTANCE.getValueManager().getTranquility().get(state)); - - apiInterface.registerAltarComponent(Blocks.GLOWSTONE.getDefaultState(), ComponentType.GLOWSTONE.name()); - apiInterface.registerAltarComponent(Blocks.SEA_LANTERN.getDefaultState(), ComponentType.GLOWSTONE.name()); - apiInterface.registerAltarComponent(BloodMagicBlocks.BLOODSTONE.get().getDefaultState(), ComponentType.BLOODSTONE.name()); - apiInterface.registerAltarComponent(BloodMagicBlocks.BLOODSTONE_BRICK.get().getDefaultState(), ComponentType.BLOODSTONE.name()); - apiInterface.registerAltarComponent(Blocks.BEACON.getDefaultState(), ComponentType.BEACON.name()); - - apiInterface.registerAltarComponent(BloodMagicBlocks.BLANK_RUNE.get().getDefaultState(), ComponentType.BLOODRUNE.name()); - apiInterface.registerAltarComponent(BloodMagicBlocks.SPEED_RUNE.get().getDefaultState(), ComponentType.BLOODRUNE.name()); - apiInterface.registerAltarComponent(BloodMagicBlocks.SACRIFICE_RUNE.get().getDefaultState(), ComponentType.BLOODRUNE.name()); - apiInterface.registerAltarComponent(BloodMagicBlocks.SELF_SACRIFICE_RUNE.get().getDefaultState(), ComponentType.BLOODRUNE.name()); - apiInterface.registerAltarComponent(BloodMagicBlocks.DISPLACEMENT_RUNE.get().getDefaultState(), ComponentType.BLOODRUNE.name()); - apiInterface.registerAltarComponent(BloodMagicBlocks.CAPACITY_RUNE.get().getDefaultState(), ComponentType.BLOODRUNE.name()); - apiInterface.registerAltarComponent(BloodMagicBlocks.AUGMENTED_CAPACITY_RUNE.get().getDefaultState(), ComponentType.BLOODRUNE.name()); - apiInterface.registerAltarComponent(BloodMagicBlocks.ORB_RUNE.get().getDefaultState(), ComponentType.BLOODRUNE.name()); - apiInterface.registerAltarComponent(BloodMagicBlocks.ACCELERATION_RUNE.get().getDefaultState(), ComponentType.BLOODRUNE.name()); - apiInterface.registerAltarComponent(BloodMagicBlocks.CHARGING_RUNE.get().getDefaultState(), ComponentType.BLOODRUNE.name()); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/impl/BloodMagicRecipeRegistrar.java b/src/main/java/wayoftime/bloodmagic/impl/BloodMagicRecipeRegistrar.java deleted file mode 100644 index ee31e7b1..00000000 --- a/src/main/java/wayoftime/bloodmagic/impl/BloodMagicRecipeRegistrar.java +++ /dev/null @@ -1,231 +0,0 @@ -package wayoftime.bloodmagic.impl; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.apache.commons.lang3.tuple.Pair; - -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableSet; - -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidStack; -import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType; -import wayoftime.bloodmagic.recipe.RecipeARC; -import wayoftime.bloodmagic.recipe.RecipeAlchemyArray; -import wayoftime.bloodmagic.recipe.RecipeAlchemyTable; -import wayoftime.bloodmagic.recipe.RecipeBloodAltar; -import wayoftime.bloodmagic.recipe.RecipeTartaricForge; - -public class BloodMagicRecipeRegistrar -{ - @Nullable - public RecipeBloodAltar getBloodAltar(World world, @Nonnull ItemStack input) - { - Preconditions.checkNotNull(input, "input cannot be null."); - if (input.isEmpty()) - return null; - - List altarRecipes = world.getRecipeManager().getRecipesForType(BloodMagicRecipeType.ALTAR); - - for (RecipeBloodAltar recipe : altarRecipes) if (recipe.getInput().test(input)) - return recipe; - - return null; - } - - public RecipeARC getARC(World world, @Nonnull ItemStack input, @Nonnull ItemStack arcToolInput, @Nonnull FluidStack inputFluid) - { - Preconditions.checkNotNull(input, "input cannot be null."); - Preconditions.checkNotNull(arcToolInput, "tool cannot be null."); - if (input.isEmpty() || arcToolInput.isEmpty()) - return null; - - List arcRecipes = world.getRecipeManager().getRecipesForType(BloodMagicRecipeType.ARC); - - for (RecipeARC recipe : arcRecipes) - { - if (recipe.getInput().test(input) && recipe.getTool().test(arcToolInput)) - { - if (recipe.getFluidIngredient() == null) - { - return recipe; - } else if (recipe.getFluidIngredient().test(inputFluid)) - { - return recipe; - } - } - } - -// if (input.isEmpty()) -// return null; -// -// List altarRecipes = world.getRecipeManager().getRecipesForType(BloodMagicRecipeType.ALTAR); -// -// for (RecipeBloodAltar recipe : altarRecipes) if (recipe.getInput().test(input)) -// return recipe; - - return null; - } - - @Nullable - public RecipeAlchemyTable getAlchemyTable(World world, @Nonnull List input) - { - Preconditions.checkNotNull(input, "input cannot be null."); - if (input.isEmpty()) - return null; - - List tartaricForgeRecipes = world.getRecipeManager().getRecipesForType(BloodMagicRecipeType.ALCHEMYTABLE); - mainLoop: for (RecipeAlchemyTable recipe : tartaricForgeRecipes) - { - if (recipe.getInput().size() != input.size()) - continue; - - List recipeInput = new ArrayList<>(recipe.getInput()); - - for (int i = 0; i < input.size(); i++) - { - boolean matched = false; - for (int j = 0; j < recipeInput.size(); j++) - { - Ingredient ingredient = recipeInput.get(j); - if (ingredient.test(input.get(i))) - { - matched = true; - recipeInput.remove(j); - break; - } - } - - if (!matched) - continue mainLoop; - } - - return recipe; - } - - return null; - } - - @Nullable - public RecipeTartaricForge getTartaricForge(World world, @Nonnull List input) - { - Preconditions.checkNotNull(input, "input cannot be null."); - if (input.isEmpty()) - return null; - - List tartaricForgeRecipes = world.getRecipeManager().getRecipesForType(BloodMagicRecipeType.TARTARICFORGE); - mainLoop: for (RecipeTartaricForge recipe : tartaricForgeRecipes) - { - if (recipe.getInput().size() != input.size()) - continue; - - List recipeInput = new ArrayList<>(recipe.getInput()); - - for (int i = 0; i < input.size(); i++) - { - boolean matched = false; - for (int j = 0; j < recipeInput.size(); j++) - { - Ingredient ingredient = recipeInput.get(j); - if (ingredient.test(input.get(i))) - { - matched = true; - recipeInput.remove(j); - break; - } - } - - if (!matched) - continue mainLoop; - } - - return recipe; - } - - return null; - } - - /** - * - * @param world - * @param input - * @param catalyst - * @return If false and the recipe is nonnull, it is a partial match. If true, - * the returned recipe is a full match. - */ - @Nullable - public Pair getAlchemyArray(World world, @Nonnull ItemStack input, @Nonnull ItemStack catalyst) - { - Preconditions.checkNotNull(input, "input cannot be null."); - if (input.isEmpty()) - return null; - - List altarRecipes = world.getRecipeManager().getRecipesForType(BloodMagicRecipeType.ARRAY); - - RecipeAlchemyArray partialMatch = null; - for (RecipeAlchemyArray recipe : altarRecipes) - { - if (recipe.getBaseInput().test(input)) - { - if (recipe.getAddedInput().test(catalyst)) - { - return Pair.of(true, recipe); - } else if (partialMatch == null) - { - partialMatch = recipe; - } - } - } - - return Pair.of(false, partialMatch); - } - - public Set getAltarRecipes(World world) - { - return ImmutableSet.copyOf(world.getRecipeManager().getRecipesForType(BloodMagicRecipeType.ALTAR)); - } - - public Set getTartaricForgeRecipes(World world) - { - return ImmutableSet.copyOf(world.getRecipeManager().getRecipesForType(BloodMagicRecipeType.TARTARICFORGE)); - } - - public Set getAlchemyArrayRecipes(World world) - { - return ImmutableSet.copyOf(world.getRecipeManager().getRecipesForType(BloodMagicRecipeType.ARRAY)); - } - - public Set getARCRecipes(World world) - { - return ImmutableSet.copyOf(world.getRecipeManager().getRecipesForType(BloodMagicRecipeType.ARC)); - } - - public Set getAlchemyTableRecipes(World world) - { - return ImmutableSet.copyOf(world.getRecipeManager().getRecipesForType(BloodMagicRecipeType.ALCHEMYTABLE)); - } - - public Set getCraftingAlchemyArrayRecipes(World world) - { - Set recipes = new HashSet(world.getRecipeManager().getRecipesForType(BloodMagicRecipeType.ARRAY)); - - Set copyRecipes = new HashSet(); - for (RecipeAlchemyArray recipe : recipes) - { - if (!recipe.getOutput().isEmpty()) - { - copyRecipes.add(recipe); - } - } - - return copyRecipes; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/impl/BloodMagicValueManager.java b/src/main/java/wayoftime/bloodmagic/impl/BloodMagicValueManager.java deleted file mode 100644 index da7d6cd5..00000000 --- a/src/main/java/wayoftime/bloodmagic/impl/BloodMagicValueManager.java +++ /dev/null @@ -1,76 +0,0 @@ -package wayoftime.bloodmagic.impl; - -import java.util.Map; - -import javax.annotation.Nonnull; - -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.util.ResourceLocation; -import wayoftime.bloodmagic.api.IBloodMagicValueManager; -import wayoftime.bloodmagic.incense.EnumTranquilityType; -import wayoftime.bloodmagic.incense.TranquilityStack; -import wayoftime.bloodmagic.util.BMLog; - -public class BloodMagicValueManager implements IBloodMagicValueManager -{ - - private final Map sacrificial; - private final Map tranquility; - - public BloodMagicValueManager() - { - this.sacrificial = Maps.newHashMap(); - this.tranquility = Maps.newHashMap(); - } - - @Override - public void setSacrificialValue(@Nonnull ResourceLocation entityId, int value) - { - BMLog.API_VERBOSE.info("Value Manager: Set sacrificial value of {} to {}.", entityId, value); - sacrificial.put(entityId, value); - } - - @Override - public void setTranquility(@Nonnull BlockState state, @Nonnull String tranquilityType, double value) - { - EnumTranquilityType tranquility = null; - for (EnumTranquilityType type : EnumTranquilityType.values()) - { - if (type.name().equalsIgnoreCase(tranquilityType)) - { - tranquility = type; - break; - } - } - - if (tranquility != null) - { - BMLog.API_VERBOSE.info("Value Manager: Set tranquility value of {} to {} @ {}", state, tranquilityType, value); - this.tranquility.put(state, new TranquilityStack(tranquility, value)); - } else - BMLog.API.warn("Invalid tranquility type: {}.", tranquilityType); - } - - public void setTranquility(Block block, TranquilityStack tranquilityStack) - { - for (BlockState state : block.getStateContainer().getValidStates()) - { - BMLog.API_VERBOSE.info("Value Manager: Set tranquility value of {} to {} @ {}", state, tranquilityStack.type, tranquilityStack.value); - tranquility.put(state, tranquilityStack); - } - } - - public Map getSacrificial() - { - return ImmutableMap.copyOf(sacrificial); - } - - public Map getTranquility() - { - return ImmutableMap.copyOf(tranquility); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/incense/EnumTranquilityType.java b/src/main/java/wayoftime/bloodmagic/incense/EnumTranquilityType.java deleted file mode 100644 index 4c1dc495..00000000 --- a/src/main/java/wayoftime/bloodmagic/incense/EnumTranquilityType.java +++ /dev/null @@ -1,25 +0,0 @@ -package wayoftime.bloodmagic.incense; - -public enum EnumTranquilityType -{ - PLANT(), - CROP(), - TREE(), - EARTHEN(), - WATER(), - FIRE(), - LAVA(),; - - public static EnumTranquilityType getType(String type) - { - for (EnumTranquilityType t : values()) - { - if (t.name().equalsIgnoreCase(type)) - { - return t; - } - } - - return null; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/incense/ITranquilityHandler.java b/src/main/java/wayoftime/bloodmagic/incense/ITranquilityHandler.java deleted file mode 100644 index e0b8d7c0..00000000 --- a/src/main/java/wayoftime/bloodmagic/incense/ITranquilityHandler.java +++ /dev/null @@ -1,14 +0,0 @@ -package wayoftime.bloodmagic.incense; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -/** - * This is a functional interface to return the TranquilityStack of a certain Block type - */ -public interface ITranquilityHandler -{ - TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, BlockState state); -} diff --git a/src/main/java/wayoftime/bloodmagic/incense/IncenseAltarComponent.java b/src/main/java/wayoftime/bloodmagic/incense/IncenseAltarComponent.java deleted file mode 100644 index 2bceb3f5..00000000 --- a/src/main/java/wayoftime/bloodmagic/incense/IncenseAltarComponent.java +++ /dev/null @@ -1,60 +0,0 @@ -package wayoftime.bloodmagic.incense; - -import net.minecraft.block.Block; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; - -public class IncenseAltarComponent -{ - public final BlockPos offsetPos; - public final Block block; - - public IncenseAltarComponent(BlockPos offsetPos, Block block) - { - this.offsetPos = offsetPos; - this.block = block; - } - - public boolean doesBlockMatch(Block block) - { - return this.block == block; - } - - /** - * Base rotation is north. - */ - public BlockPos getOffset(Direction rotation) - { - return new BlockPos(this.getX(rotation), offsetPos.getY(), this.getZ(rotation)); - } - - public int getX(Direction direction) - { - switch (direction) - { - case EAST: - return -this.offsetPos.getZ(); - case SOUTH: - return -this.offsetPos.getX(); - case WEST: - return this.offsetPos.getZ(); - default: - return this.offsetPos.getX(); - } - } - - public int getZ(Direction direction) - { - switch (direction) - { - case EAST: - return this.offsetPos.getX(); - case SOUTH: - return -this.offsetPos.getZ(); - case WEST: - return -this.offsetPos.getX(); - default: - return this.offsetPos.getZ(); - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/incense/IncenseAltarHandler.java b/src/main/java/wayoftime/bloodmagic/incense/IncenseAltarHandler.java deleted file mode 100644 index eb68885f..00000000 --- a/src/main/java/wayoftime/bloodmagic/incense/IncenseAltarHandler.java +++ /dev/null @@ -1,114 +0,0 @@ -package wayoftime.bloodmagic.incense; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class IncenseAltarHandler -{ - public static Map> incenseComponentMap = new TreeMap<>(); - // Incense bonus maximum applied for the tier of blocks. - public static double[] incenseBonuses = new double[] { 0.2, 0.6, 1.2, 2, 3, 4.5 }; - public static double[] tranquilityRequired = new double[] { 0, 6, 14.14, 28, 44.09, 83.14 }; - public static int[] roadsRequired = new int[] { 0, 1, 4, 6, 8, 10, 12 }; // TODO: Change for when the roads are - // fully implemented - - public static void registerIncenseComponent(int altarLevel, IncenseAltarComponent component) - { - if (incenseComponentMap.containsKey(altarLevel)) - { - incenseComponentMap.get(altarLevel).add(component); - } else - { - List list = new ArrayList<>(); - list.add(component); - incenseComponentMap.put(altarLevel, list); - } - } - - public static void registerIncenseComponent(int altarLevel, BlockPos offsetPos, Block block, BlockState state) - { - registerIncenseComponent(altarLevel, new IncenseAltarComponent(offsetPos, block)); - } - - public static double getMaxIncenseBonusFromComponents(World world, BlockPos pos) - { - double accumulatedBonus = 0; - for (int i = 0; i < incenseBonuses.length; i++) - { - double previousBonus = (i <= 0 ? 0 : incenseBonuses[i - 1]); - double nextBonus = incenseBonuses[i]; - if (!incenseComponentMap.containsKey(i)) - { - accumulatedBonus += (nextBonus - previousBonus); - } else - { - boolean hasAllComponentsThisTier = true; - for (IncenseAltarComponent component : incenseComponentMap.get(i)) - { - BlockPos offsetPos = pos.add(component.getOffset(Direction.NORTH)); - BlockState state = world.getBlockState(offsetPos); - Block block = state.getBlock(); - if (component.doesBlockMatch(block)) - { - hasAllComponentsThisTier = false; - } else - { - accumulatedBonus += (nextBonus - previousBonus) / incenseComponentMap.get(i).size(); - } - } - - if (!hasAllComponentsThisTier) - { - break; - } - } - } - - return accumulatedBonus; - } - - public static double getMaxIncenseBonusFromRoads(int roads) - { - double previousBonus = 0; - for (int i = 0; i < incenseBonuses.length; i++) - { - if (roads >= roadsRequired[i]) - { - previousBonus = incenseBonuses[i]; - } else - { - return previousBonus; - } - } - - return previousBonus; - } - - public static double getIncenseBonusFromComponents(World world, BlockPos pos, double tranquility, int roads) - { - double maxBonus = Math.min(getMaxIncenseBonusFromComponents(world, pos), getMaxIncenseBonusFromRoads(roads)); - double possibleBonus = 0; - - for (int i = 0; i < incenseBonuses.length; i++) - { - if (tranquility >= tranquilityRequired[i]) - { - possibleBonus = incenseBonuses[i]; - } else if (i >= 1) - { - possibleBonus += (incenseBonuses[i] - possibleBonus) * (tranquility - tranquilityRequired[i - 1]) / (tranquilityRequired[i] - tranquilityRequired[i - 1]); - break; - } - } - - return Math.min(maxBonus, possibleBonus); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/incense/IncenseTranquilityRegistry.java b/src/main/java/wayoftime/bloodmagic/incense/IncenseTranquilityRegistry.java deleted file mode 100644 index 86fe5f01..00000000 --- a/src/main/java/wayoftime/bloodmagic/incense/IncenseTranquilityRegistry.java +++ /dev/null @@ -1,33 +0,0 @@ -package wayoftime.bloodmagic.incense; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class IncenseTranquilityRegistry -{ - public static List handlerList = new ArrayList<>(); - - public static void registerTranquilityHandler(ITranquilityHandler handler) - { - handlerList.add(handler); - } - - public static TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, BlockState state) - { - for (ITranquilityHandler handler : handlerList) - { - TranquilityStack tranq = handler.getTranquilityOfBlock(world, pos, block, state); - if (tranq != null) - { - return tranq; - } - } - - return null; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/incense/TranquilityStack.java b/src/main/java/wayoftime/bloodmagic/incense/TranquilityStack.java deleted file mode 100644 index 470f7b81..00000000 --- a/src/main/java/wayoftime/bloodmagic/incense/TranquilityStack.java +++ /dev/null @@ -1,16 +0,0 @@ -package wayoftime.bloodmagic.incense; - -/** - * Holds the tranquility type and value for valid tranquility modifiers - */ -public class TranquilityStack -{ - public final EnumTranquilityType type; - public double value; - - public TranquilityStack(EnumTranquilityType type, double value) - { - this.type = type; - this.value = value; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/loot/BloodMagicLootConditions.java b/src/main/java/wayoftime/bloodmagic/loot/BloodMagicLootConditions.java deleted file mode 100644 index 6e322b92..00000000 --- a/src/main/java/wayoftime/bloodmagic/loot/BloodMagicLootConditions.java +++ /dev/null @@ -1,16 +0,0 @@ -package wayoftime.bloodmagic.loot; - -import net.minecraft.loot.LootConditionType; -import net.minecraft.loot.conditions.MatchTool; -import net.minecraft.util.registry.Registry; -import wayoftime.bloodmagic.BloodMagic; - -public class BloodMagicLootConditions -{ - public static final LootConditionType INVERTED = Registry.register(Registry.LOOT_CONDITION_TYPE, BloodMagic.rl("testing"), new LootConditionType(new MatchTool.Serializer())); - - static - { - - } -} diff --git a/src/main/java/wayoftime/bloodmagic/loot/GlobalLootModifier.java b/src/main/java/wayoftime/bloodmagic/loot/GlobalLootModifier.java deleted file mode 100644 index d2762d38..00000000 --- a/src/main/java/wayoftime/bloodmagic/loot/GlobalLootModifier.java +++ /dev/null @@ -1,302 +0,0 @@ -package wayoftime.bloodmagic.loot; - -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - -import com.google.gson.JsonObject; - -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.enchantment.Enchantments; -import net.minecraft.inventory.Inventory; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipe; -import net.minecraft.item.crafting.IRecipeType; -import net.minecraft.loot.LootContext; -import net.minecraft.loot.LootParameterSets; -import net.minecraft.loot.LootParameters; -import net.minecraft.loot.LootTable; -import net.minecraft.loot.conditions.ILootCondition; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.loot.GlobalLootModifierSerializer; -import net.minecraftforge.common.loot.LootModifier; -import net.minecraftforge.fml.RegistryObject; -import net.minecraftforge.items.ItemHandlerHelper; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.anointment.AnointmentHolder; -import wayoftime.bloodmagic.core.AnointmentRegistrar; - -public class GlobalLootModifier -{ - public static final DeferredRegister> GLM = DeferredRegister.create(ForgeRegistries.LOOT_MODIFIER_SERIALIZERS, BloodMagic.MODID); - public static final RegistryObject SILKTOUCH = GLM.register("silk_touch_bamboo", SilkTouchTestModifier.Serializer::new); - public static final RegistryObject FORTUNE = GLM.register("fortune", FortuneModifier.Serializer::new); - public static final RegistryObject LOOTING = GLM.register("looting", LootingModifier.Serializer::new); - public static final RegistryObject SMELT = GLM.register("smelt", SmeltingModifier.Serializer::new); - - private static class SilkTouchTestModifier extends LootModifier - { - public SilkTouchTestModifier(ILootCondition[] conditionsIn) - { - super(conditionsIn); -// System.out.println("Registering silk touch modifier"); - } - - @Nonnull - @Override - public List doApply(List generatedLoot, LootContext context) - { -// System.out.println("Testing to see if we gotta check it~"); - ItemStack ctxTool = context.get(LootParameters.TOOL); - // return early if silk-touch is already applied (otherwise we'll get stuck in - // an infinite loop). - if (EnchantmentHelper.getEnchantments(ctxTool).containsKey(Enchantments.SILK_TOUCH)) - return generatedLoot; - AnointmentHolder holder = AnointmentHolder.fromItemStack(ctxTool); - if (holder == null || holder.getAnointmentLevel(AnointmentRegistrar.ANOINTMENT_SILK_TOUCH.get()) <= 0) - { - return generatedLoot; - } - ItemStack fakeTool = ctxTool.copy(); - fakeTool.addEnchantment(Enchantments.SILK_TOUCH, 1); - LootContext.Builder builder = new LootContext.Builder(context); - builder.withParameter(LootParameters.TOOL, fakeTool); - LootContext ctx = builder.build(LootParameterSets.BLOCK); - LootTable loottable = context.getWorld().getServer().getLootTableManager().getLootTableFromLocation(context.get(LootParameters.BLOCK_STATE).getBlock().getLootTable()); - return loottable.generate(ctx); - } - - private static class Serializer extends GlobalLootModifierSerializer - { - @Override - public SilkTouchTestModifier read(ResourceLocation name, JsonObject json, ILootCondition[] conditionsIn) - { - return new SilkTouchTestModifier(conditionsIn); - } - - @Override - public JsonObject write(SilkTouchTestModifier instance) - { - return makeConditions(instance.conditions); - } - } - } - - private static class FortuneModifier extends LootModifier - { - public FortuneModifier(ILootCondition[] conditionsIn) - { - super(conditionsIn); -// System.out.println("Registering silk touch modifier"); - } - -// List bufferList = new ArrayList(); - - @Nonnull - @Override - public List doApply(List generatedLoot, LootContext context) - { - ItemStack ctxTool = context.get(LootParameters.TOOL); - // return early if silk-touch is already applied (otherwise we'll get stuck in - // an infinite loop). - if (ctxTool.getTag() != null && ctxTool.getTag().getBoolean("bloodmagic:checked_fortune")) - { - return generatedLoot; - } - - if (EnchantmentHelper.getEnchantments(ctxTool).containsKey(Enchantments.SILK_TOUCH)) - return generatedLoot; - AnointmentHolder holder = AnointmentHolder.fromItemStack(ctxTool); - if (holder == null) - { - return generatedLoot; - } - - int additionalFortune = holder.getAnointmentLevel(AnointmentRegistrar.ANOINTMENT_FORTUNE.get()); - if (additionalFortune <= 0) - { - return generatedLoot; - } - -// if (holder.getAnointmentLevel(AnointmentRegistrar.ANOINTMENT_SILK_TOUCH.get()) > 0) -// { -// return generatedLoot; -// } - - ItemStack fakeTool = ctxTool.copy(); - fakeTool.getOrCreateTag().putBoolean("bloodmagic:checked_fortune", true); - int baseFortuneLevel = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, ctxTool); - - fakeTool.addEnchantment(Enchantments.FORTUNE, baseFortuneLevel + additionalFortune); - LootContext.Builder builder = new LootContext.Builder(context); - builder.withParameter(LootParameters.TOOL, fakeTool); - LootContext ctx = builder.build(LootParameterSets.BLOCK); - LootTable loottable = context.getWorld().getServer().getLootTableManager().getLootTableFromLocation(context.get(LootParameters.BLOCK_STATE).getBlock().getLootTable()); - return loottable.generate(ctx); - } - - private static class Serializer extends GlobalLootModifierSerializer - { - @Override - public FortuneModifier read(ResourceLocation name, JsonObject json, ILootCondition[] conditionsIn) - { - return new FortuneModifier(conditionsIn); - } - - @Override - public JsonObject write(FortuneModifier instance) - { - return makeConditions(instance.conditions); - } - } - } - - private static class LootingModifier extends LootModifier - { - public LootingModifier(ILootCondition[] conditionsIn) - { - super(conditionsIn); - } - - @Nonnull - @Override - public List doApply(List generatedLoot, LootContext context) - { -// System.out.println("Checking for looting"); -// Entity killerEntity = context.get(LootParameters.KILLER_ENTITY); -// if (!(killerEntity instanceof PlayerEntity)) -// { - return generatedLoot; -// } -// Entity killedEntity = context.get(LootParameters.THIS_ENTITY); -// if (!(killedEntity instanceof LivingEntity)) -// { -// return generatedLoot; -// } -// ItemStack ctxTool = ((PlayerEntity) killerEntity).getHeldItemMainhand(); -// // return early if silk-touch is already applied (otherwise we'll get stuck in -// // an infinite loop). -// -// System.out.println("Checking looting. ItemStack context: "); -//// EndermanEntity d; -// if (ctxTool.getTag() != null && ctxTool.getTag().getBoolean("bloodmagic:checked_looting")) -// { -// return generatedLoot; -// } -// -// if (EnchantmentHelper.getEnchantments(ctxTool).containsKey(Enchantments.SILK_TOUCH)) -// return generatedLoot; -// AnointmentHolder holder = AnointmentHolder.fromItemStack(ctxTool); -// if (holder == null) -// { -// return generatedLoot; -// } -// -// int additionalLooting = holder.getAnointmentLevel(AnointmentRegistrar.ANOINTMENT_LOOTING.get()) * 20; -// if (additionalLooting <= 0) -// { -// return generatedLoot; -// } -// -//// if (holder.getAnointmentLevel(AnointmentRegistrar.ANOINTMENT_SILK_TOUCH.get()) > 0) -//// { -//// return generatedLoot; -//// } -// -// ItemStack fakeTool = ctxTool.copy(); -// fakeTool.getOrCreateTag().putBoolean("bloodmagic:checked_looting", true); -// int baseLootingLevel = EnchantmentHelper.getEnchantmentLevel(Enchantments.LOOTING, ctxTool); -// -// fakeTool.addEnchantment(Enchantments.LOOTING, baseLootingLevel + additionalLooting); -// LootContext.Builder builder = new LootContext.Builder(context); -// builder.withParameter(LootParameters.TOOL, fakeTool); -// LootContext ctx = builder.build(LootParameterSets.ENTITY); -// ResourceLocation resource = ((LivingEntity) killedEntity).getLootTableResourceLocation(); -// LootTable loottable = context.getWorld().getServer().getLootTableManager().getLootTableFromLocation(resource); -// return loottable.generate(ctx); - } - - private static class Serializer extends GlobalLootModifierSerializer - { - @Override - public LootingModifier read(ResourceLocation name, JsonObject json, ILootCondition[] conditionsIn) - { - return new LootingModifier(conditionsIn); - } - - @Override - public JsonObject write(LootingModifier instance) - { - return makeConditions(instance.conditions); - } - } - -// private static class ExtendedLootContext extends LootContext -// { -// public ExtendedLootContext() -// { -// -// } -// } - } - - private static class SmeltingModifier extends LootModifier - { - public SmeltingModifier(ILootCondition[] conditionsIn) - { - super(conditionsIn); - } - - @Nonnull - @Override - public List doApply(List generatedLoot, LootContext context) - { - ItemStack ctxTool = context.get(LootParameters.TOOL); - // return early if silk-touch is already applied (otherwise we'll get stuck in - // an infinite loop). - if (ctxTool.getTag() == null) - { - return generatedLoot; - } - - AnointmentHolder holder = AnointmentHolder.fromItemStack(ctxTool); - if (holder == null) - { - return generatedLoot; - } - - int smeltingLevel = holder.getAnointmentLevel(AnointmentRegistrar.ANOINTMENT_SMELTING.get()); - if (smeltingLevel <= 0) - { - return generatedLoot; - } - - ArrayList ret = new ArrayList(); - generatedLoot.forEach((stack) -> ret.add(smelt(stack, context))); - return ret; - } - - private static ItemStack smelt(ItemStack stack, LootContext context) - { - return context.getWorld().getRecipeManager().getRecipe(IRecipeType.SMELTING, new Inventory(stack), context.getWorld()).map(FurnaceRecipe::getRecipeOutput).filter(itemStack -> !itemStack.isEmpty()).map(itemStack -> ItemHandlerHelper.copyStackWithSize(itemStack, stack.getCount() * itemStack.getCount())).orElse(stack); - } - - private static class Serializer extends GlobalLootModifierSerializer - { - @Override - public SmeltingModifier read(ResourceLocation name, JsonObject json, ILootCondition[] conditionsIn) - { - return new SmeltingModifier(conditionsIn); - } - - @Override - public JsonObject write(SmeltingModifier instance) - { - return makeConditions(instance.conditions); - } - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/network/ARCTanksPacket.java b/src/main/java/wayoftime/bloodmagic/network/ARCTanksPacket.java deleted file mode 100644 index 60be5d5c..00000000 --- a/src/main/java/wayoftime/bloodmagic/network/ARCTanksPacket.java +++ /dev/null @@ -1,72 +0,0 @@ -package wayoftime.bloodmagic.network; - -import java.util.function.Supplier; - -import net.minecraft.client.Minecraft; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.fml.network.NetworkEvent.Context; -import wayoftime.bloodmagic.tile.TileAlchemicalReactionChamber; - -public class ARCTanksPacket -{ - private BlockPos pos; - private CompoundNBT inputNBT; - private CompoundNBT outputNBT; - - public ARCTanksPacket() - { - pos = BlockPos.ZERO; - inputNBT = new CompoundNBT(); - outputNBT = new CompoundNBT(); - } - - public ARCTanksPacket(TileAlchemicalReactionChamber tile) - { - this(tile.getPos(), tile.inputTank.writeToNBT(new CompoundNBT()), tile.outputTank.writeToNBT(new CompoundNBT())); - } - - public ARCTanksPacket(BlockPos pos, CompoundNBT inputNBT, CompoundNBT outputNBT) - { - this.pos = pos; - this.inputNBT = inputNBT; - this.outputNBT = outputNBT; - } - - public static void encode(ARCTanksPacket pkt, PacketBuffer buf) - { - buf.writeBlockPos(pkt.pos); - buf.writeCompoundTag(pkt.inputNBT); - buf.writeCompoundTag(pkt.outputNBT); - } - - public static ARCTanksPacket decode(PacketBuffer buf) - { - ARCTanksPacket pkt = new ARCTanksPacket(buf.readBlockPos(), buf.readCompoundTag(), buf.readCompoundTag()); - - return pkt; - } - - public static void handle(ARCTanksPacket message, Supplier context) - { - context.get().enqueueWork(() -> updateTanks(message.pos, message.inputNBT, message.outputNBT)); - context.get().setPacketHandled(true); - } - - @OnlyIn(Dist.CLIENT) - public static void updateTanks(BlockPos pos, CompoundNBT inputNBT, CompoundNBT outputNBT) - { - World world = Minecraft.getInstance().world; - TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileAlchemicalReactionChamber) - { - ((TileAlchemicalReactionChamber) tile).inputTank.readFromNBT(inputNBT); - ((TileAlchemicalReactionChamber) tile).outputTank.readFromNBT(outputNBT); - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/network/AlchemyTableButtonPacket.java b/src/main/java/wayoftime/bloodmagic/network/AlchemyTableButtonPacket.java deleted file mode 100644 index 4202043c..00000000 --- a/src/main/java/wayoftime/bloodmagic/network/AlchemyTableButtonPacket.java +++ /dev/null @@ -1,76 +0,0 @@ -package wayoftime.bloodmagic.network; - -import java.util.function.Supplier; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraftforge.fml.network.NetworkEvent.Context; -import wayoftime.bloodmagic.tile.TileAlchemyTable; - -public class AlchemyTableButtonPacket -{ - private BlockPos pos; - private int slot; - private Direction dir; - private boolean enable; - - public AlchemyTableButtonPacket() - { - this(BlockPos.ZERO, 0, Direction.DOWN, true); - } - - public AlchemyTableButtonPacket(BlockPos pos, int slot, Direction dir, boolean enable) - { - this.pos = pos; - this.slot = slot; - this.dir = dir; - this.enable = enable; - } - - public static void encode(AlchemyTableButtonPacket pkt, PacketBuffer buf) - { - buf.writeBlockPos(pkt.pos); - buf.writeInt(pkt.slot); - buf.writeInt(pkt.dir.ordinal()); - buf.writeBoolean(pkt.enable); - } - - public static AlchemyTableButtonPacket decode(PacketBuffer buf) - { - AlchemyTableButtonPacket pkt = new AlchemyTableButtonPacket(buf.readBlockPos(), buf.readInt(), Direction.byIndex(buf.readInt()), buf.readBoolean()); - - return pkt; - } - - public static void handle(AlchemyTableButtonPacket message, Supplier context) - { - context.get().enqueueWork(() -> { - PlayerEntity player = context.get().getSender(); - if (player == null) - { - return; - } - TileEntity tile = player.getEntityWorld().getTileEntity(message.pos); - if (tile instanceof TileAlchemyTable) - { - ((TileAlchemyTable) tile).setSlotEnabled(message.enable, message.slot, message.dir); - } - }); - context.get().setPacketHandled(true); - } - -// @OnlyIn(Dist.CLIENT) -// public static void updateTanks(BlockPos pos, CompoundNBT inputNBT, CompoundNBT outputNBT) -// { -// World world = Minecraft.getInstance().world; -// TileEntity tile = world.getTileEntity(pos); -// if (tile instanceof TileAlchemicalReactionChamber) -// { -// ((TileAlchemicalReactionChamber) tile).inputTank.readFromNBT(inputNBT); -// ((TileAlchemicalReactionChamber) tile).outputTank.readFromNBT(outputNBT); -// } -// } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/network/BasePacketHandler.java b/src/main/java/wayoftime/bloodmagic/network/BasePacketHandler.java deleted file mode 100644 index 74d39066..00000000 --- a/src/main/java/wayoftime/bloodmagic/network/BasePacketHandler.java +++ /dev/null @@ -1,151 +0,0 @@ -package wayoftime.bloodmagic.network; - -import java.util.Optional; -import java.util.function.BiConsumer; -import java.util.function.Function; -import java.util.function.Supplier; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.RegistryKey; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.ChunkPos; -import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; -import net.minecraftforge.fml.network.NetworkDirection; -import net.minecraftforge.fml.network.NetworkEvent.Context; -import net.minecraftforge.fml.network.NetworkRegistry; -import net.minecraftforge.fml.network.PacketDistributor; -import net.minecraftforge.fml.network.simple.SimpleChannel; - -/** - * Copied liberally from Mekanism. Many thanks to pupnewfster! - * - */ -public abstract class BasePacketHandler -{ - - protected static SimpleChannel createChannel(ResourceLocation name) - { - return NetworkRegistry.ChannelBuilder.named(name).clientAcceptedVersions(getProtocolVersion()::equals).serverAcceptedVersions(getProtocolVersion()::equals).networkProtocolVersion(BasePacketHandler::getProtocolVersion).simpleChannel(); - } - - private static String getProtocolVersion() - { - return "1"; - } - - /** - * Helper for reading strings to make sure we don't accidentally call - * PacketBuffer#readString on the server - */ - public static String readString(PacketBuffer buffer) - { - return buffer.readString(Short.MAX_VALUE); - } - -// public static void log(String log) -// { -// // TODO: Add more logging for packets using this -// if (MekanismConfig.general.logPackets.get()) -// { -// Mekanism.logger.info(log); -// } -// } -// - public static PlayerEntity getPlayer(Supplier context) - { - return context.get().getSender(); - } - - private int index = 0; - - protected abstract SimpleChannel getChannel(); - - public abstract void initialize(); - - protected void registerClientToServer(Class type, BiConsumer encoder, - Function decoder, BiConsumer> consumer) - { - getChannel().registerMessage(index++, type, encoder, decoder, consumer, Optional.of(NetworkDirection.PLAY_TO_SERVER)); - } - - protected void registerServerToClient(Class type, BiConsumer encoder, - Function decoder, BiConsumer> consumer) - { - getChannel().registerMessage(index++, type, encoder, decoder, consumer, Optional.of(NetworkDirection.PLAY_TO_CLIENT)); - } - - /** - * Send this message to the specified player. - * - * @param message - the message to send - * @param player - the player to send it to - */ - public void sendTo(MSG message, ServerPlayerEntity player) - { - getChannel().sendTo(message, player.connection.getNetworkManager(), NetworkDirection.PLAY_TO_CLIENT); - } - - /** - * Send this message to everyone connected to the server. - * - * @param message - message to send - */ - public void sendToAll(MSG message) - { - getChannel().send(PacketDistributor.ALL.noArg(), message); - } - - /** - * Send this message to everyone within the supplied dimension. - * - * @param message - the message to send - * @param dimension - the dimension to target - */ - public void sendToDimension(MSG message, RegistryKey dimension) - { - getChannel().send(PacketDistributor.DIMENSION.with(() -> dimension), message); - } - - /** - * Send this message to the server. - * - * @param message - the message to send - */ - public void sendToServer(MSG message) - { - getChannel().sendToServer(message); - } - - public void sendToAllTracking(MSG message, Entity entity) - { - getChannel().send(PacketDistributor.TRACKING_ENTITY.with(() -> entity), message); - } - - public void sendToAllTracking(MSG message, TileEntity tile) - { - sendToAllTracking(message, tile.getWorld(), tile.getPos()); - } - - public void sendToAllTracking(MSG message, World world, BlockPos pos) - { - if (world instanceof ServerWorld) - { - // If we have a ServerWorld just directly figure out the ChunkPos so as to not - // require looking up the chunk - // This provides a decent performance boost over using the packet distributor - ((ServerWorld) world).getChunkProvider().chunkManager.getTrackingPlayers(new ChunkPos(pos), false).forEach(p -> sendTo(message, p)); - } else - { - // Otherwise fallback to entities tracking the chunk if some mod did something - // odd and our world is not a ServerWorld - getChannel().send(PacketDistributor.TRACKING_CHUNK.with(() -> world.getChunk(pos.getX() >> 4, pos.getZ() >> 4)), message); - } - } - -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/network/BloodMagicPacketHandler.java b/src/main/java/wayoftime/bloodmagic/network/BloodMagicPacketHandler.java deleted file mode 100644 index fd0d365c..00000000 --- a/src/main/java/wayoftime/bloodmagic/network/BloodMagicPacketHandler.java +++ /dev/null @@ -1,54 +0,0 @@ -package wayoftime.bloodmagic.network; - -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.network.simple.SimpleChannel; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.util.ChatUtil; - -public class BloodMagicPacketHandler extends BasePacketHandler -{ -// public static final SimpleChannel INSTANCE = NetworkRegistry.newSimpleChannel(new ResourceLocation(BloodMagic.MODID, "main"), () -> PROTOCOL_VERSION, PROTOCOL_VERSION::equals, PROTOCOL_VERSION::equals); - public static final SimpleChannel INSTANCE = createChannel(new ResourceLocation(BloodMagic.MODID, "main")); - - @Override - public void initialize() - { - registerServerToClient(ChatUtil.PacketNoSpamChat.class, ChatUtil.PacketNoSpamChat::encode, ChatUtil.PacketNoSpamChat::decode, ChatUtil.PacketNoSpamChat::handle); - registerServerToClient(ARCTanksPacket.class, ARCTanksPacket::encode, ARCTanksPacket::decode, ARCTanksPacket::handle); - registerServerToClient(DemonAuraClientPacket.class, DemonAuraClientPacket::encode, DemonAuraClientPacket::decode, DemonAuraClientPacket::handle); - registerServerToClient(SetClientHealthPacket.class, SetClientHealthPacket::encode, SetClientHealthPacket::decode, SetClientHealthPacket::handle); - - registerClientToServer(KeyProcessorPacket.class, KeyProcessorPacket::encode, KeyProcessorPacket::decode, KeyProcessorPacket::handle); - registerClientToServer(SigilHoldingPacket.class, SigilHoldingPacket::encode, SigilHoldingPacket::decode, SigilHoldingPacket::handle); - registerClientToServer(AlchemyTableButtonPacket.class, AlchemyTableButtonPacket::encode, AlchemyTableButtonPacket::decode, AlchemyTableButtonPacket::handle); -// INSTANCE.registerMessage(id, messageType, encoder, decoder, messageConsumer); -// INSTANCE.registerMessage(ChatUtil.PacketNoSpamChat.Handler.class, ChatUtil.PacketNoSpamChat.class, 0, Side.CLIENT); -// INSTANCE.registerMessage(ItemRouterButtonPacketProcessor.class, ItemRouterButtonPacketProcessor.class, 1, Side.SERVER); -// INSTANCE.registerMessage(PlayerVelocityPacketProcessor.class, PlayerVelocityPacketProcessor.class, 2, Side.CLIENT); -// INSTANCE.registerMessage(PlayerFallDistancePacketProcessor.class, PlayerFallDistancePacketProcessor.class, 3, Side.SERVER); -// INSTANCE.registerMessage(SigilHoldingPacketProcessor.class, SigilHoldingPacketProcessor.class, 4, Side.SERVER); -// INSTANCE.registerMessage(KeyProcessor.class, KeyProcessor.class, 5, Side.SERVER); -// INSTANCE.registerMessage(DemonAuraPacketProcessor.class, DemonAuraPacketProcessor.class, 6, Side.CLIENT); -// INSTANCE.registerMessage(ItemRouterAmountPacketProcessor.class, ItemRouterAmountPacketProcessor.class, 7, Side.SERVER); - } - - protected SimpleChannel getChannel() - { - return INSTANCE; - } - -// public static void sendToAllAround(IMessage message, TileEntity te, int range) -// { -// INSTANCE.sendToAllAround(message, new NetworkRegistry.TargetPoint(te.getWorld().provider.getDimension(), te.getPos().getX(), te.getPos().getY(), te.getPos().getZ(), range)); -// } -// -// public static void sendToAllAround(IMessage message, TileEntity te) -// { -// sendToAllAround(message, te, 64); -// } -// -// public static void sendTo(IMessage message, EntityPlayerMP player) -// { -// INSTANCE.sendTo(message, player); -// } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/network/DemonAuraClientPacket.java b/src/main/java/wayoftime/bloodmagic/network/DemonAuraClientPacket.java deleted file mode 100644 index a3d29b9e..00000000 --- a/src/main/java/wayoftime/bloodmagic/network/DemonAuraClientPacket.java +++ /dev/null @@ -1,64 +0,0 @@ -package wayoftime.bloodmagic.network; - -import java.util.function.Supplier; - -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.fml.network.NetworkEvent.Context; -import wayoftime.bloodmagic.util.handler.event.ClientHandler; -import wayoftime.bloodmagic.will.DemonWillHolder; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; - -public class DemonAuraClientPacket -{ - public DemonWillHolder currentWill = new DemonWillHolder(); - - public DemonAuraClientPacket() - { - - } - - public DemonAuraClientPacket(DemonWillHolder holder) - { - this.currentWill = holder; - } - - public static void encode(DemonAuraClientPacket pkt, PacketBuffer buf) - { - for (EnumDemonWillType type : EnumDemonWillType.values()) - { - if (pkt.currentWill.willMap.containsKey(type)) - { - buf.writeDouble(pkt.currentWill.willMap.get(type)); - } else - { - buf.writeDouble(0); - } - } - - } - - public static DemonAuraClientPacket decode(PacketBuffer buf) - { - DemonAuraClientPacket pkt = new DemonAuraClientPacket(); - for (EnumDemonWillType type : EnumDemonWillType.values()) - { - pkt.currentWill.willMap.put(type, buf.readDouble()); - } - - return pkt; - } - - public static void handle(DemonAuraClientPacket message, Supplier context) - { - context.get().enqueueWork(() -> updateClientHolder(message.currentWill)); - context.get().setPacketHandled(true); - } - - @OnlyIn(Dist.CLIENT) - public static void updateClientHolder(DemonWillHolder holder) - { - ClientHandler.currentAura = holder; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/network/KeyProcessorPacket.java b/src/main/java/wayoftime/bloodmagic/network/KeyProcessorPacket.java deleted file mode 100644 index 7f79dc72..00000000 --- a/src/main/java/wayoftime/bloodmagic/network/KeyProcessorPacket.java +++ /dev/null @@ -1,64 +0,0 @@ -package wayoftime.bloodmagic.network; - -import java.util.function.Supplier; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.fml.network.NetworkEvent.Context; -import wayoftime.bloodmagic.client.key.IKeybindable; -import wayoftime.bloodmagic.client.key.KeyBindings; - -public class KeyProcessorPacket -{ - public int keyId; - public boolean showInChat; - - public KeyProcessorPacket(int keyId, boolean showInChat) - { - this.keyId = keyId; - this.showInChat = showInChat; - } - - public KeyProcessorPacket(KeyBindings key, boolean showInChat) - { - this(key.ordinal(), showInChat); - } - - public static void encode(KeyProcessorPacket pkt, PacketBuffer buf) - { - buf.writeInt(pkt.keyId); - buf.writeBoolean(pkt.showInChat); - } - - public static KeyProcessorPacket decode(PacketBuffer buf) - { - KeyProcessorPacket pkt = new KeyProcessorPacket(buf.readInt(), buf.readBoolean()); - - return pkt; - } - - public static void handle(KeyProcessorPacket message, Supplier context) - { - context.get().enqueueWork(() -> sendKeyToServer(message, context.get().getSender())); - context.get().setPacketHandled(true); - } - - public static void sendKeyToServer(KeyProcessorPacket msg, PlayerEntity playerEntity) - { - if (playerEntity != null) - { - ItemStack heldStack = playerEntity.getHeldItemMainhand(); - if (heldStack.getItem() instanceof IKeybindable) - { - if (msg.keyId < 0 || msg.keyId >= KeyBindings.values().length) - { - return; - } - KeyBindings key = KeyBindings.values()[msg.keyId]; - - ((IKeybindable) heldStack.getItem()).onKeyPressed(heldStack, playerEntity, key, msg.showInChat); - } - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/network/SetClientHealthPacket.java b/src/main/java/wayoftime/bloodmagic/network/SetClientHealthPacket.java deleted file mode 100644 index d89345dc..00000000 --- a/src/main/java/wayoftime/bloodmagic/network/SetClientHealthPacket.java +++ /dev/null @@ -1,48 +0,0 @@ -package wayoftime.bloodmagic.network; - -import java.util.function.Supplier; - -import net.minecraft.client.Minecraft; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.fml.network.NetworkEvent.Context; - -public class SetClientHealthPacket -{ - public float health; - - public SetClientHealthPacket() - { - - } - - public SetClientHealthPacket(float health) - { - this.health = health; - } - - public static void encode(SetClientHealthPacket pkt, PacketBuffer buf) - { - buf.writeFloat(pkt.health); - } - - public static SetClientHealthPacket decode(PacketBuffer buf) - { - SetClientHealthPacket pkt = new SetClientHealthPacket(buf.readFloat()); - - return pkt; - } - - public static void handle(SetClientHealthPacket message, Supplier context) - { - context.get().enqueueWork(() -> updateClientHealth(message.health)); - context.get().setPacketHandled(true); - } - - @OnlyIn(Dist.CLIENT) - public static void updateClientHealth(float health) - { - Minecraft.getInstance().player.setHealth(health); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/network/SigilHoldingPacket.java b/src/main/java/wayoftime/bloodmagic/network/SigilHoldingPacket.java deleted file mode 100644 index 015827b9..00000000 --- a/src/main/java/wayoftime/bloodmagic/network/SigilHoldingPacket.java +++ /dev/null @@ -1,59 +0,0 @@ -package wayoftime.bloodmagic.network; - -import java.util.function.Supplier; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.fml.network.NetworkEvent.Context; -import wayoftime.bloodmagic.common.item.sigil.ItemSigilHolding; - -public class SigilHoldingPacket -{ - private int slot; - private int mode; - - public SigilHoldingPacket() - { - } - - public SigilHoldingPacket(int slot, int mode) - { - this.slot = slot; - this.mode = mode; - } - - public static void encode(SigilHoldingPacket pkt, PacketBuffer buf) - { - buf.writeInt(pkt.slot); - buf.writeInt(pkt.mode); - } - - public static SigilHoldingPacket decode(PacketBuffer buf) - { - SigilHoldingPacket pkt = new SigilHoldingPacket(buf.readInt(), buf.readInt()); - - return pkt; - } - - public static void handle(SigilHoldingPacket message, Supplier context) - { - context.get().enqueueWork(() -> sendKeyToServer(message, context.get().getSender())); - context.get().setPacketHandled(true); - } - - public static void sendKeyToServer(SigilHoldingPacket msg, PlayerEntity playerEntity) - { - ItemStack itemStack = ItemStack.EMPTY; - - if (msg.slot > -1 && msg.slot < 9) - { - itemStack = playerEntity.inventory.getStackInSlot(msg.slot); - } - - if (!itemStack.isEmpty()) - { - ItemSigilHolding.cycleToNextSigil(itemStack, msg.mode); - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/potion/BMPotionUtils.java b/src/main/java/wayoftime/bloodmagic/potion/BMPotionUtils.java deleted file mode 100644 index 94df642c..00000000 --- a/src/main/java/wayoftime/bloodmagic/potion/BMPotionUtils.java +++ /dev/null @@ -1,78 +0,0 @@ -package wayoftime.bloodmagic.potion; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.IGrowable; -import net.minecraft.entity.LivingEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; -import wayoftime.bloodmagic.impl.BloodMagicAPI; -import wayoftime.bloodmagic.util.DamageSourceBloodMagic; - -public class BMPotionUtils -{ - public static Random rand = new Random(); - - public static double damageMobAndGrowSurroundingPlants(LivingEntity entity, int horizontalRadius, int verticalRadius, double damageRatio, int maxPlantsGrown) - { - World world = entity.getEntityWorld(); - if (world.isRemote) - { - return 0; - } - - if (!entity.isAlive()) - { - return 0; - } - - double incurredDamage = 0; - - List growList = new ArrayList<>(); - - for (int i = 0; i < maxPlantsGrown; i++) - { - BlockPos blockPos = entity.getPosition().add(rand.nextInt(horizontalRadius * 2 + 1) - horizontalRadius, rand.nextInt(verticalRadius * 2 + 1) - verticalRadius, rand.nextInt(horizontalRadius * 2 + 1) - horizontalRadius); - BlockState state = world.getBlockState(blockPos); - - if (!BloodMagicAPI.INSTANCE.getBlacklist().getGreenGrove().contains(state)) - { - if (state.getBlock() instanceof IGrowable) - { - growList.add(blockPos); - } - } - } - - for (BlockPos blockPos : growList) - { - Block block = world.getBlockState(blockPos).getBlock(); -// if (world.rand.nextInt(50) == 0) - { - BlockState preBlockState = world.getBlockState(blockPos); - for (int n = 0; n < 10; n++) - block.randomTick(world.getBlockState(blockPos), (ServerWorld) world, blockPos, world.rand); - - BlockState newState = world.getBlockState(blockPos); - if (!newState.equals(preBlockState)) - { - world.playEvent(2005, blockPos, 0); - incurredDamage += damageRatio; - } - } - } - - if (incurredDamage > 0) - { - entity.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, (float) incurredDamage); - } - - return incurredDamage; - } - -} diff --git a/src/main/java/wayoftime/bloodmagic/potion/BloodMagicPotions.java b/src/main/java/wayoftime/bloodmagic/potion/BloodMagicPotions.java deleted file mode 100644 index eafe2fe7..00000000 --- a/src/main/java/wayoftime/bloodmagic/potion/BloodMagicPotions.java +++ /dev/null @@ -1,25 +0,0 @@ -package wayoftime.bloodmagic.potion; - -import net.minecraft.potion.Effect; -import net.minecraft.potion.EffectType; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.registries.IForgeRegistry; - -public class BloodMagicPotions -{ - public static final Effect SOUL_SNARE = new PotionSoulSnare(); - public static final Effect FIRE_FUSE = new PotionFireFuse(); - public static final Effect SOUL_FRAY = new PotionBloodMagic(EffectType.HARMFUL, 0xFFFFFFFF); - public static final Effect PLANT_LEECH = new PotionBloodMagic(EffectType.HARMFUL, 0x00FF00FF); - public static final Effect SACRIFICIAL_LAMB = new PotionBloodMagic(EffectType.HARMFUL, 0xFFFFFF); - - public static void registerPotions(RegistryEvent.Register evt) - { - IForgeRegistry reg = evt.getRegistry(); - reg.register(SOUL_SNARE.setRegistryName("soulsnare")); - reg.register(FIRE_FUSE.setRegistryName("firefuse")); - reg.register(SOUL_FRAY.setRegistryName("soulfray")); - reg.register(PLANT_LEECH.setRegistryName("plantleech")); - reg.register(SACRIFICIAL_LAMB.setRegistryName("sacrificiallamb")); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/potion/PotionBloodMagic.java b/src/main/java/wayoftime/bloodmagic/potion/PotionBloodMagic.java deleted file mode 100644 index 057c44c9..00000000 --- a/src/main/java/wayoftime/bloodmagic/potion/PotionBloodMagic.java +++ /dev/null @@ -1,12 +0,0 @@ -package wayoftime.bloodmagic.potion; - -import net.minecraft.potion.Effect; -import net.minecraft.potion.EffectType; - -public class PotionBloodMagic extends Effect -{ - public PotionBloodMagic(EffectType typeIn, int liquidColorIn) - { - super(typeIn, liquidColorIn); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/potion/PotionFireFuse.java b/src/main/java/wayoftime/bloodmagic/potion/PotionFireFuse.java deleted file mode 100644 index 639a6ed7..00000000 --- a/src/main/java/wayoftime/bloodmagic/potion/PotionFireFuse.java +++ /dev/null @@ -1,40 +0,0 @@ -package wayoftime.bloodmagic.potion; - -import java.util.Random; - -import net.minecraft.entity.LivingEntity; -import net.minecraft.particles.ParticleTypes; -import net.minecraft.potion.EffectType; -import net.minecraft.world.Explosion; - -public class PotionFireFuse extends PotionBloodMagic -{ - public PotionFireFuse() - { - super(EffectType.HARMFUL, 0xFF0000FF); - } - - @Override - public void performEffect(LivingEntity entity, int amplifier) - { - if (entity.world.isRemote) - { - return; - } - - Random random = entity.world.rand; - entity.getEntityWorld().addParticle(ParticleTypes.FLAME, entity.getPosX() - + random.nextDouble() * 0.3, entity.getPosY() - + random.nextDouble() * 0.3, entity.getPosZ() + random.nextDouble() * 0.3, 0, 0.06d, 0); - - int radius = amplifier + 1; - - if (entity.getActivePotionEffect(BloodMagicPotions.FIRE_FUSE).getDuration() <= 3) - { - Explosion.Mode explosion$mode = net.minecraftforge.event.ForgeEventFactory.getMobGriefingEvent(entity.world, entity) - ? Explosion.Mode.DESTROY - : Explosion.Mode.NONE; - entity.getEntityWorld().createExplosion(null, entity.getPosX(), entity.getPosY(), entity.getPosZ(), radius, false, explosion$mode); - } - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/potion/PotionSoulSnare.java b/src/main/java/wayoftime/bloodmagic/potion/PotionSoulSnare.java deleted file mode 100644 index 34e0cc68..00000000 --- a/src/main/java/wayoftime/bloodmagic/potion/PotionSoulSnare.java +++ /dev/null @@ -1,11 +0,0 @@ -package wayoftime.bloodmagic.potion; - -import net.minecraft.potion.EffectType; - -public class PotionSoulSnare extends PotionBloodMagic -{ - public PotionSoulSnare() - { - super(EffectType.NEUTRAL, 0xFFFFFF); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/recipe/BloodMagicRecipe.java b/src/main/java/wayoftime/bloodmagic/recipe/BloodMagicRecipe.java deleted file mode 100644 index 06555bcd..00000000 --- a/src/main/java/wayoftime/bloodmagic/recipe/BloodMagicRecipe.java +++ /dev/null @@ -1,69 +0,0 @@ -package wayoftime.bloodmagic.recipe; - -import javax.annotation.Nonnull; - -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import wayoftime.bloodmagic.recipe.helper.IgnoredIInventory; - -public abstract class BloodMagicRecipe implements IRecipe -{ - private final ResourceLocation id; - - protected BloodMagicRecipe(ResourceLocation id) - { - this.id = id; - } - - /** - * Writes this recipe to a PacketBuffer. - * - * @param buffer The buffer to write to. - */ - public abstract void write(PacketBuffer buffer); - - @Nonnull - @Override - public ResourceLocation getId() - { - return id; - } - - @Override - public boolean matches(@Nonnull IgnoredIInventory inv, @Nonnull World world) - { - return true; - } - - @Override - public boolean isDynamic() - { - // Note: If we make this non dynamic, we can make it show in vanilla's crafting - // book and also then obey the recipe locking. - // For now none of that works/makes sense in our concept so don't lock it - return true; - } - - @Nonnull - @Override - public ItemStack getCraftingResult(@Nonnull IgnoredIInventory inv) - { - return ItemStack.EMPTY; - } - - @Override - public boolean canFit(int width, int height) - { - return true; - } - - @Nonnull - @Override - public ItemStack getRecipeOutput() - { - return ItemStack.EMPTY; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/recipe/RecipeARC.java b/src/main/java/wayoftime/bloodmagic/recipe/RecipeARC.java deleted file mode 100644 index 702794eb..00000000 --- a/src/main/java/wayoftime/bloodmagic/recipe/RecipeARC.java +++ /dev/null @@ -1,182 +0,0 @@ -package wayoftime.bloodmagic.recipe; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -import javax.annotation.Nonnull; - -import net.minecraft.item.crafting.IRecipeSerializer; -import net.minecraft.item.crafting.IRecipeType; -import org.apache.commons.lang3.tuple.Pair; - -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fluids.FluidStack; -import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType; -import wayoftime.bloodmagic.common.registries.BloodMagicRecipeSerializers; -import wayoftime.bloodmagic.recipe.helper.FluidStackIngredient; - -public class RecipeARC extends BloodMagicRecipe -{ - public static final int MAX_RANDOM_OUTPUTS = 3; - - @Nonnull - private final Ingredient input; - @Nonnull - private final Ingredient arc_tool; - private final FluidStackIngredient inputFluid; - @Nonnull - private final ItemStack output; - private final FluidStack outputFluid; - private final boolean consumeIngredient; - - private final List> addedItems; - - public RecipeARC(ResourceLocation id, Ingredient input, Ingredient arc_tool, FluidStackIngredient inputFluid, ItemStack output, FluidStack outputFluid, boolean consumeIngredient) - { - this(id, input, arc_tool, inputFluid, output, new ArrayList>(), outputFluid, consumeIngredient); - } - - public RecipeARC(ResourceLocation id, Ingredient input, Ingredient arc_tool, FluidStackIngredient inputFluid, ItemStack output, List> addedItems, FluidStack outputFluid, boolean consumeIngredient) - { - super(id); - this.input = input; - this.arc_tool = arc_tool; - this.inputFluid = inputFluid; - this.output = output; - this.addedItems = addedItems; - this.outputFluid = outputFluid; - this.consumeIngredient = consumeIngredient; - } - - public RecipeARC addRandomOutput(ItemStack stack, double chance) - { - if (addedItems.size() >= MAX_RANDOM_OUTPUTS) - { - return this; - } - - addedItems.add(Pair.of(stack, chance)); - - return this; - } - - @Nonnull - public final Ingredient getInput() - { - return input; - } - - @Nonnull - public final Ingredient getTool() - { - return arc_tool; - } - - public final FluidStackIngredient getFluidIngredient() - { - return inputFluid; - } - - public final FluidStack getFluidOutput() - { - return outputFluid; - } - - @Override - public final NonNullList getIngredients() - { - NonNullList list = NonNullList.create(); - list.add(getInput()); - list.add(getTool()); - return list; - } - - public List getAllListedOutputs() - { - List list = new ArrayList(); - - list.add(output.copy()); - for (Pair pair : addedItems) - { - list.add(pair.getLeft().copy()); - } - - return list; - } - - public List getAllOutputs(Random rand) - { - List list = new ArrayList(); - - list.add(output.copy()); - for (Pair pair : addedItems) - { - if (rand.nextDouble() < pair.getRight()) - list.add(pair.getLeft().copy()); - } - - return list; - } - - public double[] getAllOutputChances() - { - int size = addedItems.size(); - - double[] chanceArray = new double[size]; - for (int i = 0; i < size; i++) - { - chanceArray[i] = addedItems.get(i).getRight(); - } - - return chanceArray; - } - - public boolean getConsumeIngredient() - { - return consumeIngredient; - } - - @Override - public void write(PacketBuffer buffer) - { - input.write(buffer); - arc_tool.write(buffer); - buffer.writeItemStack(output); - buffer.writeInt(addedItems.size()); - for (Pair pair : addedItems) - { - buffer.writeItemStack(pair.getLeft()); - buffer.writeDouble(pair.getValue()); - } - - buffer.writeBoolean(inputFluid != null); - if (inputFluid != null) - { - inputFluid.write(buffer); - } - - buffer.writeBoolean(outputFluid != null); - if (outputFluid != null) - { - outputFluid.writeToPacket(buffer); - } - buffer.writeBoolean(consumeIngredient); - } - - @Override - public IRecipeSerializer getSerializer() - { - return BloodMagicRecipeSerializers.ARC.getRecipeSerializer(); - } - - @Override - public IRecipeType getType() - { - return BloodMagicRecipeType.ARC; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/recipe/RecipeAlchemyArray.java b/src/main/java/wayoftime/bloodmagic/recipe/RecipeAlchemyArray.java deleted file mode 100644 index 0c0a92a4..00000000 --- a/src/main/java/wayoftime/bloodmagic/recipe/RecipeAlchemyArray.java +++ /dev/null @@ -1,103 +0,0 @@ -package wayoftime.bloodmagic.recipe; - -import javax.annotation.Nonnull; - -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipeSerializer; -import net.minecraft.item.crafting.IRecipeType; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; -import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType; -import wayoftime.bloodmagic.common.registries.BloodMagicRecipeSerializers; - -public class RecipeAlchemyArray extends BloodMagicRecipe -{ - private final ResourceLocation id; - private final ResourceLocation texture; - @Nonnull - private final Ingredient baseInput; - @Nonnull - private final Ingredient addedInput; - @Nonnull - private final ItemStack output; - - public RecipeAlchemyArray(ResourceLocation id, ResourceLocation texture, @Nonnull Ingredient baseIngredient, @Nonnull Ingredient addedIngredient, @Nonnull ItemStack result) - { - super(id); - this.id = id; - this.texture = texture; - this.baseInput = baseIngredient; - this.addedInput = addedIngredient; - this.output = result; - } - - @Nonnull - public final ResourceLocation getId() - { - return id; - } - - @Nonnull - public final ResourceLocation getTexture() - { - return texture; - } - - @Nonnull - public final Ingredient getBaseInput() - { - return baseInput; - } - - @Nonnull - public final Ingredient getAddedInput() - { - return addedInput; - } - - @Override - public final NonNullList getIngredients() - { - NonNullList list = NonNullList.create(); - list.add(getBaseInput()); - list.add(getAddedInput()); - return list; - } - - @Nonnull - public final ItemStack getOutput() - { - return output; - } - - @Override - public void write(PacketBuffer buffer) - { - if (texture != null) - { - buffer.writeBoolean(true); - buffer.writeResourceLocation(texture); - } else - { - buffer.writeBoolean(false); - } - - baseInput.write(buffer); - addedInput.write(buffer); - buffer.writeItemStack(output); - } - - @Override - public IRecipeSerializer getSerializer() - { - return BloodMagicRecipeSerializers.ARRAY.getRecipeSerializer(); - } - - @Override - public IRecipeType getType() - { - return BloodMagicRecipeType.ARRAY; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/recipe/RecipeAlchemyTable.java b/src/main/java/wayoftime/bloodmagic/recipe/RecipeAlchemyTable.java deleted file mode 100644 index 96306e2f..00000000 --- a/src/main/java/wayoftime/bloodmagic/recipe/RecipeAlchemyTable.java +++ /dev/null @@ -1,102 +0,0 @@ -package wayoftime.bloodmagic.recipe; - -import java.util.List; - -import javax.annotation.Nonnegative; -import javax.annotation.Nonnull; - -import com.google.common.base.Preconditions; - -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipeSerializer; -import net.minecraft.item.crafting.IRecipeType; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.ResourceLocation; -import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType; -import wayoftime.bloodmagic.common.registries.BloodMagicRecipeSerializers; - -public class RecipeAlchemyTable extends BloodMagicRecipe -{ - @Nonnull - private final List input; - @Nonnull - private final ItemStack output; - @Nonnegative - private final int syphon; - @Nonnegative - private final int ticks; - @Nonnegative - private final int minimumTier; - - public static final int MAX_INPUTS = 6; - - public RecipeAlchemyTable(ResourceLocation id, List input, @Nonnull ItemStack output, int syphon, int ticks, int minimumTier) - { - super(id); - Preconditions.checkNotNull(input, "input cannot be null."); - Preconditions.checkNotNull(output, "output cannot be null."); - Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); - Preconditions.checkArgument(ticks >= 0, "ticks cannot be negative."); - Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative."); - - this.input = input; - this.output = output; - this.syphon = syphon; - this.ticks = ticks; - this.minimumTier = minimumTier; - } - - @Nonnull - public final List getInput() - { - return input; - } - - @Nonnull - public final ItemStack getOutput() - { - return output; - } - - public final int getSyphon() - { - return syphon; - } - - public final int getTicks() - { - return ticks; - } - - public final int getMinimumTier() - { - return minimumTier; - } - - @Override - public void write(PacketBuffer buffer) - { - buffer.writeInt(input.size()); - for (int i = 0; i < input.size(); i++) - { - input.get(i).write(buffer); - } - buffer.writeItemStack(output); - buffer.writeInt(syphon); - buffer.writeInt(ticks); - buffer.writeInt(minimumTier); - } - - @Override - public IRecipeSerializer getSerializer() - { - return BloodMagicRecipeSerializers.ALCHEMYTABLE.getRecipeSerializer(); - } - - @Override - public IRecipeType getType() - { - return BloodMagicRecipeType.ALCHEMYTABLE; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/recipe/RecipeBloodAltar.java b/src/main/java/wayoftime/bloodmagic/recipe/RecipeBloodAltar.java deleted file mode 100644 index 1633e130..00000000 --- a/src/main/java/wayoftime/bloodmagic/recipe/RecipeBloodAltar.java +++ /dev/null @@ -1,117 +0,0 @@ -package wayoftime.bloodmagic.recipe; - -import javax.annotation.Nonnegative; -import javax.annotation.Nonnull; - -import com.google.common.base.Preconditions; - -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipeSerializer; -import net.minecraft.item.crafting.IRecipeType; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; -import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType; -import wayoftime.bloodmagic.common.registries.BloodMagicRecipeSerializers; - -public class RecipeBloodAltar extends BloodMagicRecipe -{ - @Nonnull - private final Ingredient input; - @Nonnull - private final ItemStack output; - @Nonnull - private final int minimumTier; - @Nonnegative - private final int syphon; - @Nonnegative - private final int consumeRate; - @Nonnegative - private final int drainRate; - - public RecipeBloodAltar(ResourceLocation id, @Nonnull Ingredient input, @Nonnull ItemStack output, @Nonnegative int minimumTier, @Nonnegative int syphon, @Nonnegative int consumeRate, @Nonnegative int drainRate) - { - super(id); - Preconditions.checkNotNull(input, "input cannot be null."); - Preconditions.checkNotNull(output, "output cannot be null."); - Preconditions.checkArgument(minimumTier >= 0, "minimumTier cannot be negative."); - Preconditions.checkArgument(minimumTier <= 6, "minimumTier cannot be higher than max tier"); - Preconditions.checkArgument(syphon >= 0, "syphon cannot be negative."); - Preconditions.checkArgument(consumeRate >= 0, "consumeRate cannot be negative."); - Preconditions.checkArgument(drainRate >= 0, "drain cannot be negative."); - - this.input = input; - this.output = output; - this.minimumTier = minimumTier; - this.syphon = syphon; - this.consumeRate = consumeRate; - this.drainRate = drainRate; - } - - @Nonnull - public final Ingredient getInput() - { - return input; - } - - @Override - public final NonNullList getIngredients() - { - NonNullList list = NonNullList.create(); - list.add(getInput()); - return list; - } - - @Nonnull - public final ItemStack getOutput() - { - return output; - } - - public int getMinimumTier() - { - return minimumTier; - } - - @Nonnegative - public final int getSyphon() - { - return syphon; - } - - @Nonnegative - public final int getConsumeRate() - { - return consumeRate; - } - - @Nonnegative - public final int getDrainRate() - { - return drainRate; - } - - @Override - public void write(PacketBuffer buffer) - { - input.write(buffer); - buffer.writeItemStack(output); - buffer.writeInt(minimumTier); - buffer.writeInt(syphon); - buffer.writeInt(consumeRate); - buffer.writeInt(drainRate); - } - - @Override - public IRecipeSerializer getSerializer() - { - return BloodMagicRecipeSerializers.ALTAR.getRecipeSerializer(); - } - - @Override - public IRecipeType getType() - { - return BloodMagicRecipeType.ALTAR; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/recipe/RecipeTartaricForge.java b/src/main/java/wayoftime/bloodmagic/recipe/RecipeTartaricForge.java deleted file mode 100644 index 6fb61f2b..00000000 --- a/src/main/java/wayoftime/bloodmagic/recipe/RecipeTartaricForge.java +++ /dev/null @@ -1,92 +0,0 @@ -package wayoftime.bloodmagic.recipe; - -import java.util.List; - -import javax.annotation.Nonnegative; -import javax.annotation.Nonnull; - -import com.google.common.base.Preconditions; - -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipeSerializer; -import net.minecraft.item.crafting.IRecipeType; -import net.minecraft.item.crafting.Ingredient; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.ResourceLocation; -import wayoftime.bloodmagic.common.recipe.BloodMagicRecipeType; -import wayoftime.bloodmagic.common.registries.BloodMagicRecipeSerializers; - -public class RecipeTartaricForge extends BloodMagicRecipe -{ - @Nonnull - private final List input; - @Nonnull - private final ItemStack output; - @Nonnegative - private final double minimumSouls; - @Nonnegative - private final double soulDrain; - - public RecipeTartaricForge(ResourceLocation id, @Nonnull List input, @Nonnull ItemStack output, @Nonnegative double minimumSouls, @Nonnegative double soulDrain) - { - super(id); - Preconditions.checkNotNull(input, "input cannot be null."); - Preconditions.checkNotNull(output, "output cannot be null."); - Preconditions.checkArgument(minimumSouls >= 0, "minimumSouls cannot be negative."); - Preconditions.checkArgument(soulDrain >= 0, "soulDrain cannot be negative."); - - this.input = input; - this.output = output; - this.minimumSouls = minimumSouls; - this.soulDrain = soulDrain; - } - - @Nonnull - public final List getInput() - { - return input; - } - - @Nonnull - public final ItemStack getOutput() - { - return output; - } - - @Nonnegative - public final double getMinimumSouls() - { - return minimumSouls; - } - - @Nonnegative - public final double getSoulDrain() - { - return soulDrain; - } - - @Override - public void write(PacketBuffer buffer) - { - buffer.writeInt(input.size()); - for (int i = 0; i < input.size(); i++) - { - input.get(i).write(buffer); - } - buffer.writeItemStack(output); - buffer.writeDouble(minimumSouls); - buffer.writeDouble(soulDrain); - } - - @Override - public IRecipeSerializer getSerializer() - { - return BloodMagicRecipeSerializers.TARTARIC.getRecipeSerializer(); - } - - @Override - public IRecipeType getType() - { - return BloodMagicRecipeType.TARTARICFORGE; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/recipe/helper/FluidStackIngredient.java b/src/main/java/wayoftime/bloodmagic/recipe/helper/FluidStackIngredient.java deleted file mode 100644 index 16bf4a28..00000000 --- a/src/main/java/wayoftime/bloodmagic/recipe/helper/FluidStackIngredient.java +++ /dev/null @@ -1,384 +0,0 @@ -package wayoftime.bloodmagic.recipe.helper; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Objects; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; -import com.google.gson.JsonSyntaxException; - -import net.minecraft.fluid.Fluid; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tags.FluidTags; -import net.minecraft.tags.ITag; -import net.minecraft.tags.TagCollectionManager; -import net.minecraft.util.JSONUtils; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fluids.FluidStack; -import wayoftime.bloodmagic.util.Constants; - -/** - * Created by Thiakil on 12/07/2019. - */ -public abstract class FluidStackIngredient implements InputIngredient -{ - - public static FluidStackIngredient from(@Nonnull Fluid instance, int amount) - { - return from(new FluidStack(instance, amount)); - } - - public static FluidStackIngredient from(@Nonnull FluidStack instance) - { - return new Single(instance); - } - - public static FluidStackIngredient from(@Nonnull ITag fluidTag, int minAmount) - { - return new Tagged(fluidTag, minAmount); - } - - public static FluidStackIngredient read(PacketBuffer buffer) - { - // TODO: Allow supporting serialization of different types than just the ones we - // implement? - IngredientType type = buffer.readEnumValue(IngredientType.class); - if (type == IngredientType.SINGLE) - { - return Single.read(buffer); - } else if (type == IngredientType.TAGGED) - { - return Tagged.read(buffer); - } - return Multi.read(buffer); - } - - public static FluidStackIngredient deserialize(@Nullable JsonElement json) - { - if (json == null || json.isJsonNull()) - { - throw new JsonSyntaxException("Ingredient cannot be null"); - } - if (json.isJsonArray()) - { - JsonArray jsonArray = json.getAsJsonArray(); - int size = jsonArray.size(); - if (size == 0) - { - throw new JsonSyntaxException("Ingredient array cannot be empty, at least one ingredient must be defined"); - } else if (size > 1) - { - FluidStackIngredient[] ingredients = new FluidStackIngredient[size]; - for (int i = 0; i < size; i++) - { - // Read all the ingredients - ingredients[i] = deserialize(jsonArray.get(i)); - } - return createMulti(ingredients); - } - // If we only have a single element, just set our json as that so that we don't - // have to use Multi for efficiency reasons - json = jsonArray.get(0); - } - if (!json.isJsonObject()) - { - throw new JsonSyntaxException("Expected fluid to be object or array of objects"); - } - JsonObject jsonObject = json.getAsJsonObject(); - if (jsonObject.has(Constants.JSON.FLUID) && jsonObject.has(Constants.JSON.TAG)) - { - throw new JsonParseException("An ingredient entry is either a tag or an fluid, not both"); - } else if (jsonObject.has(Constants.JSON.FLUID)) - { - return from(SerializerHelper.deserializeFluid(jsonObject)); - } else if (jsonObject.has(Constants.JSON.TAG)) - { - if (!jsonObject.has(Constants.JSON.AMOUNT)) - { - throw new JsonSyntaxException("Expected to receive a amount that is greater than zero"); - } - JsonElement count = jsonObject.get(Constants.JSON.AMOUNT); - if (!JSONUtils.isNumber(count)) - { - throw new JsonSyntaxException("Expected amount to be a number greater than zero."); - } - int amount = count.getAsJsonPrimitive().getAsInt(); - if (amount < 1) - { - throw new JsonSyntaxException("Expected amount to be greater than zero."); - } - ResourceLocation resourceLocation = new ResourceLocation(JSONUtils.getString(jsonObject, Constants.JSON.TAG)); - ITag tag = TagCollectionManager.getManager().getFluidTags().get(resourceLocation); - if (tag == null) - { - throw new JsonSyntaxException("Unknown fluid tag '" + resourceLocation + "'"); - } - return from(tag, amount); - } - throw new JsonSyntaxException("Expected to receive a resource location representing either a tag or a fluid."); - } - - public static FluidStackIngredient createMulti(FluidStackIngredient... ingredients) - { - if (ingredients.length == 0) - { - // TODO: Throw error - } else if (ingredients.length == 1) - { - return ingredients[0]; - } - List cleanedIngredients = new ArrayList<>(); - for (FluidStackIngredient ingredient : ingredients) - { - if (ingredient instanceof Multi) - { - // Don't worry about if our inner ingredients are multi as well, as if this is - // the only external method for - // creating a multi ingredient, then we are certified they won't be of a higher - // depth - cleanedIngredients.addAll(Arrays.asList(((Multi) ingredient).ingredients)); - } else - { - cleanedIngredients.add(ingredient); - } - } - // There should be more than a single fluid or we would have split out earlier - return new Multi(cleanedIngredients.toArray(new FluidStackIngredient[0])); - } - - public static class Single extends FluidStackIngredient - { - - @Nonnull - private final FluidStack fluidInstance; - - public Single(@Nonnull FluidStack fluidInstance) - { - this.fluidInstance = Objects.requireNonNull(fluidInstance); - } - - @Override - public boolean test(@Nonnull FluidStack fluidStack) - { - return testType(fluidStack) && fluidStack.getAmount() >= fluidInstance.getAmount(); - } - - @Override - public boolean testType(@Nonnull FluidStack fluidStack) - { - return Objects.requireNonNull(fluidStack).isFluidEqual(fluidInstance); - } - - @Nonnull - @Override - public FluidStack getMatchingInstance(@Nonnull FluidStack fluidStack) - { - return test(fluidStack) ? fluidInstance : FluidStack.EMPTY; - } - - @Nonnull - @Override - public List getRepresentations() - { - return Collections.singletonList(fluidInstance); - } - - @Override - public void write(PacketBuffer buffer) - { - buffer.writeEnumValue(IngredientType.SINGLE); - fluidInstance.writeToPacket(buffer); - } - - @Nonnull - @Override - public JsonElement serialize() - { - JsonObject json = new JsonObject(); - json.addProperty(Constants.JSON.AMOUNT, fluidInstance.getAmount()); - json.addProperty(Constants.JSON.FLUID, fluidInstance.getFluid().getRegistryName().toString()); - if (fluidInstance.hasTag()) - { - json.addProperty(Constants.JSON.NBT, fluidInstance.getTag().toString()); - } - return json; - } - - public static Single read(PacketBuffer buffer) - { - return new Single(FluidStack.readFromPacket(buffer)); - } - } - - public static class Tagged extends FluidStackIngredient - { - - @Nonnull - private final ITag tag; - private final int amount; - - public Tagged(@Nonnull ITag tag, int amount) - { - this.tag = tag; - this.amount = amount; - } - - @Override - public boolean test(@Nonnull FluidStack fluidStack) - { - return testType(fluidStack) && fluidStack.getAmount() >= amount; - } - - @Override - public boolean testType(@Nonnull FluidStack fluidStack) - { - return Objects.requireNonNull(fluidStack).getFluid().isIn(tag); - } - - @Nonnull - @Override - public FluidStack getMatchingInstance(@Nonnull FluidStack fluidStack) - { - if (test(fluidStack)) - { - // Our fluid is in the tag so we make a new stack with the given amount - return new FluidStack(fluidStack, amount); - } - return FluidStack.EMPTY; - } - - @Nonnull - @Override - public List getRepresentations() - { - // TODO: Can this be cached some how - List representations = new ArrayList<>(); - for (Fluid fluid : TagResolverHelper.getRepresentations(tag)) - { - representations.add(new FluidStack(fluid, amount)); - } - return representations; - } - - @Override - public void write(PacketBuffer buffer) - { - buffer.writeEnumValue(IngredientType.TAGGED); - buffer.writeResourceLocation(TagCollectionManager.getManager().getFluidTags().getValidatedIdFromTag(tag)); - buffer.writeVarInt(amount); - } - - @Nonnull - @Override - public JsonElement serialize() - { - JsonObject json = new JsonObject(); - json.addProperty(Constants.JSON.AMOUNT, amount); - json.addProperty(Constants.JSON.TAG, TagCollectionManager.getManager().getFluidTags().getValidatedIdFromTag(tag).toString()); - return json; - } - - public static Tagged read(PacketBuffer buffer) - { - return new Tagged(FluidTags.makeWrapperTag(buffer.readResourceLocation().toString()), buffer.readVarInt()); - } - } - - public static class Multi extends FluidStackIngredient - { - - private final FluidStackIngredient[] ingredients; - - protected Multi(@Nonnull FluidStackIngredient... ingredients) - { - this.ingredients = ingredients; - } - - @Override - public boolean test(@Nonnull FluidStack stack) - { - return Arrays.stream(ingredients).anyMatch(ingredient -> ingredient.test(stack)); - } - - @Override - public boolean testType(@Nonnull FluidStack stack) - { - return Arrays.stream(ingredients).anyMatch(ingredient -> ingredient.testType(stack)); - } - - @Nonnull - @Override - public FluidStack getMatchingInstance(@Nonnull FluidStack stack) - { - for (FluidStackIngredient ingredient : ingredients) - { - FluidStack matchingInstance = ingredient.getMatchingInstance(stack); - if (!matchingInstance.isEmpty()) - { - return matchingInstance; - } - } - return FluidStack.EMPTY; - } - - @Nonnull - @Override - public List getRepresentations() - { - List representations = new ArrayList<>(); - for (FluidStackIngredient ingredient : ingredients) - { - representations.addAll(ingredient.getRepresentations()); - } - return representations; - } - - @Override - public void write(PacketBuffer buffer) - { - buffer.writeEnumValue(IngredientType.MULTI); - buffer.writeVarInt(ingredients.length); - for (FluidStackIngredient ingredient : ingredients) - { - ingredient.write(buffer); - } - } - - @Nonnull - @Override - public JsonElement serialize() - { - JsonArray json = new JsonArray(); - for (FluidStackIngredient ingredient : ingredients) - { - json.add(ingredient.serialize()); - } - return json; - } - - public static FluidStackIngredient read(PacketBuffer buffer) - { - FluidStackIngredient[] ingredients = new FluidStackIngredient[buffer.readVarInt()]; - for (int i = 0; i < ingredients.length; i++) - { - ingredients[i] = FluidStackIngredient.read(buffer); - } - return createMulti(ingredients); - } - } - - private enum IngredientType - { - SINGLE, - TAGGED, - MULTI - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/recipe/helper/IgnoredIInventory.java b/src/main/java/wayoftime/bloodmagic/recipe/helper/IgnoredIInventory.java deleted file mode 100644 index be062c29..00000000 --- a/src/main/java/wayoftime/bloodmagic/recipe/helper/IgnoredIInventory.java +++ /dev/null @@ -1,67 +0,0 @@ -package wayoftime.bloodmagic.recipe.helper; - -import javax.annotation.Nonnull; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; - -public final class IgnoredIInventory implements IInventory -{ - public static final IgnoredIInventory INSTANCE = new IgnoredIInventory(); - - private IgnoredIInventory() - { - } - - @Override - public int getSizeInventory() - { - return 0; - } - - @Override - public boolean isEmpty() - { - return true; - } - - @Override - public ItemStack getStackInSlot(int index) - { - return ItemStack.EMPTY; - } - - @Override - public ItemStack decrStackSize(int index, int count) - { - return ItemStack.EMPTY; - } - - @Override - public ItemStack removeStackFromSlot(int index) - { - return ItemStack.EMPTY; - } - - @Override - public void setInventorySlotContents(int index, @Nonnull ItemStack stack) - { - } - - @Override - public void markDirty() - { - } - - @Override - public boolean isUsableByPlayer(@Nonnull PlayerEntity player) - { - return false; - } - - @Override - public void clear() - { - } -} diff --git a/src/main/java/wayoftime/bloodmagic/recipe/helper/InputIngredient.java b/src/main/java/wayoftime/bloodmagic/recipe/helper/InputIngredient.java deleted file mode 100644 index 366e712d..00000000 --- a/src/main/java/wayoftime/bloodmagic/recipe/helper/InputIngredient.java +++ /dev/null @@ -1,52 +0,0 @@ -package wayoftime.bloodmagic.recipe.helper; - -import java.util.List; -import java.util.function.Predicate; - -import javax.annotation.Nonnull; - -import com.google.gson.JsonElement; - -import net.minecraft.network.PacketBuffer; - -public interface InputIngredient extends Predicate -{ - - /** - * Evaluates this predicate on the given argument, ignoring any size data. - * - * @param type the input argument - * - * @return {@code true} if the input argument matches the predicate, otherwise - * {@code false} - */ - boolean testType(@Nonnull TYPE type); - - TYPE getMatchingInstance(TYPE type); - - /** - * Primarily for JEI, a list of valid instances of the type - * - * @return List (empty means no valid registrations found and recipe is to be - * hidden) - * - * @apiNote Do not modify any of the values returned by the representations - */ - @Nonnull - List getRepresentations(); - - /** - * Writes this ingredient to a PacketBuffer. - * - * @param buffer The buffer to write to. - */ - void write(PacketBuffer buffer); - - /** - * Serializes this ingredient to a JsonElement - * - * @return JsonElement representation of this ingredient. - */ - @Nonnull - JsonElement serialize(); -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/recipe/helper/SerializerHelper.java b/src/main/java/wayoftime/bloodmagic/recipe/helper/SerializerHelper.java deleted file mode 100644 index da325df7..00000000 --- a/src/main/java/wayoftime/bloodmagic/recipe/helper/SerializerHelper.java +++ /dev/null @@ -1,129 +0,0 @@ -package wayoftime.bloodmagic.recipe.helper; - -import javax.annotation.Nonnull; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonSyntaxException; -import com.mojang.brigadier.exceptions.CommandSyntaxException; - -import net.minecraft.fluid.Fluid; -import net.minecraft.fluid.Fluids; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.ShapedRecipe; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.JsonToNBT; -import net.minecraft.util.JSONUtils; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.registries.ForgeRegistries; -import wayoftime.bloodmagic.util.Constants; - -/** - * Copied liberally from Mekanism. Thanks, pupnewfster! - * - */ -public class SerializerHelper -{ - private SerializerHelper() - { - } - - private static final Gson GSON = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create(); - - private static void validateKey(@Nonnull JsonObject json, @Nonnull String key) - { - if (!json.has(key)) - { - throw new JsonSyntaxException("Missing '" + key + "', expected to find an object"); - } - if (!json.get(key).isJsonObject()) - { - throw new JsonSyntaxException("Expected '" + key + "' to be an object"); - } - } - - public static ItemStack getItemStack(@Nonnull JsonObject json, @Nonnull String key) - { - validateKey(json, key); - return ShapedRecipe.deserializeItem(JSONUtils.getJsonObject(json, key)); - } - - public static JsonElement serializeItemStack(@Nonnull ItemStack stack) - { - JsonObject json = new JsonObject(); - json.addProperty(Constants.JSON.ITEM, stack.getItem().getRegistryName().toString()); - if (stack.getCount() > 1) - { - json.addProperty(Constants.JSON.COUNT, stack.getCount()); - } - if (stack.hasTag()) - { - json.addProperty(Constants.JSON.NBT, stack.getTag().toString()); - } - return json; - } - - public static FluidStack getFluidStack(@Nonnull JsonObject json, @Nonnull String key) - { - validateKey(json, key); - return deserializeFluid(JSONUtils.getJsonObject(json, key)); - } - - public static FluidStack deserializeFluid(@Nonnull JsonObject json) - { - if (!json.has(Constants.JSON.AMOUNT)) - { - throw new JsonSyntaxException("Expected to receive a amount that is greater than zero"); - } - JsonElement count = json.get(Constants.JSON.AMOUNT); - if (!JSONUtils.isNumber(count)) - { - throw new JsonSyntaxException("Expected amount to be a number greater than zero."); - } - int amount = count.getAsJsonPrimitive().getAsInt(); - if (amount < 1) - { - throw new JsonSyntaxException("Expected amount to be greater than zero."); - } - ResourceLocation resourceLocation = new ResourceLocation(JSONUtils.getString(json, Constants.JSON.FLUID)); - Fluid fluid = ForgeRegistries.FLUIDS.getValue(resourceLocation); - if (fluid == null || fluid == Fluids.EMPTY) - { - throw new JsonSyntaxException("Invalid fluid type '" + resourceLocation + "'"); - } - CompoundNBT nbt = null; - if (json.has(Constants.JSON.NBT)) - { - JsonElement jsonNBT = json.get(Constants.JSON.NBT); - try - { - if (jsonNBT.isJsonObject()) - { - nbt = JsonToNBT.getTagFromJson(GSON.toJson(jsonNBT)); - } else - { - nbt = JsonToNBT.getTagFromJson(JSONUtils.getString(jsonNBT, Constants.JSON.NBT)); - } - } catch (CommandSyntaxException e) - { - throw new JsonSyntaxException("Invalid NBT entry for fluid '" + resourceLocation + "'"); - } - } - return new FluidStack(fluid, amount, nbt); - } - - public static JsonElement serializeFluidStack(@Nonnull FluidStack stack) - { - JsonObject json = new JsonObject(); - json.addProperty(Constants.JSON.FLUID, stack.getFluid().getRegistryName().toString()); - json.addProperty(Constants.JSON.AMOUNT, stack.getAmount()); - if (stack.hasTag()) - { - json.addProperty(Constants.JSON.NBT, stack.getTag().toString()); - } - return json; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/recipe/helper/TagResolverHelper.java b/src/main/java/wayoftime/bloodmagic/recipe/helper/TagResolverHelper.java deleted file mode 100644 index 02a5eaac..00000000 --- a/src/main/java/wayoftime/bloodmagic/recipe/helper/TagResolverHelper.java +++ /dev/null @@ -1,32 +0,0 @@ -package wayoftime.bloodmagic.recipe.helper; - -import java.util.Collections; -import java.util.List; - -import net.minecraft.tags.ITag; - -/** - * Copied from Mekanism, including the author's rant about tags. - */ -public class TagResolverHelper -{ - - public static List getRepresentations(ITag tag) - { - try - { - return tag.getAllElements(); - } catch (IllegalStateException e) - { - // Why do tags have to be such an annoyance in 1.16 - // This is needed so that we can ensure we give JEI an empty list of - // representations - // instead of crashing on the first run, as recipes get "initialized" before - // tags are - // done initializing, and we don't want to spam the log with errors. JEI and - // things - // still work fine regardless of this - return Collections.emptyList(); - } - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/ritual/AreaDescriptor.java b/src/main/java/wayoftime/bloodmagic/ritual/AreaDescriptor.java deleted file mode 100644 index b37eeb80..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/AreaDescriptor.java +++ /dev/null @@ -1,654 +0,0 @@ -package wayoftime.bloodmagic.ritual; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.gen.feature.template.PlacementSettings; -import net.minecraft.world.gen.feature.template.Template; -import wayoftime.bloodmagic.util.Constants; - -public abstract class AreaDescriptor implements Iterator -{ - public List getContainedPositions(BlockPos pos) - { - return new ArrayList<>(); - } - - public AxisAlignedBB getAABB(BlockPos pos) - { - return null; - } - - public abstract void resetCache(); - - public abstract boolean isWithinArea(BlockPos pos); - - public abstract void resetIterator(); - - public void readFromNBT(CompoundNBT tag) - { - - } - - public void writeToNBT(CompoundNBT tag) - { - - } - - public abstract AreaDescriptor copy(); - - public abstract int getVolumeForOffsets(BlockPos offset1, BlockPos offset2); - - public abstract boolean isWithinRange(BlockPos offset1, BlockPos offset2, int verticalLimit, int horizontalLimit); - - public abstract int getVolume(); - - public abstract int getHeight(); - - public abstract boolean isWithinRange(int verticalLimit, int horizontalLimit); - - /** - * This method changes the area descriptor so that its range matches the two - * blocks that are selected. When implementing this method, assume that these - * positions are the blocks that are clicked by the player. - * - * @param pos1 - * @param pos2 - */ - public abstract void modifyAreaByBlockPositions(BlockPos pos1, BlockPos pos2); - - public abstract boolean intersects(AreaDescriptor descriptor); - - public abstract AreaDescriptor offset(BlockPos offset); - - public abstract AreaDescriptor rotateDescriptor(PlacementSettings settings); - - public static class Rectangle extends AreaDescriptor - { - protected BlockPos minimumOffset; - protected BlockPos maximumOffset; // Non-inclusive maximum offset. - private BlockPos currentPosition; - - private ArrayList blockPosCache; - private BlockPos cachedPosition; - - private boolean cache = true; - - /** - * This constructor takes in the minimum and maximum BlockPos. The maximum - * offset is non-inclusive, meaning if you pass in (0,0,0) and (1,1,1), calling - * getContainedPositions() will only give (0,0,0). - * - * @param minimumOffset - - * @param maximumOffset - - */ - public Rectangle(BlockPos minimumOffset, BlockPos maximumOffset) - { - setOffsets(minimumOffset, maximumOffset); - } - - public Rectangle(BlockPos minimumOffset, int sizeX, int sizeY, int sizeZ) - { - this(minimumOffset, minimumOffset.add(sizeX, sizeY, sizeZ)); - } - - public Rectangle(BlockPos minimumOffset, int size) - { - this(minimumOffset, size, size, size); - } - - public Rectangle(AreaDescriptor.Rectangle rectangle) - { - this(rectangle.minimumOffset, rectangle.maximumOffset); - } - - public AreaDescriptor.Rectangle copy() - { - return new AreaDescriptor.Rectangle(this); - } - - @Override - public List getContainedPositions(BlockPos pos) - { - if (!cache || !pos.equals(cachedPosition) || blockPosCache.isEmpty()) - { - ArrayList posList = new ArrayList<>(); - - for (int j = minimumOffset.getY(); j < maximumOffset.getY(); j++) - { - for (int i = minimumOffset.getX(); i < maximumOffset.getX(); i++) - { - for (int k = minimumOffset.getZ(); k < maximumOffset.getZ(); k++) - { - posList.add(pos.add(i, j, k)); - } - } - } - - blockPosCache = posList; - cachedPosition = pos; - } - - return Collections.unmodifiableList(blockPosCache); - } - - @Override - public AxisAlignedBB getAABB(BlockPos pos) - { - AxisAlignedBB tempAABB = new AxisAlignedBB(minimumOffset, maximumOffset); - return tempAABB.offset(pos.getX(), pos.getY(), pos.getZ()); - } - - @Override - public int getHeight() - { - return this.maximumOffset.getY() - this.minimumOffset.getY(); - } - - public BlockPos getMinimumOffset() - { - return minimumOffset; - } - - public BlockPos getMaximumOffset() - { - return maximumOffset; - } - - /** - * Sets the offsets of the AreaDescriptor in a safe way that will make - * minimumOffset the lowest corner - * - * @param offset1 - - * @param offset2 - - */ - public void setOffsets(BlockPos offset1, BlockPos offset2) - { - this.minimumOffset = new BlockPos(Math.min(offset1.getX(), offset2.getX()), Math.min(offset1.getY(), offset2.getY()), Math.min(offset1.getZ(), offset2.getZ())); - this.maximumOffset = new BlockPos(Math.max(offset1.getX(), offset2.getX()), Math.max(offset1.getY(), offset2.getY()), Math.max(offset1.getZ(), offset2.getZ())); - blockPosCache = new ArrayList<>(); - } - - @Override - public void resetCache() - { - this.blockPosCache = new ArrayList<>(); - } - - @Override - public boolean isWithinArea(BlockPos pos) - { - int x = pos.getX(); - int y = pos.getY(); - int z = pos.getZ(); - - return x >= minimumOffset.getX() && x < maximumOffset.getX() && y >= minimumOffset.getY() - && y < maximumOffset.getY() && z >= minimumOffset.getZ() && z < maximumOffset.getZ(); - } - - @Override - public boolean hasNext() - { - return currentPosition == null || !(currentPosition.getX() + 1 == maximumOffset.getX() - && currentPosition.getY() + 1 == maximumOffset.getY() - && currentPosition.getZ() + 1 == maximumOffset.getZ()); - } - - @Override - public BlockPos next() - { - if (currentPosition != null) - { - int nextX = currentPosition.getX() + 1 >= maximumOffset.getX() ? minimumOffset.getX() - : currentPosition.getX() + 1; - int nextZ = nextX != minimumOffset.getX() ? currentPosition.getZ() - : (currentPosition.getZ() + 1 >= maximumOffset.getZ() ? minimumOffset.getZ() - : currentPosition.getZ() + 1); - int nextY = (nextZ != minimumOffset.getZ() || nextX != minimumOffset.getX()) ? currentPosition.getY() - : (currentPosition.getY() + 1); - currentPosition = new BlockPos(nextX, nextY, nextZ); - } else - { - currentPosition = minimumOffset; - } - - return currentPosition; - } - - @Override - public void remove() - { - - } - - @Override - public void resetIterator() - { - currentPosition = null; - } - - @Override - public void modifyAreaByBlockPositions(BlockPos pos1, BlockPos pos2) - { - setOffsets(pos1, pos2); - maximumOffset = maximumOffset.add(1, 1, 1); - resetIterator(); - resetCache(); - } - - @Override - public void readFromNBT(CompoundNBT tag) - { - minimumOffset = new BlockPos(tag.getInt(Constants.NBT.X_COORD + "min"), tag.getInt(Constants.NBT.Y_COORD + "min"), tag.getInt(Constants.NBT.Z_COORD + "min")); - maximumOffset = new BlockPos(tag.getInt(Constants.NBT.X_COORD + "max"), tag.getInt(Constants.NBT.Y_COORD + "max"), tag.getInt(Constants.NBT.Z_COORD + "max")); - } - - @Override - public void writeToNBT(CompoundNBT tag) - { - tag.putInt(Constants.NBT.X_COORD + "min", minimumOffset.getX()); - tag.putInt(Constants.NBT.Y_COORD + "min", minimumOffset.getY()); - tag.putInt(Constants.NBT.Z_COORD + "min", minimumOffset.getZ()); - tag.putInt(Constants.NBT.X_COORD + "max", maximumOffset.getX()); - tag.putInt(Constants.NBT.Y_COORD + "max", maximumOffset.getY()); - tag.putInt(Constants.NBT.Z_COORD + "max", maximumOffset.getZ()); - } - - @Override - public int getVolumeForOffsets(BlockPos offset1, BlockPos offset2) - { - BlockPos minPos = new BlockPos(Math.min(offset1.getX(), offset2.getX()), Math.min(offset1.getY(), offset2.getY()), Math.min(offset1.getZ(), offset2.getZ())); - BlockPos maxPos = new BlockPos(Math.max(offset1.getX(), offset2.getX()), Math.max(offset1.getY(), offset2.getY()), Math.max(offset1.getZ(), offset2.getZ())); - - maxPos = maxPos.add(1, 1, 1); - - return (maxPos.getX() - minPos.getX()) * (maxPos.getY() - minPos.getY()) * (maxPos.getZ() - minPos.getZ()); - } - - @Override - public boolean isWithinRange(BlockPos offset1, BlockPos offset2, int verticalLimit, int horizontalLimit) - { - BlockPos minPos = new BlockPos(Math.min(offset1.getX(), offset2.getX()), Math.min(offset1.getY(), offset2.getY()), Math.min(offset1.getZ(), offset2.getZ())); - BlockPos maxPos = new BlockPos(Math.max(offset1.getX(), offset2.getX()), Math.max(offset1.getY(), offset2.getY()), Math.max(offset1.getZ(), offset2.getZ())); - - return minPos.getY() >= -verticalLimit && maxPos.getY() <= verticalLimit - && minPos.getX() >= -horizontalLimit && maxPos.getX() <= horizontalLimit - && minPos.getZ() >= -horizontalLimit && maxPos.getZ() <= horizontalLimit; - } - - @Override - public int getVolume() - { - return (maximumOffset.getX() - minimumOffset.getX()) * (maximumOffset.getY() - minimumOffset.getY()) - * (maximumOffset.getZ() - minimumOffset.getZ()); - } - - @Override - public boolean isWithinRange(int verticalLimit, int horizontalLimit) - { - return minimumOffset.getY() >= -verticalLimit && maximumOffset.getY() <= verticalLimit + 1 - && minimumOffset.getX() >= -horizontalLimit && maximumOffset.getX() <= horizontalLimit + 1 - && minimumOffset.getZ() >= -horizontalLimit && maximumOffset.getZ() <= horizontalLimit + 1; - } - - @Override - public boolean intersects(AreaDescriptor descriptor) - { - if (descriptor instanceof AreaDescriptor.Rectangle) - { - AreaDescriptor.Rectangle rectangle = (AreaDescriptor.Rectangle) descriptor; - - return !(minimumOffset.getX() >= rectangle.maximumOffset.getX() - || minimumOffset.getY() >= rectangle.maximumOffset.getY() - || minimumOffset.getZ() >= rectangle.maximumOffset.getZ() - || rectangle.minimumOffset.getX() >= maximumOffset.getX() - || rectangle.minimumOffset.getY() >= maximumOffset.getY() - || rectangle.minimumOffset.getZ() >= maximumOffset.getZ()); - } - - return false; - } - - @Override - public AreaDescriptor offset(BlockPos offset) - { - return new AreaDescriptor.Rectangle(this.minimumOffset.add(offset), this.maximumOffset.add(offset)); - } - - @Override - public AreaDescriptor rotateDescriptor(PlacementSettings settings) - { - BlockPos rotatePos1 = Template.transformedBlockPos(settings, minimumOffset); - BlockPos rotatePos2 = Template.transformedBlockPos(settings, maximumOffset.add(-1, -1, -1)); // It works, - // shut up! - - AreaDescriptor.Rectangle rectangle = new AreaDescriptor.Rectangle(this.minimumOffset, 1); - rectangle.modifyAreaByBlockPositions(rotatePos1, rotatePos2); - - return rectangle; - } - } - - public static class HemiSphere extends AreaDescriptor - { - private BlockPos minimumOffset; - private int radius; - - private ArrayList blockPosCache; - private BlockPos cachedPosition; - - private boolean cache = true; - - public HemiSphere(BlockPos minimumOffset, int radius) - { - setRadius(minimumOffset, radius); - } - - public HemiSphere(AreaDescriptor.HemiSphere hemiSphere) - { - this(hemiSphere.minimumOffset, hemiSphere.radius); - } - - public AreaDescriptor.HemiSphere copy() - { - return new AreaDescriptor.HemiSphere(this); - } - - public void setRadius(BlockPos minimumOffset, int radius) - { - this.minimumOffset = new BlockPos(Math.min(minimumOffset.getX(), minimumOffset.getX()), Math.min(minimumOffset.getY(), minimumOffset.getY()), Math.min(minimumOffset.getZ(), minimumOffset.getZ())); - this.radius = radius; - blockPosCache = new ArrayList<>(); - } - - @Override - public int getHeight() - { - return this.radius * 2; - } - - @Override - public List getContainedPositions(BlockPos pos) - { - if (!cache || !pos.equals(cachedPosition) || blockPosCache.isEmpty()) - { - ArrayList posList = new ArrayList<>(); - - int i = -radius; - int j = minimumOffset.getY(); - int k = -radius; - - // TODO For some reason the bottom of the hemisphere is not going up with the - // minOffset - - while (i <= radius) - { - while (j <= radius) - { - while (k <= radius) - { - if (i * i + j * j + k * k >= (radius + 0.5F) * (radius + 0.5F)) - { - k++; - continue; - } - - posList.add(pos.add(i, j, k)); - k++; - } - - k = -radius; - j++; - } - - j = minimumOffset.getY(); - i++; - } - - blockPosCache = posList; - cachedPosition = pos; - } - - return Collections.unmodifiableList(blockPosCache); - } - - /** - * Since you can't make a box using a sphere, this returns null - */ - @Override - public AxisAlignedBB getAABB(BlockPos pos) - { - return null; - } - - @Override - public void resetCache() - { - this.blockPosCache = new ArrayList<>(); - } - - @Override - public boolean isWithinArea(BlockPos pos) - { - return blockPosCache.contains(pos); - } - - @Override - public boolean hasNext() - { - return false; - } - - @Override - public BlockPos next() - { - return null; - } - - @Override - public void remove() - { - - } - - @Override - public void resetIterator() - { - - } - - @Override - public void modifyAreaByBlockPositions(BlockPos pos1, BlockPos pos2) - { - - } - - @Override - public int getVolumeForOffsets(BlockPos pos1, BlockPos pos2) - { - return 0; - } - - @Override - public boolean isWithinRange(BlockPos offset1, BlockPos offset2, int verticalLimit, int horizontalLimit) - { - return false; - } - - @Override - public int getVolume() - { - return 0; - } - - @Override - public boolean isWithinRange(int verticalLimit, int horizontalLimit) - { - return false; - } - - @Override - public boolean intersects(AreaDescriptor descriptor) - { - return false; - } - - @Override - public AreaDescriptor offset(BlockPos offset) - { - return new AreaDescriptor.HemiSphere(minimumOffset.add(offset), radius); - } - - @Override - public AreaDescriptor rotateDescriptor(PlacementSettings settings) - { - return this; - } - } - - public static class Cross extends AreaDescriptor - { - - private ArrayList blockPosCache; - private BlockPos cachedPosition; - - private BlockPos centerPos; - private int size; - - private boolean cache = true; - - public Cross(BlockPos center, int size) - { - this.centerPos = center; - this.size = size; - this.blockPosCache = new ArrayList<>(); - } - - public Cross(AreaDescriptor.Cross cross) - { - this(cross.centerPos, cross.size); - } - - public AreaDescriptor.Cross copy() - { - return new AreaDescriptor.Cross(this); - } - - @Override - public int getHeight() - { - return this.size * 2 + 1; - } - - @Override - public List getContainedPositions(BlockPos pos) - { - if (!cache || !pos.equals(cachedPosition) || blockPosCache.isEmpty()) - { - resetCache(); - - blockPosCache.add(centerPos.add(pos)); - for (int i = 1; i <= size; i++) - { - blockPosCache.add(centerPos.add(pos).add(i, 0, 0)); - blockPosCache.add(centerPos.add(pos).add(0, 0, i)); - blockPosCache.add(centerPos.add(pos).add(-i, 0, 0)); - blockPosCache.add(centerPos.add(pos).add(0, 0, -i)); - } - } - - cachedPosition = pos; - - return Collections.unmodifiableList(blockPosCache); - } - - @Override - public void resetCache() - { - blockPosCache = new ArrayList<>(); - } - - @Override - public boolean isWithinArea(BlockPos pos) - { - return blockPosCache.contains(pos); - } - - @Override - public boolean hasNext() - { - return false; - } - - @Override - public BlockPos next() - { - return null; - } - - @Override - public void remove() - { - - } - - @Override - public void resetIterator() - { - - } - - @Override - public void modifyAreaByBlockPositions(BlockPos pos1, BlockPos pos2) - { - - } - - @Override - public int getVolumeForOffsets(BlockPos pos1, BlockPos pos2) - { - return 0; - } - - @Override - public boolean isWithinRange(BlockPos offset1, BlockPos offset2, int verticalLimit, int horizontalLimit) - { - return false; - } - - @Override - public int getVolume() - { - return 0; - } - - @Override - public boolean isWithinRange(int verticalLimit, int horizontalLimit) - { - return false; - } - - @Override - public boolean intersects(AreaDescriptor descriptor) - { - return false; - } - - @Override - public AreaDescriptor offset(BlockPos offset) - { - return new AreaDescriptor.Cross(centerPos.add(offset), size); - } - - @Override - public AreaDescriptor rotateDescriptor(PlacementSettings settings) - { - return this; - } - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/ritual/CapabilityRuneType.java b/src/main/java/wayoftime/bloodmagic/ritual/CapabilityRuneType.java deleted file mode 100644 index 258867c4..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/CapabilityRuneType.java +++ /dev/null @@ -1,58 +0,0 @@ -package wayoftime.bloodmagic.ritual; - -import java.util.concurrent.Callable; - -import net.minecraft.nbt.ByteNBT; -import net.minecraft.nbt.INBT; -import net.minecraft.util.Direction; -import net.minecraftforge.common.capabilities.Capability; - -public final class CapabilityRuneType -{ - public static class RuneTypeStorage implements Capability.IStorage - { - @Override - public INBT writeNBT(Capability capability, IRitualStone.Tile instance, Direction side) - { - return ByteNBT.valueOf((byte) instance.getRuneType().ordinal()); - } - - @Override - public void readNBT(Capability capability, IRitualStone.Tile instance, Direction side, INBT nbt) - { - instance.setRuneType(EnumRuneType.byMetadata(((ByteNBT) nbt).getByte())); - } - } - - public static class RuneTypeWrapper implements IRitualStone.Tile - { - private EnumRuneType type = EnumRuneType.BLANK; - - @Override - public boolean isRuneType(EnumRuneType runeType) - { - return type == runeType; - } - - @Override - public EnumRuneType getRuneType() - { - return type; - } - - public void setRuneType(EnumRuneType runeType) - { - type = runeType; - } - } - - public static class Factory implements Callable - { - @Override - public IRitualStone.Tile call() - throws Exception - { - return new RuneTypeWrapper(); - } - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/ritual/EnumReaderBoundaries.java b/src/main/java/wayoftime/bloodmagic/ritual/EnumReaderBoundaries.java deleted file mode 100644 index 3e664671..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/EnumReaderBoundaries.java +++ /dev/null @@ -1,22 +0,0 @@ -package wayoftime.bloodmagic.ritual; - -import java.util.Locale; - -import net.minecraft.util.IStringSerializable; - -public enum EnumReaderBoundaries implements IStringSerializable -{ - SUCCESS, VOLUME_TOO_LARGE, NOT_WITHIN_BOUNDARIES; - - @Override - public String toString() - { - return name().toLowerCase(Locale.ROOT); - } - - @Override - public String getString() - { - return toString(); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/ritual/EnumRitualReaderState.java b/src/main/java/wayoftime/bloodmagic/ritual/EnumRitualReaderState.java deleted file mode 100644 index 8ed0308a..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/EnumRitualReaderState.java +++ /dev/null @@ -1,8 +0,0 @@ -package wayoftime.bloodmagic.ritual; - -public enum EnumRitualReaderState -{ - SET_AREA, - INFORMATION, - SET_WILL_TYPES,; -} diff --git a/src/main/java/wayoftime/bloodmagic/ritual/EnumRuneType.java b/src/main/java/wayoftime/bloodmagic/ritual/EnumRuneType.java deleted file mode 100644 index 959e771d..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/EnumRuneType.java +++ /dev/null @@ -1,54 +0,0 @@ -package wayoftime.bloodmagic.ritual; - -import java.util.Locale; - -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.text.TextFormatting; - -public enum EnumRuneType implements IStringSerializable -{ - BLANK(TextFormatting.GRAY), - WATER(TextFormatting.AQUA), - FIRE(TextFormatting.RED), - EARTH(TextFormatting.GREEN), - AIR(TextFormatting.WHITE), - DUSK(TextFormatting.DARK_GRAY), - DAWN(TextFormatting.GOLD); - - public final TextFormatting colorCode; - - EnumRuneType(TextFormatting colorCode) - { - this.colorCode = colorCode; - } - - @Override - public String toString() - { - return name().toLowerCase(Locale.ENGLISH); - } - - @Override - public String getString() - { - return this.toString(); - } - -// @Nonnull -// public ItemStack getStack(int count) -// { -// ItemStack ret = new ItemStack(RegistrarBloodMagicItems.INSCRIPTION_TOOL, count, ordinal()); -// CompoundNBT tag = new CompoundNBT(); -// tag.putInt(Constants.NBT.USES, 10); -// ret.setTag(tag); -// return ret; -// } - - public static EnumRuneType byMetadata(int meta) - { - if (meta < 0 || meta >= values().length) - meta = 0; - - return values()[meta]; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/ritual/IMasterRitualStone.java b/src/main/java/wayoftime/bloodmagic/ritual/IMasterRitualStone.java deleted file mode 100644 index 775e5642..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/IMasterRitualStone.java +++ /dev/null @@ -1,81 +0,0 @@ -package wayoftime.bloodmagic.ritual; - -import java.util.List; -import java.util.Map; -import java.util.UUID; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import wayoftime.bloodmagic.core.data.SoulNetwork; -import wayoftime.bloodmagic.core.data.SoulTicket; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; - -/** - * This interface is for internal implementation only. - *

- * It is provided via the API for easy obtaining of basic data. - */ -public interface IMasterRitualStone -{ - UUID getOwner(); - - SoulNetwork getOwnerNetwork(); - - boolean activateRitual(ItemStack activationCrystal, PlayerEntity activator, Ritual ritual); - - void performRitual(World world, BlockPos pos); - - void stopRitual(Ritual.BreakType breakType); - - int getCooldown(); - - void setCooldown(int cooldown); - - boolean isActive(); - - void setActive(boolean active); - - Direction getDirection(); - - boolean areTanksEmpty(); - - int getRunningTime(); - - World getWorldObj(); - - BlockPos getBlockPos(); - - String getNextBlockRange(String range); - - void provideInformationOfRitualToPlayer(PlayerEntity player); - - void provideInformationOfRangeToPlayer(PlayerEntity player, String range); - - void provideInformationOfWillConfigToPlayer(PlayerEntity player, List typeList); - - void setActiveWillConfig(PlayerEntity player, List typeList); - - EnumReaderBoundaries setBlockRangeByBounds(PlayerEntity player, String range, BlockPos offset1, BlockPos offset2); - - List getActiveWillConfig(); - - default SoulTicket ticket(int amount) - { - return SoulTicket.block(getWorldObj(), getBlockPos(), amount); - } - - AreaDescriptor getBlockRange(String range); - - void addBlockRanges(Map blockRanges); - - void addBlockRange(String range, AreaDescriptor defaultRange); - - void setBlockRanges(Map blockRanges); - - void setBlockRange(String range, AreaDescriptor defaultRange); - - Ritual getCurrentRitual(); -} diff --git a/src/main/java/wayoftime/bloodmagic/ritual/IRitualStone.java b/src/main/java/wayoftime/bloodmagic/ritual/IRitualStone.java deleted file mode 100644 index a4409fe9..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/IRitualStone.java +++ /dev/null @@ -1,20 +0,0 @@ -package wayoftime.bloodmagic.ritual; - -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public interface IRitualStone -{ - boolean isRuneType(World world, BlockPos pos, EnumRuneType runeType); - - void setRuneType(World world, BlockPos pos, EnumRuneType runeType); - - interface Tile - { - boolean isRuneType(EnumRuneType runeType); - - EnumRuneType getRuneType(); - - void setRuneType(EnumRuneType runeType); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/ritual/ModRituals.java b/src/main/java/wayoftime/bloodmagic/ritual/ModRituals.java deleted file mode 100644 index e3421d7d..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/ModRituals.java +++ /dev/null @@ -1,26 +0,0 @@ -package wayoftime.bloodmagic.ritual; - -import net.minecraft.block.Blocks; -import wayoftime.bloodmagic.ritual.harvest.HarvestHandlerPlantable; -import wayoftime.bloodmagic.ritual.harvest.HarvestHandlerStem; -import wayoftime.bloodmagic.ritual.harvest.HarvestHandlerTall; -import wayoftime.bloodmagic.ritual.harvest.HarvestRegistry; - -public class ModRituals -{ - public static void initHarvestHandlers() - { - HarvestRegistry.registerRangeAmplifier(Blocks.DIAMOND_BLOCK.getDefaultState(), 15); - HarvestRegistry.registerRangeAmplifier(Blocks.GOLD_BLOCK.getDefaultState(), 10); - HarvestRegistry.registerRangeAmplifier(Blocks.IRON_BLOCK.getDefaultState(), 6); - - HarvestRegistry.registerHandler(new HarvestHandlerPlantable()); - HarvestRegistry.registerHandler(new HarvestHandlerTall()); - HarvestRegistry.registerHandler(new HarvestHandlerStem()); - } -// -// public static void initCuttingFluids() { -// CrushingRegistry.registerCuttingFluid(new CrushingHandlerCuttingFluid(ItemCuttingFluid.FluidType.BASIC.getStack(), 250, 0.5)); -// CrushingRegistry.registerCuttingFluid(new CrushingHandlerCuttingFluid(ItemCuttingFluid.FluidType.EXPLOSIVE.getStack(), 25, 0.05)); -// } -} diff --git a/src/main/java/wayoftime/bloodmagic/ritual/Ritual.java b/src/main/java/wayoftime/bloodmagic/ritual/Ritual.java deleted file mode 100644 index 648e18e6..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/Ritual.java +++ /dev/null @@ -1,427 +0,0 @@ -package wayoftime.bloodmagic.ritual; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.UUID; -import java.util.function.Consumer; - -import org.apache.commons.lang3.builder.ToStringBuilder; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.ListNBT; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import wayoftime.bloodmagic.demonaura.WorldDemonWillHandler; -import wayoftime.bloodmagic.will.DemonWillHolder; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; - -/** - * Abstract class for creating new rituals. Register your ritual by annotating - * it with {@link RitualRegister} - */ -public abstract class Ritual -{ - - protected final Map modableRangeMap = new HashMap<>(); - protected final Map volumeRangeMap = new HashMap<>(); - protected final Map horizontalRangeMap = new HashMap<>(); - protected final Map verticalRangeMap = new HashMap<>(); - private final String name; - private final int crystalLevel; - private final int activationCost; - private final RitualRenderer renderer; - private final String unlocalizedName; - - public Ritual(String name, int crystalLevel, int activationCost, RitualRenderer renderer, String unlocalizedName) - { - this.name = name; - this.crystalLevel = crystalLevel; - this.activationCost = activationCost; - this.renderer = renderer; - this.unlocalizedName = unlocalizedName; - } - - /** - * @param name - The name of the ritual - * @param crystalLevel - Required Activation Crystal tier - * @param activationCost - Base LP cost for activating the ritual - */ - public Ritual(String name, int crystalLevel, int activationCost, String unlocalizedName) - { - this(name, crystalLevel, activationCost, null, unlocalizedName); - } - - public void readFromNBT(CompoundNBT tag) - { - ListNBT tags = tag.getList("areas", 10); - if (tags.isEmpty()) - { - return; - } - - for (int i = 0; i < tags.size(); i++) - { - CompoundNBT newTag = tags.getCompound(i); - String rangeKey = newTag.getString("key"); - - CompoundNBT storedTag = newTag.getCompound("area"); - AreaDescriptor desc = this.getBlockRange(rangeKey); - if (desc != null) - { - desc.readFromNBT(storedTag); - } - } - } - - public void writeToNBT(CompoundNBT tag) - { - ListNBT tags = new ListNBT(); - - for (Entry entry : modableRangeMap.entrySet()) - { - CompoundNBT newTag = new CompoundNBT(); - newTag.putString("key", entry.getKey()); - CompoundNBT storedTag = new CompoundNBT(); - - entry.getValue().writeToNBT(storedTag); - - newTag.put("area", storedTag); - - tags.add(newTag); - } - - tag.put("areas", tags); - } - - /** - * Called when the player attempts to activate the ritual. - *

- * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#activateRitual(ItemStack, PlayerEntity, Ritual)} - * - * @param masterRitualStone - The {@link IMasterRitualStone} that the ritual is - * bound to - * @param player - The activating player - * @param owner - Owner of the crystal activating this ritual, or - * the current owner of the ritual if being - * reactivated. - * @return - Whether activation was successful - */ - public boolean activateRitual(IMasterRitualStone masterRitualStone, PlayerEntity player, UUID owner) - { - return true; - } - - /** - * Called every {@link #getRefreshTime()} ticks while active. - *

- * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#performRitual(World, BlockPos)} - * - * @param masterRitualStone - The {@link IMasterRitualStone} that the ritual is - * bound to - */ - public abstract void performRitual(IMasterRitualStone masterRitualStone); - - /** - * Called when the ritual is stopped for a given {@link Ritual.BreakType}. - *

- * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#stopRitual(Ritual.BreakType)} - * - * @param masterRitualStone - The {@link IMasterRitualStone} that the ritual is - * bound to - * @param breakType - The type of break that caused the stoppage. - */ - public void stopRitual(IMasterRitualStone masterRitualStone, BreakType breakType) - { - - } - - /** - * Used to set the amount of LP drained every {@link #getRefreshTime()} ticks. - * - * @return - The amount of LP drained per refresh - */ - public abstract int getRefreshCost(); - - /** - * Used to set the refresh rate of the ritual. (How often - * {@link #performRitual(IMasterRitualStone)} is called. - * - * @return - How often to perform the effect in ticks. - */ - public int getRefreshTime() - { - return 20; - } - - public void addBlockRange(String range, AreaDescriptor defaultRange) - { - modableRangeMap.put(range, defaultRange); - } - - /** - * Used to grab the range of a ritual for a given effect. - * - * @param range - Range that needs to be pulled. - * @return - - */ - public AreaDescriptor getBlockRange(String range) - { - if (modableRangeMap.containsKey(range)) - { - return modableRangeMap.get(range); - } - - return null; - } - - public List getListOfRanges() - { - return new ArrayList<>(modableRangeMap.keySet()); - } - - public String getNextBlockRange(String range) - { - List rangeList = getListOfRanges(); - - if (rangeList.isEmpty()) - { - return ""; - } - - if (!rangeList.contains(range)) - { - return rangeList.get(0); - } - - boolean hasMatch = false; - - for (String rangeCheck : rangeList) - { - if (hasMatch) - { - return rangeCheck; - } else if (rangeCheck.equals(range)) - { - hasMatch = true; - } - } - - return rangeList.get(0); - } - - public EnumReaderBoundaries canBlockRangeBeModified(String range, AreaDescriptor descriptor, IMasterRitualStone master, BlockPos offset1, BlockPos offset2, DemonWillHolder holder) - { - List willConfig = master.getActiveWillConfig(); - int maxVolume = getMaxVolumeForRange(range, willConfig, holder); - int maxVertical = getMaxVerticalRadiusForRange(range, willConfig, holder); - int maxHorizontal = getMaxHorizontalRadiusForRange(range, willConfig, holder); - - return (maxVolume <= 0 || descriptor.getVolumeForOffsets(offset1, offset2) <= maxVolume) - ? descriptor.isWithinRange(offset1, offset2, maxVertical, maxHorizontal) ? EnumReaderBoundaries.SUCCESS - : EnumReaderBoundaries.NOT_WITHIN_BOUNDARIES - : EnumReaderBoundaries.VOLUME_TOO_LARGE; - } - - protected void setMaximumVolumeAndDistanceOfRange(String range, int volume, int horizontalRadius, int verticalRadius) - { - volumeRangeMap.put(range, volume); - horizontalRangeMap.put(range, horizontalRadius); - verticalRangeMap.put(range, verticalRadius); - } - - protected boolean checkDescriptorIsWithinRange(AreaDescriptor descriptor, int maxVolume, int maxHorizontal, int maxVertical) - { - return descriptor.getVolume() <= maxVolume && descriptor.isWithinRange(maxVertical, maxHorizontal); - } - - public int getMaxVolumeForRange(String range, List activeTypes, DemonWillHolder holder) - { - return volumeRangeMap.get(range); - } - - public int getMaxVerticalRadiusForRange(String range, List activeTypes, DemonWillHolder holder) - { - return verticalRangeMap.get(range); - } - - public int getMaxHorizontalRadiusForRange(String range, List activeTypes, DemonWillHolder holder) - { - return horizontalRangeMap.get(range); - } - - public ITextComponent getErrorForBlockRangeOnFail(PlayerEntity player, String range, IMasterRitualStone master, BlockPos offset1, BlockPos offset2) - { - AreaDescriptor descriptor = this.getBlockRange(range); - if (descriptor == null) - { - return new TranslationTextComponent("ritual.bloodmagic.blockRange.tooBig", "?"); - } - - List willConfig = master.getActiveWillConfig(); - DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(master.getWorldObj(), master.getBlockPos()); - - int maxVolume = this.getMaxVolumeForRange(range, willConfig, holder); - int maxVertical = this.getMaxVerticalRadiusForRange(range, willConfig, holder); - int maxHorizontal = this.getMaxHorizontalRadiusForRange(range, willConfig, holder); - - if (maxVolume > 0 && descriptor.getVolumeForOffsets(offset1, offset2) > maxVolume) - { - return new TranslationTextComponent("ritual.bloodmagic.blockRange.tooBig", maxVolume); - } else - { - return new TranslationTextComponent("ritual.bloodmagic.blockRange.tooFar", maxVertical, maxHorizontal); - } - } - - public ITextComponent[] provideInformationOfRitualToPlayer(PlayerEntity player) - { - return new ITextComponent[] - { new TranslationTextComponent(this.getTranslationKey() + ".info") }; - } - - public ITextComponent provideInformationOfRangeToPlayer(PlayerEntity player, String range) - { - if (getListOfRanges().contains(range)) - { - return new TranslationTextComponent(this.getTranslationKey() + "." + range + ".info"); - } else - { - return new TranslationTextComponent("ritual.bloodmagic.blockRange.noRange"); - } - } - - public abstract void gatherComponents(Consumer components); - - protected final void addRune(Consumer components, int offset1, int y, int offset2, EnumRuneType rune) - { - components.accept(new RitualComponent(new BlockPos(offset1, y, offset2), rune)); - } - - protected final void addOffsetRunes(Consumer components, int offset1, int offset2, int y, EnumRuneType rune) - { - addRune(components, offset1, y, offset2, rune); - addRune(components, offset2, y, offset1, rune); - addRune(components, offset1, y, -offset2, rune); - addRune(components, -offset2, y, offset1, rune); - addRune(components, -offset1, y, offset2, rune); - addRune(components, offset2, y, -offset1, rune); - addRune(components, -offset1, y, -offset2, rune); - addRune(components, -offset2, y, -offset1, rune); - } - - protected final void addCornerRunes(Consumer components, int offset, int y, EnumRuneType rune) - { - addRune(components, offset, y, offset, rune); - addRune(components, offset, y, -offset, rune); - addRune(components, -offset, y, -offset, rune); - addRune(components, -offset, y, offset, rune); - } - - protected final void addParallelRunes(Consumer components, int offset, int y, EnumRuneType rune) - { - addRune(components, offset, y, 0, rune); - addRune(components, -offset, y, 0, rune); - addRune(components, 0, y, -offset, rune); - addRune(components, 0, y, offset, rune); - } - - public double getWillRespectingConfig(World world, BlockPos pos, EnumDemonWillType type, List willConfig) - { - return willConfig.contains(type) ? WorldDemonWillHandler.getCurrentWill(world, pos, type) : 0; - } - - public abstract Ritual getNewCopy(); - - public String getName() - { - return name; - } - - public int getCrystalLevel() - { - return crystalLevel; - } - - public int getActivationCost() - { - return activationCost; - } - - public RitualRenderer getRenderer() - { - return renderer; - } - - public String getTranslationKey() - { - return unlocalizedName; - } - - public Map getModableRangeMap() - { - return modableRangeMap; - } - - public Map getVolumeRangeMap() - { - return volumeRangeMap; - } - - public Map getHorizontalRangeMap() - { - return horizontalRangeMap; - } - - public Map getVerticalRangeMap() - { - return verticalRangeMap; - } - - @Override - public String toString() - { - return new ToStringBuilder(this).append("name", name).append("crystalLevel", crystalLevel).append("activationCost", activationCost).append("renderer", renderer).append("unlocalizedName", unlocalizedName).append("modableRangeMap", modableRangeMap).append("volumeRangeMap", volumeRangeMap).append("horizontalRangeMap", horizontalRangeMap).append("verticalRangeMap", verticalRangeMap).append("refreshTime", getRefreshTime()).append("listOfRanges", getListOfRanges()).toString(); - } - - @Override - public boolean equals(Object o) - { - if (this == o) - return true; - if (!(o instanceof Ritual)) - return false; - - Ritual ritual = (Ritual) o; - - if (crystalLevel != ritual.crystalLevel) - return false; - if (activationCost != ritual.activationCost) - return false; - if (name != null ? !name.equals(ritual.name) : ritual.name != null) - return false; - return unlocalizedName != null ? unlocalizedName.equals(ritual.unlocalizedName) - : ritual.unlocalizedName == null; - } - - @Override - public int hashCode() - { - int result = name != null ? name.hashCode() : 0; - result = 31 * result + crystalLevel; - result = 31 * result + activationCost; - result = 31 * result + (unlocalizedName != null ? unlocalizedName.hashCode() : 0); - return result; - } - - public enum BreakType - { - REDSTONE, BREAK_MRS, BREAK_STONE, ACTIVATE, DEACTIVATE, EXPLOSION, - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/ritual/RitualComponent.java b/src/main/java/wayoftime/bloodmagic/ritual/RitualComponent.java deleted file mode 100644 index 0f34813f..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/RitualComponent.java +++ /dev/null @@ -1,70 +0,0 @@ -package wayoftime.bloodmagic.ritual; - -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; - -/** - * Used to set a {@link EnumRuneType} type to a given {@link BlockPos} for usage - * in Ritual creation. - */ -public class RitualComponent -{ - private final BlockPos offset; - private final EnumRuneType runeType; - - public RitualComponent(BlockPos offset, EnumRuneType runeType) - { - this.offset = offset; - this.runeType = runeType; - } - - public int getX(Direction direction) - { - switch (direction) - { - case EAST: - return -this.getOffset().getZ(); - case SOUTH: - return -this.getOffset().getX(); - case WEST: - return this.getOffset().getZ(); - default: - return this.getOffset().getX(); - } - } - - public int getY() - { - return this.getOffset().getY(); - } - - public int getZ(Direction direction) - { - switch (direction) - { - case EAST: - return this.getOffset().getX(); - case SOUTH: - return -this.getOffset().getZ(); - case WEST: - return -this.getOffset().getX(); - default: - return this.getOffset().getZ(); - } - } - - public BlockPos getOffset(Direction direction) - { - return new BlockPos(getX(direction), offset.getY(), getZ(direction)); - } - - public BlockPos getOffset() - { - return offset; - } - - public EnumRuneType getRuneType() - { - return runeType; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/ritual/RitualManager.java b/src/main/java/wayoftime/bloodmagic/ritual/RitualManager.java deleted file mode 100644 index cfe912a4..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/RitualManager.java +++ /dev/null @@ -1,178 +0,0 @@ -package wayoftime.bloodmagic.ritual; - -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; - -import net.minecraft.block.BlockState; -import net.minecraft.util.DamageSource; -import net.minecraftforge.fml.ModList; -import wayoftime.bloodmagic.ritual.imperfect.ImperfectRitual; -import wayoftime.bloodmagic.util.BMLog; - -public class RitualManager -{ - public static final DamageSource RITUAL_DAMAGE = new DamageSource("ritual_damage").setDamageBypassesArmor(); - - private final Map rituals; - private final Map ritualsReverse; - private final List sortedRituals; - private final Map imperfectRituals; - private final Map imperfectRitualsReverse; -// private final Configuration config; - - public RitualManager() - { - this.rituals = Maps.newTreeMap(); - this.ritualsReverse = Maps.newHashMap(); - this.sortedRituals = Lists.newArrayList(); - this.imperfectRituals = Maps.newTreeMap(); - this.imperfectRitualsReverse = Maps.newHashMap(); -// this.config = config; - } - -// public void discover(ASMDataTable dataTable) - public void discover() - { - ModList.get().getAllScanData().forEach(scan -> { - scan.getAnnotations().forEach(a -> { - if (a.getAnnotationType().getClassName().equals(RitualRegister.class.getName())) - { - try - { - - Class clazz = Class.forName(a.getClassType().getClassName()); - RitualRegister ritualRegister = clazz.getAnnotation(RitualRegister.class); - String id = ritualRegister.value(); - if (Ritual.class.isAssignableFrom(clazz)) - { - Ritual ritual = (Ritual) clazz.newInstance(); - rituals.put(id, ritual); - ritualsReverse.put(ritual, id); - BMLog.DEBUG.info("Registered ritual {}", id); - } else - { - BMLog.DEFAULT.error("Error creating ritual instance for {}.", id); - } - } catch (Exception e) - { - e.printStackTrace(); - } - } - }); - }); - - ModList.get().getAllScanData().forEach(scan -> { - scan.getAnnotations().forEach(a -> { - if (a.getAnnotationType().getClassName().equals(RitualRegister.Imperfect.class.getName())) - { - try - { - - Class clazz = Class.forName(a.getClassType().getClassName()); - RitualRegister.Imperfect ritualRegister = clazz.getAnnotation(RitualRegister.Imperfect.class); - String id = ritualRegister.value(); - if (ImperfectRitual.class.isAssignableFrom(clazz)) - { - ImperfectRitual ritual = (ImperfectRitual) clazz.newInstance(); - imperfectRituals.put(id, ritual); - imperfectRitualsReverse.put(ritual, id); - BMLog.DEBUG.info("Registered imperfect ritual {}", id); - } else - { - BMLog.DEFAULT.error("Error creating imperfect ritual instance for {}.", id); - } - } catch (Exception e) - { - e.printStackTrace(); - } - } - }); - }); - -// syncConfig(); - - // Sort rituals - sortedRituals.addAll(rituals.values()); - // Oh dear this is probably so slow - sortedRituals.sort((o1, o2) -> { - Set components = Sets.newHashSet(); - o1.gatherComponents(components::add); - int initialSize = components.size(); - components.clear(); - o2.gatherComponents(components::add); - return Integer.compare(initialSize, components.size()); - }); - } - - public Ritual getRitual(String id) - { - Ritual ritual = rituals.get(id); - return ritual == null ? null : ritual.getNewCopy(); - } - - public String getId(Ritual ritual) - { - return ritualsReverse.get(ritual); - } - - public ImperfectRitual getImperfectRitual(BlockState state) - { - for (ImperfectRitual ritual : imperfectRituals.values()) if (ritual.getBlockRequirement().test(state)) - return ritual; - - return null; - } - - public String getId(ImperfectRitual ritual) - { - return imperfectRitualsReverse.get(ritual); - } - - public Collection getRituals() - { - return rituals.values(); - } - - public Collection getImperfectRituals() - { - return imperfectRituals.values(); - } - - public List getSortedRituals() - { - return sortedRituals; - } - -// public void syncConfig() -// { -// config.addCustomCategoryComment("rituals", "Toggles for all rituals"); -// rituals.forEach((k, v) -> config.getBoolean(k, "rituals", true, "Enable the " + k + " ritual.")); -// imperfectRituals.forEach((k, v) -> config.getBoolean(k, "rituals.imperfect", true, "Enable the " + k + " imperfect ritual.")); -// config.save(); -// } -// - public boolean enabled(String id, boolean imperfect) - { - return id != null; -// return id != null && config.getBoolean(id, "rituals" + (imperfect ? ".imperfect" : ""), true, ""); - } -// -// public Configuration getConfig() -// { -// return config; -// } - - public static class BadRitualException extends RuntimeException - { - public BadRitualException(String message) - { - super(message); - } - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/ritual/RitualRegister.java b/src/main/java/wayoftime/bloodmagic/ritual/RitualRegister.java deleted file mode 100644 index 56527fa6..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/RitualRegister.java +++ /dev/null @@ -1,58 +0,0 @@ -package wayoftime.bloodmagic.ritual; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import java.util.function.Function; - -import wayoftime.bloodmagic.ritual.imperfect.ImperfectRitual; - -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -public @interface RitualRegister -{ - String value(); - - Class, Ritual>> factory() default DefaultRitualFactory.class; - - @Retention(RetentionPolicy.RUNTIME) - @Target(ElementType.TYPE) - @interface Imperfect - { - - String value(); - - Class, ImperfectRitual>> factory() default DefaultImperfectRitualFactory.class; - } - - class DefaultRitualFactory implements Function, Ritual> - { - @Override - public Ritual apply(Class aClass) - { - try - { - return aClass.newInstance(); - } catch (Exception e) - { - return null; - } - } - } - - class DefaultImperfectRitualFactory implements Function, ImperfectRitual> - { - @Override - public ImperfectRitual apply(Class aClass) - { - try - { - return aClass.newInstance(); - } catch (Exception e) - { - return null; - } - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/ritual/RitualRenderer.java b/src/main/java/wayoftime/bloodmagic/ritual/RitualRenderer.java deleted file mode 100644 index a2172c45..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/RitualRenderer.java +++ /dev/null @@ -1,14 +0,0 @@ -package wayoftime.bloodmagic.ritual; - -import net.minecraft.client.Minecraft; -import net.minecraft.util.ResourceLocation; - -public abstract class RitualRenderer -{ - public abstract void renderAt(IMasterRitualStone masterRitualStone, double x, double y, double z); - - protected void bindTexture(ResourceLocation resourceLocation) - { - Minecraft.getInstance().getTextureManager().bindTexture(resourceLocation); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java b/src/main/java/wayoftime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java deleted file mode 100644 index 0bfbc47d..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java +++ /dev/null @@ -1,190 +0,0 @@ -package wayoftime.bloodmagic.ritual.harvest; - -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.CropsBlock; -import net.minecraft.item.BlockItem; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import net.minecraft.loot.LootContext; -import net.minecraft.loot.LootParameters; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; -import net.minecraftforge.fml.ModList; -import net.minecraftforge.registries.ForgeRegistries; -import wayoftime.bloodmagic.util.BMLog; - -/** - * Harvest handler for standard plantable crops such as Wheat, Potatoes, and - * Netherwart.
- * Register a new crop for this handler with - * {@link HarvestRegistry#registerStandardCrop(Block, int)} - */ - -public class HarvestHandlerPlantable implements IHarvestHandler -{ - private static final ItemStack mockHoe = new ItemStack(Items.DIAMOND_HOE, 1); - - public HarvestHandlerPlantable() - { - HarvestRegistry.registerStandardCrop(Blocks.CARROTS, 7); - HarvestRegistry.registerStandardCrop(Blocks.WHEAT, 7); - HarvestRegistry.registerStandardCrop(Blocks.POTATOES, 7); - HarvestRegistry.registerStandardCrop(Blocks.BEETROOTS, 3); - HarvestRegistry.registerStandardCrop(Blocks.NETHER_WART, 3); - - addThirdPartyCrop("actuallyadditions", "flax_block", 7); - addThirdPartyCrop("actuallyadditions", "canola_block", 7); - addThirdPartyCrop("actuallyadditions", "rice_block", 7); - - addThirdPartyCrop("extrautils2", "redorchid", 6); - addThirdPartyCrop("extrautils2", "enderlily", 7); - - addThirdPartyCrop("roots", "moonglow", 7); - addThirdPartyCrop("roots", "terra_moss", 7); - addThirdPartyCrop("roots", "pereskia", 7); - addThirdPartyCrop("roots", "wildroot", 7); - addThirdPartyCrop("roots", "aubergine", 7); - addThirdPartyCrop("roots", "spirit_herb", 7); - - addPamCrops(); - - addMysticalCrops(); - } - - @Override - public boolean harvest(World world, BlockPos pos, BlockState state, List drops) - { -// NonNullList blockDrops = NonNullList.create(); -// state.getBlock().getDrops(blockDrops, world, pos, state, 0); - boolean foundSeed = false; - LootContext.Builder lootBuilder = new LootContext.Builder((ServerWorld) world); - Vector3d blockCenter = new Vector3d(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); - List blockDrops = state.getDrops(lootBuilder.withParameter(LootParameters.field_237457_g_, blockCenter).withParameter(LootParameters.TOOL, mockHoe)); - -// System.out.println("Size of list: " + blockDrops.size()); - - for (ItemStack stack : blockDrops) - { - if (stack.isEmpty()) - continue; - - // This hurts my soul. - if (stack.getItem() instanceof BlockItem && ((BlockItem) stack.getItem()).getBlock() == state.getBlock()) - { - stack.shrink(1); - foundSeed = true; - break; - } - } - -// System.out.println("Found seed: " + foundSeed); - - if (foundSeed) - { - world.setBlockState(pos, state.getBlock().getDefaultState()); - world.playEvent(2001, pos, Block.getStateId(state)); - for (ItemStack stack : blockDrops) - { - if (stack.isEmpty()) - continue; - - drops.add(stack); - } - - return true; - } - - return false; - } - - @Override - public boolean test(World world, BlockPos pos, BlockState state) - { -// state.hasProperty(null); - return HarvestRegistry.getStandardCrops().containsKey(state.getBlock()) && state.getBlock() instanceof CropsBlock && ((CropsBlock) state.getBlock()).isMaxAge(state); -// return HarvestRegistry.getStandardCrops().containsKey(state.getBlock()) && state.getBlock().getMetaFromState(state) == HarvestRegistry.getStandardCrops().get(state.getBlock()); - } - - private static void addThirdPartyCrop(String modid, String regName, int matureMeta) - { - if (!ModList.get().isLoaded(modid)) - return; - - Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(modid, regName)); - if (block != null && block != Blocks.AIR) - HarvestRegistry.registerStandardCrop(block, matureMeta); - } - - private static void addPamCrops() - { - if (!ModList.get().isLoaded("harvestcraft")) - return; - - try - { - Class pamRegistry = Class.forName("com.pam.harvestcraft.blocks.CropRegistry"); - Field names = pamRegistry.getDeclaredField("cropNames"); - Method getCrop = pamRegistry.getMethod("getCrop", String.class); - for (String name : (String[]) names.get(null)) - { - CropsBlock crop = (CropsBlock) getCrop.invoke(null, name); - HarvestRegistry.registerStandardCrop(crop, crop.getMaxAge()); - } - } catch (ClassNotFoundException e) - { - BMLog.DEFAULT.error("HarvestCraft integration cancelled; unable to find registry class"); - } catch (NoSuchMethodException | NoSuchFieldException e) - { - BMLog.DEFAULT.error("HarvestCraft integration cancelled; unable to find crop name mapper"); - } catch (IllegalAccessException | InvocationTargetException e) - { - BMLog.DEFAULT.error("HarvestCraft integration cancelled; crop name lookup broke"); - } - } - - private static void addMysticalCrops() - { - if (!ModList.get().isLoaded("mysticalagriculture")) - return; - - try - { - Class mysticalAPI = Class.forName("com.blakebr0.mysticalagriculture.api.MysticalAgricultureAPI"); - Method getRegistry = mysticalAPI.getMethod("getCropRegistry"); - Object registry = getRegistry.invoke(null); - - Class mysticalRegistry = Class.forName("com.blakebr0.mysticalagriculture.api.registry.ICropRegistry"); - Method getCrops = mysticalRegistry.getMethod("getCrops"); - @SuppressWarnings("unchecked") - List crops = (List) getCrops.invoke(registry); - - Class mysticalCrop = Class.forName("com.blakebr0.mysticalagriculture.api.crop.ICrop"); - Method getCrop = mysticalCrop.getMethod("getCrop"); - - for (Object maCrop : crops) - { - CropsBlock crop = (CropsBlock) getCrop.invoke(maCrop); - HarvestRegistry.registerStandardCrop(crop, crop.getMaxAge()); - } - } catch (ClassNotFoundException e) - { - BMLog.DEFAULT.error("MysticalAgriculture integration cancelled: unable to find a class: " + e.getMessage()); - } catch (NoSuchMethodException e) - { - BMLog.DEFAULT.error("MysticalAgriculture integration cancelled: unable to find a method: " + e.getMessage()); - } catch (IllegalAccessException | InvocationTargetException e) - { - BMLog.DEFAULT.error("MysticalAgriculture integration cancelled: failed to invoke a method: " + e.getMessage()); - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/ritual/harvest/HarvestHandlerStem.java b/src/main/java/wayoftime/bloodmagic/ritual/harvest/HarvestHandlerStem.java deleted file mode 100644 index e2d876b8..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/harvest/HarvestHandlerStem.java +++ /dev/null @@ -1,72 +0,0 @@ -package wayoftime.bloodmagic.ritual.harvest; - -import java.util.Collection; -import java.util.List; - -import net.minecraft.block.AttachedStemBlock; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import net.minecraft.loot.LootContext; -import net.minecraft.loot.LootParameters; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; - -/** - * Harvest handler for crops with stems such as Pumpkins and Melons. Rotation - * based crop blocks are a good reason to use this (see pumpkins).
- * Register a new crop for this handler with - * {@link HarvestRegistry#registerStemCrop(BlockState, BlockState)} - */ -public class HarvestHandlerStem implements IHarvestHandler -{ - private static final ItemStack mockHoe = new ItemStack(Items.DIAMOND_HOE, 1); - - public HarvestHandlerStem() - { - for (int i = 0; i < 4; i++) - { - Direction facing = Direction.byHorizontalIndex(i); - HarvestRegistry.registerStemCrop(Blocks.PUMPKIN.getDefaultState(), Blocks.ATTACHED_PUMPKIN_STEM.getDefaultState().with(AttachedStemBlock.FACING, facing)); - HarvestRegistry.registerStemCrop(Blocks.MELON.getDefaultState(), Blocks.ATTACHED_MELON_STEM.getDefaultState().with(AttachedStemBlock.FACING, facing)); - } - } - - @Override - public boolean harvest(World world, BlockPos pos, BlockState state, List drops) - { - Direction cropDir = state.get(AttachedStemBlock.FACING); - - if (cropDir != Direction.UP) - { - BlockPos cropPos = pos.offset(cropDir); - BlockState probableCrop = world.getBlockState(cropPos); - Collection registeredCrops = HarvestRegistry.getStemCrops().get(state); - - for (BlockState registeredCrop : registeredCrops) - { - if (registeredCrop == probableCrop) - { - LootContext.Builder lootBuilder = new LootContext.Builder((ServerWorld) world); - Vector3d blockCenter = new Vector3d(cropPos.getX() + 0.5, cropPos.getY() + 0.5, cropPos.getZ() + 0.5); - List blockDrops = registeredCrop.getDrops(lootBuilder.withParameter(LootParameters.field_237457_g_, blockCenter).withParameter(LootParameters.TOOL, mockHoe)); - drops.addAll(blockDrops); - world.destroyBlock(cropPos, false); - return true; - } - } - } - - return false; - } - - @Override - public boolean test(World world, BlockPos pos, BlockState state) - { - return HarvestRegistry.getStemCrops().containsKey(state); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/ritual/harvest/HarvestHandlerTall.java b/src/main/java/wayoftime/bloodmagic/ritual/harvest/HarvestHandlerTall.java deleted file mode 100644 index 4ca53ce8..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/harvest/HarvestHandlerTall.java +++ /dev/null @@ -1,59 +0,0 @@ -package wayoftime.bloodmagic.ritual.harvest; - -import java.util.List; - -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.CactusBlock; -import net.minecraft.block.SugarCaneBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import net.minecraft.loot.LootContext; -import net.minecraft.loot.LootParameters; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; - -/** - * Harvest handler for crops that grow vertically such as Sugar Cane and Cactus. - *
- * Register a new crop for this handler with - * {@link HarvestRegistry#registerTallCrop(BlockState)} - */ -public class HarvestHandlerTall implements IHarvestHandler -{ - private static final ItemStack mockHoe = new ItemStack(Items.DIAMOND_HOE, 1); - - public HarvestHandlerTall() - { - for (int i = 0; i < 15; i++) - { - HarvestRegistry.registerTallCrop(Blocks.SUGAR_CANE.getDefaultState().with(SugarCaneBlock.AGE, i)); - HarvestRegistry.registerTallCrop(Blocks.CACTUS.getDefaultState().with(CactusBlock.AGE, i)); - } - } - - @Override - public boolean harvest(World world, BlockPos pos, BlockState state, List drops) - { - BlockState up = world.getBlockState(pos.up()); - if (up.getBlock() == state.getBlock()) - { - LootContext.Builder lootBuilder = new LootContext.Builder((ServerWorld) world); - Vector3d blockCenter = new Vector3d(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); - List blockDrops = state.getDrops(lootBuilder.withParameter(LootParameters.field_237457_g_, blockCenter).withParameter(LootParameters.TOOL, mockHoe)); - drops.addAll(blockDrops); - world.destroyBlock(pos.up(), false); - return true; - } - - return false; - } - - @Override - public boolean test(World world, BlockPos pos, BlockState state) - { - return HarvestRegistry.getTallCrops().contains(state); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/ritual/harvest/HarvestRegistry.java b/src/main/java/wayoftime/bloodmagic/ritual/harvest/HarvestRegistry.java deleted file mode 100644 index c4738256..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/harvest/HarvestRegistry.java +++ /dev/null @@ -1,125 +0,0 @@ -package wayoftime.bloodmagic.ritual.harvest; - -import java.util.List; -import java.util.Map; -import java.util.Set; - -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Multimap; -import com.google.common.collect.Sets; - -import net.minecraft.block.AttachedStemBlock; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.StemBlock; - -public class HarvestRegistry -{ - - private static final List HARVEST_HANDLERS = Lists.newArrayList(); - private static final Map STANDARD_CROPS = Maps.newHashMap(); - private static final Set TALL_CROPS = Sets.newHashSet(); - private static final Multimap STEM_CROPS = ArrayListMultimap.create(); - private static final Map AMPLIFIERS = Maps.newHashMap(); - - /** - * Registers a handler for the Harvest Ritual to call. - * - * @param handler - The custom handler to register - */ - public static void registerHandler(IHarvestHandler handler) - { - if (!HARVEST_HANDLERS.contains(handler)) - HARVEST_HANDLERS.add(handler); - } - - /** - * Registers a standard crop (IE: Wheat, Carrots, Potatoes, Netherwart, etc) for - * the {@link WayofTime.bloodmagic.ritual.harvest.HarvestHandlerPlantable} - * handler to handle. - * - * @param crop - The crop block to handle. - * @param matureMeta - The meta value at which the crop is considered mature and - * ready to be harvested. - */ - public static void registerStandardCrop(Block crop, int matureMeta) - { - if (!STANDARD_CROPS.containsKey(crop)) - STANDARD_CROPS.put(crop, matureMeta); - } - - /** - * Registers a tall crop (Sugar Cane and Cactus) for the - * {@link WayofTime.bloodmagic.ritual.harvest.HarvestHandlerTall} handler to - * handle. - * - * @param crop - The crop block to handle. - */ - public static void registerTallCrop(BlockState crop) - { - if (!TALL_CROPS.contains(crop)) - TALL_CROPS.add(crop); - } - - /** - * Registers a stem crop (Melon and Pumpkin) for the - * {@link WayofTime.bloodmagic.ritual.harvest.HarvestHandlerStem} handler to - * handle. - *

- * Use {@link net.minecraftforge.oredict.OreDictionary#WILDCARD_VALUE} to accept - * any meta for the crop block. - *

- * The Stem must be instanceof {@link StemBlock} - * - * @param crop - The crop block to handle. - * @param stem - The stem of the crop - */ - public static void registerStemCrop(BlockState crop, BlockState stem) - { - if (!STEM_CROPS.containsKey(crop) && stem.getBlock() instanceof AttachedStemBlock) - STEM_CROPS.put(stem, crop); - } - - /** - * Registers a range amplifier for the Harvest Ritual. - * - * @param block - The block for the amplifier. - * @param range - The range the amplifier provides. - */ - public static void registerRangeAmplifier(BlockState block, int range) - { - if (!AMPLIFIERS.containsKey(block)) - AMPLIFIERS.put(block, range); - } - - public static List getHarvestHandlers() - { - return ImmutableList.copyOf(HARVEST_HANDLERS); - } - - public static Map getStandardCrops() - { - return ImmutableMap.copyOf(STANDARD_CROPS); - } - - public static Set getTallCrops() - { - return ImmutableSet.copyOf(TALL_CROPS); - } - - public static Multimap getStemCrops() - { - return ImmutableMultimap.copyOf(STEM_CROPS); - } - - public static Map getAmplifiers() - { - return ImmutableMap.copyOf(AMPLIFIERS); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/ritual/harvest/IHarvestHandler.java b/src/main/java/wayoftime/bloodmagic/ritual/harvest/IHarvestHandler.java deleted file mode 100644 index 82313dd5..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/harvest/IHarvestHandler.java +++ /dev/null @@ -1,39 +0,0 @@ -package wayoftime.bloodmagic.ritual.harvest; - -import java.util.List; - -import net.minecraft.block.BlockState; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -/** - * Used to define a HarvestHandler for the Harvest Ritual. - */ -public interface IHarvestHandler -{ - - /** - * Called whenever the Harvest Ritual attempts to harvest a block.
- * Use this to break the block and plant a new one.
- * Add the items to be dropped to the drops list.
- * - * @param world - The world - * @param pos - The position of the {@link BlockState} being checked - * @param state - The {@link BlockState} being checked - * @param drops - The items to be dropped - * @return If the block was successfully harvested. - */ - boolean harvest(World world, BlockPos pos, BlockState state, List drops); - - /** - * Tests to see if the block is valid for harvest. - * - * @param world The world - * @param pos The position in the world of the {@link BlockState} being - * checked - * @param state The {@link BlockState} being checked - * @return if this block is valid for harvest. - */ - boolean test(World world, BlockPos pos, BlockState state); -} diff --git a/src/main/java/wayoftime/bloodmagic/ritual/imperfect/IImperfectRitualStone.java b/src/main/java/wayoftime/bloodmagic/ritual/imperfect/IImperfectRitualStone.java deleted file mode 100644 index 856f5c60..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/imperfect/IImperfectRitualStone.java +++ /dev/null @@ -1,20 +0,0 @@ -package wayoftime.bloodmagic.ritual.imperfect; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -/** - * This interface is for internal implementation only. - *

- * It is provided via the API for easy obtaining of basic data. - */ -public interface IImperfectRitualStone -{ - - boolean performRitual(World world, BlockPos pos, ImperfectRitual imperfectRitual, PlayerEntity player); - - World getRitualWorld(); - - BlockPos getRitualPos(); -} diff --git a/src/main/java/wayoftime/bloodmagic/ritual/imperfect/ImperfectRitual.java b/src/main/java/wayoftime/bloodmagic/ritual/imperfect/ImperfectRitual.java deleted file mode 100644 index 6fe28e1f..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/imperfect/ImperfectRitual.java +++ /dev/null @@ -1,108 +0,0 @@ -package wayoftime.bloodmagic.ritual.imperfect; - -import java.util.function.Predicate; - -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.world.World; - -/** - * Abstract class for creating new imperfect rituals. To register, annotate your - * class with {@link WayofTime.bloodmagic.ritual.RitualRegister.Imperfect} - */ -public abstract class ImperfectRitual -{ - - private final String name; - private final Predicate blockRequirement; - private final int activationCost; - private final boolean lightShow; - private final String unlocalizedName; - - public ImperfectRitual(String name, Predicate blockRequirement, int activationCost, boolean lightShow, String unlocalizedName) - { - this.name = name; - this.blockRequirement = blockRequirement; - this.activationCost = activationCost; - this.lightShow = lightShow; - this.unlocalizedName = unlocalizedName; - } - - /** - * @param name The name of the ritual - * @param blockRequirement The block required above the ImperfectRitualStone - * @param activationCost Base LP cost for activating the ritual - */ - public ImperfectRitual(String name, Predicate blockRequirement, int activationCost, String unlocalizedName) - { - this(name, blockRequirement, activationCost, false, unlocalizedName); - } - - /** - * Called when the player activates the ritual - * {@link WayofTime.bloodmagic.tile.TileImperfectRitualStone#performRitual(World, net.minecraft.util.math.BlockPos, ImperfectRitual, PlayerEntity)} - * - * @param imperfectRitualStone - The {@link IImperfectRitualStone} that the - * ritual is bound to - * @param player - The player activating the ritual - * @return - Whether activation was successful - */ - public abstract boolean onActivate(IImperfectRitualStone imperfectRitualStone, PlayerEntity player); - - public String getName() - { - return name; - } - - public Predicate getBlockRequirement() - { - return blockRequirement; - } - - public int getActivationCost() - { - return activationCost; - } - - public boolean isLightShow() - { - return lightShow; - } - - public String getTranslationKey() - { - return unlocalizedName; - } - - @Override - public String toString() - { - return getName() + "@" + getActivationCost(); - } - - @Override - public boolean equals(Object o) - { - if (this == o) - return true; - if (!(o instanceof ImperfectRitual)) - return false; - - ImperfectRitual that = (ImperfectRitual) o; - - if (activationCost != that.activationCost) - return false; - if (name != null ? !name.equals(that.name) : that.name != null) - return false; - return unlocalizedName != null ? unlocalizedName.equals(that.unlocalizedName) : that.unlocalizedName == null; - } - - @Override - public int hashCode() - { - int result = name != null ? name.hashCode() : 0; - result = 31 * result + activationCost; - result = 31 * result + (unlocalizedName != null ? unlocalizedName.hashCode() : 0); - return result; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualAnimalGrowth.java b/src/main/java/wayoftime/bloodmagic/ritual/types/RitualAnimalGrowth.java deleted file mode 100644 index 3a6aea63..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualAnimalGrowth.java +++ /dev/null @@ -1,258 +0,0 @@ -package wayoftime.bloodmagic.ritual.types; - -import java.util.List; -import java.util.function.Consumer; - -import net.minecraft.entity.passive.AnimalEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.EffectInstance; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.items.IItemHandler; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; -import wayoftime.bloodmagic.demonaura.WorldDemonWillHandler; -import wayoftime.bloodmagic.potion.BloodMagicPotions; -import wayoftime.bloodmagic.ritual.AreaDescriptor; -import wayoftime.bloodmagic.ritual.EnumRuneType; -import wayoftime.bloodmagic.ritual.IMasterRitualStone; -import wayoftime.bloodmagic.ritual.Ritual; -import wayoftime.bloodmagic.ritual.RitualComponent; -import wayoftime.bloodmagic.ritual.RitualRegister; -import wayoftime.bloodmagic.util.Utils; - -@RitualRegister("animal_growth") -public class RitualAnimalGrowth extends Ritual -{ - public static final double rawWillDrain = 0.05; - public static final double vengefulWillDrain = 0.02; - public static final double steadfastWillDrain = 0.1; - public static final double destructiveWillDrain = 1; - - public static final String GROWTH_RANGE = "growing"; - public static final String CHEST_RANGE = "chest"; - public static int defaultRefreshTime = 20; - public int refreshTime = 20; - - public RitualAnimalGrowth() - { - super("ritualAnimalGrowth", 0, 10000, "ritual." + BloodMagic.MODID + ".animalGrowthRitual"); - addBlockRange(GROWTH_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-2, 1, -2), 5, 2, 5)); - addBlockRange(CHEST_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1)); - - setMaximumVolumeAndDistanceOfRange(GROWTH_RANGE, 0, 7, 7); - setMaximumVolumeAndDistanceOfRange(CHEST_RANGE, 1, 3, 3); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) - { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - if (currentEssence < getRefreshCost()) - { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - int maxGrowths = currentEssence / getRefreshCost(); - int totalGrowths = 0; - BlockPos pos = masterRitualStone.getBlockPos(); - - AreaDescriptor chestRange = masterRitualStone.getBlockRange(CHEST_RANGE); - TileEntity chest = world.getTileEntity(chestRange.getContainedPositions(pos).get(0)); - IItemHandler itemHandler = null; - if (chest != null) - { - itemHandler = Utils.getInventory(chest, null); - } - - List willConfig = masterRitualStone.getActiveWillConfig(); - - double rawWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DEFAULT, willConfig); - double steadfastWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.STEADFAST, willConfig); - double corrosiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.CORROSIVE, willConfig); - double destructiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DESTRUCTIVE, willConfig); - double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig); - - refreshTime = getRefreshTimeForRawWill(rawWill); - - boolean consumeRawWill = rawWill >= rawWillDrain && refreshTime != defaultRefreshTime; - - double vengefulDrain = 0; - double steadfastDrain = 0; - double destructiveDrain = 0; - - boolean decreaseBreedTimer = vengefulWill >= vengefulWillDrain; - boolean breedAnimals = steadfastWill >= steadfastWillDrain && itemHandler != null; - boolean kamikaze = destructiveWill >= destructiveWillDrain; - - AreaDescriptor growingRange = masterRitualStone.getBlockRange(GROWTH_RANGE); - AxisAlignedBB axis = growingRange.getAABB(masterRitualStone.getBlockPos()); - List animalList = world.getEntitiesWithinAABB(AnimalEntity.class, axis); - - boolean performedEffect = false; - - for (AnimalEntity animal : animalList) - { - if (animal.getGrowingAge() < 0) - { - animal.addGrowth(5); - totalGrowths++; - performedEffect = true; - } else if (animal.getGrowingAge() > 0) - { - if (decreaseBreedTimer) - { - if (vengefulWill >= vengefulWillDrain) - { - animal.setGrowingAge(Math.max(0, animal.getGrowingAge() - getBreedingDecreaseForWill(vengefulWill))); - vengefulDrain += vengefulWillDrain; - vengefulWill -= vengefulWillDrain; - performedEffect = true; - } else - { - decreaseBreedTimer = false; - } - } - } else - { - if (kamikaze) - { - if (destructiveWill >= destructiveWillDrain) - { - if (!animal.isPotionActive(BloodMagicPotions.SACRIFICIAL_LAMB)) - { - animal.addPotionEffect(new EffectInstance(BloodMagicPotions.SACRIFICIAL_LAMB, 1200)); - destructiveDrain += destructiveWillDrain; - destructiveWill -= destructiveWillDrain; - performedEffect = true; - } - } else - { - kamikaze = false; - } - } - - if (breedAnimals) - { - if (steadfastWill >= steadfastWillDrain) - { - if (!animal.isInLove()) - { - for (int slot = 0; slot < itemHandler.getSlots(); slot++) - { - ItemStack foodStack = itemHandler.getStackInSlot(slot); - if (foodStack != null && animal.isBreedingItem(foodStack) && itemHandler.extractItem(slot, 1, true) != null) - { - animal.setInLove(null); - itemHandler.extractItem(slot, 1, false); - steadfastDrain += steadfastWillDrain; - steadfastWill -= steadfastWillDrain; - performedEffect = true; - break; - } - } - } - } else - { - breedAnimals = false; - } - } - } - - if (totalGrowths >= maxGrowths) - { - break; - } - } - - if (performedEffect && consumeRawWill) - { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.DEFAULT, rawWillDrain, true); - } - - if (vengefulDrain > 0) - { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.VENGEFUL, vengefulDrain, true); - } - - if (steadfastDrain > 0) - { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.STEADFAST, steadfastDrain, true); - } - - if (destructiveDrain > 0) - { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.DESTRUCTIVE, destructiveDrain, true); - } - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(totalGrowths * getRefreshCost())); - } - - @Override - public int getRefreshCost() - { - return 2; - } - - @Override - public void gatherComponents(Consumer components) - { - - addParallelRunes(components, 2, 0, EnumRuneType.DUSK); - addParallelRunes(components, 1, 0, EnumRuneType.WATER); - components.accept(new RitualComponent(new BlockPos(1, 0, 2), EnumRuneType.EARTH)); - components.accept(new RitualComponent(new BlockPos(1, 0, -2), EnumRuneType.EARTH)); - components.accept(new RitualComponent(new BlockPos(-1, 0, 2), EnumRuneType.EARTH)); - components.accept(new RitualComponent(new BlockPos(-1, 0, -2), EnumRuneType.EARTH)); - components.accept(new RitualComponent(new BlockPos(2, 0, 1), EnumRuneType.AIR)); - components.accept(new RitualComponent(new BlockPos(2, 0, -1), EnumRuneType.AIR)); - components.accept(new RitualComponent(new BlockPos(-2, 0, 1), EnumRuneType.AIR)); - components.accept(new RitualComponent(new BlockPos(-2, 0, -1), EnumRuneType.AIR)); - } - - @Override - public Ritual getNewCopy() - { - return new RitualAnimalGrowth(); - } - - @Override - public ITextComponent[] provideInformationOfRitualToPlayer(PlayerEntity player) - { - return new ITextComponent[] { new TranslationTextComponent(this.getTranslationKey() + ".info"), - new TranslationTextComponent(this.getTranslationKey() + ".default.info"), - new TranslationTextComponent(this.getTranslationKey() + ".corrosive.info"), - new TranslationTextComponent(this.getTranslationKey() + ".steadfast.info"), - new TranslationTextComponent(this.getTranslationKey() + ".destructive.info"), - new TranslationTextComponent(this.getTranslationKey() + ".vengeful.info") }; - } - - public int getBreedingDecreaseForWill(double vengefulWill) - { - return (int) (10 + vengefulWill / 5); - } - - public int getRefreshTimeForRawWill(double rawWill) - { - if (rawWill >= rawWillDrain) - { - return (int) Math.max(defaultRefreshTime - rawWill / 10, 1); - } - - return defaultRefreshTime; - } - - @Override - public int getRefreshTime() - { - return refreshTime; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualArmourEvolve.java b/src/main/java/wayoftime/bloodmagic/ritual/types/RitualArmourEvolve.java deleted file mode 100644 index 477f6704..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualArmourEvolve.java +++ /dev/null @@ -1,110 +0,0 @@ -package wayoftime.bloodmagic.ritual.types; - -import java.util.List; -import java.util.function.Consumer; - -import net.minecraft.entity.EntityType; -import net.minecraft.entity.effect.LightningBoltEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.core.living.LivingStats; -import wayoftime.bloodmagic.core.living.LivingUtil; -import wayoftime.bloodmagic.ritual.AreaDescriptor; -import wayoftime.bloodmagic.ritual.EnumRuneType; -import wayoftime.bloodmagic.ritual.IMasterRitualStone; -import wayoftime.bloodmagic.ritual.Ritual; -import wayoftime.bloodmagic.ritual.RitualComponent; -import wayoftime.bloodmagic.ritual.RitualRegister; - -@RitualRegister("armour_evolve") -public class RitualArmourEvolve extends Ritual -{ - public static final String CHECK_RANGE = "fillRange"; - - public RitualArmourEvolve() - { - super("ritualArmourEvolve", 0, 50000, "ritual." + BloodMagic.MODID + ".armourEvolveRitual"); - addBlockRange(CHECK_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1, 2, 1)); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) - { - World world = masterRitualStone.getWorldObj(); - - if (world.isRemote) - { - return; - } - - BlockPos pos = masterRitualStone.getBlockPos(); - - AreaDescriptor checkRange = masterRitualStone.getBlockRange(CHECK_RANGE); - - List playerList = world.getEntitiesWithinAABB(PlayerEntity.class, checkRange.getAABB(pos)); - - for (PlayerEntity player : playerList) - { - if (LivingUtil.hasFullSet(player)) - { - ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); - LivingStats stats = LivingStats.fromPlayer(player); - - if (stats.getMaxPoints() < 300) - { - stats.setMaxPoints(300); - LivingStats.toPlayer(player, stats); -// ((ItemLivingArmour) chestStack.getItem()).setLivingArmour(chestStack, armour, true); - - masterRitualStone.setActive(false); - - LightningBoltEntity lightningboltentity = EntityType.LIGHTNING_BOLT.create(world); -// LightningBoltEntity lightning = new LightningBoltEntity(world, pos.getX() + dispX, pos.getY(), pos.getZ() + dispZ); - lightningboltentity.setPosition(pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5); -// lightningboltentity.setEffectOnly(true); - world.addEntity(lightningboltentity); - } - - } - } - } - - @Override - public int getRefreshTime() - { - return 1; - } - - @Override - public int getRefreshCost() - { - return 0; - } - - @Override - public void gatherComponents(Consumer components) - { - addCornerRunes(components, 1, 0, EnumRuneType.DUSK); - addCornerRunes(components, 2, 0, EnumRuneType.FIRE); - addOffsetRunes(components, 1, 2, 0, EnumRuneType.FIRE); - addCornerRunes(components, 1, 1, EnumRuneType.DUSK); - addParallelRunes(components, 4, 0, EnumRuneType.EARTH); - addCornerRunes(components, 1, 3, EnumRuneType.DUSK); - addParallelRunes(components, 1, 4, EnumRuneType.EARTH); - - for (int i = 0; i < 4; i++) - { - addCornerRunes(components, 3, i, EnumRuneType.EARTH); - } - } - - @Override - public Ritual getNewCopy() - { - return new RitualArmourEvolve(); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualCrushing.java b/src/main/java/wayoftime/bloodmagic/ritual/types/RitualCrushing.java deleted file mode 100644 index 92af0383..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualCrushing.java +++ /dev/null @@ -1,360 +0,0 @@ -package wayoftime.bloodmagic.ritual.types; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.function.Consumer; - -import com.mojang.authlib.GameProfile; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.enchantment.Enchantments; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import net.minecraft.loot.LootContext; -import net.minecraft.loot.LootParameters; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; -import net.minecraftforge.common.util.FakePlayer; -import net.minecraftforge.common.util.FakePlayerFactory; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.common.block.BlockMasterRitualStone; -import wayoftime.bloodmagic.demonaura.WorldDemonWillHandler; -import wayoftime.bloodmagic.ritual.AreaDescriptor; -import wayoftime.bloodmagic.ritual.EnumRuneType; -import wayoftime.bloodmagic.ritual.IMasterRitualStone; -import wayoftime.bloodmagic.ritual.IRitualStone; -import wayoftime.bloodmagic.ritual.Ritual; -import wayoftime.bloodmagic.ritual.RitualComponent; -import wayoftime.bloodmagic.ritual.RitualRegister; -import wayoftime.bloodmagic.util.Utils; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; - -@RitualRegister("crushing") -public class RitualCrushing extends Ritual -{ - public static final String CRUSHING_RANGE = "crushingRange"; - public static final String CHEST_RANGE = "chest"; - - public static double rawWillDrain = 0.05; - public static double steadfastWillDrain = 0.2; - public static double destructiveWillDrain = 0.2; - public static double vengefulWillDrain = 0.2; - - public static Map cuttingFluidLPMap = new HashMap<>(); - public static Map cuttingFluidWillMap = new HashMap<>(); - public static int defaultRefreshTime = 40; - private FakePlayer fakePlayer; - public int refreshTime = 40; - - private static final ItemStack mockPick = new ItemStack(Items.DIAMOND_PICKAXE, 1); - static - { - mockPick.addEnchantment(Enchantments.SILK_TOUCH, 1); - } - - public RitualCrushing() - { - super("ritualCrushing", 0, 5000, "ritual." + BloodMagic.MODID + ".crushingRitual"); - addBlockRange(CRUSHING_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-1, -3, -1), 3)); - addBlockRange(CHEST_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1)); - - setMaximumVolumeAndDistanceOfRange(CRUSHING_RANGE, 50, 10, 10); - setMaximumVolumeAndDistanceOfRange(CHEST_RANGE, 1, 3, 3); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) - { - World world = masterRitualStone.getWorldObj(); - if (world.isRemote) - { - return; - } - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - if (currentEssence < getRefreshCost()) - { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - BlockPos pos = masterRitualStone.getBlockPos(); - AreaDescriptor chestRange = masterRitualStone.getBlockRange(CHEST_RANGE); - TileEntity tile = world.getTileEntity(chestRange.getContainedPositions(pos).get(0)); - - if (tile != null && Utils.getNumberOfFreeSlots(tile, Direction.DOWN) < 1) - { - return; - } - - List willConfig = masterRitualStone.getActiveWillConfig(); - - double rawWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DEFAULT, willConfig); - double steadfastWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.STEADFAST, willConfig); - double corrosiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.CORROSIVE, willConfig); - double destructiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DESTRUCTIVE, willConfig); - double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig); - - refreshTime = getRefreshTimeForRawWill(rawWill); - - boolean consumeRawWill = rawWill >= rawWillDrain && refreshTime != defaultRefreshTime; - - boolean isSilkTouch = steadfastWill >= steadfastWillDrain; - boolean useCuttingFluid = corrosiveWill > 0; - - int fortune = destructiveWill > 0 ? 3 : 0; - - AreaDescriptor crushingRange = masterRitualStone.getBlockRange(CRUSHING_RANGE); - boolean hasOperated = false; - - double rawDrain = 0; - - for (BlockPos newPos : crushingRange.getContainedPositions(pos)) - { - if (world.isAirBlock(newPos)) - { - continue; - } - - BlockState state = world.getBlockState(newPos); - Block block = state.getBlock(); - - if (block instanceof BlockMasterRitualStone || block instanceof IRitualStone - || state.getBlockHardness(world, newPos) == -1.0F || Utils.isBlockLiquid(state)) - { - continue; - } - - boolean isBlockClaimed = false; -// if (useCuttingFluid) -// { -// ItemStack checkStack = block.getItem(world, newPos, state); -// if (checkStack.isEmpty()) -// { -// continue; -// } -// -// ItemStack copyStack = checkStack.copy(); -// -// for (ICrushingHandler handler : CrushingRegistry.getCrushingHandlerList()) -// { -// int lpDrain = handler.getLpDrain(); -// double willDrain = handler.getWillDrain(); -// -// if (corrosiveWill < willDrain || currentEssence < lpDrain + getRefreshCost()) -// { -// continue; -// } -// -// ItemStack result = handler.getRecipeOutput(copyStack, world, pos); -// -// if (result.isEmpty()) -// { -// continue; -// } -// -// if (tile != null) -// { -// result = Utils.insertStackIntoTile(result, tile, Direction.DOWN); -// if (!result.isEmpty()) -// { -// Utils.spawnStackAtBlock(world, pos, Direction.UP, result); -// } -// } else -// { -// Utils.spawnStackAtBlock(world, pos, Direction.UP, result); -// } -// -// WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.CORROSIVE, willDrain, true); -// corrosiveWill -= willDrain; -// -// masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(lpDrain)); -// currentEssence -= lpDrain; -// -// isBlockClaimed = true; -// } -// -// } - - Blocks d; - if (!isBlockClaimed && isSilkTouch) - { - LootContext.Builder lootBuilder = new LootContext.Builder((ServerWorld) world); - Vector3d blockCenter = new Vector3d(newPos.getX() + 0.5, newPos.getY() + 0.5, newPos.getZ() + 0.5); - List silkDrops = state.getDrops(lootBuilder.withParameter(LootParameters.field_237457_g_, blockCenter).withParameter(LootParameters.TOOL, mockPick)); - - for (ItemStack item : silkDrops) - { - ItemStack copyStack = item.copy(); - - if (tile != null) - { - copyStack = Utils.insertStackIntoTile(copyStack, tile, Direction.DOWN); - } else - { - Utils.spawnStackAtBlock(world, pos, Direction.UP, copyStack); - continue; - } - if (!copyStack.isEmpty()) - { - Utils.spawnStackAtBlock(world, pos, Direction.UP, copyStack); - } - } - - if (steadfastWill >= steadfastWillDrain) - { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.STEADFAST, steadfastWillDrain, true); - steadfastWill -= steadfastWillDrain; - } else - { - continue; - } - - } else if (!isBlockClaimed) - { - if (fortune > 0 && destructiveWill < destructiveWillDrain) - { - fortune = 0; - } - - ItemStack mockFortunePick = new ItemStack(Items.DIAMOND_PICKAXE, 1); - mockFortunePick.addEnchantment(Enchantments.FORTUNE, fortune); - - LootContext.Builder lootBuilder = new LootContext.Builder((ServerWorld) world); - Vector3d blockCenter = new Vector3d(newPos.getX() + 0.5, newPos.getY() + 0.5, newPos.getZ() + 0.5); - List stackList = state.getDrops(lootBuilder.withParameter(LootParameters.field_237457_g_, blockCenter).withParameter(LootParameters.TOOL, mockFortunePick)); -// List stackList = Block.getDrops(state, world, newPos, world.getTileEntity(newPos)); - -// List stackList = block.getDrops(world, newPos, state, fortune); - - for (ItemStack item : stackList) - { - ItemStack copyStack = item.copy(); - - if (tile != null) - { - copyStack = Utils.insertStackIntoTile(copyStack, tile, Direction.DOWN); - } else - { - Utils.spawnStackAtBlock(world, pos, Direction.UP, copyStack); - continue; - } - if (!copyStack.isEmpty()) - { - Utils.spawnStackAtBlock(world, pos, Direction.UP, copyStack); - } - } - - if (fortune > 0) - { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.DESTRUCTIVE, destructiveWillDrain, true); - destructiveWill -= destructiveWillDrain; - } - } - - world.destroyBlock(newPos, false); - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); - hasOperated = true; - - if (consumeRawWill) - { - rawDrain += rawWillDrain; - rawWill -= rawWillDrain; - } - - break; - } - -// if (hasOperated && tile != null && vengefulWill >= vengefulWillDrain) -// { -// Pair pair = CompressionRegistry.compressInventory(tile, world); -// if (pair.getRight()) -// { -// ItemStack returned = pair.getLeft(); -// if (returned != null) -// { -// Utils.spawnStackAtBlock(world, pos, Direction.UP, returned); -// } -// -// WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.VENGEFUL, vengefulWillDrain, true); -// } -// } - - if (rawDrain > 0) - { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.DEFAULT, rawDrain, true); - } - } - - public int getRefreshTimeForRawWill(double rawWill) - { - if (rawWill >= rawWillDrain) - { - return Math.max(1, (int) (40 - rawWill / 5)); - } - - return defaultRefreshTime; - } - - @Override - public int getRefreshTime() - { - return refreshTime; - } - - @Override - public int getRefreshCost() - { - return 7; - } - - @Override - public void gatherComponents(Consumer components) - { - addParallelRunes(components, 1, 0, EnumRuneType.EARTH); - addParallelRunes(components, 2, 0, EnumRuneType.FIRE); - addCornerRunes(components, 2, 0, EnumRuneType.DUSK); - addParallelRunes(components, 2, 1, EnumRuneType.AIR); - } - - @Override - public ITextComponent[] provideInformationOfRitualToPlayer(PlayerEntity player) - { - return new ITextComponent[] - { new TranslationTextComponent(this.getTranslationKey() + ".info"), - new TranslationTextComponent(this.getTranslationKey() + ".default.info"), - new TranslationTextComponent(this.getTranslationKey() + ".corrosive.info"), - new TranslationTextComponent(this.getTranslationKey() + ".steadfast.info"), - new TranslationTextComponent(this.getTranslationKey() + ".destructive.info"), - new TranslationTextComponent(this.getTranslationKey() + ".vengeful.info") }; - } - - @Override - public Ritual getNewCopy() - { - return new RitualCrushing(); - } - - public static void registerCuttingFluid(ItemStack stack, int lpDrain, double willDrain) - { - cuttingFluidLPMap.put(stack, lpDrain); - cuttingFluidWillMap.put(stack, willDrain); - } - - private FakePlayer getFakePlayer(ServerWorld world) - { - return fakePlayer == null - ? fakePlayer = FakePlayerFactory.get(world, new GameProfile(null, BloodMagic.MODID + "_ritual_crushing")) - : fakePlayer; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualCrystalHarvest.java b/src/main/java/wayoftime/bloodmagic/ritual/types/RitualCrystalHarvest.java deleted file mode 100644 index 1a8add72..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualCrystalHarvest.java +++ /dev/null @@ -1,104 +0,0 @@ -package wayoftime.bloodmagic.ritual.types; - -import java.util.function.Consumer; - -import net.minecraft.block.BlockState; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.ritual.AreaDescriptor; -import wayoftime.bloodmagic.ritual.EnumRuneType; -import wayoftime.bloodmagic.ritual.IMasterRitualStone; -import wayoftime.bloodmagic.ritual.Ritual; -import wayoftime.bloodmagic.ritual.RitualComponent; -import wayoftime.bloodmagic.ritual.RitualRegister; -import wayoftime.bloodmagic.tile.TileDemonCrystal; - -@RitualRegister("crystal_harvest") -public class RitualCrystalHarvest extends Ritual -{ - public static final String CRYSTAL_RANGE = "crystal"; - - public RitualCrystalHarvest() - { - super("ritualCrystalHarvest", 0, 40000, "ritual." + BloodMagic.MODID + ".crystalHarvestRitual"); - addBlockRange(CRYSTAL_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-3, 2, -3), 7, 5, 7)); - - setMaximumVolumeAndDistanceOfRange(CRYSTAL_RANGE, 250, 5, 7); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) - { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - BlockPos pos = masterRitualStone.getBlockPos(); - - if (currentEssence < getRefreshCost()) - { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - int maxEffects = 1; - int totalEffects = 0; - - AreaDescriptor crystalRange = masterRitualStone.getBlockRange(CRYSTAL_RANGE); - - crystalRange.resetIterator(); - while (crystalRange.hasNext()) - { - BlockPos nextPos = crystalRange.next().add(pos); - TileEntity tile = world.getTileEntity(nextPos); - if (tile instanceof TileDemonCrystal) - { - TileDemonCrystal demonCrystal = (TileDemonCrystal) tile; - if (demonCrystal.dropSingleCrystal()) - { - BlockState state = world.getBlockState(nextPos); - world.notifyBlockUpdate(nextPos, state, state, 3); - totalEffects++; - if (totalEffects >= maxEffects) - { - break; - } - } - } - } - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * totalEffects)); - } - - @Override - public int getRefreshTime() - { - return 25; - } - - @Override - public int getRefreshCost() - { - return 50; - } - - @Override - public void gatherComponents(Consumer components) - { - addCornerRunes(components, 1, 0, EnumRuneType.AIR); - addParallelRunes(components, 1, 1, EnumRuneType.DUSK); - addParallelRunes(components, 1, -1, EnumRuneType.FIRE); - addParallelRunes(components, 2, -1, EnumRuneType.FIRE); - addParallelRunes(components, 3, -1, EnumRuneType.FIRE); - addOffsetRunes(components, 3, 1, -1, EnumRuneType.FIRE); - addCornerRunes(components, 3, -1, EnumRuneType.EARTH); - addCornerRunes(components, 3, 0, EnumRuneType.EARTH); - addOffsetRunes(components, 3, 2, 0, EnumRuneType.DUSK); - } - - @Override - public Ritual getNewCopy() - { - return new RitualCrystalHarvest(); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualCrystalSplit.java b/src/main/java/wayoftime/bloodmagic/ritual/types/RitualCrystalSplit.java deleted file mode 100644 index 9e399aae..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualCrystalSplit.java +++ /dev/null @@ -1,215 +0,0 @@ -package wayoftime.bloodmagic.ritual.types; - -import java.util.function.Consumer; - -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.ritual.EnumRuneType; -import wayoftime.bloodmagic.ritual.IMasterRitualStone; -import wayoftime.bloodmagic.ritual.Ritual; -import wayoftime.bloodmagic.ritual.RitualComponent; -import wayoftime.bloodmagic.ritual.RitualRegister; -import wayoftime.bloodmagic.tile.TileDemonCrystal; - -@RitualRegister("crystal_split") -public class RitualCrystalSplit extends Ritual -{ - public RitualCrystalSplit() - { - super("ritualCrystalSplit", 0, 20000, "ritual." + BloodMagic.MODID + ".crystalSplitRitual"); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) - { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - if (currentEssence < getRefreshCost()) - { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - BlockPos pos = masterRitualStone.getBlockPos(); - Direction direction = masterRitualStone.getDirection(); - BlockPos rawPos = pos.up(2); - - TileEntity tile = world.getTileEntity(rawPos); - if (!(tile instanceof TileDemonCrystal) || ((TileDemonCrystal) tile).getWillType() != EnumDemonWillType.DEFAULT) - { - return; - } - - BlockState rawState = world.getBlockState(rawPos); - - TileDemonCrystal rawTile = (TileDemonCrystal) tile; - if (rawTile.getCrystalCount() >= 5) - { - BlockPos vengefulPos = pos.offset(rotateFacing(Direction.NORTH, direction)).up(); - BlockPos corrosivePos = pos.offset(rotateFacing(Direction.EAST, direction)).up(); - BlockPos steadfastPos = pos.offset(rotateFacing(Direction.SOUTH, direction)).up(); - BlockPos destructivePos = pos.offset(rotateFacing(Direction.WEST, direction)).up(); - - int vengefulCrystals = 0; - int corrosiveCrystals = 0; - int steadfastCrystals = 0; - int destructiveCrystals = 0; - - tile = world.getTileEntity(vengefulPos); - if (tile instanceof TileDemonCrystal && ((TileDemonCrystal) tile).getWillType() == EnumDemonWillType.VENGEFUL && ((TileDemonCrystal) tile).getCrystalCount() < 7) - { - vengefulCrystals = ((TileDemonCrystal) tile).getCrystalCount(); - } else if (!(tile instanceof TileDemonCrystal) && world.isAirBlock(vengefulPos)) - { - // #donothing, no point setting the crystal to 0 again - } else - { - return; - } - - tile = world.getTileEntity(corrosivePos); - if (tile instanceof TileDemonCrystal && ((TileDemonCrystal) tile).getWillType() == EnumDemonWillType.CORROSIVE && ((TileDemonCrystal) tile).getCrystalCount() < 7) - { - corrosiveCrystals = ((TileDemonCrystal) tile).getCrystalCount(); - } else if (!(tile instanceof TileDemonCrystal) && world.isAirBlock(corrosivePos)) - { - - } else - { - return; - } - - tile = world.getTileEntity(steadfastPos); - if (tile instanceof TileDemonCrystal && ((TileDemonCrystal) tile).getWillType() == EnumDemonWillType.STEADFAST && ((TileDemonCrystal) tile).getCrystalCount() < 7) - { - steadfastCrystals = ((TileDemonCrystal) tile).getCrystalCount(); - } else if (!(tile instanceof TileDemonCrystal) && world.isAirBlock(steadfastPos)) - { - - } else - { - return; - } - - tile = world.getTileEntity(destructivePos); - if (tile instanceof TileDemonCrystal && ((TileDemonCrystal) tile).getWillType() == EnumDemonWillType.DESTRUCTIVE && ((TileDemonCrystal) tile).getCrystalCount() < 7) - { - destructiveCrystals = ((TileDemonCrystal) tile).getCrystalCount(); - } else if (!(tile instanceof TileDemonCrystal) && world.isAirBlock(destructivePos)) - { - - } else - { - return; - } - - rawTile.setCrystalCount(rawTile.getCrystalCount() - 4); - - growCrystal(world, vengefulPos, EnumDemonWillType.VENGEFUL, vengefulCrystals); - growCrystal(world, corrosivePos, EnumDemonWillType.CORROSIVE, corrosiveCrystals); - growCrystal(world, steadfastPos, EnumDemonWillType.STEADFAST, steadfastCrystals); - growCrystal(world, destructivePos, EnumDemonWillType.DESTRUCTIVE, destructiveCrystals); - rawTile.markDirty(); - world.notifyBlockUpdate(rawPos, rawState, rawState, 3); - } - } - - public Direction rotateFacing(Direction facing, Direction rotation) - { - switch (rotation) - { - case EAST: - return facing.rotateY(); - case SOUTH: - return facing.rotateY().rotateY(); - case WEST: - return facing.rotateYCCW(); - case NORTH: - default: - return facing; - } - } - - public void growCrystal(World world, BlockPos pos, EnumDemonWillType type, int currentCrystalCount) - { - if (currentCrystalCount <= 0) - { - BlockState state; - switch (type) - { - case CORROSIVE: - state = BloodMagicBlocks.CORROSIVE_CRYSTAL_BLOCK.get().getDefaultState(); - break; - case DEFAULT: - state = BloodMagicBlocks.RAW_CRYSTAL_BLOCK.get().getDefaultState(); - break; - case DESTRUCTIVE: - state = BloodMagicBlocks.DESTRUCTIVE_CRYSTAL_BLOCK.get().getDefaultState(); - break; - case STEADFAST: - state = BloodMagicBlocks.STEADFAST_CRYSTAL_BLOCK.get().getDefaultState(); - break; - case VENGEFUL: - state = BloodMagicBlocks.VENGEFUL_CRYSTAL_BLOCK.get().getDefaultState(); - break; - default: - state = BloodMagicBlocks.RAW_CRYSTAL_BLOCK.get().getDefaultState(); - } - world.setBlockState(pos, state, 3); - } else - { - TileDemonCrystal tile = (TileDemonCrystal) world.getTileEntity(pos); - tile.setCrystalCount(currentCrystalCount + 1); - tile.markDirty(); - BlockState state = world.getBlockState(pos); - world.notifyBlockUpdate(pos, state, state, 3); - } - } - - @Override - public int getRefreshTime() - { - return 20; - } - - @Override - public int getRefreshCost() - { - return 1000; - } - - @Override - public void gatherComponents(Consumer components) - { - addRune(components, 0, 0, -1, EnumRuneType.FIRE); - addRune(components, 1, 0, 0, EnumRuneType.EARTH); - addRune(components, 0, 0, 1, EnumRuneType.WATER); - addRune(components, -1, 0, 0, EnumRuneType.AIR); - - this.addOffsetRunes(components, 1, 2, -1, EnumRuneType.DUSK); - this.addCornerRunes(components, 1, 0, EnumRuneType.BLANK); - this.addParallelRunes(components, 2, 0, EnumRuneType.DUSK); - } - - @Override - public Ritual getNewCopy() - { - return new RitualCrystalSplit(); - } - - @Override - public ITextComponent[] provideInformationOfRitualToPlayer(PlayerEntity player) - { - return new ITextComponent[] { new TranslationTextComponent(this.getTranslationKey() + ".info") }; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualEllipsoid.java b/src/main/java/wayoftime/bloodmagic/ritual/types/RitualEllipsoid.java deleted file mode 100644 index 1587145d..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualEllipsoid.java +++ /dev/null @@ -1,272 +0,0 @@ -package wayoftime.bloodmagic.ritual.types; - -import java.util.function.Consumer; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.item.BlockItem; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.ritual.AreaDescriptor; -import wayoftime.bloodmagic.ritual.EnumRuneType; -import wayoftime.bloodmagic.ritual.IMasterRitualStone; -import wayoftime.bloodmagic.ritual.Ritual; -import wayoftime.bloodmagic.ritual.RitualComponent; -import wayoftime.bloodmagic.ritual.RitualRegister; - -@RitualRegister("ellipsoid") -public class RitualEllipsoid extends Ritual -{ - public static final String SPHEROID_RANGE = "spheroidRange"; - public static final String CHEST_RANGE = "chest"; - - private boolean cached = false; - private BlockPos currentPos; // Offset - - public RitualEllipsoid() - { - super("ritualEllipsoid", 0, 20000, "ritual." + BloodMagic.MODID + ".ellipseRitual"); - addBlockRange(SPHEROID_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-10, -10, -10), new BlockPos(11, 11, 11))); - addBlockRange(CHEST_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1)); - - setMaximumVolumeAndDistanceOfRange(SPHEROID_RANGE, 0, 32, 32); - setMaximumVolumeAndDistanceOfRange(CHEST_RANGE, 1, 3, 3); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) - { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - BlockPos masterPos = masterRitualStone.getBlockPos(); - AreaDescriptor chestRange = masterRitualStone.getBlockRange(CHEST_RANGE); - TileEntity tileInventory = world.getTileEntity(chestRange.getContainedPositions(masterPos).get(0)); - - if (currentEssence < getRefreshCost()) - { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - AreaDescriptor sphereRange = masterRitualStone.getBlockRange(SPHEROID_RANGE); - AxisAlignedBB sphereBB = sphereRange.getAABB(masterPos); - int minX = (int) (masterPos.getX() - sphereBB.minX); - int maxX = (int) (sphereBB.maxX - masterPos.getX()) - 1; - int minY = (int) (masterPos.getY() - sphereBB.minY); - int maxY = (int) (sphereBB.maxY - masterPos.getY()) - 1; - int minZ = (int) (masterPos.getZ() - sphereBB.minZ); - int maxZ = (int) (sphereBB.maxZ - masterPos.getZ()) - 1; - - if (tileInventory != null) - { -// System.out.println("Tile"); - if (tileInventory.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN).isPresent()) - { -// System.out.println("Have inv"); - IItemHandler itemHandler = tileInventory.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN).resolve().get(); - - if (itemHandler.getSlots() <= 0) - { - return; - } - - int blockSlot = -1; - for (int invSlot = 0; invSlot < itemHandler.getSlots(); invSlot++) - { - ItemStack stack = itemHandler.extractItem(invSlot, 1, true); - if (stack.isEmpty() || !(stack.getItem() instanceof BlockItem)) - continue; - - blockSlot = invSlot; - break; - } - -// System.out.println("Block slot: " + blockSlot); - - if (blockSlot == -1) - { - return; - } - - int xR = Math.max(maxX, minX); - int yR = Math.max(maxY, minY); - int zR = Math.max(maxZ, minZ); - - int j = -minX; - int i = -minY; - int k = -minZ; - - if (currentPos != null) - { - j = currentPos.getY(); - i = Math.min(xR, Math.max(-minX, currentPos.getX())); - k = Math.min(zR, Math.max(-minZ, currentPos.getZ())); - } - int checks = 0; - int maxChecks = 100; - - while (j <= maxY) - { - while (i <= maxX) - { - while (k <= maxZ) - { - checks++; - if (checks >= maxChecks) - { - this.currentPos = new BlockPos(i, j, k); -// System.out.println(this.currentPos); - return; - } - - if (checkIfEllipsoidShell(xR, yR, zR, i, j, k)) - { - BlockPos newPos = masterPos.add(i, j, k); -// - if (!world.isAirBlock(newPos)) - { - k++; - continue; - } - - BlockState placeState = Block.getBlockFromItem(itemHandler.getStackInSlot(blockSlot).getItem()).getDefaultState(); - world.setBlockState(newPos, placeState); - - itemHandler.extractItem(blockSlot, 1, false); - tileInventory.markDirty(); - // TODO: - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); - k++; - this.currentPos = new BlockPos(i, j, k); -// System.out.println(this.currentPos); - return; - } - k++; - } - i++; - k = -minZ; - } - j++; - i = -minX; - this.currentPos = new BlockPos(i, j, k); - return; - } - - j = -minY; - this.currentPos = new BlockPos(i, j, k); - return; - } - } - } - - public boolean checkIfEllipsoidShell(int xR, int yR, int zR, int xOff, int yOff, int zOff) - { - // Checking shell in the x-direction - if (!checkIfEllipsoid(xR, yR, zR, xOff, yOff, zOff)) - { - return false; - } - - return !((checkIfEllipsoid(xR, yR, zR, xOff + 1, yOff, zOff) && checkIfEllipsoid(xR, yR, zR, xOff - 1, yOff, zOff)) && (checkIfEllipsoid(xR, yR, zR, xOff, yOff + 1, zOff) && checkIfEllipsoid(xR, yR, zR, xOff, yOff - 1, zOff)) && (checkIfEllipsoid(xR, yR, zR, xOff, yOff, zOff + 1) && checkIfEllipsoid(xR, yR, zR, xOff, yOff, zOff - 1))); -// if (xOff * xOff + yOff * yOff + zOff * zOff >= (xR - 0.5) * (xR - 0.5) && xOff * xOff + yOff * yOff + zOff * zOff <= (xR + 0.5) * (xR + 0.5)) -// if (checkIfEllipsoid(xR, yR, zR, xOff, yOff, zOff)) -// { -// if (xOff * xOff / ((xR - 0.5) * (xR - 0.5)) + yOff * yOff / ((yR - 0.5) * (yR - 0.5)) >= 1 - zOff * zOff / ((zR + possOffset) * (zR + possOffset))) -// { -// return true; -// } -// -// if (xOff * xOff / ((xR - 0.5) * (xR - 0.5)) + zOff * zOff / ((zR - 0.5) * (zR - 0.5)) >= 1 - yOff * yOff / ((yR + possOffset) * (yR + possOffset))) -// { -// return true; -// } -// -// if (zOff * zOff / ((zR - 0.5) * (zR - 0.5)) + yOff * yOff / ((yR - 0.5) * (yR - 0.5)) >= 1 - xOff * xOff / ((xR + possOffset) * (xR + possOffset))) -// { -// return true; -// } -// } -// return false; - } - - public boolean checkIfEllipsoid(float xR, float yR, float zR, float xOff, float yOff, float zOff) - { - float possOffset = 0.5f; - return xOff * xOff / ((xR + possOffset) * (xR + possOffset)) + yOff * yOff / ((yR + possOffset) * (yR + possOffset)) + zOff * zOff / ((zR + possOffset) * (zR + possOffset)) <= 1; - } - - @Override - public int getRefreshCost() - { - return 10;// Temporary - } - - @Override - public int getRefreshTime() - { - return 1; - } - -// @Override -// public void readFromNBT(NBTTagCompound tag) -// { -// super.readFromNBT(tag); -// tag -// } - - @Override - public void gatherComponents(Consumer components) - { - addCornerRunes(components, 1, 0, EnumRuneType.DUSK); - - addRune(components, 4, 0, 0, EnumRuneType.FIRE); - addRune(components, 5, 0, 0, EnumRuneType.FIRE); - addRune(components, 5, 0, -1, EnumRuneType.FIRE); - addRune(components, 5, 0, -2, EnumRuneType.FIRE); - addRune(components, -4, 0, 0, EnumRuneType.FIRE); - addRune(components, -5, 0, 0, EnumRuneType.FIRE); - addRune(components, -5, 0, 1, EnumRuneType.FIRE); - addRune(components, -5, 0, 2, EnumRuneType.FIRE); - - addRune(components, 0, 0, 4, EnumRuneType.AIR); - addRune(components, 0, 0, 5, EnumRuneType.AIR); - addRune(components, 1, 0, 5, EnumRuneType.AIR); - addRune(components, 2, 0, 5, EnumRuneType.AIR); - addRune(components, 0, 0, -4, EnumRuneType.AIR); - addRune(components, 0, 0, -5, EnumRuneType.AIR); - addRune(components, -1, 0, -5, EnumRuneType.AIR); - addRune(components, -2, 0, -5, EnumRuneType.AIR); - - addRune(components, 3, 0, 1, EnumRuneType.EARTH); - addRune(components, 3, 0, 2, EnumRuneType.EARTH); - addRune(components, 3, 0, 3, EnumRuneType.EARTH); - addRune(components, 2, 0, 3, EnumRuneType.EARTH); - addRune(components, -3, 0, -1, EnumRuneType.EARTH); - addRune(components, -3, 0, -2, EnumRuneType.EARTH); - addRune(components, -3, 0, -3, EnumRuneType.EARTH); - addRune(components, -2, 0, -3, EnumRuneType.EARTH); - - addRune(components, 1, 0, -3, EnumRuneType.WATER); - addRune(components, 2, 0, -3, EnumRuneType.WATER); - addRune(components, 3, 0, -3, EnumRuneType.WATER); - addRune(components, 3, 0, -2, EnumRuneType.WATER); - addRune(components, -1, 0, 3, EnumRuneType.WATER); - addRune(components, -2, 0, 3, EnumRuneType.WATER); - addRune(components, -3, 0, 3, EnumRuneType.WATER); - addRune(components, -3, 0, 2, EnumRuneType.WATER); - } - - @Override - public Ritual getNewCopy() - { - return new RitualEllipsoid(); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualFeatheredKnife.java b/src/main/java/wayoftime/bloodmagic/ritual/types/RitualFeatheredKnife.java deleted file mode 100644 index 9f2a7734..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualFeatheredKnife.java +++ /dev/null @@ -1,258 +0,0 @@ -package wayoftime.bloodmagic.ritual.types; - -import java.util.List; -import java.util.function.Consumer; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.potion.EffectInstance; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.ConfigHandler; -import wayoftime.bloodmagic.altar.IBloodAltar; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; -import wayoftime.bloodmagic.demonaura.WorldDemonWillHandler; -import wayoftime.bloodmagic.network.SetClientHealthPacket; -import wayoftime.bloodmagic.potion.BloodMagicPotions; -import wayoftime.bloodmagic.ritual.AreaDescriptor; -import wayoftime.bloodmagic.ritual.EnumRuneType; -import wayoftime.bloodmagic.ritual.IMasterRitualStone; -import wayoftime.bloodmagic.ritual.Ritual; -import wayoftime.bloodmagic.ritual.RitualComponent; -import wayoftime.bloodmagic.ritual.RitualRegister; -import wayoftime.bloodmagic.util.helper.PlayerSacrificeHelper; - -@RitualRegister("feathered_knife") -public class RitualFeatheredKnife extends Ritual -{ - public static final String ALTAR_RANGE = "altar"; - public static final String DAMAGE_RANGE = "damage"; - - public static double rawWillDrain = 0.05; - public static double destructiveWillDrain = 0.05; - public static double corrosiveWillThreshold = 10; - public static double steadfastWillThreshold = 10; - public static double vengefulWillThreshold = 10; - public static int defaultRefreshTime = 20; - public int refreshTime = 20; - public BlockPos altarOffsetPos = new BlockPos(0, 0, 0); // TODO: Save! - - public RitualFeatheredKnife() - { - super("ritualFeatheredKnife", 0, 25000, "ritual." + BloodMagic.MODID + ".featheredKnifeRitual"); - addBlockRange(ALTAR_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-5, -10, -5), 11, 21, 11)); - addBlockRange(DAMAGE_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-15, -20, -15), 31, 41, 31)); - - setMaximumVolumeAndDistanceOfRange(ALTAR_RANGE, 0, 10, 15); - setMaximumVolumeAndDistanceOfRange(DAMAGE_RANGE, 0, 25, 15); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) - { - World world = masterRitualStone.getWorldObj(); -// if (world.isRemote) -// { -// return; -// } - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - if (currentEssence < getRefreshCost()) - { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - BlockPos pos = masterRitualStone.getBlockPos(); - - List willConfig = masterRitualStone.getActiveWillConfig(); - - double corrosiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.CORROSIVE, willConfig); - double destructiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DESTRUCTIVE, willConfig); - double rawWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DEFAULT, willConfig); - double steadfastWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.STEADFAST, willConfig); - double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig); - - refreshTime = getRefreshTimeForRawWill(rawWill); - - boolean consumeRawWill = rawWill >= rawWillDrain && refreshTime != defaultRefreshTime; - - int maxEffects = currentEssence / getRefreshCost(); - int totalEffects = 0; - - BlockPos altarPos = pos.add(altarOffsetPos); - - TileEntity tile = world.getTileEntity(altarPos); - - AreaDescriptor altarRange = masterRitualStone.getBlockRange(ALTAR_RANGE); - - if (!altarRange.isWithinArea(altarOffsetPos) || !(tile instanceof IBloodAltar)) - { - for (BlockPos newPos : altarRange.getContainedPositions(pos)) - { - TileEntity nextTile = world.getTileEntity(newPos); - if (nextTile instanceof IBloodAltar) - { - tile = nextTile; - altarOffsetPos = newPos.subtract(pos); - - altarRange.resetCache(); - break; - } - } - } - - boolean useIncense = corrosiveWill >= corrosiveWillThreshold; - - if (tile instanceof IBloodAltar) - { - IBloodAltar tileAltar = (IBloodAltar) tile; - - AreaDescriptor damageRange = masterRitualStone.getBlockRange(DAMAGE_RANGE); - AxisAlignedBB range = damageRange.getAABB(pos); - - double destructiveDrain = 0; - - List entities = world.getEntitiesWithinAABB(PlayerEntity.class, range); - - for (PlayerEntity player : entities) - { - float healthThreshold = steadfastWill >= steadfastWillThreshold ? 0.7f : 0.3f; - - if (vengefulWill >= vengefulWillThreshold && !player.getGameProfile().getId().equals(masterRitualStone.getOwner())) - { - healthThreshold = 0.1f; - } - - float health = player.getHealth(); - float maxHealth = player.getMaxHealth(); - - float sacrificedHealth = 1; - double lpModifier = 1; - - if ((health / player.getMaxHealth() > healthThreshold) && (!useIncense || !player.isPotionActive(BloodMagicPotions.SOUL_FRAY))) - { - if (useIncense) - { - double incenseAmount = PlayerSacrificeHelper.getPlayerIncense(player); - - sacrificedHealth = health - maxHealth * healthThreshold; - lpModifier *= PlayerSacrificeHelper.getModifier(incenseAmount); - - PlayerSacrificeHelper.setPlayerIncense(player, 0); - player.addPotionEffect(new EffectInstance(BloodMagicPotions.SOUL_FRAY, PlayerSacrificeHelper.soulFrayDuration)); - } - - if (destructiveWill >= destructiveWillDrain * sacrificedHealth) - { - lpModifier *= getLPModifierForWill(destructiveWill); - destructiveWill -= destructiveWillDrain * sacrificedHealth; - destructiveDrain += destructiveWillDrain * sacrificedHealth; - } - -// if (LivingArmour.hasFullSet(player)) -// { -// ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); -// LivingArmour armour = ItemLivingArmour.getLivingArmour(chestStack); -// if (armour != null) -// { -// LivingArmourUpgrade upgrade = ItemLivingArmour.getUpgrade(BloodMagic.MODID + ".upgrade.selfSacrifice", chestStack); -// -// if (upgrade instanceof LivingArmourUpgradeSelfSacrifice) -// { -// double modifier = ((LivingArmourUpgradeSelfSacrifice) upgrade).getSacrificeModifier(); -// -// lpModifier *= (1 + modifier); -// } -// } -// } - - player.setHealth(health - sacrificedHealth); - BloodMagic.packetHandler.sendTo(new SetClientHealthPacket(health - sacrificedHealth), (ServerPlayerEntity) player); - - tileAltar.sacrificialDaggerCall((int) (ConfigHandler.values.sacrificialDaggerConversion * lpModifier * sacrificedHealth), false); - - totalEffects++; - - if (totalEffects >= maxEffects) - { - break; - } - - } - } - - if (destructiveDrain > 0) - { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.STEADFAST, destructiveDrain, true); - } - } - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * totalEffects)); - if (totalEffects > 0 && consumeRawWill) - { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.DEFAULT, rawWillDrain, true); - } - } - - @Override - public int getRefreshTime() - { - return refreshTime; - } - - @Override - public int getRefreshCost() - { - return 20; - } - - @Override - public void gatherComponents(Consumer components) - { - addParallelRunes(components, 1, 0, EnumRuneType.DUSK); - addParallelRunes(components, 2, -1, EnumRuneType.WATER); - addCornerRunes(components, 1, -1, EnumRuneType.AIR); - addOffsetRunes(components, 2, 4, -1, EnumRuneType.FIRE); - addOffsetRunes(components, 2, 4, 0, EnumRuneType.EARTH); - addOffsetRunes(components, 4, 3, 0, EnumRuneType.EARTH); - addCornerRunes(components, 3, 0, EnumRuneType.AIR); - } - - @Override - public Ritual getNewCopy() - { - return new RitualFeatheredKnife(); - } - - @Override - public ITextComponent[] provideInformationOfRitualToPlayer(PlayerEntity player) - { - return new ITextComponent[] { new TranslationTextComponent(this.getTranslationKey() + ".info"), - new TranslationTextComponent(this.getTranslationKey() + ".default.info"), - new TranslationTextComponent(this.getTranslationKey() + ".corrosive.info"), - new TranslationTextComponent(this.getTranslationKey() + ".steadfast.info"), - new TranslationTextComponent(this.getTranslationKey() + ".destructive.info"), - new TranslationTextComponent(this.getTranslationKey() + ".vengeful.info") }; - } - - public double getLPModifierForWill(double destructiveWill) - { - return 1 + destructiveWill * 0.2 / 100; - } - - public int getRefreshTimeForRawWill(double rawWill) - { - if (rawWill >= rawWillDrain) - { - return 10; - } - - return defaultRefreshTime; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualGreenGrove.java b/src/main/java/wayoftime/bloodmagic/ritual/types/RitualGreenGrove.java deleted file mode 100644 index a8d67d12..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualGreenGrove.java +++ /dev/null @@ -1,345 +0,0 @@ -package wayoftime.bloodmagic.ritual.types; - -import java.util.List; -import java.util.Random; -import java.util.function.Consumer; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.CactusBlock; -import net.minecraft.block.FarmlandBlock; -import net.minecraft.block.IGrowable; -import net.minecraft.block.SugarCaneBlock; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.potion.EffectInstance; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; -import wayoftime.bloodmagic.demonaura.WorldDemonWillHandler; -import wayoftime.bloodmagic.impl.BloodMagicAPI; -import wayoftime.bloodmagic.potion.BloodMagicPotions; -import wayoftime.bloodmagic.ritual.AreaDescriptor; -import wayoftime.bloodmagic.ritual.EnumRuneType; -import wayoftime.bloodmagic.ritual.IMasterRitualStone; -import wayoftime.bloodmagic.ritual.Ritual; -import wayoftime.bloodmagic.ritual.RitualComponent; -import wayoftime.bloodmagic.ritual.RitualRegister; -import wayoftime.bloodmagic.util.Utils; -import wayoftime.bloodmagic.will.DemonWillHolder; - -@RitualRegister("green_grove") -public class RitualGreenGrove extends Ritual -{ - public static final String GROW_RANGE = "growing"; - public static final String LEECH_RANGE = "leech"; - public static final String HYDRATE_RANGE = "hydrate"; - - public static double corrosiveWillDrain = 0.2; - public static double rawWillDrain = 0.05; - public static double vengefulWillDrain = 0.05; - public static double steadfastWillDrain = 0.05; - public static int defaultRefreshTime = 20; - public static double defaultGrowthChance = 0.3; - public static BlockState farmlandState = Blocks.FARMLAND.getDefaultState().with(FarmlandBlock.MOISTURE, 7); - public int refreshTime = 20; - - public RitualGreenGrove() - { - super("ritualGreenGrove", 0, 5000, "ritual." + BloodMagic.MODID + ".greenGroveRitual"); - addBlockRange(GROW_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-1, 2, -1), 3, 1, 3)); - addBlockRange(LEECH_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 0, 0), 1)); - addBlockRange(HYDRATE_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 0, 0), 1)); - setMaximumVolumeAndDistanceOfRange(GROW_RANGE, 81, 4, 4); - setMaximumVolumeAndDistanceOfRange(LEECH_RANGE, 0, 15, 15); - setMaximumVolumeAndDistanceOfRange(HYDRATE_RANGE, 0, 15, 15); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) - { - World world = masterRitualStone.getWorldObj(); - if (!(world instanceof ServerWorld)) - { - return; - } - - ServerWorld serverWorld = (ServerWorld) world; - BlockPos pos = masterRitualStone.getBlockPos(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - if (currentEssence < getRefreshCost()) - { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - int maxGrowths = currentEssence / getRefreshCost(); - int totalGrowths = 0; - - List willConfig = masterRitualStone.getActiveWillConfig(); - - DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(world, pos); - double corrosiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.CORROSIVE, willConfig); - double rawWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DEFAULT, willConfig); - double steadfastWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.STEADFAST, willConfig); - double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig); - - refreshTime = getRefreshTimeForRawWill(rawWill); - double growthChance = getPlantGrowthChanceForWill(vengefulWill); - - boolean consumeRawWill = rawWill >= rawWillDrain && refreshTime != defaultRefreshTime; - boolean consumeVengefulWill = vengefulWill >= vengefulWillDrain && growthChance != defaultGrowthChance; - - double rawDrain = 0; - double vengefulDrain = 0; - - AreaDescriptor growingRange = masterRitualStone.getBlockRange(GROW_RANGE); - - int maxGrowthVolume = getMaxVolumeForRange(GROW_RANGE, willConfig, holder); - if (!growingRange.isWithinRange(getMaxVerticalRadiusForRange(GROW_RANGE, willConfig, holder), getMaxHorizontalRadiusForRange(GROW_RANGE, willConfig, holder)) || (maxGrowthVolume != 0 && growingRange.getVolume() > maxGrowthVolume)) - { - return; - } - - for (BlockPos newPos : growingRange.getContainedPositions(pos)) - { - BlockState state = world.getBlockState(newPos); - - if (!BloodMagicAPI.INSTANCE.getBlacklist().getGreenGrove().contains(state)) - { - boolean flag = state.getBlock() instanceof IGrowable || state.getBlock() instanceof CactusBlock || state.getBlock() instanceof SugarCaneBlock; - if (flag) - { - if (world.rand.nextDouble() < growthChance) - { - state.getBlock().randomTick(state, serverWorld, newPos, new Random()); - BlockState newState = world.getBlockState(newPos); - if (!newState.equals(state)) - { - world.playEvent(2005, newPos, 0); - totalGrowths++; - if (consumeRawWill) - { - rawWill -= rawWillDrain; - rawDrain += rawWillDrain; - } - - if (consumeVengefulWill) - { - vengefulWill -= vengefulWillDrain; - vengefulDrain += vengefulWillDrain; - } - } - } - } - } - - if (totalGrowths >= maxGrowths || (consumeRawWill && rawWill < rawWillDrain) || (consumeVengefulWill && vengefulWill < vengefulWillDrain)) - { - break; - } - } - - if (rawDrain > 0) - { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.DEFAULT, rawDrain, true); - } - - if (vengefulDrain > 0) - { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.VENGEFUL, vengefulDrain, true); - } - - AreaDescriptor hydrateRange = masterRitualStone.getBlockRange(HYDRATE_RANGE); - - double steadfastDrain = 0; - if (steadfastWill > steadfastWillDrain) - { - AxisAlignedBB aabb = hydrateRange.getAABB(pos); - steadfastDrain += steadfastWillDrain * Utils.plantSeedsInArea(world, aabb, 2, 1); - steadfastWill -= steadfastDrain; - - for (BlockPos newPos : hydrateRange.getContainedPositions(pos)) - { - if (steadfastWill < steadfastWillDrain) - { - break; - } - - BlockState state = world.getBlockState(newPos); - Block block = state.getBlock(); - - boolean hydratedBlock = false; - if (block == Blocks.DIRT || block == Blocks.GRASS) - { - world.setBlockState(newPos, farmlandState); - hydratedBlock = true; - } else if (block == Blocks.FARMLAND) - { - int meta = state.get(FarmlandBlock.MOISTURE); - if (meta < 7) - { - world.setBlockState(newPos, farmlandState); - hydratedBlock = true; - } - } - - if (hydratedBlock) - { - steadfastWill -= steadfastWillDrain; - steadfastDrain += steadfastWillDrain; - } - } - } - - if (steadfastDrain > 0) - { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.STEADFAST, steadfastDrain, true); - } - - double corrosiveDrain = 0; - if (corrosiveWill > corrosiveWillDrain) - { - AreaDescriptor leechRange = masterRitualStone.getBlockRange(LEECH_RANGE); - AxisAlignedBB mobArea = leechRange.getAABB(pos); - List entityList = world.getEntitiesWithinAABB(LivingEntity.class, mobArea); - for (LivingEntity entityLiving : entityList) - { - if (corrosiveWill < corrosiveWillDrain) - { - break; - } - - if (entityLiving instanceof PlayerEntity) - { - continue; - } - - if (entityLiving.isPotionActive(BloodMagicPotions.PLANT_LEECH) || !entityLiving.isPotionApplicable(new EffectInstance(BloodMagicPotions.PLANT_LEECH))) - { - continue; - } - - entityLiving.addPotionEffect(new EffectInstance(BloodMagicPotions.PLANT_LEECH, 200, 0)); - - corrosiveWill -= corrosiveWillDrain; - corrosiveDrain += corrosiveWillDrain; - } - - if (corrosiveDrain > 0) - { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.CORROSIVE, corrosiveDrain, true); - } - } - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(totalGrowths * getRefreshCost())); - } - - public double getPlantGrowthChanceForWill(double will) - { - if (will > 0) - { - return 0.3 + will / 200; - } - - return defaultGrowthChance; - } - - public int getRefreshTimeForRawWill(double rawWill) - { - if (rawWill > 0) - { - return 10; - } - - return defaultRefreshTime; - } - - @Override - public int getRefreshTime() - { - return refreshTime; - } - - @Override - public int getMaxVolumeForRange(String range, List activeTypes, DemonWillHolder holder) - { - if (GROW_RANGE.equals(range) && activeTypes.contains(EnumDemonWillType.DESTRUCTIVE)) - { - double destructiveWill = holder.getWill(EnumDemonWillType.DESTRUCTIVE); - if (destructiveWill > 0) - { - return 81 + (int) Math.pow(destructiveWill / 4, 1.5); - } - } - - return volumeRangeMap.get(range); - } - - @Override - public int getMaxVerticalRadiusForRange(String range, List activeTypes, DemonWillHolder holder) - { - if (GROW_RANGE.equals(range) && activeTypes.contains(EnumDemonWillType.DESTRUCTIVE)) - { - double destructiveWill = holder.getWill(EnumDemonWillType.DESTRUCTIVE); - if (destructiveWill > 0) - { - return (int) (4 + destructiveWill / 10d); - } - } - - return verticalRangeMap.get(range); - } - - @Override - public int getMaxHorizontalRadiusForRange(String range, List activeTypes, DemonWillHolder holder) - { - if (GROW_RANGE.equals(range) && activeTypes.contains(EnumDemonWillType.DESTRUCTIVE)) - { - double destructiveWill = holder.getWill(EnumDemonWillType.DESTRUCTIVE); - if (destructiveWill > 0) - { - return (int) (4 + destructiveWill / 10d); - } - } - - return horizontalRangeMap.get(range); - } - - @Override - public int getRefreshCost() - { - return 20; // TODO: Need to find a way to balance this - } - - @Override - public void gatherComponents(Consumer components) - { - addCornerRunes(components, 1, 0, EnumRuneType.EARTH); - addParallelRunes(components, 1, 0, EnumRuneType.WATER); - } - - @Override - public ITextComponent[] provideInformationOfRitualToPlayer(PlayerEntity player) - { - return new ITextComponent[] { new TranslationTextComponent(this.getTranslationKey() + ".info"), - new TranslationTextComponent(this.getTranslationKey() + ".default.info"), - new TranslationTextComponent(this.getTranslationKey() + ".corrosive.info"), - new TranslationTextComponent(this.getTranslationKey() + ".steadfast.info"), - new TranslationTextComponent(this.getTranslationKey() + ".destructive.info"), - new TranslationTextComponent(this.getTranslationKey() + ".vengeful.info") }; - } - - @Override - public Ritual getNewCopy() - { - return new RitualGreenGrove(); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualHarvest.java b/src/main/java/wayoftime/bloodmagic/ritual/types/RitualHarvest.java deleted file mode 100644 index 1ac4433e..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualHarvest.java +++ /dev/null @@ -1,145 +0,0 @@ -package wayoftime.bloodmagic.ritual.types; - -import java.util.List; -import java.util.function.Consumer; - -import com.google.common.collect.Lists; - -import net.minecraft.block.BlockState; -import net.minecraft.inventory.InventoryHelper; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.items.ItemHandlerHelper; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.ritual.AreaDescriptor; -import wayoftime.bloodmagic.ritual.EnumRuneType; -import wayoftime.bloodmagic.ritual.IMasterRitualStone; -import wayoftime.bloodmagic.ritual.Ritual; -import wayoftime.bloodmagic.ritual.RitualComponent; -import wayoftime.bloodmagic.ritual.RitualRegister; -import wayoftime.bloodmagic.ritual.harvest.HarvestRegistry; -import wayoftime.bloodmagic.ritual.harvest.IHarvestHandler; - -/** - * This ritual uses registered {@link IHarvestHandler}'s to harvest blocks. - *

- * To register a new Handler for this ritual use - * {@link HarvestRegistry#registerHandler(IHarvestHandler)} - *

- * This ritual includes a way to change the range based on what block is above - * the MasterRitualStone. You can use - * {@link HarvestRegistry#registerRangeAmplifier(BlockState, int)} to register a - * new amplifier. - */ -@RitualRegister("harvest") -public class RitualHarvest extends Ritual -{ - public static final String HARVEST_RANGE = "harvestRange"; - - public RitualHarvest() - { - super("ritualHarvest", 0, 20000, "ritual." + BloodMagic.MODID + ".harvestRitual"); - addBlockRange(HARVEST_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-4, 1, -4), 9, 5, 9)); - setMaximumVolumeAndDistanceOfRange(HARVEST_RANGE, 0, 15, 15); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) - { - World world = masterRitualStone.getWorldObj(); - BlockPos pos = masterRitualStone.getBlockPos(); - - if (masterRitualStone.getOwnerNetwork().getCurrentEssence() < getRefreshCost()) - { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - int harvested = 0; - - AreaDescriptor harvestArea = masterRitualStone.getBlockRange(HARVEST_RANGE); - - harvestArea.resetIterator(); - while (harvestArea.hasNext()) - { - BlockPos nextPos = harvestArea.next().add(pos); - if (harvestBlock(world, nextPos, masterRitualStone.getBlockPos())) - { - harvested++; - } - } - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * harvested)); - } - - @Override - public int getRefreshCost() - { - return 20; - } - - @Override - public int getRefreshTime() - { - return 5; - } - - @Override - public void gatherComponents(Consumer components) - { - addCornerRunes(components, 1, 0, EnumRuneType.DUSK); - addParallelRunes(components, 2, 0, EnumRuneType.EARTH); - addOffsetRunes(components, 3, 1, 0, EnumRuneType.EARTH); - addOffsetRunes(components, 3, 2, 0, EnumRuneType.WATER); - } - - @Override - public Ritual getNewCopy() - { - return new RitualHarvest(); - } - - public static boolean harvestBlock(World world, BlockPos cropPos, BlockPos controllerPos) - { - BlockState harvestState = world.getBlockState(cropPos); - TileEntity potentialInventory = world.getTileEntity(controllerPos.up()); - IItemHandler itemHandler = null; - if (potentialInventory != null && potentialInventory.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN).isPresent()) - itemHandler = potentialInventory.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.DOWN).resolve().get(); - - for (IHarvestHandler handler : HarvestRegistry.getHarvestHandlers()) - { - if (handler.test(world, cropPos, harvestState)) - { - List drops = Lists.newArrayList(); - if (handler.harvest(world, cropPos, harvestState, drops)) - { - for (ItemStack stack : drops) - { - if (stack.isEmpty()) - continue; - - // TODO I wrote this, but didn't actually think about whether it should be a - // thing. Remove the true if we want to keep it - if (itemHandler == null || true) - InventoryHelper.spawnItemStack(world, cropPos.getX(), cropPos.getY(), cropPos.getZ(), stack); - else - { - ItemStack remainder = ItemHandlerHelper.insertItemStacked(itemHandler, stack, false); - if (!remainder.isEmpty()) - InventoryHelper.spawnItemStack(world, cropPos.getX(), cropPos.getY(), cropPos.getZ(), remainder); - } - } - return true; - } - } - } - - return false; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualLava.java b/src/main/java/wayoftime/bloodmagic/ritual/types/RitualLava.java deleted file mode 100644 index 2cbfba90..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualLava.java +++ /dev/null @@ -1,359 +0,0 @@ -package wayoftime.bloodmagic.ritual.types; - -import java.util.List; -import java.util.function.Consumer; - -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.fluid.Fluids; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; -import net.minecraftforge.fluids.capability.IFluidHandler; -import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.demonaura.WorldDemonWillHandler; -import wayoftime.bloodmagic.potion.BloodMagicPotions; -import wayoftime.bloodmagic.ritual.AreaDescriptor; -import wayoftime.bloodmagic.ritual.EnumRuneType; -import wayoftime.bloodmagic.ritual.IMasterRitualStone; -import wayoftime.bloodmagic.ritual.Ritual; -import wayoftime.bloodmagic.ritual.RitualComponent; -import wayoftime.bloodmagic.ritual.RitualRegister; -import wayoftime.bloodmagic.util.DamageSourceBloodMagic; -import wayoftime.bloodmagic.util.Utils; -import wayoftime.bloodmagic.will.DemonWillHolder; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; - -@RitualRegister("lava") -public class RitualLava extends Ritual -{ - public static final String LAVA_RANGE = "lavaRange"; - public static final String FIRE_FUSE_RANGE = "fireFuse"; - public static final String FIRE_RESIST_RANGE = "fireResist"; - public static final String FIRE_DAMAGE_RANGE = "fireDamage"; - public static final String LAVA_TANK_RANGE = "lavaTank"; - - public static final double vengefulWillDrain = 1; - public static final double steadfastWillDrain = 0.5; - public static final double corrosiveWillDrain = 0.2; - public static final int corrosiveRefreshTime = 20; - public int timer = 0; - - public RitualLava() - { - super("ritualLava", 0, 10000, "ritual." + BloodMagic.MODID + ".lavaRitual"); - addBlockRange(LAVA_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1)); - addBlockRange(FIRE_FUSE_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-2, -2, -2), 5)); - addBlockRange(FIRE_RESIST_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 0, 0), 1)); - addBlockRange(FIRE_DAMAGE_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 0, 0), 1)); - addBlockRange(LAVA_TANK_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1)); - - setMaximumVolumeAndDistanceOfRange(LAVA_RANGE, 9, 3, 3); - setMaximumVolumeAndDistanceOfRange(FIRE_FUSE_RANGE, 0, 10, 10); - setMaximumVolumeAndDistanceOfRange(FIRE_RESIST_RANGE, 0, 10, 10); - setMaximumVolumeAndDistanceOfRange(FIRE_DAMAGE_RANGE, 0, 10, 10); - setMaximumVolumeAndDistanceOfRange(LAVA_TANK_RANGE, 1, 10, 10); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) - { - timer++; - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - int lpDrain = 0; - - if (currentEssence < getRefreshCost()) - { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - BlockPos pos = masterRitualStone.getBlockPos(); - List willConfig = masterRitualStone.getActiveWillConfig(); - - double rawWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DEFAULT, willConfig); - double rawDrained = 0; - - DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(world, pos); - AreaDescriptor lavaRange = masterRitualStone.getBlockRange(LAVA_RANGE); - - int maxLavaVolume = getMaxVolumeForRange(LAVA_RANGE, willConfig, holder); - if (!lavaRange.isWithinRange(getMaxVerticalRadiusForRange(LAVA_RANGE, willConfig, holder), getMaxHorizontalRadiusForRange(LAVA_RANGE, willConfig, holder)) || (maxLavaVolume != 0 && lavaRange.getVolume() > maxLavaVolume)) - { - return; - } - - for (BlockPos newPos : lavaRange.getContainedPositions(pos)) - { - BlockState state = world.getBlockState(newPos); - if (world.isAirBlock(newPos) || Utils.isFlowingLiquid(world, newPos, state)) - { - int lpCost = getLPCostForRawWill(rawWill); - if (currentEssence < lpCost) - { - break; - } - world.setBlockState(newPos, Blocks.LAVA.getDefaultState()); - currentEssence -= lpCost; - lpDrain += lpCost; - if (rawWill > 0) - { - double drain = getWillCostForRawWill(rawWill); - rawWill -= drain; - rawDrained += drain; - } - } - } - - if (rawWill > 0) - { - AreaDescriptor chestRange = masterRitualStone.getBlockRange(LAVA_TANK_RANGE); - TileEntity tile = world.getTileEntity(chestRange.getContainedPositions(pos).get(0)); - double drain = getWillCostForRawWill(rawWill); - int lpCost = getLPCostForRawWill(rawWill); - - if (rawWill >= drain && currentEssence >= lpCost) - { - if (tile != null) - { - LazyOptional capability = tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, null); - if (capability.isPresent()) - { - IFluidHandler handler = capability.resolve().get(); - double filled = handler.fill(new FluidStack(Fluids.LAVA, 1000), FluidAction.EXECUTE); - - double ratio = filled / 1000; - - rawWill -= drain * ratio; - rawDrained += drain * ratio; - - currentEssence -= Math.ceil(lpCost * ratio); - lpDrain += Math.ceil(lpCost * ratio); - } - } - } - } - - double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig); - double steadfastWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.STEADFAST, willConfig); - double corrosiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.CORROSIVE, willConfig); - - if (vengefulWill >= vengefulWillDrain) - { - double vengefulDrained = 0; - AreaDescriptor fuseRange = masterRitualStone.getBlockRange(FIRE_FUSE_RANGE); - - AxisAlignedBB fuseArea = fuseRange.getAABB(pos); - List entities = world.getEntitiesWithinAABB(LivingEntity.class, fuseArea); - - for (LivingEntity entity : entities) - { - if (vengefulWill < vengefulWillDrain) - { - break; - } - - if (entity instanceof PlayerEntity) - { - continue; - } - - if (!entity.isPotionActive(BloodMagicPotions.FIRE_FUSE)) - { - entity.addPotionEffect(new EffectInstance(BloodMagicPotions.FIRE_FUSE, 100, 0)); - - vengefulDrained += vengefulWillDrain; - vengefulWill -= vengefulWillDrain; - } - } - - if (vengefulDrained > 0) - { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.VENGEFUL, vengefulDrained, true); - } - } - - if (steadfastWill >= steadfastWillDrain) - { - double steadfastDrained = 0; - AreaDescriptor resistRange = masterRitualStone.getBlockRange(FIRE_RESIST_RANGE); - - int duration = getFireResistForWill(steadfastWill); - - AxisAlignedBB resistArea = resistRange.getAABB(pos); - List entities = world.getEntitiesWithinAABB(PlayerEntity.class, resistArea); - - for (PlayerEntity entity : entities) - { - if (steadfastWill < steadfastWillDrain) - { - break; - } - if (!entity.isPotionActive(Effects.FIRE_RESISTANCE) || (entity.getActivePotionEffect(Effects.FIRE_RESISTANCE).getDuration() < 2)) - { - entity.addPotionEffect(new EffectInstance(Effects.FIRE_RESISTANCE, 100, 0)); - - steadfastDrained += steadfastWillDrain; - steadfastWill -= steadfastWillDrain; - } - } - - if (steadfastDrained > 0) - { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.STEADFAST, steadfastDrained, true); - } - } - - if (timer % corrosiveRefreshTime == 0 && corrosiveWill >= corrosiveWillDrain) - { - double corrosiveDrained = 0; - AreaDescriptor resistRange = masterRitualStone.getBlockRange(FIRE_DAMAGE_RANGE); - - float damage = getCorrosiveDamageForWill(corrosiveWill); - - AxisAlignedBB damageArea = resistRange.getAABB(pos); - List entities = world.getEntitiesWithinAABB(LivingEntity.class, damageArea); - - for (LivingEntity entity : entities) - { - if (corrosiveWill < corrosiveWillDrain) - { - break; - } - - if (!entity.isAlive() && entity.hurtTime <= 0 && Utils.isImmuneToFireDamage(entity)) - { - if (entity.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, damage)) - { - corrosiveDrained += corrosiveWillDrain; - corrosiveWill -= corrosiveWillDrain; - } - } - } - - if (corrosiveDrained > 0) - { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.CORROSIVE, corrosiveDrained, true); - } - } - - if (rawDrained > 0) - { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.DEFAULT, rawDrained, true); - } - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(lpDrain)); - } - - @Override - public int getRefreshTime() - { - return 1; - } - - @Override - public int getRefreshCost() - { - return 500; - } - - @Override - public ITextComponent[] provideInformationOfRitualToPlayer(PlayerEntity player) - { - return new ITextComponent[] { new TranslationTextComponent(this.getTranslationKey() + ".info"), - new TranslationTextComponent(this.getTranslationKey() + ".default.info"), - new TranslationTextComponent(this.getTranslationKey() + ".corrosive.info"), - new TranslationTextComponent(this.getTranslationKey() + ".steadfast.info"), - new TranslationTextComponent(this.getTranslationKey() + ".destructive.info"), - new TranslationTextComponent(this.getTranslationKey() + ".vengeful.info") }; - } - - @Override - public void gatherComponents(Consumer components) - { - addParallelRunes(components, 1, 0, EnumRuneType.FIRE); - } - - @Override - public Ritual getNewCopy() - { - return new RitualLava(); - } - - @Override - public int getMaxVolumeForRange(String range, List activeTypes, DemonWillHolder holder) - { - if (LAVA_RANGE.equals(range) && activeTypes.contains(EnumDemonWillType.DESTRUCTIVE)) - { - double destructiveWill = holder.getWill(EnumDemonWillType.DESTRUCTIVE); - if (destructiveWill > 0) - { - return 9 + (int) Math.pow(destructiveWill / 10, 1.5); - } - } - - return volumeRangeMap.get(range); - } - - @Override - public int getMaxVerticalRadiusForRange(String range, List activeTypes, DemonWillHolder holder) - { - if (LAVA_RANGE.equals(range) && activeTypes.contains(EnumDemonWillType.DESTRUCTIVE)) - { - double destructiveWill = holder.getWill(EnumDemonWillType.DESTRUCTIVE); - if (destructiveWill > 0) - { - return (int) (3 + destructiveWill / 10d); - } - } - - return verticalRangeMap.get(range); - } - - @Override - public int getMaxHorizontalRadiusForRange(String range, List activeTypes, DemonWillHolder holder) - { - if (LAVA_RANGE.equals(range) && activeTypes.contains(EnumDemonWillType.DESTRUCTIVE)) - { - double destructiveWill = holder.getWill(EnumDemonWillType.DESTRUCTIVE); - if (destructiveWill > 0) - { - return (int) (3 + destructiveWill / 10d); - } - } - - return horizontalRangeMap.get(range); - } - - public int getFireResistForWill(double steadfastWill) - { - return (int) (200 + steadfastWill * 3); - } - - public float getCorrosiveDamageForWill(double corrosiveWill) - { - return (float) (1 + corrosiveWill * 0.05); - } - - public int getLPCostForRawWill(double raw) - { - return Math.max((int) (500 - raw), 0); - } - - public double getWillCostForRawWill(double raw) - { - return Math.min(1, raw / 500); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualMagnetic.java b/src/main/java/wayoftime/bloodmagic/ritual/types/RitualMagnetic.java deleted file mode 100644 index 16aab5ef..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualMagnetic.java +++ /dev/null @@ -1,202 +0,0 @@ -package wayoftime.bloodmagic.ritual.types; - -import java.util.function.Consumer; - -import com.mojang.authlib.GameProfile; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; -import net.minecraftforge.common.Tags; -import net.minecraftforge.common.util.FakePlayer; -import net.minecraftforge.common.util.FakePlayerFactory; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.ritual.AreaDescriptor; -import wayoftime.bloodmagic.ritual.EnumRuneType; -import wayoftime.bloodmagic.ritual.IMasterRitualStone; -import wayoftime.bloodmagic.ritual.Ritual; -import wayoftime.bloodmagic.ritual.RitualComponent; -import wayoftime.bloodmagic.ritual.RitualRegister; -import wayoftime.bloodmagic.util.Utils; - -@RitualRegister("magnetism") -public class RitualMagnetic extends Ritual -{ - public static final String PLACEMENT_RANGE = "placementRange"; - // public static final String SEARCH_RANGE = "searchRange"; - public BlockPos lastPos; // An offset - private FakePlayer fakePlayer; - - public RitualMagnetic() - { - super("ritualMagnetic", 0, 5000, "ritual." + BloodMagic.MODID + ".magneticRitual"); - addBlockRange(PLACEMENT_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-1, 1, -1), 3)); - setMaximumVolumeAndDistanceOfRange(PLACEMENT_RANGE, 50, 4, 4); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) - { - World world = masterRitualStone.getWorldObj(); - Vector3d MRSpos = new Vector3d(masterRitualStone.getBlockPos().getX(), masterRitualStone.getBlockPos().getY(), masterRitualStone.getBlockPos().getZ()); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - if (currentEssence < getRefreshCost()) - { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - BlockPos pos = masterRitualStone.getBlockPos(); - - AreaDescriptor placementRange = masterRitualStone.getBlockRange(PLACEMENT_RANGE); - - BlockPos replacement = pos; - boolean replace = false; - - for (BlockPos offset : placementRange.getContainedPositions(pos)) - { - if (world.isAirBlock(offset)) - { - replacement = offset; - replace = true; - break; - } - } - - BlockState downState = world.getBlockState(pos.down()); - int radius = getRadius(downState.getBlock()); - - if (replace) - { - int j = -1; - int i = -radius; - int k = -radius; - - if (lastPos != null) - { - j = lastPos.getY(); - i = Math.min(radius, Math.max(-radius, lastPos.getX())); - k = Math.min(radius, Math.max(-radius, lastPos.getZ())); - } - - if (j + pos.getY() >= 0) - { - while (i <= radius) - { - while (k <= radius) - { - BlockPos newPos = pos.add(i, j, k); - Vector3d newPosVector = new Vector3d(newPos.getX(), newPos.getY(), newPos.getZ()); - BlockState state = world.getBlockState(newPos); -// RayTraceResult fakeRayTrace = world.rayTraceBlocks(MRSpos, newPosVector, false); -// ItemStack checkStack = state.getBlock().getPickBlock(state, fakeRayTrace, world, newPos, getFakePlayer((ServerWorld) world)); - ItemStack checkStack = new ItemStack(state.getBlock()); - if (isBlockOre(checkStack)) - { - Utils.swapLocations(world, newPos, world, replacement); - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost())); - k++; - this.lastPos = new BlockPos(i, j, k); - return; - } else - { - k++; - } - } - i++; - k = -radius; - } - j--; - i = -radius; - this.lastPos = new BlockPos(i, j, k); - return; - } - - j = -1; - this.lastPos = new BlockPos(i, j, k); - } - - } - - public int getRadius(Block block) - { - if (block == Blocks.IRON_BLOCK) - { - return 7; - } - - if (block == Blocks.GOLD_BLOCK) - { - return 15; - } - - if (block == Blocks.DIAMOND_BLOCK) - { - return 31; - } - - return 3; - } - - @Override - public int getRefreshTime() - { - return 40; - } - - @Override - public int getRefreshCost() - { - return 50; - } - - @Override - public void gatherComponents(Consumer components) - { - addCornerRunes(components, 1, 0, EnumRuneType.EARTH); - addParallelRunes(components, 2, 1, EnumRuneType.EARTH); - addCornerRunes(components, 2, 1, EnumRuneType.AIR); - addParallelRunes(components, 2, 2, EnumRuneType.FIRE); - } - - @Override - public Ritual getNewCopy() - { - return new RitualMagnetic(); - } - - private FakePlayer getFakePlayer(ServerWorld world) - { - return fakePlayer == null - ? fakePlayer = FakePlayerFactory.get(world, new GameProfile(null, BloodMagic.MODID + "_ritual_magnetic")) - : fakePlayer; - } - - public static boolean isBlockOre(ItemStack stack) - { - if (stack.isEmpty()) - return false; - - return stack.getItem().isIn(Tags.Items.ORES); - -// for(ResourceLocation rl : stack.getItem().getTags()) -// { -// rl.getPath() -// } - -// for (int id : OreDictionary.getOreIDs(stack)) -// { -// String oreName = OreDictionary.getOreName(id); -// if (oreName.contains("ore")) -// return true; -// } - -// return false; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualRegeneration.java b/src/main/java/wayoftime/bloodmagic/ritual/types/RitualRegeneration.java deleted file mode 100644 index d83cdb44..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualRegeneration.java +++ /dev/null @@ -1,214 +0,0 @@ -package wayoftime.bloodmagic.ritual.types; - -import java.util.Collections; -import java.util.List; -import java.util.function.Consumer; - -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; -import wayoftime.bloodmagic.demonaura.WorldDemonWillHandler; -import wayoftime.bloodmagic.ritual.AreaDescriptor; -import wayoftime.bloodmagic.ritual.EnumRuneType; -import wayoftime.bloodmagic.ritual.IMasterRitualStone; -import wayoftime.bloodmagic.ritual.Ritual; -import wayoftime.bloodmagic.ritual.RitualComponent; -import wayoftime.bloodmagic.ritual.RitualRegister; -import wayoftime.bloodmagic.util.DamageSourceBloodMagic; -import wayoftime.bloodmagic.util.Utils; - -@RitualRegister("regeneration") -public class RitualRegeneration extends Ritual -{ - public static final String HEAL_RANGE = "heal"; - public static final String VAMPIRE_RANGE = "vampire"; - - public static final int SACRIFICE_AMOUNT = 100; - - public static final double corrosiveWillDrain = 0.04; - - public RitualRegeneration() - { - super("ritualRegeneration", 0, 25000, "ritual." + BloodMagic.MODID + ".regenerationRitual"); - addBlockRange(HEAL_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-15, -15, -15), 31)); - addBlockRange(VAMPIRE_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-15, -15, -15), 31)); - - setMaximumVolumeAndDistanceOfRange(HEAL_RANGE, 0, 20, 20); - setMaximumVolumeAndDistanceOfRange(VAMPIRE_RANGE, 0, 20, 20); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) - { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - if (currentEssence < getRefreshCost()) - { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - BlockPos pos = masterRitualStone.getBlockPos(); - - int maxEffects = currentEssence / getRefreshCost(); - int totalEffects = 0; - - int totalCost = 0; - - List willConfig = masterRitualStone.getActiveWillConfig(); - - double rawWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DEFAULT, willConfig); - double steadfastWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.STEADFAST, willConfig); - double corrosiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.CORROSIVE, willConfig); - double destructiveWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.DESTRUCTIVE, willConfig); - double vengefulWill = this.getWillRespectingConfig(world, pos, EnumDemonWillType.VENGEFUL, willConfig); - - double vengefulDrain = 0; - double steadfastDrain = 0; - double destructiveDrain = 0; - double corrosiveDrain = 0; - - boolean syphonHealth = corrosiveWill >= corrosiveWillDrain; - boolean applyAbsorption = false; - float absorptionRate = 1; - int maxAbsorption = 20; - - AreaDescriptor healArea = masterRitualStone.getBlockRange(HEAL_RANGE); - AxisAlignedBB healRange = healArea.getAABB(pos); - - AreaDescriptor damageArea = masterRitualStone.getBlockRange(VAMPIRE_RANGE); - AxisAlignedBB damageRange = damageArea.getAABB(pos); - - List entities = world.getEntitiesWithinAABB(LivingEntity.class, healRange); - List players = world.getEntitiesWithinAABB(PlayerEntity.class, healRange); - List damagedEntities = world.getEntitiesWithinAABB(LivingEntity.class, damageRange); - - if (syphonHealth) - { - for (PlayerEntity player : players) - { - if (player.getHealth() <= player.getMaxHealth() - 1) - { - float syphonedHealthAmount = getSyphonAmountForWill(corrosiveWill); - Collections.shuffle(damagedEntities); - for (LivingEntity damagedEntity : damagedEntities) - { - if (damagedEntity instanceof PlayerEntity) - { - continue; - } - - float currentHealth = damagedEntity.getHealth(); - - damagedEntity.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, Math.min(player.getMaxHealth() - player.getHealth(), syphonedHealthAmount)); - - float healthDifference = currentHealth - damagedEntity.getHealth(); - if (healthDifference > 0) - { - corrosiveDrain += corrosiveWillDrain; - corrosiveWill -= corrosiveWillDrain; - player.heal(healthDifference); - } - - break; - } - } - } - } - - for (LivingEntity entity : entities) - { - float health = entity.getHealth(); - if (health <= entity.getMaxHealth() - 1) - { - if (entity.isPotionApplicable(new EffectInstance(Effects.REGENERATION))) - { - if (entity instanceof PlayerEntity) - { - totalCost += getRefreshCost(); - currentEssence -= getRefreshCost(); - } else - { - totalCost += getRefreshCost() / 10; - currentEssence -= getRefreshCost() / 10; - } - - entity.addPotionEffect(new EffectInstance(Effects.REGENERATION, 50, 0, false, false)); - - totalEffects++; - - if (totalEffects >= maxEffects) - { - break; - } - } - } - if (applyAbsorption && entity instanceof PlayerEntity) - { - if (applyAbsorption) - { - float added = Utils.addAbsorptionToMaximum(entity, absorptionRate, maxAbsorption, 1000); - } - } - } - - if (corrosiveDrain > 0) - { - WorldDemonWillHandler.drainWill(world, pos, EnumDemonWillType.CORROSIVE, corrosiveDrain, true); - } - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(totalCost)); - } - - @Override - public int getRefreshTime() - { - return 50; - } - - @Override - public int getRefreshCost() - { - return SACRIFICE_AMOUNT; - } - - @Override - public void gatherComponents(Consumer components) - { - components.accept(new RitualComponent(new BlockPos(4, 0, 0), EnumRuneType.AIR)); - components.accept(new RitualComponent(new BlockPos(5, 0, -1), EnumRuneType.AIR)); - components.accept(new RitualComponent(new BlockPos(5, 0, 1), EnumRuneType.AIR)); - components.accept(new RitualComponent(new BlockPos(-4, 0, 0), EnumRuneType.AIR)); - components.accept(new RitualComponent(new BlockPos(-5, 0, -1), EnumRuneType.AIR)); - components.accept(new RitualComponent(new BlockPos(-5, 0, 1), EnumRuneType.AIR)); - components.accept(new RitualComponent(new BlockPos(0, 0, 4), EnumRuneType.FIRE)); - components.accept(new RitualComponent(new BlockPos(1, 0, 5), EnumRuneType.FIRE)); - components.accept(new RitualComponent(new BlockPos(-1, 0, 5), EnumRuneType.FIRE)); - components.accept(new RitualComponent(new BlockPos(0, 0, -4), EnumRuneType.FIRE)); - components.accept(new RitualComponent(new BlockPos(1, 0, -5), EnumRuneType.FIRE)); - components.accept(new RitualComponent(new BlockPos(-1, 0, -5), EnumRuneType.FIRE)); - addOffsetRunes(components, 3, 5, 0, EnumRuneType.WATER); - addCornerRunes(components, 3, 0, EnumRuneType.DUSK); - addOffsetRunes(components, 4, 5, 0, EnumRuneType.EARTH); - addOffsetRunes(components, 4, 5, -1, EnumRuneType.EARTH); - addCornerRunes(components, 5, 0, EnumRuneType.EARTH); - } - - @Override - public Ritual getNewCopy() - { - return new RitualRegeneration(); - } - - public float getSyphonAmountForWill(double corrosiveWill) - { - return 1; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualUpgradeRemove.java b/src/main/java/wayoftime/bloodmagic/ritual/types/RitualUpgradeRemove.java deleted file mode 100644 index a0b15e0a..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualUpgradeRemove.java +++ /dev/null @@ -1,170 +0,0 @@ -package wayoftime.bloodmagic.ritual.types; - -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.function.Consumer; - -import net.minecraft.entity.EntityType; -import net.minecraft.entity.effect.LightningBoltEntity; -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.common.item.BloodMagicItems; -import wayoftime.bloodmagic.core.living.ILivingContainer; -import wayoftime.bloodmagic.core.living.LivingStats; -import wayoftime.bloodmagic.core.living.LivingUpgrade; -import wayoftime.bloodmagic.core.living.LivingUtil; -import wayoftime.bloodmagic.ritual.AreaDescriptor; -import wayoftime.bloodmagic.ritual.EnumRuneType; -import wayoftime.bloodmagic.ritual.IMasterRitualStone; -import wayoftime.bloodmagic.ritual.Ritual; -import wayoftime.bloodmagic.ritual.RitualComponent; -import wayoftime.bloodmagic.ritual.RitualRegister; - -@RitualRegister("upgrade_remove") -public class RitualUpgradeRemove extends Ritual -{ - public static final String CHECK_RANGE = "fillRange"; - - public RitualUpgradeRemove() - { - super("ritualUpgradeRemove", 0, 25000, "ritual." + BloodMagic.MODID + ".upgradeRemoveRitual"); - addBlockRange(CHECK_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1, 2, 1)); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) - { - World world = masterRitualStone.getWorldObj(); - - if (world.isRemote) - { - return; - } - - BlockPos pos = masterRitualStone.getBlockPos(); - - AreaDescriptor checkRange = masterRitualStone.getBlockRange(CHECK_RANGE); - - List playerList = world.getEntitiesWithinAABB(PlayerEntity.class, checkRange.getAABB(pos)); - - for (PlayerEntity player : playerList) - { - if (LivingUtil.hasFullSet(player)) - { - boolean removedUpgrade = false; - - ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); - LivingStats stats = LivingStats.fromPlayer(player); - if (stats != null) - { - Map upgrades = stats.getUpgrades(); - - for (Entry entry : upgrades.entrySet()) - { - int exp = entry.getValue().intValue(); - LivingUpgrade upgrade = entry.getKey(); - int level = upgrade.getLevel(exp); - if (level >= 1) - { - ItemStack upgradeStack = new ItemStack(BloodMagicItems.LIVING_TOME.get()); -// int expForLevel = upgrade.getNextRequirement(upgrade.getLevel(exp) - 1); - ((ILivingContainer) BloodMagicItems.LIVING_TOME.get()).updateLivingStats(upgradeStack, new LivingStats().setMaxPoints(upgrade.getLevelCost(exp)).addExperience(upgrade.getKey(), exp)); - ItemEntity item = new ItemEntity(world, player.getPosX(), player.getPosY(), player.getPosZ(), upgradeStack); - world.addEntity(item); - removedUpgrade = true; - } - stats.resetExperience(upgrade.getKey()); - } - -// @SuppressWarnings("unchecked") -// HashMap upgradeMap = (HashMap) armour.upgradeMap.clone(); -// -// for (Entry entry : upgradeMap.entrySet()) -// { -// LivingArmourUpgrade upgrade = entry.getValue(); -// String upgradeKey = entry.getKey(); -// -// ItemStack upgradeStack = new ItemStack(RegistrarBloodMagicItems.UPGRADE_TOME); -// LivingUpgrades.setKey(upgradeStack, upgradeKey); -// LivingUpgrades.setLevel(upgradeStack, upgrade.getUpgradeLevel()); -// -// boolean successful = armour.removeUpgrade(player, upgrade); -// -// if (successful) -// { -// removedUpgrade = true; -// world.spawnEntity(new ItemEntity(world, player.posX, player.posY, player.posZ, upgradeStack)); -// for (Entry trackerEntry : armour.trackerMap.entrySet()) -// { -// StatTracker tracker = trackerEntry.getValue(); -// if (tracker != null) -// { -// if (tracker.providesUpgrade(upgradeKey)) -// { -// tracker.resetTracker(); // Resets the tracker if the upgrade corresponding to it -// // was removed. -// } -// } -// } -// } -// } - - if (removedUpgrade) - { - LivingStats.toPlayer(player, stats); - - masterRitualStone.setActive(false); - - LightningBoltEntity lightningboltentity = EntityType.LIGHTNING_BOLT.create(world); -// LightningBoltEntity lightning = new LightningBoltEntity(world, pos.getX() + dispX, pos.getY(), pos.getZ() + dispZ); - lightningboltentity.setPosition(pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5); - lightningboltentity.setEffectOnly(true); - world.addEntity(lightningboltentity); - } - - } - } - } - } - - @Override - public int getRefreshTime() - { - return 1; - } - - @Override - public int getRefreshCost() - { - return 0; - } - - @Override - public void gatherComponents(Consumer components) - { - addCornerRunes(components, 1, 0, EnumRuneType.DUSK); - addCornerRunes(components, 2, 0, EnumRuneType.FIRE); - addOffsetRunes(components, 1, 2, 0, EnumRuneType.FIRE); - addCornerRunes(components, 1, 1, EnumRuneType.WATER); - addParallelRunes(components, 4, 0, EnumRuneType.EARTH); - addCornerRunes(components, 1, 3, EnumRuneType.WATER); - addParallelRunes(components, 1, 4, EnumRuneType.AIR); - - for (int i = 0; i < 4; i++) - { - addCornerRunes(components, 3, i, EnumRuneType.EARTH); - } - } - - @Override - public Ritual getNewCopy() - { - return new RitualUpgradeRemove(); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualWater.java b/src/main/java/wayoftime/bloodmagic/ritual/types/RitualWater.java deleted file mode 100644 index aa7d230f..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualWater.java +++ /dev/null @@ -1,85 +0,0 @@ -package wayoftime.bloodmagic.ritual.types; - -import java.util.function.Consumer; - -import net.minecraft.block.Blocks; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.ritual.AreaDescriptor; -import wayoftime.bloodmagic.ritual.EnumRuneType; -import wayoftime.bloodmagic.ritual.IMasterRitualStone; -import wayoftime.bloodmagic.ritual.Ritual; -import wayoftime.bloodmagic.ritual.RitualComponent; -import wayoftime.bloodmagic.ritual.RitualRegister; - -@RitualRegister("water") -public class RitualWater extends Ritual -{ - public static final String WATER_RANGE = "waterRange"; - - public RitualWater() - { - super("ritualWater", 0, 500, "ritual." + BloodMagic.MODID + ".waterRitual"); - addBlockRange(WATER_RANGE, new AreaDescriptor.Rectangle(new BlockPos(0, 1, 0), 1)); - setMaximumVolumeAndDistanceOfRange(WATER_RANGE, 9, 3, 3); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) - { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - if (currentEssence < getRefreshCost()) - { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - int maxEffects = currentEssence / getRefreshCost(); - int totalEffects = 0; - - AreaDescriptor waterRange = masterRitualStone.getBlockRange(WATER_RANGE); - - for (BlockPos newPos : waterRange.getContainedPositions(masterRitualStone.getBlockPos())) - { - if (world.isAirBlock(newPos)) - { - world.setBlockState(newPos, Blocks.WATER.getDefaultState()); - totalEffects++; - } - - if (totalEffects >= maxEffects) - { - break; - } - } - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * totalEffects)); - } - - @Override - public int getRefreshTime() - { - return 1; - } - - @Override - public int getRefreshCost() - { - return 25; - } - - @Override - public void gatherComponents(Consumer components) - { - addCornerRunes(components, 1, 0, EnumRuneType.WATER); - } - - @Override - public Ritual getNewCopy() - { - return new RitualWater(); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualWellOfSuffering.java b/src/main/java/wayoftime/bloodmagic/ritual/types/RitualWellOfSuffering.java deleted file mode 100644 index e802b53b..00000000 --- a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualWellOfSuffering.java +++ /dev/null @@ -1,157 +0,0 @@ -package wayoftime.bloodmagic.ritual.types; - -import java.util.List; -import java.util.function.Consumer; - -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.impl.BloodMagicAPI; -import wayoftime.bloodmagic.ritual.AreaDescriptor; -import wayoftime.bloodmagic.ritual.EnumRuneType; -import wayoftime.bloodmagic.ritual.IMasterRitualStone; -import wayoftime.bloodmagic.ritual.Ritual; -import wayoftime.bloodmagic.ritual.RitualComponent; -import wayoftime.bloodmagic.ritual.RitualManager; -import wayoftime.bloodmagic.ritual.RitualRegister; -import wayoftime.bloodmagic.tile.TileAltar; - -@RitualRegister("well_of_suffering") -public class RitualWellOfSuffering extends Ritual -{ - public static final String ALTAR_RANGE = "altar"; - public static final String DAMAGE_RANGE = "damage"; - - public static final int SACRIFICE_AMOUNT = 25; - - public BlockPos altarOffsetPos = new BlockPos(0, 0, 0); // TODO: Save! - - public RitualWellOfSuffering() - { - super("ritualWellOfSuffering", 0, 40000, "ritual." + BloodMagic.MODID + ".wellOfSufferingRitual"); - addBlockRange(ALTAR_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-5, -10, -5), 11, 21, 11)); - addBlockRange(DAMAGE_RANGE, new AreaDescriptor.Rectangle(new BlockPos(-10, -10, -10), 21)); - - setMaximumVolumeAndDistanceOfRange(ALTAR_RANGE, 0, 10, 15); - setMaximumVolumeAndDistanceOfRange(DAMAGE_RANGE, 0, 15, 15); - } - - @Override - public void performRitual(IMasterRitualStone masterRitualStone) - { - World world = masterRitualStone.getWorldObj(); - int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence(); - - if (currentEssence < getRefreshCost()) - { - masterRitualStone.getOwnerNetwork().causeNausea(); - return; - } - - BlockPos pos = masterRitualStone.getBlockPos(); - - int maxEffects = currentEssence / getRefreshCost(); - int totalEffects = 0; - - BlockPos altarPos = pos.add(altarOffsetPos); - - TileEntity tile = world.getTileEntity(altarPos); - - AreaDescriptor altarRange = masterRitualStone.getBlockRange(ALTAR_RANGE); - - if (!altarRange.isWithinArea(altarOffsetPos) || !(tile instanceof TileAltar)) - { - for (BlockPos newPos : altarRange.getContainedPositions(pos)) - { - TileEntity nextTile = world.getTileEntity(newPos); - if (nextTile instanceof TileAltar) - { - tile = nextTile; - altarOffsetPos = newPos.subtract(pos); - - altarRange.resetCache(); - break; - } - } - } - - if (tile instanceof TileAltar) - { - TileAltar tileAltar = (TileAltar) tile; - - AreaDescriptor damageRange = masterRitualStone.getBlockRange(DAMAGE_RANGE); - AxisAlignedBB range = damageRange.getAABB(pos); - - List entities = world.getEntitiesWithinAABB(LivingEntity.class, range); - - for (LivingEntity entity : entities) - { -// EntityEntry entityEntry = ForgeRegistries.ENTITIES.getKe; - ResourceLocation id = entity.getType().getRegistryName(); - - if (BloodMagicAPI.INSTANCE.getBlacklist().getSacrifice().contains(id)) - continue; - - int lifeEssenceRatio = BloodMagicAPI.INSTANCE.getValueManager().getSacrificial().getOrDefault(id, SACRIFICE_AMOUNT); - - if (lifeEssenceRatio <= 0) - continue; - - if (entity.isAlive() && !(entity instanceof PlayerEntity)) - { - if (entity.attackEntityFrom(RitualManager.RITUAL_DAMAGE, 1)) - { - if (entity.isChild()) - lifeEssenceRatio *= 0.5F; - - tileAltar.sacrificialDaggerCall(lifeEssenceRatio, true); - - totalEffects++; - - if (totalEffects >= maxEffects) - { - break; - } - } - } - } - } - - masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost() * totalEffects)); - } - - @Override - public int getRefreshTime() - { - return 25; - } - - @Override - public int getRefreshCost() - { - return 2; - } - - @Override - public void gatherComponents(Consumer components) - { - addCornerRunes(components, 1, 0, EnumRuneType.FIRE); - addCornerRunes(components, 2, -1, EnumRuneType.FIRE); - addParallelRunes(components, 2, -1, EnumRuneType.EARTH); - addCornerRunes(components, -3, -1, EnumRuneType.DUSK); - addOffsetRunes(components, 2, 4, -1, EnumRuneType.WATER); - addOffsetRunes(components, 1, 4, 0, EnumRuneType.WATER); - addParallelRunes(components, 4, 1, EnumRuneType.AIR); - } - - @Override - public Ritual getNewCopy() - { - return new RitualWellOfSuffering(); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/structures/Dungeon.java b/src/main/java/wayoftime/bloodmagic/structures/Dungeon.java deleted file mode 100644 index f1cd36f9..00000000 --- a/src/main/java/wayoftime/bloodmagic/structures/Dungeon.java +++ /dev/null @@ -1,228 +0,0 @@ -package wayoftime.bloodmagic.structures; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Random; - -import org.apache.commons.lang3.tuple.Pair; - -import net.minecraft.util.Direction; -import net.minecraft.util.Mirror; -import net.minecraft.util.Rotation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.gen.feature.template.PlacementSettings; -import net.minecraft.world.server.ServerWorld; -import wayoftime.bloodmagic.ritual.AreaDescriptor; -import wayoftime.bloodmagic.util.BMLog; - -public class Dungeon -{ - public static boolean placeStructureAtPosition(Random rand, ServerWorld world, BlockPos pos) - { - long startTime = System.nanoTime(); - - Map> availableDoorMap = new HashMap<>(); // Map of doors. The EnumFacing indicates - // what way this door faces. - List descriptorList = new ArrayList<>(); - Map> roomMap = new HashMap<>(); // Placement positions in terms -// // of actual positions - -// List>> roomList = new ArrayList<>(); - - PlacementSettings settings = new PlacementSettings(); - Mirror mir = Mirror.NONE; - - settings.setMirror(mir); - - Rotation rot = Rotation.NONE; - - settings.setRotation(rot); - settings.setIgnoreEntities(true); - settings.setChunk(null); - - settings.addProcessor(new StoneToOreProcessor(0.2f)); - -// settings.setReplacedBlock(null); - -// settings.setIgnoreStructureBlock(false); - settings.func_215223_c(true); - -// PlacementSettings placementsettings = (new PlacementSettings()).setMirror(this.mirror).setRotation(this.rotation).setIgnoreEntities(this.ignoreEntities).setChunk((ChunkPos)null); -// if (this.integrity < 1.0F) { -// placementsettings.clearProcessors().addProcessor(new IntegrityProcessor(MathHelper.clamp(this.integrity, 0.0F, 1.0F))).setRandom(func_214074_b(this.seed)); -// } -// -// BlockPos blockpos2 = blockpos.add(this.position); -// p_242689_3_.func_237144_a_(p_242689_1_, blockpos2, placementsettings, func_214074_b(this.seed)); - -// List rotationInfo = new ArrayList(); - -// int n = 1; - DungeonRoom room = getRandomRoom(rand); - roomMap.put(pos, Pair.of(room, settings.copy())); -// roomList.add(Pair.of(pos, Pair.of(room, settings.copy()))); - descriptorList.addAll(room.getAreaDescriptors(settings, pos)); - for (Direction facing : Direction.values()) - { - if (availableDoorMap.containsKey(facing)) - { - List doorList = availableDoorMap.get(facing); - doorList.addAll(room.getDoorOffsetsForFacing(settings, facing, pos)); - } else - { - List doorList = room.getDoorOffsetsForFacing(settings, facing, pos); - availableDoorMap.put(facing, doorList); - } - } - -// rotationInfo.add(settings.getRotation()); - - // Initial AreaDescriptors and door positions are initialized. Time for fun! - for (int i = 0; i < 100; i++) - { - // Get which facing of doors are available. - List facingList = new ArrayList<>(); - for (Entry> entry : availableDoorMap.entrySet()) - { - if (entry.getValue() != null && !entry.getValue().isEmpty()) - { - facingList.add(entry.getKey()); - } - } - - Collections.shuffle(facingList); // Shuffle the list so that it is random what is chosen - - Pair removedDoor1 = null; - Pair removedDoor2 = null; - BlockPos roomLocation = null; - - testDirection: for (Direction doorFacing : facingList) - { - Direction oppositeDoorFacing = doorFacing.getOpposite(); - List availableDoorList = availableDoorMap.get(doorFacing); // May need to copy here - Collections.shuffle(availableDoorList); - - Rotation randRotation = Rotation.values()[rand.nextInt(Rotation.values().length)]; -// Rotation randRotation = Rotation.CLOCKWISE_90; - settings.setRotation(randRotation); // Same for the Mirror - DungeonRoom testingRoom = getRandomRoom(rand); - - List otherDoorList = testingRoom.getDoorOffsetsForFacing(settings, oppositeDoorFacing, BlockPos.ZERO); - if (otherDoorList != null && !otherDoorList.isEmpty()) - { - // See if one of these doors works. - Collections.shuffle(otherDoorList); - BlockPos testDoor = otherDoorList.get(0); - testDoor: for (BlockPos availableDoor : availableDoorList) - { - // TODO: Test if it fits, then add the doors to the list. - roomLocation = availableDoor.subtract(testDoor).add(doorFacing.getDirectionVec()); - - List descriptors = testingRoom.getAreaDescriptors(settings, roomLocation); - for (AreaDescriptor testDesc : descriptors) - { - for (AreaDescriptor currentDesc : descriptorList) - { - if (testDesc.intersects(currentDesc)) - { - break testDoor; - } - } - } - - roomMap.put(roomLocation, Pair.of(testingRoom, settings.copy())); -// roomList.add(Pair.of(roomLocation, Pair.of(testingRoom, settings.copy()))); - descriptorList.addAll(descriptors); - removedDoor1 = Pair.of(doorFacing, availableDoor); - removedDoor2 = Pair.of(oppositeDoorFacing, testDoor.add(roomLocation)); - - room = testingRoom; -// n++; -// rotationInfo.add(randRotation); -// System.out.println("Placement: " + n); -// -// for (Direction facing : Direction.values()) -// { -// List testingDoorList = testingRoom.getDoorOffsetsForFacing(settings, facing, BlockPos.ZERO); -// System.out.println("Door Facing: " + facing + ", Door List: " + testingDoorList); -// } - - break testDirection; - } - - break; - } - -// Collections.shuffle(otherDoorList); - } - - if (removedDoor1 != null) - { - for (Direction facing : Direction.values()) - { - if (availableDoorMap.containsKey(facing)) - { - List doorList = availableDoorMap.get(facing); - doorList.addAll(room.getDoorOffsetsForFacing(settings, facing, roomLocation)); - } else - { - List doorList = room.getDoorOffsetsForFacing(settings, facing, roomLocation); - availableDoorMap.put(facing, doorList); - } - } - - Direction face = removedDoor1.getKey(); - if (availableDoorMap.containsKey(face)) - { - availableDoorMap.get(face).remove(removedDoor1.getRight()); - } - } - - if (removedDoor2 != null) - { - Direction face = removedDoor2.getKey(); - if (availableDoorMap.containsKey(face)) - { - availableDoorMap.get(face).remove(removedDoor2.getRight()); - } - } - } - - long endTime = System.nanoTime(); - - long duration = (endTime - startTime); // divide by 1000000 to get milliseconds. - BMLog.DEBUG.info("Duration: " + duration + "(ns), " + duration / 1000000 + "(ms)"); - - // Building what I've got -// n = 0; - for (Entry> entry : roomMap.entrySet()) -// for (Pair> entry : roomList) - { -// n++; - BlockPos placementPos = entry.getKey(); - DungeonRoom placedRoom = entry.getValue().getKey(); - PlacementSettings placementSettings = entry.getValue().getValue(); - - placedRoom.placeStructureAtPosition(rand, placementSettings, world, placementPos); - -// world.setBlockState(placementPos, Blocks.REDSTONE_BLOCK.getDefaultState(), 3); -// System.out.println("Supposed Rotation for " + n + ": " + rotationInfo.get(n - 1)); -// System.out.println("Placement: " + n + ", BlockPos: " + placementPos + ", Rotation: " + placementSettings.getRotation()); - } - -// System.out.println(roomMap.size()); -// System.out.println(roomList.size()); - - return false; - } - - public static DungeonRoom getRandomRoom(Random rand) - { -// System.out.println("Dungeon size: " + DungeonRoomRegistry.dungeonWeightMap.size()); - return DungeonRoomRegistry.getRandomDungeonRoom(rand); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/structures/DungeonRoom.java b/src/main/java/wayoftime/bloodmagic/structures/DungeonRoom.java deleted file mode 100644 index 9e2dc086..00000000 --- a/src/main/java/wayoftime/bloodmagic/structures/DungeonRoom.java +++ /dev/null @@ -1,78 +0,0 @@ -package wayoftime.bloodmagic.structures; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Random; - -import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.gen.feature.template.PlacementSettings; -import net.minecraft.world.gen.feature.template.Template; -import net.minecraft.world.server.ServerWorld; -import wayoftime.bloodmagic.ritual.AreaDescriptor; - -public class DungeonRoom -{ - public int dungeonWeight = 1; - public Map structureMap = new HashMap<>(); - - public Map> doorMap = new HashMap<>(); // Map of doors. The EnumFacing indicates what way - // this door faces. - public List descriptorList = new ArrayList<>(); - - public DungeonRoom(Map structureMap, Map> doorMap, List descriptorList) - { - this.structureMap = structureMap; - this.doorMap = doorMap; - this.descriptorList = descriptorList; - } - - public List getAreaDescriptors(PlacementSettings settings, BlockPos offset) - { - List newList = new ArrayList<>(); - - for (AreaDescriptor desc : descriptorList) - { - newList.add(desc.rotateDescriptor(settings).offset(offset)); - } - - return newList; - } - - public List getDoorOffsetsForFacing(PlacementSettings settings, Direction facing, BlockPos offset) - { - List offsetList = new ArrayList<>(); - -// Direction originalFacing = DungeonUtil.rotate(settings.getMirror(), settings.getRotation(), facing); - Direction originalFacing = DungeonUtil.reverseRotate(settings.getMirror(), settings.getRotation(), facing); -// Direction originalFacing = facing; - if (doorMap.containsKey(originalFacing)) - { - List doorList = doorMap.get(originalFacing); - for (BlockPos doorPos : doorList) - { - offsetList.add(Template.transformedBlockPos(settings, doorPos).add(offset)); - } - } - - return offsetList; - } - - public boolean placeStructureAtPosition(Random rand, PlacementSettings settings, ServerWorld world, BlockPos pos) - { - for (Entry entry : structureMap.entrySet()) - { - ResourceLocation location = new ResourceLocation(entry.getKey()); - DungeonStructure structure = new DungeonStructure(location); - BlockPos offsetPos = Template.transformedBlockPos(settings, entry.getValue()); - - structure.placeStructureAtPosition(rand, settings, world, pos.add(offsetPos)); - } - - return true; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/structures/DungeonRoomLoader.java b/src/main/java/wayoftime/bloodmagic/structures/DungeonRoomLoader.java deleted file mode 100644 index 9eabeb69..00000000 --- a/src/main/java/wayoftime/bloodmagic/structures/DungeonRoomLoader.java +++ /dev/null @@ -1,102 +0,0 @@ -package wayoftime.bloodmagic.structures; - -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStream; -import java.io.Writer; -import java.net.URL; -import java.util.List; -import java.util.Random; - -import org.apache.commons.io.IOUtils; - -import com.google.common.base.Charsets; -import com.google.common.io.Resources; -import com.google.common.reflect.TypeToken; - -import net.minecraft.util.ResourceLocation; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.gson.Serializers; - -public class DungeonRoomLoader -{ - public static void saveDungeons() - { - for (DungeonRoom room : DungeonRoomRegistry.dungeonWeightMap.keySet()) - { - saveSingleDungeon(room); - } - } - - public static void saveSingleDungeon(DungeonRoom room) - { - String json = Serializers.GSON.toJson(room); - - Writer writer; - try - { - File file = new File("config/BloodMagic/schematics"); - file.mkdirs(); - - writer = new FileWriter("config/BloodMagic/schematics/" + new Random().nextInt() + ".json"); - writer.write(json); - writer.close(); - } catch (IOException e) - { - e.printStackTrace(); - } - } - - public static void loadDungeons() - { - try - { -// System.out.println("LOADING DEMON DUNGEONS"); - - URL schematicURL = DungeonRoomLoader.class.getResource(resLocToResourcePath(new ResourceLocation("bloodmagic:schematics"))); - List schematics = Serializers.GSON.fromJson(Resources.toString(schematicURL, Charsets.UTF_8), new TypeToken>() - { - }.getType()); - for (String schematicKey : schematics) - { - ResourceLocation schematic = new ResourceLocation(schematicKey); - URL dungeonURL = DungeonRoomLoader.class.getResource(resLocToResourcePath(schematic)); - DungeonRoom dungeonRoom = Serializers.GSON.fromJson(Resources.toString(dungeonURL, Charsets.UTF_8), DungeonRoom.class); - DungeonRoomRegistry.registerDungeonRoom(dungeonRoom, Math.max(1, dungeonRoom.dungeonWeight)); - } - - System.out.println("# schematics: " + schematics.size()); - - } catch (Exception e) - { - e.printStackTrace(); - } - } - - public static void test() - { - ResourceLocation id = new ResourceLocation(BloodMagic.MODID, "testGson"); - String s = id.getNamespace(); - String s1 = id.getPath(); - InputStream inputstream = null; - - try - { - inputstream = DungeonRoomLoader.class.getResourceAsStream("/assets/" + s + "/schematics/" + s1 + ".nbt"); -// this.readTemplateFromStream(s1, inputstream); - return; - } catch (Throwable var10) - { - - } finally - { - IOUtils.closeQuietly(inputstream); - } - } - - public static String resLocToResourcePath(ResourceLocation resourceLocation) - { - return "/assets/" + resourceLocation.getNamespace() + "/schematics/" + resourceLocation.getPath() + ".json"; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/structures/DungeonRoomRegistry.java b/src/main/java/wayoftime/bloodmagic/structures/DungeonRoomRegistry.java deleted file mode 100644 index 4a8f46f2..00000000 --- a/src/main/java/wayoftime/bloodmagic/structures/DungeonRoomRegistry.java +++ /dev/null @@ -1,33 +0,0 @@ -package wayoftime.bloodmagic.structures; - -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Random; - -public class DungeonRoomRegistry -{ - public static Map dungeonWeightMap = new HashMap<>(); - private static int totalWeight = 0; - - public static void registerDungeonRoom(DungeonRoom room, int weight) - { - dungeonWeightMap.put(room, weight); - totalWeight += weight; - } - - public static DungeonRoom getRandomDungeonRoom(Random rand) - { - int wantedWeight = rand.nextInt(totalWeight); - for (Entry entry : dungeonWeightMap.entrySet()) - { - wantedWeight -= entry.getValue(); - if (wantedWeight < 0) - { - return entry.getKey(); - } - } - - return null; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/structures/DungeonStructure.java b/src/main/java/wayoftime/bloodmagic/structures/DungeonStructure.java deleted file mode 100644 index 4ecb12d4..00000000 --- a/src/main/java/wayoftime/bloodmagic/structures/DungeonStructure.java +++ /dev/null @@ -1,55 +0,0 @@ -package wayoftime.bloodmagic.structures; - -import java.util.Random; - -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.gen.feature.template.PlacementSettings; -import net.minecraft.world.gen.feature.template.Template; -import net.minecraft.world.gen.feature.template.TemplateManager; -import net.minecraft.world.server.ServerWorld; -import wayoftime.bloodmagic.util.BMLog; - -public class DungeonStructure -{ - public ResourceLocation resource; - - public DungeonStructure(ResourceLocation resource) - { - this.resource = resource; - } - - public boolean placeStructureAtPosition(Random rand, PlacementSettings settings, ServerWorld world, BlockPos pos) - { - if (pos == null) - return false; - - MinecraftServer minecraftserver = world.getServer(); - TemplateManager templatemanager = world.getStructureTemplateManager(); - - Template template = templatemanager.getTemplate(resource); - - if (template == null) - { - System.out.println("Invalid template for location: " + resource); - BMLog.DEBUG.warn("Invalid template for location: " + resource); - return false; - } - -// settings.func_189946_a(MathHelper.clamp_float(schema.integrity, 0.0F, 1.0F)); - - BlockPos offset = Template.transformedBlockPos(settings, new BlockPos(0, 0, 0)); - BlockPos finalPos = pos.add(offset); -// template.addBlocksToWorldChunk(world, finalPos, settings); - template.func_237144_a_(world, finalPos, settings, rand); -// template.func_237152_b_(world, finalPos, settings, rand); - - return true; - } - - public DungeonStructure copy() - { - return new DungeonStructure(resource); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/structures/DungeonTester.java b/src/main/java/wayoftime/bloodmagic/structures/DungeonTester.java deleted file mode 100644 index dafa1a15..00000000 --- a/src/main/java/wayoftime/bloodmagic/structures/DungeonTester.java +++ /dev/null @@ -1,95 +0,0 @@ -package wayoftime.bloodmagic.structures; - -import java.util.Random; - -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.server.ServerWorld; - -public class DungeonTester -{ - public static void testDungeonGeneration(ServerWorld world, BlockPos pos) - { - - } - - public static void testDungeonElementWithOutput(ServerWorld world, BlockPos pos) - { - Dungeon.placeStructureAtPosition(new Random(), world, pos); -// ResourceLocation resource = new ResourceLocation(BloodMagic.MODID, "t_corridor"); -// -//// DungeonStructure structure = new DungeonStructure(resource); -//// Map structureMap = new HashMap(); -//// structureMap.put(structure, new BlockPos(0, 0, 0)); -// -// Map structureMap = new HashMap(); -// structureMap.put(resource.toString(), BlockPos.ZERO); -// -//// Map> doorMap = new HashMap>(); -//// List descriptorList = new ArrayList(); -//// descriptorList.add(new AreaDescriptor.Rectangle(new BlockPos(0, 0, 0), 11, 5, 8)); -//// -//// DungeonUtil.addRoom(doorMap, Direction.NORTH, new BlockPos(5, 0, 0)); -//// DungeonUtil.addRoom(doorMap, Direction.EAST, new BlockPos(10, 0, 5)); -//// DungeonUtil.addRoom(doorMap, Direction.WEST, new BlockPos(0, 0, 5)); -//// -//// DungeonRoom room = new DungeonRoom(structureMap, doorMap, descriptorList); -// -// DungeonRoom room = Dungeon.getRandomRoom(new Random()); -// -// PlacementSettings settings = new PlacementSettings(); -// -// Mirror mir = Mirror.NONE; -// settings.setMirror(mir); -// -// net.minecraft.util.Rotation rot = Rotation.NONE; -// settings.setRotation(rot); -// -// settings.setIgnoreEntities(true); -// settings.setChunk((ChunkPos) null); -// settings.func_215223_c(true); -//// settings.setReplacedBlock((Block) null); -//// settings.setIgnoreStructureBlock(false); -// -// int i = 0; -// -// for (Mirror mirror : Mirror.values()) -// { -// System.out.print("Mirror: " + mirror + '\n'); -// int j = 0; -// for (Rotation rotation : Rotation.values()) -// { -// System.out.print("Rotation: " + rotation + '\n'); -// settings.setRotation(rotation); -// settings.setMirror(mirror); -// -// BlockPos offsetPos = pos.add(i * 32, 0, j * 32); -// room.placeStructureAtPosition(new Random(), settings, world, offsetPos); -// -// world.setBlockState(offsetPos, Blocks.REDSTONE_BLOCK.getDefaultState(), 3); -// -//// List descriptors = room.getAreaDescriptors(settings, offsetPos); -//// for (AreaDescriptor desc : descriptors) -//// { -//// List posList = desc.getContainedPositions(new BlockPos(0, 0, 0)); -//// for (BlockPos placePos : posList) -//// { -//// world.setBlockState(placePos, Blocks.REDSTONE_BLOCK.getDefaultState()); -//// } -//// } -// -//// for (Direction facing : Direction.HORIZONTALS) -// for (int k = 0; k < 4; k++) -// { -// Direction facing = Direction.byHorizontalIndex(k); -// List doorList = room.getDoorOffsetsForFacing(settings, facing, offsetPos); -// for (BlockPos doorPos : doorList) -// { -// System.out.print("Door at " + doorPos + " facing " + facing + '\n'); -// } -// } -// j++; -// } -// i++; -// } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/structures/DungeonUtil.java b/src/main/java/wayoftime/bloodmagic/structures/DungeonUtil.java deleted file mode 100644 index e302e03d..00000000 --- a/src/main/java/wayoftime/bloodmagic/structures/DungeonUtil.java +++ /dev/null @@ -1,55 +0,0 @@ -package wayoftime.bloodmagic.structures; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import net.minecraft.util.Direction; -import net.minecraft.util.Mirror; -import net.minecraft.util.Rotation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.gen.feature.template.PlacementSettings; - -public class DungeonUtil -{ - public static Direction rotate(Mirror mirror, Rotation rotation, Direction original) - { - return rotation.rotate(mirror.mirror(original)); - } - - public static Direction reverseRotate(Mirror mirror, Rotation rotation, Direction original) - { - return mirror.mirror(getOppositeRotation(rotation).rotate(original)); - } - - public static Direction getFacingForSettings(PlacementSettings settings, Direction original) - { - return rotate(settings.getMirror(), settings.getRotation(), original); - } - - public static Rotation getOppositeRotation(Rotation rotation) - { - switch (rotation) - { - case CLOCKWISE_90: - return Rotation.COUNTERCLOCKWISE_90; - case COUNTERCLOCKWISE_90: - return Rotation.CLOCKWISE_90; - default: - return rotation; - } - } - - public static void addRoom(Map> doorMap, Direction facing, BlockPos offsetPos) - { - if (doorMap.containsKey(facing)) - { - doorMap.get(facing).add(offsetPos); - } else - { - List doorList = new ArrayList<>(); - doorList.add(offsetPos); - doorMap.put(facing, doorList); - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/structures/ItemDungeonTester.java b/src/main/java/wayoftime/bloodmagic/structures/ItemDungeonTester.java deleted file mode 100644 index d5527888..00000000 --- a/src/main/java/wayoftime/bloodmagic/structures/ItemDungeonTester.java +++ /dev/null @@ -1,29 +0,0 @@ -package wayoftime.bloodmagic.structures; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; -import wayoftime.bloodmagic.BloodMagic; - -public class ItemDungeonTester extends Item -{ - public ItemDungeonTester() - { - super(new Item.Properties().maxStackSize(1).group(BloodMagic.TAB)); - } - - @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) - { - if (!world.isRemote && world instanceof ServerWorld) - { - System.out.println("Test"); - DungeonTester.testDungeonElementWithOutput((ServerWorld) world, player.getPosition()); - } - return super.onItemRightClick(world, player, hand); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/structures/ModDungeons.java b/src/main/java/wayoftime/bloodmagic/structures/ModDungeons.java deleted file mode 100644 index 6c066b6e..00000000 --- a/src/main/java/wayoftime/bloodmagic/structures/ModDungeons.java +++ /dev/null @@ -1,28 +0,0 @@ -package wayoftime.bloodmagic.structures; - -public class ModDungeons -{ - public static void init() - { -// ResourceLocation resource = new ResourceLocation(Constants.Mod.MODID, "HallChest1"); -// -// Map structureMap = new HashMap(); -// structureMap.put(resource.toString(), new BlockPos(0, 0, 0)); -// -// Map> doorMap = new HashMap>(); -// List descriptorList = new ArrayList(); -// descriptorList.add(new AreaDescriptor.Rectangle(new BlockPos(0, 0, 0), 12, 5, 9)); -// -// DungeonUtil.addRoom(doorMap, EnumFacing.EAST, new BlockPos(11, 0, 4)); -// DungeonUtil.addRoom(doorMap, EnumFacing.WEST, new BlockPos(0, 0, 4)); -// -// DungeonRoom room = new DungeonRoom(structureMap, doorMap, descriptorList); -// DungeonRoomLoader.saveSingleDungeon(room); -// -// DungeonRoomRegistry.registerDungeonRoom(room, 1); -// -// DungeonRoomLoader.saveDungeons(); - - DungeonRoomLoader.loadDungeons(); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/structures/StoneToOreProcessor.java b/src/main/java/wayoftime/bloodmagic/structures/StoneToOreProcessor.java deleted file mode 100644 index e4d325d6..00000000 --- a/src/main/java/wayoftime/bloodmagic/structures/StoneToOreProcessor.java +++ /dev/null @@ -1,46 +0,0 @@ -package wayoftime.bloodmagic.structures; - -import java.util.Random; - -import javax.annotation.Nullable; - -import com.mojang.serialization.Codec; - -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IWorldReader; -import net.minecraft.world.gen.feature.template.IStructureProcessorType; -import net.minecraft.world.gen.feature.template.PlacementSettings; -import net.minecraft.world.gen.feature.template.StructureProcessor; -import net.minecraft.world.gen.feature.template.Template; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; - -public class StoneToOreProcessor extends StructureProcessor -{ - public static final Codec field_237077_a_ = Codec.FLOAT.fieldOf("integrity").orElse(1.0F).xmap(StoneToOreProcessor::new, (p_237078_0_) -> { - return p_237078_0_.integrity; - }).codec(); - private final float integrity; - - public StoneToOreProcessor(float integrity) - { - this.integrity = integrity; - } - - @Nullable - public Template.BlockInfo func_230386_a_(IWorldReader p_230386_1_, BlockPos p_230386_2_, BlockPos p_230386_3_, Template.BlockInfo p_230386_4_, Template.BlockInfo p_230386_5_, PlacementSettings p_230386_6_) - { - if (p_230386_5_.state.getBlock() != BloodMagicBlocks.DUNGEON_STONE.get()) - { - return p_230386_5_; - } - Random random = p_230386_6_.getRandom(p_230386_5_.pos); - return !(this.integrity >= 1.0F) && !(random.nextFloat() <= this.integrity) - ? new Template.BlockInfo(p_230386_5_.pos, BloodMagicBlocks.DUNGEON_ORE.get().getDefaultState(), p_230386_5_.nbt) - : p_230386_5_; - } - - protected IStructureProcessorType getType() - { - return IStructureProcessorType.BLOCK_ROT; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/tile/TileAlchemicalReactionChamber.java b/src/main/java/wayoftime/bloodmagic/tile/TileAlchemicalReactionChamber.java deleted file mode 100644 index 2196d608..00000000 --- a/src/main/java/wayoftime/bloodmagic/tile/TileAlchemicalReactionChamber.java +++ /dev/null @@ -1,510 +0,0 @@ -package wayoftime.bloodmagic.tile; - -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.inventory.container.Container; -import net.minecraft.inventory.container.INamedContainerProvider; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipe; -import net.minecraft.item.crafting.IRecipeType; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.fluids.FluidAttributes; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidUtil; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; -import net.minecraftforge.fluids.capability.IFluidHandler; -import net.minecraftforge.fluids.capability.IFluidHandlerItem; -import net.minecraftforge.fluids.capability.templates.FluidTank; -import net.minecraftforge.items.ItemHandlerHelper; -import net.minecraftforge.registries.ObjectHolder; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.recipe.helper.FluidStackIngredient; -import wayoftime.bloodmagic.impl.BloodMagicAPI; -import wayoftime.bloodmagic.recipe.RecipeARC; -import wayoftime.bloodmagic.common.item.arc.IARCTool; -import wayoftime.bloodmagic.common.item.inventory.InventoryWrapper; -import wayoftime.bloodmagic.common.tags.BloodMagicTags; -import wayoftime.bloodmagic.network.ARCTanksPacket; -import wayoftime.bloodmagic.tile.container.ContainerAlchemicalReactionChamber; -import wayoftime.bloodmagic.util.Constants; -import wayoftime.bloodmagic.util.MultiSlotItemHandler; - -public class TileAlchemicalReactionChamber extends TileInventory implements ITickableTileEntity, INamedContainerProvider, ISidedInventory, IFluidHandler -{ - @ObjectHolder("bloodmagic:alchemicalreactionchamber") - public static TileEntityType TYPE; - - public static final int ARC_TOOL_SLOT = 0; - public static final int OUTPUT_SLOT = 1; - public static final int NUM_OUTPUTS = 5; - public static final int INPUT_SLOT = 6; - public static final int INPUT_BUCKET_SLOT = 7; - public static final int OUTPUT_BUCKET_SLOT = 8; - - public FluidTank inputTank = new FluidTank(FluidAttributes.BUCKET_VOLUME * 20); - public FluidTank outputTank = new FluidTank(FluidAttributes.BUCKET_VOLUME * 20); - - public double currentProgress = 0; - public static final double DEFAULT_SPEED = 0.005; - - public TileAlchemicalReactionChamber(TileEntityType type) - { - super(type, 9, "alchemicalreactionchamber"); - } - - public TileAlchemicalReactionChamber() - { - this(TYPE); - } - - @Override - public void deserialize(CompoundNBT tag) - { - super.deserialize(tag); - - currentProgress = tag.getDouble(Constants.NBT.ARC_PROGRESS); - - CompoundNBT inputTankTag = tag.getCompound("inputtank"); - inputTank.readFromNBT(inputTankTag); - - CompoundNBT outputTankTag = tag.getCompound("outputtank"); - outputTank.readFromNBT(outputTankTag); - } - - @Override - public CompoundNBT serialize(CompoundNBT tag) - { - super.serialize(tag); - - tag.putDouble(Constants.NBT.ARC_PROGRESS, currentProgress); - - CompoundNBT inputTankTag = new CompoundNBT(); - inputTank.writeToNBT(inputTankTag); - tag.put("inputtank", inputTankTag); - - CompoundNBT outputTankTag = new CompoundNBT(); - outputTank.writeToNBT(outputTankTag); - tag.put("outputtank", outputTankTag); - - return tag; - } - - @Override - public void tick() - { -// if (world.isRemote) -// { -// return; -// } - -// if (world.getGameTime() % 20 == 0) -// { -// outputTank.fill(new FluidStack(Fluids.WATER, 100), FluidAction.EXECUTE); -// } - - boolean outputChanged = false; - - ItemStack fullBucketStack = this.getStackInSlot(INPUT_BUCKET_SLOT); - ItemStack emptyBucketStack = this.getStackInSlot(OUTPUT_BUCKET_SLOT); - - ItemStack[] outputInventory = new ItemStack[] { getStackInSlot(1), getStackInSlot(2), getStackInSlot(3), - getStackInSlot(4), getStackInSlot(5) }; - - MultiSlotItemHandler outputSlotHandler = new MultiSlotItemHandler(outputInventory, 64); - - if (!world.isRemote) - { - if (!fullBucketStack.isEmpty() && inputTank.getSpace() >= 1000) - { - ItemStack testFullBucketStack = ItemHandlerHelper.copyStackWithSize(fullBucketStack, 1); - LazyOptional fluidHandlerWrapper = FluidUtil.getFluidHandler(testFullBucketStack); - if (fluidHandlerWrapper.isPresent()) - { - IFluidHandlerItem fluidHandler = fluidHandlerWrapper.resolve().get(); - FluidStack transferedStack = FluidUtil.tryFluidTransfer(inputTank, fluidHandler, 1000, false); - if (!transferedStack.isEmpty()) - { - fluidHandler.drain(transferedStack, FluidAction.EXECUTE); - List arrayList = new ArrayList<>(); - arrayList.add(fluidHandler.getContainer()); - if (outputSlotHandler.canTransferAllItemsToSlots(arrayList, true)) - { - outputChanged = true; - inputTank.fill(transferedStack, FluidAction.EXECUTE); - outputSlotHandler.canTransferAllItemsToSlots(arrayList, false); - if (fullBucketStack.getCount() > 1) - { - fullBucketStack.setCount(fullBucketStack.getCount() - 1); - } else - { - setInventorySlotContents(INPUT_BUCKET_SLOT, ItemStack.EMPTY); - } - } - } - } - } - - if (!emptyBucketStack.isEmpty() && outputTank.getFluidAmount() >= 1000) - { - ItemStack testEmptyBucketStack = ItemHandlerHelper.copyStackWithSize(emptyBucketStack, 1); - LazyOptional fluidHandlerWrapper = FluidUtil.getFluidHandler(testEmptyBucketStack); - if (fluidHandlerWrapper.isPresent()) - { - IFluidHandlerItem fluidHandler = fluidHandlerWrapper.resolve().get(); - FluidStack transferedStack = FluidUtil.tryFluidTransfer(fluidHandler, outputTank, 1000, false); - if (!transferedStack.isEmpty()) - { - fluidHandler.fill(transferedStack, FluidAction.EXECUTE); - List arrayList = new ArrayList<>(); - arrayList.add(fluidHandler.getContainer()); - if (outputSlotHandler.canTransferAllItemsToSlots(arrayList, true)) - { - outputChanged = true; - outputTank.drain(transferedStack, FluidAction.EXECUTE); - outputSlotHandler.canTransferAllItemsToSlots(arrayList, false); - if (emptyBucketStack.getCount() > 1) - { - emptyBucketStack.setCount(emptyBucketStack.getCount() - 1); - } else - { - setInventorySlotContents(OUTPUT_BUCKET_SLOT, ItemStack.EMPTY); - } - } - } - } - } - } - - ItemStack inputStack = this.getStackInSlot(INPUT_SLOT); - ItemStack toolStack = this.getStackInSlot(ARC_TOOL_SLOT); - - double craftingMultiplier = 1; - if (toolStack.getItem() instanceof IARCTool) - { - craftingMultiplier = ((IARCTool) toolStack.getItem()).getCraftingSpeedMultiplier(toolStack); - } - - RecipeARC recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getARC(world, inputStack, toolStack, inputTank.getFluid()); - if (canCraft(recipe, outputSlotHandler)) - { - // We have enough fluid (if applicable) and the theoretical outputs can fit. - currentProgress += craftingMultiplier * DEFAULT_SPEED; - if (currentProgress >= 1) - { - if (!world.isRemote) - { - outputChanged = true; - craftItem(recipe, outputSlotHandler); - } - - currentProgress = 0; - } - } else - { - if (toolStack.getItem().isIn(BloodMagicTags.ARC_TOOL_FURNACE)) - { - InventoryWrapper invWrapper = new InventoryWrapper(1); - invWrapper.setInventorySlotContents(0, inputStack.copy()); -// ItemStack[] outputInventory = new ItemStack[] -// { input }; - -// MultiSlotItemHandler outputSlotHandler = new MultiSlotItemHandler(outputInventory, 64); - Optional furnaceRecipe = world.getRecipeManager().getRecipe(IRecipeType.SMELTING, invWrapper, world); - if (furnaceRecipe.isPresent()) - { - ItemStack outputStack = furnaceRecipe.get().getCraftingResult(invWrapper); - if (canCraftFurnace(outputStack, outputSlotHandler)) - { - currentProgress += craftingMultiplier * DEFAULT_SPEED; - if (currentProgress >= 1) - { - if (!world.isRemote) - { - craftFurnace(outputStack, outputSlotHandler); - outputChanged = true; - } - - currentProgress = 0; - } - } - } else - { - currentProgress = 0; - } - } else - { - currentProgress = 0; - } - } - - if (outputChanged && !world.isRemote) - { - for (int i = 0; i < NUM_OUTPUTS; i++) - { - this.setInventorySlotContents(OUTPUT_SLOT + i, outputSlotHandler.getStackInSlot(i)); - } - } - -// FluidUtil.tryEmptyContainer(container, fluidDestination, maxAmount, player, doDrain) - } - - private boolean canCraft(RecipeARC recipe, MultiSlotItemHandler outputSlotHandler) - { - if (recipe == null) - return false; - - FluidStackIngredient inputFluidIngredient = recipe.getFluidIngredient(); - if (inputFluidIngredient != null && !inputFluidIngredient.test(inputTank.getFluid())) - { - return false; - } - - if (outputSlotHandler.canTransferAllItemsToSlots(recipe.getAllListedOutputs(), true)) - { - FluidStack outputStack = recipe.getFluidOutput(); - return outputStack.isEmpty() ? true - : outputTank.fill(outputStack, FluidAction.SIMULATE) >= outputStack.getAmount(); - } - - return false; - } - - private void craftItem(RecipeARC recipe, MultiSlotItemHandler outputSlotHandler) - { - if (this.canCraft(recipe, outputSlotHandler)) - { - if (recipe.getFluidIngredient() != null) - { - FluidStack inputStack = recipe.getFluidIngredient().getMatchingInstance(inputTank.getFluid()); - inputTank.drain(inputStack, FluidAction.EXECUTE); - } - - outputSlotHandler.canTransferAllItemsToSlots(recipe.getAllOutputs(world.rand), false); - outputTank.fill(recipe.getFluidOutput().copy(), FluidAction.EXECUTE); - consumeInventory(recipe.getConsumeIngredient()); - } - } - - private boolean canCraftFurnace(ItemStack outputStack, MultiSlotItemHandler outputSlotHandler) - { - List outputList = new ArrayList<>(); - outputList.add(outputStack); - return outputSlotHandler.canTransferAllItemsToSlots(outputList, true); - } - - private void craftFurnace(ItemStack outputStack, MultiSlotItemHandler outputSlotHandler) - { - List outputList = new ArrayList<>(); - outputList.add(outputStack); - outputSlotHandler.canTransferAllItemsToSlots(outputList, false); - consumeInventory(false); - } - - public void consumeInventory(boolean consumeInput) - { - ItemStack inputStack = getStackInSlot(INPUT_SLOT); - if (!inputStack.isEmpty()) - { - if (!consumeInput && inputStack.getItem().hasContainerItem(inputStack)) - { - setInventorySlotContents(INPUT_SLOT, inputStack.getItem().getContainerItem(inputStack)); - } else - { - inputStack.shrink(1); - if (inputStack.isEmpty()) - { - setInventorySlotContents(INPUT_SLOT, ItemStack.EMPTY); - } - } - } - - ItemStack toolStack = getStackInSlot(ARC_TOOL_SLOT); - if (!toolStack.isEmpty()) - { - if (toolStack.isDamageable()) - { - toolStack.setDamage(toolStack.getDamage() + 1); - if (toolStack.getDamage() >= toolStack.getMaxDamage()) - { - setInventorySlotContents(ARC_TOOL_SLOT, ItemStack.EMPTY); - } - } else if (toolStack.getItem().hasContainerItem(toolStack)) - { - setInventorySlotContents(ARC_TOOL_SLOT, toolStack.getItem().getContainerItem(inputStack)); - } else - { - toolStack.shrink(1); - if (toolStack.isEmpty()) - { - setInventorySlotContents(ARC_TOOL_SLOT, ItemStack.EMPTY); - } - } - } - } - - @Override - public Container createMenu(int p_createMenu_1_, PlayerInventory p_createMenu_2_, PlayerEntity p_createMenu_3_) - { - assert world != null; - return new ContainerAlchemicalReactionChamber(this, p_createMenu_1_, p_createMenu_2_); - } - - @Override - public ITextComponent getDisplayName() - { - return new StringTextComponent("Alchemical Reaction Chamber"); - } - - public double getProgressForGui() - { - return currentProgress; - } - - @Override - public int[] getSlotsForFace(Direction side) - { - switch (side) - { - case UP: - return new int[] { ARC_TOOL_SLOT }; - case DOWN: - return new int[] { 1, 2, 3, 4, 5 }; - default: - return new int[] { 6, 7, 8 }; - } - } - - @Override - public boolean canInsertItem(int index, ItemStack itemStack, Direction direction) - { - if (index == INPUT_BUCKET_SLOT || index == OUTPUT_BUCKET_SLOT) - { - Optional fluidStackOptional = FluidUtil.getFluidContained(itemStack); - - return fluidStackOptional.isPresent() && ((index == OUTPUT_BUCKET_SLOT && !fluidStackOptional.get().isEmpty()) || (index == INPUT_BUCKET_SLOT && fluidStackOptional.get().isEmpty())); - } - - if (index >= OUTPUT_SLOT && index < OUTPUT_SLOT + NUM_OUTPUTS) - { - return false; - } - - if (index == ARC_TOOL_SLOT) - { - return itemStack.getItem().isIn(BloodMagicTags.ARC_TOOL); - } - - return true; - } - - @Override - public boolean canExtractItem(int index, ItemStack stack, Direction direction) - { - return index >= OUTPUT_SLOT && index < OUTPUT_SLOT + NUM_OUTPUTS; - } - - @SuppressWarnings("unchecked") - @Override - public LazyOptional getCapability(@Nonnull Capability capability, @Nullable Direction facing) - { - if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) - { - return LazyOptional.of(() -> this).cast(); - } - - return super.getCapability(capability, facing); - } - - @Override - public int getTanks() - { - return 2; - } - - @Override - public FluidStack getFluidInTank(int tank) - { - switch (tank) - { - case 0: - return inputTank.getFluid(); - default: - return outputTank.getFluid(); - } - } - - @Override - public int getTankCapacity(int tank) - { - switch (tank) - { - case 0: - return inputTank.getCapacity(); - default: - return outputTank.getCapacity(); - } - } - - @Override - public boolean isFluidValid(int tank, FluidStack stack) - { - switch (tank) - { - case 0: - return inputTank.isFluidValid(stack); - default: - return outputTank.isFluidValid(stack); - } - } - - @Override - public int fill(FluidStack resource, FluidAction action) - { - int fillAmount = inputTank.fill(resource, action); - if (fillAmount > 0 && !world.isRemote) - { - BloodMagic.packetHandler.sendToAllTracking(new ARCTanksPacket(this), this); -// this.world.notifyBlockUpdate(pos, getBlockState(), getBlockState(), 3); - } - return fillAmount; - } - - @Override - public FluidStack drain(FluidStack resource, FluidAction action) - { - FluidStack drainedStack = outputTank.drain(resource, action); - if (!drainedStack.isEmpty() && !world.isRemote) - { - BloodMagic.packetHandler.sendToAllTracking(new ARCTanksPacket(this), this); -// this.world.notifyBlockUpdate(pos, getBlockState(), getBlockState(), 3); - } - return drainedStack; - } - - @Override - public FluidStack drain(int maxDrain, FluidAction action) - { - FluidStack drainedStack = outputTank.drain(maxDrain, action); - if (!drainedStack.isEmpty() && !world.isRemote) - { - BloodMagic.packetHandler.sendToAllTracking(new ARCTanksPacket(this), this); -// this.world.notifyBlockUpdate(pos, getBlockState(), getBlockState(), 3); - } - return drainedStack; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/tile/TileAlchemyArray.java b/src/main/java/wayoftime/bloodmagic/tile/TileAlchemyArray.java deleted file mode 100644 index e18fd6b8..00000000 --- a/src/main/java/wayoftime/bloodmagic/tile/TileAlchemyArray.java +++ /dev/null @@ -1,168 +0,0 @@ -package wayoftime.bloodmagic.tile; - -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; -import net.minecraftforge.registries.ObjectHolder; -import wayoftime.bloodmagic.common.alchemyarray.AlchemyArrayEffect; -import wayoftime.bloodmagic.core.registry.AlchemyArrayRegistry; -import wayoftime.bloodmagic.util.Constants; - -public class TileAlchemyArray extends TileInventory implements ITickableTileEntity -{ - @ObjectHolder("bloodmagic:alchemyarray") - public static TileEntityType TYPE; - - public boolean isActive = false; - public int activeCounter = 0; - public Direction rotation = Direction.byHorizontalIndex(0); - public int rotateCooldown = 0; - - private String key = ""; - public AlchemyArrayEffect arrayEffect; - private boolean doDropIngredients = true; - - public TileAlchemyArray(TileEntityType type) - { - super(type, 2, "alchemyarray"); -// this.bloodAltar = new BloodAltar(this); - } - - public TileAlchemyArray() - { - this(TYPE); - } - - public void onEntityCollidedWithBlock(BlockState state, Entity entity) - { - if (arrayEffect != null) - { - arrayEffect.onEntityCollidedWithBlock(this, getWorld(), pos, state, entity); - } - } - - @Override - public void deserialize(CompoundNBT tagCompound) - { - super.deserialize(tagCompound); - this.isActive = tagCompound.getBoolean("isActive"); - this.activeCounter = tagCompound.getInt("activeCounter"); - this.key = tagCompound.getString("stringKey"); - if (!tagCompound.contains("doDropIngredients")) // Check if the array is old - { - this.doDropIngredients = true; - } else - { - this.doDropIngredients = tagCompound.getBoolean("doDropIngredients"); - } - this.rotation = Direction.byHorizontalIndex(tagCompound.getInt(Constants.NBT.DIRECTION)); - - CompoundNBT arrayTag = tagCompound.getCompound("arrayTag"); -// arrayEffect = AlchemyArrayRegistry.getEffect(world, this.getStackInSlot(0), this.getStackInSlot(1)); - if (arrayEffect != null) - { - arrayEffect.readFromNBT(arrayTag); - } - } - - public void doDropIngredients(boolean drop) - { - this.doDropIngredients = drop; - } - - @Override - public CompoundNBT serialize(CompoundNBT tagCompound) - { - super.serialize(tagCompound); - tagCompound.putBoolean("isActive", isActive); - tagCompound.putInt("activeCounter", activeCounter); - tagCompound.putString("stringKey", "".equals(key) ? "empty" : key.toString()); - tagCompound.putBoolean("doDropIngredients", doDropIngredients); - tagCompound.putInt(Constants.NBT.DIRECTION, rotation.getHorizontalIndex()); - - CompoundNBT arrayTag = new CompoundNBT(); - if (arrayEffect != null) - { - arrayEffect.writeToNBT(arrayTag); - } - tagCompound.put("arrayTag", arrayTag); - - return tagCompound; - } - - @Override - public void tick() - { -// System.out.println("Active counter: " + this.activeCounter); - if (isActive && attemptCraft()) - { - activeCounter++; - } else - { - isActive = false; - doDropIngredients = true; - activeCounter = 0; - arrayEffect = null; - key = "empty"; - } - if (rotateCooldown > 0) - rotateCooldown--; - } - - public boolean attemptCraft() - { - if (arrayEffect != null) - { - isActive = true; - - } else - { - AlchemyArrayEffect effect = AlchemyArrayRegistry.getEffect(world, this.getStackInSlot(0), this.getStackInSlot(1)); -// System.out.println("Effect: " + effect); - if (effect == null) - { -// key = effect.i - return false; - } else - { - arrayEffect = effect; - } - } - - if (arrayEffect != null) - { - isActive = true; - if (arrayEffect.update(this, this.activeCounter)) - { - this.decrStackSize(0, 1); - this.decrStackSize(1, 1); - this.getWorld().setBlockState(getPos(), Blocks.AIR.getDefaultState()); - } - - return true; - } - return false; - } - -// @Override - public Direction getRotation() - { - return rotation; - } - - public void setRotation(Direction rotation) - { - this.rotation = rotation; - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack itemstack) - { - return slot == 0 || slot == 1; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/tile/TileAlchemyTable.java b/src/main/java/wayoftime/bloodmagic/tile/TileAlchemyTable.java deleted file mode 100644 index 02d9ec37..00000000 --- a/src/main/java/wayoftime/bloodmagic/tile/TileAlchemyTable.java +++ /dev/null @@ -1,593 +0,0 @@ -package wayoftime.bloodmagic.tile; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang3.ArrayUtils; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.inventory.container.Container; -import net.minecraft.inventory.container.INamedContainerProvider; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.ItemHandlerHelper; -import net.minecraftforge.registries.ObjectHolder; -import wayoftime.bloodmagic.api.event.BloodMagicCraftedEvent; -import wayoftime.bloodmagic.common.item.BloodOrb; -import wayoftime.bloodmagic.common.item.IBindable; -import wayoftime.bloodmagic.common.item.IBloodOrb; -import wayoftime.bloodmagic.core.data.Binding; -import wayoftime.bloodmagic.core.data.SoulNetwork; -import wayoftime.bloodmagic.core.data.SoulTicket; -import wayoftime.bloodmagic.impl.BloodMagicAPI; -import wayoftime.bloodmagic.recipe.RecipeAlchemyTable; -import wayoftime.bloodmagic.tile.container.ContainerAlchemyTable; -import wayoftime.bloodmagic.util.Constants; -import wayoftime.bloodmagic.util.helper.NetworkHelper; - -public class TileAlchemyTable extends TileInventory implements ISidedInventory, ITickableTileEntity, INamedContainerProvider -{ - @ObjectHolder("bloodmagic:alchemytable") - public static TileEntityType TYPE; - - public static final int orbSlot = 6; - public static final int outputSlot = 7; - - public Direction direction = Direction.NORTH; - public boolean isSlave = false; - public int burnTime = 0; - public int ticksRequired = 1; - - public BlockPos connectedPos = BlockPos.ZERO; - public boolean[] blockedSlots = new boolean[] { false, false, false, false, false, false }; - public boolean[] allowedDirectionsSlot0 = new boolean[] { false, false, true, true, true, true }; - public boolean[] allowedDirectionsSlot1 = new boolean[] { false, false, true, true, true, true }; - public boolean[] allowedDirectionsSlot2 = new boolean[] { false, false, true, true, true, true }; - public boolean[] allowedDirectionsSlot3 = new boolean[] { false, false, true, true, true, true }; - public boolean[] allowedDirectionsSlot4 = new boolean[] { false, false, true, true, true, true }; - public boolean[] allowedDirectionsSlot5 = new boolean[] { false, false, true, true, true, true }; - public boolean[] allowedDirectionsOrb = new boolean[] { false, true, false, false, false, false }; - public boolean[] allowedDirectionsOutput = new boolean[] { true, false, false, false, false, false }; - - public int activeSlot = -1; - - public TileAlchemyTable(TileEntityType type) - { - super(type, 8, "alchemytable"); - } - - public TileAlchemyTable() - { - this(TYPE); - } - - public void setInitialTableParameters(Direction direction, boolean isSlave, BlockPos connectedPos) - { - this.isSlave = isSlave; - this.connectedPos = connectedPos; - - if (!isSlave) - { - this.direction = direction; - } - } - - public boolean isInvisible() - { - return isSlave(); - } - - public boolean isInputSlotAccessible(int slot) - { - return !(slot < 6 && slot >= 0) || !blockedSlots[slot]; - } - - public void toggleInputSlotAccessible(int slot) - { - if (slot < 6 && slot >= 0) - blockedSlots[slot] = !blockedSlots[slot]; - } - - public boolean isSlotEnabled(int slot, Direction dir) - { - switch (slot) - { - case 0: - return allowedDirectionsSlot0[dir.ordinal()]; - case 1: - return allowedDirectionsSlot1[dir.ordinal()]; - case 2: - return allowedDirectionsSlot2[dir.ordinal()]; - case 3: - return allowedDirectionsSlot3[dir.ordinal()]; - case 4: - return allowedDirectionsSlot4[dir.ordinal()]; - case 5: - return allowedDirectionsSlot5[dir.ordinal()]; - case 6: - return allowedDirectionsOrb[dir.ordinal()]; - case 7: - return allowedDirectionsOutput[dir.ordinal()]; - } - - return false; - } - - public void setSlotEnabled(boolean enabled, int slot, Direction dir) - { - switch (slot) - { - case 0: - allowedDirectionsSlot0[dir.ordinal()] = enabled; - break; - case 1: - allowedDirectionsSlot1[dir.ordinal()] = enabled; - break; - case 2: - allowedDirectionsSlot2[dir.ordinal()] = enabled; - break; - case 3: - allowedDirectionsSlot3[dir.ordinal()] = enabled; - break; - case 4: - allowedDirectionsSlot4[dir.ordinal()] = enabled; - break; - case 5: - allowedDirectionsSlot5[dir.ordinal()] = enabled; - break; - case 6: - allowedDirectionsOrb[dir.ordinal()] = enabled; - break; - case 7: - allowedDirectionsOutput[dir.ordinal()] = enabled; - break; - } - } - - @Override - public void deserialize(CompoundNBT tag) - { - super.deserialize(tag); - - isSlave = tag.getBoolean("isSlave"); - direction = Direction.byIndex(tag.getInt(Constants.NBT.DIRECTION)); - connectedPos = new BlockPos(tag.getInt(Constants.NBT.X_COORD), tag.getInt(Constants.NBT.Y_COORD), tag.getInt(Constants.NBT.Z_COORD)); - - burnTime = tag.getInt("burnTime"); - ticksRequired = tag.getInt("ticksRequired"); - - byte[] array = tag.getByteArray("blockedSlots"); - for (int i = 0; i < array.length; i++) blockedSlots[i] = array[i] != 0; - - for (int i = 0; i <= outputSlot; i++) - { - byte[] allowedSlotArray = tag.getByteArray("allowedDirections" + i); - for (int j = 0; j < Math.min(allowedSlotArray.length, Direction.values().length); j++) - { - this.setSlotEnabled(allowedSlotArray[j] == 1 ? true : false, i, Direction.values()[j]); - } -// tag.putByteArray("allowedDirections" + i, allowedSlotArray); - } - } - - @Override - public CompoundNBT serialize(CompoundNBT tag) - { - super.serialize(tag); - - tag.putBoolean("isSlave", isSlave); - tag.putInt(Constants.NBT.DIRECTION, direction.getIndex()); - tag.putInt(Constants.NBT.X_COORD, connectedPos.getX()); - tag.putInt(Constants.NBT.Y_COORD, connectedPos.getY()); - tag.putInt(Constants.NBT.Z_COORD, connectedPos.getZ()); - - tag.putInt("burnTime", burnTime); - tag.putInt("ticksRequired", ticksRequired); - - byte[] blockedSlotArray = new byte[blockedSlots.length]; - for (int i = 0; i < blockedSlots.length; i++) blockedSlotArray[i] = (byte) (blockedSlots[i] ? 1 : 0); - - tag.putByteArray("blockedSlots", blockedSlotArray); - - for (int i = 0; i <= outputSlot; i++) - { - byte[] allowedSlotArray = new byte[Direction.values().length]; - for (int j = 0; j < Direction.values().length; j++) - { - allowedSlotArray[j] = (byte) (this.isSlotEnabled(i, Direction.values()[j]) ? 1 : 0); - } - tag.putByteArray("allowedDirections" + i, allowedSlotArray); - } - - return tag; - } - - @Override - public LazyOptional getCapability(Capability capability, Direction facing) - { - if (facing != null && capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) - { - if (this.isSlave()) - { - TileEntity tile = getWorld().getTileEntity(connectedPos); - if (tile instanceof TileAlchemyTable && !((TileAlchemyTable) tile).isSlave) - { - return (LazyOptional) tile.getCapability(capability, facing); - } - } else - { - return super.getCapability(capability, facing); - } - } - - return super.getCapability(capability, facing); - } - - @Override - public int[] getSlotsForFace(Direction side) - { - List integerList = new ArrayList(); - for (int i = 0; i <= outputSlot; i++) - { - if (this.isSlotEnabled(i, side)) - { - integerList.add(i); - } - } - - int[] intArray = new int[integerList.size()]; - for (int i = 0; i < intArray.length; i++) - { - intArray[i] = integerList.get(i); - } - - return intArray; -// switch (side) -// { -// case DOWN: -// return new int[] { outputSlot }; -// case UP: -// return new int[] { orbSlot }; -// default: -// return new int[] { 0, 1, 2, 3, 4, 5 }; -// } - } - - @Override - public boolean canInsertItem(int index, ItemStack stack, Direction direction) - { - switch (index) - { - case outputSlot: - return false; - case orbSlot: - return !stack.isEmpty() && stack.getItem() instanceof IBloodOrb; - default: - return this.isSlotEnabled(index, direction); - } -// switch (direction) -// { -// case DOWN: -// return index != outputSlot && index != orbSlot; -// case UP: -// if (index == orbSlot && !stack.isEmpty() && stack.getItem() instanceof IBloodOrb) -// { -// return true; -// } else -// { -// return true; -// } -// default: -// if (this.isSlave) -// { -// TileEntity tile = getWorld().getTileEntity(connectedPos); -// if (tile instanceof TileAlchemyTable && !((TileAlchemyTable) tile).isSlave) -// { -// return ((TileAlchemyTable) tile).canInsertItem(index, stack, direction); -// } -// } -// return getAccessibleInputSlots(direction).contains(index); -// } - } - - @Override - public boolean canExtractItem(int index, ItemStack stack, Direction direction) - { - switch (direction) - { - default: - return this.isSlotEnabled(index, direction); - } - } - - public List getAccessibleInputSlots(Direction direction) - { - List list = new ArrayList<>(); - - for (int i = 0; i < 6; i++) - { - if (isInputSlotAccessible(i)) - { - list.add(i); - } - } - - return list; - } - - @Override - public void tick() - { - if (isSlave()) - { - return; - } - - List inputList = new ArrayList<>(); - - for (int i = 0; i < 6; i++) - { - if (!getStackInSlot(i).isEmpty()) - { - inputList.add(getStackInSlot(i)); - } - } - - int tier = getTierOfOrb(); - - // Simple recipes - RecipeAlchemyTable recipeAlchemyTable = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getAlchemyTable(world, inputList); - if (recipeAlchemyTable != null && (burnTime > 0 || (!getWorld().isRemote && tier >= recipeAlchemyTable.getMinimumTier() && getContainedLp() >= recipeAlchemyTable.getSyphon()))) - { - if (burnTime == 1) - notifyUpdate(); - - if (canCraft(recipeAlchemyTable.getOutput())) - { - ticksRequired = recipeAlchemyTable.getTicks(); - burnTime++; - if (burnTime >= ticksRequired) - { - if (!getWorld().isRemote) - { - if (recipeAlchemyTable.getSyphon() > 0) - { - if (consumeLp(recipeAlchemyTable.getSyphon()) < recipeAlchemyTable.getSyphon()) - { - // There was not enough LP to craft or there was no orb - burnTime = 0; - notifyUpdate(); - return; - } - } - - ItemStack[] inputs = new ItemStack[0]; - for (ItemStack stack : inputList) ArrayUtils.add(inputs, stack.copy()); - - BloodMagicCraftedEvent.AlchemyTable event = new BloodMagicCraftedEvent.AlchemyTable(recipeAlchemyTable.getOutput().copy(), inputs); - MinecraftForge.EVENT_BUS.post(event); - - ItemStack outputSlotStack = getStackInSlot(outputSlot); - if (outputSlotStack.isEmpty()) - setInventorySlotContents(outputSlot, event.getOutput()); - else - outputSlotStack.grow(event.getOutput().getCount()); - - consumeInventory(recipeAlchemyTable); - - burnTime = 0; - notifyUpdate(); - } - } - } - } else - { - burnTime = 0; - } - - } - - public double getProgressForGui() - { - return ((double) burnTime) / ticksRequired; - } - - private boolean canCraft(ItemStack output) - { - ItemStack currentOutputStack = getStackInSlot(outputSlot); - if (output.isEmpty()) - return false; - if (currentOutputStack.isEmpty()) - return true; - if (!ItemHandlerHelper.canItemStacksStack(output, currentOutputStack)) - return false; - int result = currentOutputStack.getCount() + output.getCount(); - return result <= getInventoryStackLimit() && result <= currentOutputStack.getMaxStackSize(); - } - - public int getTierOfOrb() - { - ItemStack orbStack = getStackInSlot(orbSlot); - if (!orbStack.isEmpty()) - { - if (orbStack.getItem() instanceof IBloodOrb) - { - BloodOrb orb = ((IBloodOrb) orbStack.getItem()).getOrb(orbStack); - return orb == null ? 0 : orb.getTier(); - } - } - - return 0; - } - - public int getContainedLp() - { - ItemStack orbStack = getStackInSlot(orbSlot); - if (!orbStack.isEmpty()) - { - if (orbStack.getItem() instanceof IBloodOrb) - { - Binding binding = ((IBindable) orbStack.getItem()).getBinding(orbStack); - if (binding == null) - { - return 0; - } - - SoulNetwork network = NetworkHelper.getSoulNetwork(binding); - - return network.getCurrentEssence(); - } - } - - return 0; - } - - public void craftItem(List inputList, RecipeAlchemyTable recipe) - { - ItemStack outputStack = recipe.getOutput(); - if (this.canCraft(outputStack)) - { - ItemStack currentOutputStack = getStackInSlot(outputSlot); - - ItemStack[] inputs = new ItemStack[0]; - for (ItemStack stack : inputList) ArrayUtils.add(inputs, stack.copy()); - - BloodMagicCraftedEvent.AlchemyTable event = new BloodMagicCraftedEvent.AlchemyTable(outputStack.copy(), inputs); - MinecraftForge.EVENT_BUS.post(event); - outputStack = event.getOutput(); - - if (currentOutputStack.isEmpty()) - { - setInventorySlotContents(outputSlot, outputStack); - } else if (ItemHandlerHelper.canItemStacksStack(outputStack, currentOutputStack)) - { - currentOutputStack.grow(outputStack.getCount()); - } - - consumeInventory(recipe); - } - } - - public int consumeLp(int requested) - { - ItemStack orbStack = getStackInSlot(orbSlot); - - if (!orbStack.isEmpty()) - { - if (orbStack.getItem() instanceof IBloodOrb) - { - if (NetworkHelper.syphonFromContainer(orbStack, SoulTicket.item(orbStack, world, pos, requested))) - { - return requested; - } - } - } - - return 0; - } - - public void consumeInventory(RecipeAlchemyTable recipe) - { - for (int i = 0; i < 6; i++) - { - ItemStack inputStack = getStackInSlot(i); - if (!inputStack.isEmpty()) - { - if (inputStack.getItem().hasContainerItem(inputStack)) - { - setInventorySlotContents(i, inputStack.getItem().getContainerItem(inputStack)); - continue; - } else if (inputStack.getMaxDamage() > 0) - { -// inputStack.setDamage(inputStack.getDamage() + 1); -// if (inputStack.getDamage() >= inputStack.getMaxDamage()) -// { -// -// } - - if (!inputStack.isDamageable()) - { - continue; - } - if (inputStack.attemptDamageItem(1, world.rand, null)) - { - setInventorySlotContents(i, ItemStack.EMPTY); - } - continue; - } - - inputStack.shrink(1); - if (inputStack.isEmpty()) - { - setInventorySlotContents(i, ItemStack.EMPTY); - } - } - } - } - - public Direction getDirection() - { - return direction; - } - - public boolean isSlave() - { - return isSlave; - } - - public int getBurnTime() - { - return burnTime; - } - - public int getTicksRequired() - { - return ticksRequired; - } - - public BlockPos getConnectedPos() - { - return connectedPos; - } - - public boolean[] getBlockedSlots() - { - return blockedSlots; - } - - public static int getOrbSlot() - { - return orbSlot; - } - - public static int getOutputSlot() - { - return outputSlot; - } - - @Override - public Container createMenu(int p_createMenu_1_, PlayerInventory p_createMenu_2_, PlayerEntity p_createMenu_3_) - { - assert world != null; - return new ContainerAlchemyTable(this, p_createMenu_1_, p_createMenu_2_); - } - - @Override - public ITextComponent getDisplayName() - { - return new StringTextComponent("Alchemy Table"); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/tile/TileAltar.java b/src/main/java/wayoftime/bloodmagic/tile/TileAltar.java deleted file mode 100644 index 897d72d6..00000000 --- a/src/main/java/wayoftime/bloodmagic/tile/TileAltar.java +++ /dev/null @@ -1,253 +0,0 @@ -package wayoftime.bloodmagic.tile; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.fluids.capability.CapabilityFluidHandler; -import net.minecraftforge.registries.ObjectHolder; -import wayoftime.bloodmagic.altar.AltarTier; -import wayoftime.bloodmagic.altar.BloodAltar; -import wayoftime.bloodmagic.altar.IBloodAltar; - -public class TileAltar extends TileInventory implements IBloodAltar, ITickableTileEntity -{ - @ObjectHolder("bloodmagic:altar") - public static TileEntityType TYPE; - private BloodAltar bloodAltar; - - private LazyOptional fluidOptional; - - public TileAltar(TileEntityType type) - { - super(type, 1, "altar"); - this.bloodAltar = new BloodAltar(this); - } - - public TileAltar() - { - this(TYPE); - } - - @Override - public void deserialize(CompoundNBT tagCompound) - { - super.deserialize(tagCompound); - - CompoundNBT altarTag = tagCompound.getCompound("bloodAltar"); - - this.bloodAltar.readFromNBT(altarTag); - } - - @Override - public CompoundNBT serialize(CompoundNBT tagCompound) - { - super.serialize(tagCompound); - - CompoundNBT altarTag = new CompoundNBT(); - this.bloodAltar.writeToNBT(altarTag); - - tagCompound.put("bloodAltar", altarTag); - return tagCompound; - } - - @Override - public void tick() - { - bloodAltar.update(); - } - - @Override - public void sacrificialDaggerCall(int amount, boolean isSacrifice) - { - bloodAltar.sacrificialDaggerCall(amount, isSacrifice); - } - - @Override - public boolean isItemValidForSlot(int slot, ItemStack itemstack) - { - return slot == 0; - } - - @Override - public int getCapacity() - { - return bloodAltar.getCapacity(); - } - - @Override - public int getCurrentBlood() - { - return bloodAltar.getCurrentBlood(); - } - - @Override - public int getTier() - { - return bloodAltar.getTier().toInt(); - } - - @Override - public int getProgress() - { - return bloodAltar.getProgress(); - } - - @Override - public float getSacrificeMultiplier() - { - return bloodAltar.getSacrificeMultiplier(); - } - - @Override - public float getSelfSacrificeMultiplier() - { - return bloodAltar.getSelfSacrificeMultiplier(); - } - - @Override - public float getOrbMultiplier() - { - return bloodAltar.getOrbMultiplier(); - } - - @Override - public float getDislocationMultiplier() - { - return bloodAltar.getDislocationMultiplier(); - } - - @Override - public float getConsumptionMultiplier() - { - return bloodAltar.getConsumptionMultiplier(); - } - - @Override - public float getConsumptionRate() - { - return bloodAltar.getConsumptionRate(); - } - - @Override - public int getLiquidRequired() - { - return bloodAltar.getLiquidRequired(); - } - - @Override - public int getBufferCapacity() - { - return bloodAltar.getBufferCapacity(); - } - - @Override - public void startCycle() - { - bloodAltar.startCycle(); - } - - @Override - public void checkTier() - { - bloodAltar.checkTier(); - } - - @Override - public void requestPauseAfterCrafting(int cooldown) - { - bloodAltar.requestPauseAfterCrafting(cooldown); - } - - @Override - public boolean isActive() - { - return bloodAltar.isActive(); - } - - @Override - public int fillMainTank(int amount) - { - return bloodAltar.fillMainTank(amount); - } - - @Override - public void setActive() - { - bloodAltar.setActive(); - } - - @Override - public int getChargingRate() - { - return bloodAltar.getChargingRate(); - } - - @Override - public int getTotalCharge() - { - return bloodAltar.getTotalCharge(); - } - - @Override - public int getChargingFrequency() - { - return bloodAltar.getChargingFrequency(); - } - - public AltarTier getCurrentTierDisplayed() - { - return bloodAltar.getCurrentTierDisplayed(); - } - - public boolean setCurrentTierDisplayed(AltarTier altarTier) - { - return bloodAltar.setCurrentTierDisplayed(altarTier); - } -// -// @Override -// public boolean hasCapability(@Nonnull Capability capability, @Nullable Direction facing) -// { -// if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) -// { -// return true; -// } -// -// return super.hasCapability(capability, facing); -// } - - @Override - protected void invalidateCaps() - { - super.invalidateCaps(); - if (fluidOptional != null) - { - fluidOptional.invalidate(); - fluidOptional = null; - } - - } - - @SuppressWarnings("unchecked") - @Override - public LazyOptional getCapability(@Nonnull Capability capability, @Nullable Direction facing) - { - if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) - { - if (fluidOptional == null) - { - fluidOptional = LazyOptional.of(() -> new BloodAltar.VariableSizeFluidHandler(bloodAltar)); - } - return fluidOptional.cast(); -// return (T) bloodAltar; - } - - return super.getCapability(capability, facing); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/tile/TileDeforesterCharge.java b/src/main/java/wayoftime/bloodmagic/tile/TileDeforesterCharge.java deleted file mode 100644 index 110f1d6c..00000000 --- a/src/main/java/wayoftime/bloodmagic/tile/TileDeforesterCharge.java +++ /dev/null @@ -1,231 +0,0 @@ -package wayoftime.bloodmagic.tile; - -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import com.mojang.datafixers.util.Pair; - -import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.loot.LootContext; -import net.minecraft.loot.LootParameters; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.particles.ParticleTypes; -import net.minecraft.tags.BlockTags; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.world.server.ServerWorld; -import net.minecraftforge.registries.ObjectHolder; -import wayoftime.bloodmagic.common.block.BlockShapedExplosive; - -public class TileDeforesterCharge extends TileExplosiveCharge -{ - @ObjectHolder("bloodmagic:deforester_charge") - public static TileEntityType TYPE; - - private Map treePartsMap; - private List treePartsCache; - private boolean finishedAnalysis; -// private Iterator blockPosIterator; - -// private boolean cached = false; - - public double internalCounter = 0; - - public int currentLogs = 0; - - public int maxLogs = 128; - - public TileDeforesterCharge(TileEntityType type, int maxLogs) - { - super(type); - - this.maxLogs = maxLogs; - } - - public TileDeforesterCharge() - { - this(TYPE, 128); - } - - @Override - public void onUpdate() - { - if (world.isRemote) - { - return; - } -// System.out.println("Counter: " + internalCounter); - - Direction explosiveDirection = this.getBlockState().get(BlockShapedExplosive.ATTACHED).getOpposite(); - BlockState attachedState = world.getBlockState(pos.offset(explosiveDirection)); - if (!BlockTags.LOGS.contains(attachedState.getBlock()) && !BlockTags.LEAVES.contains(attachedState.getBlock())) - { - return; - } - - if (treePartsMap == null) - { - treePartsMap = new HashMap(); - treePartsMap.put(pos.offset(explosiveDirection), false); - treePartsCache = new LinkedList(); - treePartsCache.add(pos.offset(explosiveDirection)); - internalCounter = 0; -// treePartsMap.add(pos.offset(explosiveDirection)); - } - - boolean foundNew = false; - List newPositions = new LinkedList(); - for (BlockPos currentPos : treePartsCache) - { - if (!treePartsMap.getOrDefault(currentPos, false)) // If the BlockPos wasn't checked yet - { -// BlockPos currentPos = entry.getKey(); - for (Direction dir : Direction.values()) - { - BlockPos checkPos = currentPos.offset(dir); - if (treePartsMap.containsKey(checkPos)) - { - continue; - } - - BlockState checkState = world.getBlockState(checkPos); - - boolean isTree = false; - if (currentLogs >= maxLogs) - { - continue; - } - if (BlockTags.LOGS.contains(checkState.getBlock())) - { - currentLogs++; - isTree = true; - - } else if (BlockTags.LEAVES.contains(checkState.getBlock())) - { - isTree = true; - } - - if (isTree) - { - treePartsMap.put(checkPos, false); - newPositions.add(checkPos); - foundNew = true; - } - } - - treePartsMap.put(currentPos, true); - if (currentLogs >= maxLogs) - { - finishedAnalysis = true; - break; - } - } - } - - treePartsCache.addAll(newPositions); - -// System.out.println("Found blocks: " + treePartsMap.size()); - - if (foundNew) - { - return; - } - - internalCounter++; - if (internalCounter == 20) - { -// worldIn.playSound((PlayerEntity)null, tntentity.getPosX(), tntentity.getPosY(), tntentity.getPosZ(), SoundEvents.ENTITY_TNT_PRIMED, SoundCategory.BLOCKS, 1.0F, 1.0F); - world.playSound((PlayerEntity) null, this.getPos().getX() + 0.5, this.getPos().getY() + 0.5, this.getPos().getZ() + 0.5, SoundEvents.ITEM_FLINTANDSTEEL_USE, SoundCategory.BLOCKS, 1.0F, world.rand.nextFloat() * 0.4F + 0.8F); - ((ServerWorld) this.world).spawnParticle(ParticleTypes.FLAME, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 5, 0.02, 0.03, 0.02, 0); - } - - if (internalCounter == 30) - { - world.playSound((PlayerEntity) null, this.getPos().getX() + 0.5, this.getPos().getY() + 0.5, this.getPos().getZ() + 0.5, SoundEvents.ENTITY_TNT_PRIMED, SoundCategory.BLOCKS, 1.0F, 1.0F); - } - - if (internalCounter < 30) - { - return; - } - - if (world.rand.nextDouble() < 0.3) - { - ((ServerWorld) this.world).spawnParticle(ParticleTypes.SMOKE, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 1, 0.0D, 0.0D, 0.0D, 0); - } - - if (internalCounter == 100) - { - ItemStack toolStack = this.getHarvestingTool(); - world.playSound((PlayerEntity) null, this.getPos().getX() + 0.5, this.getPos().getY() + 0.5, this.getPos().getZ() + 0.5, SoundEvents.ENTITY_GENERIC_EXPLODE, SoundCategory.BLOCKS, 4.0F, (1.0F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); - - int numParticles = 10; - - ((ServerWorld) this.world).spawnParticle(ParticleTypes.EXPLOSION, pos.getX() + 0.5 + explosiveDirection.getXOffset(), pos.getY() + 0.5 + explosiveDirection.getYOffset(), pos.getZ() + 0.5 + explosiveDirection.getZOffset(), numParticles, 1.0D, 1.0D, 1.0D, 0); - - ObjectArrayList> objectarraylist = new ObjectArrayList<>(); - - for (BlockPos blockPos : treePartsCache) - { -// BlockPos blockpos = initialPos.offset(explosiveDirection, i).offset(sweepDir1, j).offset(sweepDir2, k); - - BlockState blockstate = this.world.getBlockState(blockPos); - Block block = blockstate.getBlock(); - if (!blockstate.isAir(this.world, blockPos)) - { - BlockPos blockpos1 = blockPos.toImmutable(); -// this.world.getProfiler().startSection("explosion_blocks"); - if (this.world instanceof ServerWorld) - { - TileEntity tileentity = blockstate.hasTileEntity() ? this.world.getTileEntity(blockPos) : null; - LootContext.Builder lootcontext$builder = (new LootContext.Builder((ServerWorld) this.world)).withRandom(this.world.rand).withParameter(LootParameters.field_237457_g_, Vector3d.copyCentered(blockPos)).withParameter(LootParameters.TOOL, toolStack).withNullableParameter(LootParameters.BLOCK_ENTITY, tileentity); -// if (this.mode == Explosion.Mode.DESTROY) { -// lootcontext$builder.withParameter(LootParameters.EXPLOSION_RADIUS, this.size); -// } - - blockstate.getDrops(lootcontext$builder).forEach((stack) -> { - handleExplosionDrops(objectarraylist, stack, blockpos1); - }); - - world.setBlockState(blockPos, Blocks.AIR.getDefaultState(), 3); - -// blockstate.onBlockExploded(this.world, blockpos, null); -// this.world.getProfiler().endSection(); - } - } - } - - for (Pair pair : objectarraylist) - { - Block.spawnAsEntity(this.world, pair.getSecond(), pair.getFirst()); - } - - world.setBlockState(getPos(), Blocks.AIR.getDefaultState()); - } - } - - @Override - public void deserialize(CompoundNBT tag) - { - internalCounter = tag.getDouble("internalCounter"); - } - - @Override - public CompoundNBT serialize(CompoundNBT tag) - { - tag.putDouble("internalCounter", internalCounter); - return tag; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/tile/TileDemonCrucible.java b/src/main/java/wayoftime/bloodmagic/tile/TileDemonCrucible.java deleted file mode 100644 index 8e1cd973..00000000 --- a/src/main/java/wayoftime/bloodmagic/tile/TileDemonCrucible.java +++ /dev/null @@ -1,271 +0,0 @@ -package wayoftime.bloodmagic.tile; - -import java.util.HashMap; -import java.util.Map.Entry; - -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; -import net.minecraftforge.registries.ObjectHolder; -import wayoftime.bloodmagic.demonaura.WorldDemonWillHandler; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; -import wayoftime.bloodmagic.api.compat.IDemonWillConduit; -import wayoftime.bloodmagic.api.compat.IDemonWillGem; -import wayoftime.bloodmagic.api.compat.IDiscreteDemonWill; - -public class TileDemonCrucible extends TileInventory implements ITickableTileEntity, IDemonWillConduit, ISidedInventory -{ - @ObjectHolder("bloodmagic:demoncrucible") - public static TileEntityType TYPE; - public final int maxWill = 100; - public final double gemDrainRate = 10; - public HashMap willMap = new HashMap<>(); // TODO: Change to DemonWillHolder - public int internalCounter = 0; - - public TileDemonCrucible(TileEntityType type) - { - super(type, 1, "demoncrucible"); - } - - public TileDemonCrucible() - { - this(TYPE); - } - - @Override - public void tick() - { - if (getWorld().isRemote) - { - return; - } - - internalCounter++; - - if (getWorld().isBlockPowered(getPos())) - { - // TODO: Fill the contained gem if it is there. - ItemStack stack = this.getStackInSlot(0); - if (stack.getItem() instanceof IDemonWillGem) - { - IDemonWillGem gemItem = (IDemonWillGem) stack.getItem(); - for (EnumDemonWillType type : EnumDemonWillType.values()) - { - if (willMap.containsKey(type)) - { - double current = willMap.get(type); - double fillAmount = Math.min(gemDrainRate, current); - if (fillAmount > 0) - { - fillAmount = gemItem.fillWill(type, stack, fillAmount, true); - if (willMap.get(type) - fillAmount <= 0) - { - willMap.remove(type); - } else - { - willMap.put(type, willMap.get(type) - fillAmount); - } - } - } - } - } - } else - { - ItemStack stack = this.getStackInSlot(0); - if (!stack.isEmpty()) - { - if (stack.getItem() instanceof IDemonWillGem) - { - IDemonWillGem gemItem = (IDemonWillGem) stack.getItem(); - for (EnumDemonWillType type : EnumDemonWillType.values()) - { - double currentAmount = WorldDemonWillHandler.getCurrentWill(getWorld(), pos, type); - double drainAmount = Math.min(maxWill - currentAmount, gemDrainRate); - double filled = WorldDemonWillHandler.fillWillToMaximum(getWorld(), pos, type, drainAmount, maxWill, false); - - filled = gemItem.drainWill(type, stack, filled, false); - if (filled > 0) - { - filled = gemItem.drainWill(type, stack, filled, true); - WorldDemonWillHandler.fillWillToMaximum(getWorld(), pos, type, filled, maxWill, true); - } - } - } else if (stack.getItem() instanceof IDiscreteDemonWill) // TODO: Limit the speed of this process - { - IDiscreteDemonWill willItem = (IDiscreteDemonWill) stack.getItem(); - EnumDemonWillType type = willItem.getType(stack); - double currentAmount = WorldDemonWillHandler.getCurrentWill(getWorld(), pos, type); - double needed = maxWill - currentAmount; - double discreteAmount = willItem.getDiscretization(stack); - if (needed >= discreteAmount) - { - double filled = willItem.drainWill(stack, discreteAmount); - if (filled > 0) - { - WorldDemonWillHandler.fillWillToMaximum(getWorld(), pos, type, filled, maxWill, true); - if (stack.getCount() <= 0) - { - this.setInventorySlotContents(0, ItemStack.EMPTY); - } - } - } - } - } - } - } - - @Override - public void deserialize(CompoundNBT tag) - { - super.deserialize(tag); - - willMap.clear(); - - for (EnumDemonWillType type : EnumDemonWillType.values()) - { - double amount = tag.getDouble("EnumWill" + type.name()); - if (amount > 0) - { - willMap.put(type, amount); - } - } - } - - @Override - public CompoundNBT serialize(CompoundNBT tag) - { - super.serialize(tag); - - for (Entry entry : willMap.entrySet()) - { - tag.putDouble("EnumWill" + entry.getKey().name(), entry.getValue()); - } - return tag; - } - - // IDemonWillConduit - - @Override - public int getWeight() - { - return 10; - } - - @Override - public double fillDemonWill(EnumDemonWillType type, double amount, boolean doFill) - { - if (amount <= 0) - { - return 0; - } - - if (!canFill(type)) - { - return 0; - } - - if (!doFill) - { - if (!willMap.containsKey(type)) - { - return Math.min(maxWill, amount); - } - - return Math.min(maxWill - willMap.get(type), amount); - } - - if (!willMap.containsKey(type)) - { - double max = Math.min(maxWill, amount); - - willMap.put(type, max); - - return max; - } - - double current = willMap.get(type); - double filled = maxWill - current; - - if (amount < filled) - { - willMap.put(type, current + amount); - filled = amount; - } else - { - willMap.put(type, (double) maxWill); - } - - return filled; - } - - @Override - public double drainDemonWill(EnumDemonWillType type, double amount, boolean doDrain) - { - if (!willMap.containsKey(type)) - { - return 0; - } - - double drained = amount; - double current = willMap.get(type); - if (current < drained) - { - drained = current; - } - - if (doDrain) - { - current -= drained; - if (current <= 0) - { - willMap.remove(type); - } else - { - willMap.put(type, current); - } - } - - return drained; - } - - @Override - public boolean canFill(EnumDemonWillType type) - { - return true; - } - - @Override - public boolean canDrain(EnumDemonWillType type) - { - return true; - } - - @Override - public double getCurrentWill(EnumDemonWillType type) - { - return willMap.containsKey(type) ? willMap.get(type) : 0; - } - - @Override - public int[] getSlotsForFace(Direction side) - { - return new int[] - { 0 }; - } - - @Override - public boolean canInsertItem(int index, ItemStack stack, Direction direction) - { - return !stack.isEmpty() && inventory.get(0).isEmpty() - && (stack.getItem() instanceof IDemonWillGem || stack.getItem() instanceof IDiscreteDemonWill); - } - - @Override - public boolean canExtractItem(int index, ItemStack stack, Direction direction) - { - return true; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/tile/TileDemonCrystal.java b/src/main/java/wayoftime/bloodmagic/tile/TileDemonCrystal.java deleted file mode 100644 index b7310f7e..00000000 --- a/src/main/java/wayoftime/bloodmagic/tile/TileDemonCrystal.java +++ /dev/null @@ -1,253 +0,0 @@ -package wayoftime.bloodmagic.tile; - -import java.util.Locale; - -import net.minecraft.block.BlockState; -import net.minecraft.inventory.InventoryHelper; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; -import net.minecraftforge.registries.ObjectHolder; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; -import wayoftime.bloodmagic.common.block.BlockDemonCrystal; -import wayoftime.bloodmagic.demonaura.WorldDemonWillHandler; -import wayoftime.bloodmagic.tile.base.TileTicking; -import wayoftime.bloodmagic.util.Constants; -import wayoftime.bloodmagic.will.DemonWillHolder; - -public class TileDemonCrystal extends TileTicking -{ - public static final double sameWillConversionRate = 45; - public static final double defaultWillConversionRate = 90; - public static final double timeDelayForWrongWill = 0.6; - public final int maxWill = 100; - public final double drainRate = 1; - public DemonWillHolder holder = new DemonWillHolder(); - public double progressToNextCrystal = 0; - public int internalCounter = 0; - public Direction placement = Direction.UP; // Side that this crystal is placed on. - - public EnumDemonWillType willType; - - @ObjectHolder("bloodmagic:demoncrystal") - public static TileEntityType TYPE; - - public TileDemonCrystal(TileEntityType type, EnumDemonWillType willType) - { - super(type); - this.willType = willType; - } - - public TileDemonCrystal(EnumDemonWillType willType) - { - this(TYPE, willType); - } - - public TileDemonCrystal() - { - this(TYPE, EnumDemonWillType.DEFAULT); - } - - @Override - public void onUpdate() - { - if (world.isRemote) - { - return; - } - - internalCounter++; - - if (internalCounter % 20 == 0) - { - int crystalCount = getCrystalCount(); - if (crystalCount < 7) - { -// this.setCrystalCount(crystalCount + 1); - EnumDemonWillType type = getWillType(); - - double value = WorldDemonWillHandler.getCurrentWill(getWorld(), pos, type); - if (type != EnumDemonWillType.DEFAULT) - { - if (value >= 0.5) - { - double nextProgress = getCrystalGrowthPerSecond(value); - progressToNextCrystal += WorldDemonWillHandler.drainWill(getWorld(), getPos(), type, nextProgress * sameWillConversionRate, true) / sameWillConversionRate; - } else - { - value = WorldDemonWillHandler.getCurrentWill(getWorld(), pos, EnumDemonWillType.DEFAULT); - if (value > 0.5) - { - double nextProgress = getCrystalGrowthPerSecond(value) * timeDelayForWrongWill; - progressToNextCrystal += WorldDemonWillHandler.drainWill(getWorld(), getPos(), EnumDemonWillType.DEFAULT, nextProgress * defaultWillConversionRate, true) / defaultWillConversionRate; - } - } - } else - { - if (value > 0.5) - { - - double nextProgress = getCrystalGrowthPerSecond(value); - progressToNextCrystal += WorldDemonWillHandler.drainWill(getWorld(), getPos(), type, nextProgress * sameWillConversionRate, true) / sameWillConversionRate; - } - } - - checkAndGrowCrystal(); - } - } - - } - - /** - * Encourages the crystal to grow by a large percentage by telling it to drain - * will from the aura. - * - * @param willDrain The amount of drain that is needed for the crystal - * to grow successfully for the desired amount. Can be - * more than the base amount. - * @param progressPercentage - * @return percentage actually grown. - */ - public double growCrystalWithWillAmount(double willDrain, double progressPercentage) - { - int crystalCount = getCrystalCount(); - if (crystalCount >= 7) - { - return 0; - } - - EnumDemonWillType type = this.getWillType(); - - double value = WorldDemonWillHandler.getCurrentWill(getWorld(), pos, type); - double percentDrain = willDrain <= 0 ? 1 : Math.min(1, value / willDrain); - if (percentDrain <= 0) - { - return 0; - } - - // Verification that you can actually drain the will from this chunk, for future - // proofing. - WorldDemonWillHandler.drainWill(getWorld(), pos, type, percentDrain * willDrain, true); - progressToNextCrystal += percentDrain * progressPercentage; - - checkAndGrowCrystal(); - - return percentDrain * progressPercentage; - } - - public EnumDemonWillType getWillType() - { - return willType; - } - - public void checkAndGrowCrystal() - { - int crystalCount = getCrystalCount(); - if (progressToNextCrystal >= 1 && internalCounter % 100 == 0 && crystalCount < 7) - { - progressToNextCrystal--; - this.setCrystalCount(crystalCount + 1); - markDirty(); - notifyUpdate(); - } - } - - public double getMaxWillForCrystal() - { - return 50; - } - - public boolean dropSingleCrystal() - { - int crystalCount = getCrystalCount(); - if (!getWorld().isRemote && crystalCount > 1) - { - EnumDemonWillType type = getWillType(); -// EnumDemonWillType type = state.getValue(BlockDemonCrystal.TYPE); - ItemStack stack = BlockDemonCrystal.getItemStackDropped(type, 1); - if (!stack.isEmpty()) - { - setCrystalCount(crystalCount - 1); - InventoryHelper.spawnItemStack(getWorld(), pos.getX(), pos.getY(), pos.getZ(), stack); - notifyUpdate(); - return true; - } - } - - return false; - } - - public double getCrystalGrowthPerSecond(double will) - { -// return 0.1; - return 1.0 / 200 * Math.sqrt(will / 200); - } - - @Override - public void deserialize(CompoundNBT tag) - { - holder.readFromNBT(tag, "Will"); - placement = Direction.byIndex(tag.getInt("placement")); - progressToNextCrystal = tag.getDouble("progress"); - - if (!tag.contains(Constants.NBT.WILL_TYPE)) - { - this.willType = EnumDemonWillType.DEFAULT; - } else - { - this.willType = EnumDemonWillType.valueOf(tag.getString(Constants.NBT.WILL_TYPE).toUpperCase(Locale.ENGLISH)); - } - } - - @Override - public CompoundNBT serialize(CompoundNBT tag) - { - holder.writeToNBT(tag, "Will"); - tag.putInt("placement", placement.getIndex()); - tag.putDouble("progress", progressToNextCrystal); - - if (willType == EnumDemonWillType.DEFAULT) - { - if (tag.contains(Constants.NBT.WILL_TYPE)) - { - tag.remove(Constants.NBT.WILL_TYPE); - } - - } else - { - tag.putString(Constants.NBT.WILL_TYPE, willType.toString()); - } - - return tag; - } - - public int getCrystalCount() - { - BlockState state = world.getBlockState(getPos()); - return state.get(BlockDemonCrystal.AGE) + 1; - } - - public void setCrystalCount(int crystalCount) - { - BlockState state = world.getBlockState(getPos()); - world.setBlockState(getPos(), state.with(BlockDemonCrystal.AGE, crystalCount - 1)); - } - - public Direction getPlacement() - { - return placement; - } - - public void setPlacement(Direction placement) - { - this.placement = placement; - } - -// @Override -// protected void onDataPacketClientReceived() -// { -// super.onDataPacketClientReceived(); -// notifyUpdate(); -// } -} diff --git a/src/main/java/wayoftime/bloodmagic/tile/TileDemonCrystallizer.java b/src/main/java/wayoftime/bloodmagic/tile/TileDemonCrystallizer.java deleted file mode 100644 index 96f91f52..00000000 --- a/src/main/java/wayoftime/bloodmagic/tile/TileDemonCrystallizer.java +++ /dev/null @@ -1,187 +0,0 @@ -package wayoftime.bloodmagic.tile; - -import net.minecraft.block.Block; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraftforge.registries.ObjectHolder; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.demonaura.WorldDemonWillHandler; -import wayoftime.bloodmagic.tile.base.TileTicking; -import wayoftime.bloodmagic.will.DemonWillHolder; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; -import wayoftime.bloodmagic.api.compat.IDemonWillConduit; - -public class TileDemonCrystallizer extends TileTicking implements IDemonWillConduit -{ - @ObjectHolder("bloodmagic:demoncrystallizer") - public static TileEntityType TYPE; - - public static final int maxWill = 100; - public static final double drainRate = 1; - public static final double willToFormCrystal = 99; - public static final double totalFormationTime = 1000; - // The whole purpose of this block is to grow a crystal initially. The - // acceleration and crystal growing is up to the crystal itself afterwards. - public DemonWillHolder holder = new DemonWillHolder(); - public double internalCounter = 0; - - public TileDemonCrystallizer(TileEntityType type) - { - super(type); - } - - public TileDemonCrystallizer() - { - this(TYPE); - } - - @Override - public void onUpdate() - { - if (world.isRemote) - { - return; - } - - BlockPos offsetPos = pos.offset(Direction.UP); - if (getWorld().isAirBlock(offsetPos)) // Room for a crystal to grow - { - EnumDemonWillType highestType = WorldDemonWillHandler.getHighestDemonWillType(getWorld(), pos); - double amount = WorldDemonWillHandler.getCurrentWill(getWorld(), pos, highestType); - if (amount >= willToFormCrystal) - { - internalCounter += getCrystalFormationRate(amount); - if (internalCounter >= totalFormationTime) - { - if (WorldDemonWillHandler.drainWill(getWorld(), getPos(), highestType, willToFormCrystal, false) >= willToFormCrystal) - { - if (formCrystal(highestType, offsetPos)) - { - WorldDemonWillHandler.drainWill(getWorld(), getPos(), highestType, willToFormCrystal, true); - internalCounter = 0; - } - } - } - } - } - } - - public boolean formCrystal(EnumDemonWillType type, BlockPos position) - { - Block block = BloodMagicBlocks.RAW_CRYSTAL_BLOCK.get(); - switch (type) - { - case CORROSIVE: - block = BloodMagicBlocks.CORROSIVE_CRYSTAL_BLOCK.get(); - break; - case DESTRUCTIVE: - block = BloodMagicBlocks.DESTRUCTIVE_CRYSTAL_BLOCK.get(); - break; - case STEADFAST: - block = BloodMagicBlocks.STEADFAST_CRYSTAL_BLOCK.get(); - break; - case VENGEFUL: - block = BloodMagicBlocks.VENGEFUL_CRYSTAL_BLOCK.get(); - break; - default: - break; - } - getWorld().setBlockState(position, block.getDefaultState()); - TileEntity tile = getWorld().getTileEntity(position); - if (tile instanceof TileDemonCrystal) - { - ((TileDemonCrystal) tile).setPlacement(Direction.UP); - return true; - } - - return false; - } - - public double getCrystalFormationRate(double currentWill) - { - return 1; - } - - @Override - public void deserialize(CompoundNBT tag) - { - holder.readFromNBT(tag, "Will"); - internalCounter = tag.getDouble("internalCounter"); - } - - @Override - public CompoundNBT serialize(CompoundNBT tag) - { - holder.writeToNBT(tag, "Will"); - tag.putDouble("internalCounter", internalCounter); - return tag; - } - - // IDemonWillConduit - - @Override - public int getWeight() - { - return 10; - } - - @Override - public double fillDemonWill(EnumDemonWillType type, double amount, boolean doFill) - { - if (amount <= 0) - { - return 0; - } - - if (!canFill(type)) - { - return 0; - } - - if (!doFill) - { - return Math.min(maxWill - holder.getWill(type), amount); - } - - return holder.addWill(type, amount, maxWill); - } - - @Override - public double drainDemonWill(EnumDemonWillType type, double amount, boolean doDrain) - { - double drained = amount; - double current = holder.getWill(type); - if (current < drained) - { - drained = current; - } - - if (doDrain) - { - return holder.drainWill(type, amount); - } - - return drained; - } - - @Override - public boolean canFill(EnumDemonWillType type) - { - return true; - } - - @Override - public boolean canDrain(EnumDemonWillType type) - { - return true; - } - - @Override - public double getCurrentWill(EnumDemonWillType type) - { - return holder.getWill(type); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/tile/TileExplosiveCharge.java b/src/main/java/wayoftime/bloodmagic/tile/TileExplosiveCharge.java deleted file mode 100644 index d334ef65..00000000 --- a/src/main/java/wayoftime/bloodmagic/tile/TileExplosiveCharge.java +++ /dev/null @@ -1,97 +0,0 @@ -package wayoftime.bloodmagic.tile; - -import com.mojang.datafixers.util.Pair; - -import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.inventory.InventoryHelper; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.math.BlockPos; -import wayoftime.bloodmagic.anointment.AnointmentHolder; -import wayoftime.bloodmagic.tile.base.TileTicking; - -public class TileExplosiveCharge extends TileTicking -{ - public AnointmentHolder anointmentHolder = new AnointmentHolder(); - - public TileExplosiveCharge(TileEntityType type) - { - super(type); - } - - protected static void handleExplosionDrops(ObjectArrayList> dropPositionArray, ItemStack stack, BlockPos pos) - { - int i = dropPositionArray.size(); - - for (int j = 0; j < i; ++j) - { - Pair pair = dropPositionArray.get(j); - ItemStack itemstack = pair.getFirst(); - if (ItemEntity.canMergeStacks(itemstack, stack)) - { - ItemStack itemstack1 = ItemEntity.mergeStacks(itemstack, stack, 16); - dropPositionArray.set(j, Pair.of(itemstack1, pair.getSecond())); - if (stack.isEmpty()) - { - return; - } - } - } - - dropPositionArray.add(Pair.of(stack, pos)); - } - - public ItemStack getHarvestingTool() - { - ItemStack stack = new ItemStack(Items.DIAMOND_PICKAXE); - if (anointmentHolder != null) - anointmentHolder.toItemStack(stack); - return stack; - } - - @Override - public void deserialize(CompoundNBT tag) - { - if (tag.contains("holder")) - { - anointmentHolder = AnointmentHolder.fromNBT(tag.getCompound("holder")); - } - - } - - @Override - public CompoundNBT serialize(CompoundNBT tag) - { - if (anointmentHolder != null) - { - tag.put("holder", anointmentHolder.serialize()); - } - - return tag; - } - - public void setAnointmentHolder(AnointmentHolder holder) - { - this.anointmentHolder = holder; - } - - public void dropSelf() - { - ItemStack stack = new ItemStack(getBlockState().getBlock()); - if (anointmentHolder != null && !anointmentHolder.isEmpty()) - { - anointmentHolder.toItemStack(stack); - } - - InventoryHelper.spawnItemStack(world, pos.getX(), pos.getY(), pos.getZ(), stack); - } - - @Override - public void onUpdate() - { - - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/tile/TileFungalCharge.java b/src/main/java/wayoftime/bloodmagic/tile/TileFungalCharge.java deleted file mode 100644 index 36d61f09..00000000 --- a/src/main/java/wayoftime/bloodmagic/tile/TileFungalCharge.java +++ /dev/null @@ -1,40 +0,0 @@ -package wayoftime.bloodmagic.tile; - -import net.minecraft.block.BlockState; -import net.minecraft.tileentity.TileEntityType; -import net.minecraftforge.registries.ObjectHolder; -import wayoftime.bloodmagic.common.tags.BloodMagicTags; - -public class TileFungalCharge extends TileVeinMineCharge -{ - @ObjectHolder("bloodmagic:fungal_charge") - public static TileEntityType TYPE; - - public TileFungalCharge(TileEntityType type, int maxBlocks) - { - super(type, maxBlocks); - } - - public TileFungalCharge() - { - this(TYPE, 64 * 3); - } - - @Override - public boolean isValidBlock(BlockState originalBlockState, BlockState testState) - { - return isValidStartingBlock(testState); - } - - @Override - public boolean isValidStartingBlock(BlockState originalBlockState) - { - return BloodMagicTags.Blocks.MUSHROOM_HYPHAE.contains(originalBlockState.getBlock()) || BloodMagicTags.Blocks.MUSHROOM_STEM.contains(originalBlockState.getBlock()); - } - - @Override - public boolean checkDiagonals() - { - return true; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/tile/TileIncenseAltar.java b/src/main/java/wayoftime/bloodmagic/tile/TileIncenseAltar.java deleted file mode 100644 index e68eb31c..00000000 --- a/src/main/java/wayoftime/bloodmagic/tile/TileIncenseAltar.java +++ /dev/null @@ -1,206 +0,0 @@ -package wayoftime.bloodmagic.tile; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.particles.ParticleTypes; -import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.server.ServerWorld; -import net.minecraftforge.registries.ObjectHolder; -import wayoftime.bloodmagic.incense.EnumTranquilityType; -import wayoftime.bloodmagic.api.compat.IIncensePath; -import wayoftime.bloodmagic.incense.IncenseAltarHandler; -import wayoftime.bloodmagic.incense.IncenseTranquilityRegistry; -import wayoftime.bloodmagic.incense.TranquilityStack; -import wayoftime.bloodmagic.ritual.AreaDescriptor; -import wayoftime.bloodmagic.util.helper.PlayerSacrificeHelper; - -public class TileIncenseAltar extends TileInventory implements ITickableTileEntity -{ - public static int maxCheckRange = 5; - public AreaDescriptor incenseArea = new AreaDescriptor.Rectangle(new BlockPos(-5, -5, -5), 11); - public Map tranquilityMap = new HashMap<>(); - - public double incenseAddition = 0; // Self-sacrifice is multiplied by 1 plus this value. - public double tranquility = 0; - public int roadDistance = 0; // Number of road blocks laid down - - @ObjectHolder("bloodmagic:incensealtar") - public static TileEntityType TYPE; - - public TileIncenseAltar(TileEntityType type) - { - super(type, 1, "incensealtar"); - } - - public TileIncenseAltar() - { - this(TYPE); - } - - @Override - public void tick() - { - AxisAlignedBB aabb = incenseArea.getAABB(getPos()); - List playerList = getWorld().getEntitiesWithinAABB(PlayerEntity.class, aabb); - if (playerList.isEmpty()) - { - return; - } - - if (getWorld().getGameTime() % 100 == 0) - { - recheckConstruction(); - } - - boolean hasPerformed = false; - - for (PlayerEntity player : playerList) - { - if (PlayerSacrificeHelper.incrementIncense(player, 0, incenseAddition, incenseAddition / 100)) - { - hasPerformed = true; - } - } - - if (hasPerformed) - { - if (getWorld().rand.nextInt(4) == 0 && getWorld() instanceof ServerWorld) - { - ServerWorld server = (ServerWorld) getWorld(); - server.spawnParticle(ParticleTypes.FLAME, pos.getX() + 0.5, pos.getY() + 1.2, pos.getZ() + 0.5, 1, 0.02, 0.03, 0.02, 0); - } - } - } - - @Override - public void deserialize(CompoundNBT tag) - { - super.deserialize(tag); - tranquility = tag.getDouble("tranquility"); - incenseAddition = tag.getDouble("incenseAddition"); - } - - @Override - public CompoundNBT serialize(CompoundNBT tag) - { - super.serialize(tag); - tag.putDouble("tranquility", tranquility); - tag.putDouble("incenseAddition", incenseAddition); - return tag; - } - - public void recheckConstruction() - { - // TODO: Check the physical construction of the incense altar to determine the - // maximum length. - int maxLength = 11; // Max length of the path. The path starts two blocks away from the center - // block. - int yOffset = 0; - - Map tranquilityMap = new HashMap<>(); - - for (int currentDistance = 2; currentDistance < currentDistance + maxLength; currentDistance++) - { - boolean canFormRoad = false; - - for (int i = -maxCheckRange + yOffset; i <= maxCheckRange + yOffset; i++) - { - BlockPos verticalPos = pos.add(0, i, 0); - - canFormRoad = true; - level: for (int index = 0; index < 4; index++) - { - Direction horizontalFacing = Direction.byHorizontalIndex(index); - BlockPos facingOffsetPos = verticalPos.offset(horizontalFacing, currentDistance); - for (int j = -1; j <= 1; j++) - { - BlockPos offsetPos = facingOffsetPos.offset(horizontalFacing.rotateY(), j); - BlockState state = getWorld().getBlockState(offsetPos); - Block block = state.getBlock(); - if (!(block instanceof IIncensePath && ((IIncensePath) block).getLevelOfPath(getWorld(), offsetPos, state) >= currentDistance - 2)) - { - canFormRoad = false; - break level; - } - } - } - - if (canFormRoad) - { - yOffset = i; - break; - } - } - - if (canFormRoad) - { - for (int i = -currentDistance; i <= currentDistance; i++) - { - for (int j = -currentDistance; j <= currentDistance; j++) - { - if (Math.abs(i) != currentDistance && Math.abs(j) != currentDistance) - { - continue; // TODO: Can make this just set j to currentDistance to speed it up. - } - - for (int y = yOffset; y <= 2 + yOffset; y++) - { - BlockPos offsetPos = pos.add(i, y, j); - BlockState state = getWorld().getBlockState(offsetPos); - Block block = state.getBlock(); - TranquilityStack stack = IncenseTranquilityRegistry.getTranquilityOfBlock(getWorld(), offsetPos, block, state); - if (stack != null) - { - if (!tranquilityMap.containsKey(stack.type)) - { - tranquilityMap.put(stack.type, stack.value); - } else - { - tranquilityMap.put(stack.type, tranquilityMap.get(stack.type) + stack.value); - } - } - } - } - } - } else - { - roadDistance = currentDistance - 2; - break; - } - } - - this.tranquilityMap = tranquilityMap; - - double totalTranquility = 0; - for (Entry entry : tranquilityMap.entrySet()) - { - totalTranquility += entry.getValue(); - } - - if (totalTranquility < 0) - { - return; - } - - double appliedTranquility = 0; - for (Entry entry : tranquilityMap.entrySet()) - { - appliedTranquility += Math.sqrt(entry.getValue()); - } - - double bonus = IncenseAltarHandler.getIncenseBonusFromComponents(getWorld(), pos, appliedTranquility, roadDistance); - incenseAddition = bonus; - this.tranquility = appliedTranquility; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/tile/TileInventory.java b/src/main/java/wayoftime/bloodmagic/tile/TileInventory.java deleted file mode 100644 index 961fc1fd..00000000 --- a/src/main/java/wayoftime/bloodmagic/tile/TileInventory.java +++ /dev/null @@ -1,317 +0,0 @@ -package wayoftime.bloodmagic.tile; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.inventory.InventoryHelper; -import net.minecraft.inventory.ItemStackHelper; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; -import net.minecraft.util.NonNullList; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.items.wrapper.InvWrapper; -import net.minecraftforge.items.wrapper.SidedInvWrapper; -import wayoftime.bloodmagic.tile.base.TileBase; - -public class TileInventory extends TileBase implements IInventory -{ - protected int[] syncedSlots = new int[0]; - protected NonNullList inventory; - LazyOptional handlerDown; - LazyOptional handlerUp; - LazyOptional handlerNorth; - LazyOptional handlerSouth; - LazyOptional handlerWest; - LazyOptional handlerEast; - private int size; - - // IInventory - private String name; - - public TileInventory(TileEntityType type, int size, String name) - { - super(type); - this.inventory = NonNullList.withSize(size, ItemStack.EMPTY); - this.size = size; - this.name = name; - initializeItemHandlers(); - } - - protected boolean isSyncedSlot(int slot) - { - for (int s : this.syncedSlots) - { - if (s == slot) - { - return true; - } - } - return false; - } - - @Override - public void deserialize(CompoundNBT tagCompound) - { - super.deserialize(tagCompound); - - this.inventory = NonNullList.withSize(this.getSizeInventory(), ItemStack.EMPTY); - - ItemStackHelper.loadAllItems(tagCompound, this.inventory); - -// ListNBT tags = tagCompound.getList("Items", 10); -// inventory = NonNullList.withSize(size, ItemStack.EMPTY); -// -// -// -// for (int i = 0; i < tags.size(); i++) -// { -// if (!isSyncedSlot(i)) -// { -// CompoundNBT data = tags.getCompoundTagAt(i); -// byte j = data.getByte("Slot"); -// -// if (j >= 0 && j < inventory.size()) -// { -// inventory.set(j, new ItemStack(data)); // No matter how much an i looks like a j, it is not one. -// // They are drastically different characters and cause -// // drastically different things to happen. Apparently I -// // didn't know this at one point. - TehNut -// } -// } -// } - } - - @Override - public CompoundNBT serialize(CompoundNBT tagCompound) - { - super.serialize(tagCompound); - - ItemStackHelper.saveAllItems(tagCompound, this.inventory); -// NBTTagList tags = new NBTTagList(); -// -// for (int i = 0; i < inventory.size(); i++) -// { -// if ((!inventory.get(i).isEmpty()) && !isSyncedSlot(i)) -// { -// CompoundNBT data = new CompoundNBT(); -// data.putByte("Slot", (byte) i); -// inventory.get(i).write(data); -// tags.appendTag(data); -// } -// } -// -// tagCompound.setTag("Items", tags); - return tagCompound; - } - - public void dropItems() - { - InventoryHelper.dropInventoryItems(getWorld(), getPos(), this); - } - - @Override - public int getSizeInventory() - { - return size; - } - - @Override - public ItemStack getStackInSlot(int index) - { - return inventory.get(index); - } - - @Override - public ItemStack decrStackSize(int index, int count) - { - if (!getStackInSlot(index).isEmpty()) - { - if (!getWorld().isRemote) - getWorld().notifyBlockUpdate(getPos(), getWorld().getBlockState(getPos()), getWorld().getBlockState(getPos()), 3); - - if (getStackInSlot(index).getCount() <= count) - { - ItemStack itemStack = inventory.get(index); - inventory.set(index, ItemStack.EMPTY); - markDirty(); - return itemStack; - } - - ItemStack itemStack = inventory.get(index).split(count); - markDirty(); - return itemStack; - } - - return ItemStack.EMPTY; - } - - @Override - public ItemStack removeStackFromSlot(int slot) - { - if (!inventory.get(slot).isEmpty()) - { - ItemStack itemStack = inventory.get(slot); - setInventorySlotContents(slot, ItemStack.EMPTY); - return itemStack; - } - return ItemStack.EMPTY; - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - inventory.set(slot, stack); - if (!stack.isEmpty() && stack.getCount() > getInventoryStackLimit()) - stack.setCount(getInventoryStackLimit()); - markDirty(); - if (!getWorld().isRemote) - getWorld().notifyBlockUpdate(getPos(), getWorld().getBlockState(getPos()), getWorld().getBlockState(getPos()), 3); - } - - @Override - public int getInventoryStackLimit() - { - return 64; - } - - @Override - public void openInventory(PlayerEntity player) - { - - } - - @Override - public void closeInventory(PlayerEntity player) - { - - } - - @Override - public boolean isItemValidForSlot(int index, ItemStack stack) - { - return true; - } - - // IWorldNameable - -// @Override -// public int getField(int id) -// { -// return 0; -// } -// -// @Override -// public void setField(int id, int value) -// { -// -// } -// -// @Override -// public int getFieldCount() -// { -// return 0; -// } - - @Override - public void clear() - { - this.inventory = NonNullList.withSize(size, ItemStack.EMPTY); - } - - @Override - public boolean isEmpty() - { - for (ItemStack stack : inventory) if (!stack.isEmpty()) - return false; - - return true; - } - - @Override - public boolean isUsableByPlayer(PlayerEntity player) - { - return true; - } - -// @Override -// public String getName() -// { -// return TextHelper.localize("tile.bloodmagic." + name + ".name"); -// } -// -// @Override -// public boolean hasCustomName() -// { -// return true; -// } -// -// @Override -// public ITextComponent getDisplayName() -// { -// return new TextComponentString(getName()); -// } - - protected void initializeItemHandlers() - { - if (this instanceof ISidedInventory) - { - handlerDown = LazyOptional.of(() -> new SidedInvWrapper((ISidedInventory) this, Direction.DOWN)); - handlerUp = LazyOptional.of(() -> new SidedInvWrapper((ISidedInventory) this, Direction.UP)); - handlerNorth = LazyOptional.of(() -> new SidedInvWrapper((ISidedInventory) this, Direction.NORTH)); - handlerSouth = LazyOptional.of(() -> new SidedInvWrapper((ISidedInventory) this, Direction.SOUTH)); - handlerWest = LazyOptional.of(() -> new SidedInvWrapper((ISidedInventory) this, Direction.WEST)); - handlerEast = LazyOptional.of(() -> new SidedInvWrapper((ISidedInventory) this, Direction.EAST)); - } else - { - handlerDown = LazyOptional.of(() -> new InvWrapper(this)); - handlerUp = handlerDown; - handlerNorth = handlerDown; - handlerSouth = handlerDown; - handlerWest = handlerDown; - handlerEast = handlerDown; - } - } - - @SuppressWarnings("unchecked") - @Override - public LazyOptional getCapability(@Nonnull Capability capability, @Nullable Direction facing) - { - if (facing != null && capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) - { - switch (facing) - { - case DOWN: - return handlerDown.cast(); - case EAST: - return handlerEast.cast(); - case NORTH: - return handlerNorth.cast(); - case SOUTH: - return handlerSouth.cast(); - case UP: - return handlerUp.cast(); - case WEST: - return handlerWest.cast(); - } - } else if (facing == null && capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) - { - return handlerDown.cast(); - } - - return super.getCapability(capability, facing); - } - -// @Override -// public boolean hasCapability(Capability capability, Direction facing) -// { -// return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(capability, facing); -// } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/wayoftime/bloodmagic/tile/TileMasterRitualStone.java deleted file mode 100644 index 5aa0f181..00000000 --- a/src/main/java/wayoftime/bloodmagic/tile/TileMasterRitualStone.java +++ /dev/null @@ -1,582 +0,0 @@ -package wayoftime.bloodmagic.tile; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.UUID; - -import javax.annotation.Nullable; - -import com.google.common.base.Strings; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.registries.ObjectHolder; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.common.item.ItemActivationCrystal; -import wayoftime.bloodmagic.core.data.Binding; -import wayoftime.bloodmagic.core.data.SoulNetwork; -import wayoftime.bloodmagic.demonaura.WorldDemonWillHandler; -import wayoftime.bloodmagic.event.RitualEvent; -import wayoftime.bloodmagic.common.item.IBindable; -import wayoftime.bloodmagic.ritual.AreaDescriptor; -import wayoftime.bloodmagic.ritual.EnumReaderBoundaries; -import wayoftime.bloodmagic.ritual.IMasterRitualStone; -import wayoftime.bloodmagic.ritual.Ritual; -import wayoftime.bloodmagic.tile.base.TileTicking; -import wayoftime.bloodmagic.util.ChatUtil; -import wayoftime.bloodmagic.util.Constants; -import wayoftime.bloodmagic.util.helper.BindableHelper; -import wayoftime.bloodmagic.util.helper.NBTHelper; -import wayoftime.bloodmagic.util.helper.NetworkHelper; -import wayoftime.bloodmagic.util.helper.PlayerHelper; -import wayoftime.bloodmagic.util.helper.RitualHelper; -import wayoftime.bloodmagic.will.DemonWillHolder; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; - -public class TileMasterRitualStone extends TileTicking implements IMasterRitualStone -{ - @ObjectHolder("bloodmagic:masterritualstone") - public static TileEntityType TYPE; - protected final Map modableRangeMap = new HashMap<>(); - private UUID owner; - private SoulNetwork cachedNetwork; - private boolean active; - private boolean redstoned; - private int activeTime; - private int cooldown; - private Ritual currentRitual; - private Direction direction = Direction.NORTH; - private boolean inverted; - private List currentActiveWillConfig = new ArrayList<>(); - - public TileMasterRitualStone(TileEntityType type) - { - super(type); - } - - public TileMasterRitualStone() - { - this(TYPE); - } - - @Override - public void onUpdate() - { - if (getWorld().isRemote) - return; - - if (isPowered() && isActive()) - { - active = false; - redstoned = true; - stopRitual(Ritual.BreakType.REDSTONE); - return; - } - - if (!isActive() && !isPowered() && isRedstoned() && getCurrentRitual() != null) - { - active = true; - ItemStack crystalStack = NBTHelper.checkNBT(ItemActivationCrystal.CrystalType.getStack(getCurrentRitual().getCrystalLevel())); - BindableHelper.applyBinding(crystalStack, new Binding(owner, PlayerHelper.getUsernameFromUUID(owner))); - activateRitual(crystalStack, null, getCurrentRitual()); - redstoned = false; - } - - if (getCurrentRitual() != null && isActive()) - { - if (activeTime % getCurrentRitual().getRefreshTime() == 0) - performRitual(getWorld(), getPos()); - - activeTime++; - } - } - - @Override - public void deserialize(CompoundNBT tag) - { - owner = tag.hasUniqueId("owner") ? tag.getUniqueId("owner") : null; - if (owner != null) - cachedNetwork = NetworkHelper.getSoulNetwork(owner); - currentRitual = BloodMagic.RITUAL_MANAGER.getRitual(tag.getString(Constants.NBT.CURRENT_RITUAL)); - if (currentRitual != null) - { - CompoundNBT ritualTag = tag.getCompound(Constants.NBT.CURRENT_RITUAL_TAG); - if (!ritualTag.isEmpty()) - { - currentRitual.readFromNBT(ritualTag); - } - addBlockRanges(currentRitual.getModableRangeMap()); - for (Entry entry : modableRangeMap.entrySet()) - { - CompoundNBT descriptorTag = ritualTag.getCompound(entry.getKey()); - entry.getValue().readFromNBT(descriptorTag); -// ritualTag.put(entry.getKey(), descriptorTag); - } - } - active = tag.getBoolean(Constants.NBT.IS_RUNNING); - activeTime = tag.getInt(Constants.NBT.RUNTIME); - direction = Direction.values()[tag.getInt(Constants.NBT.DIRECTION)]; - redstoned = tag.getBoolean(Constants.NBT.IS_REDSTONED); - - for (EnumDemonWillType type : EnumDemonWillType.values()) - { - if (tag.getBoolean("EnumWill" + type)) - { - currentActiveWillConfig.add(type); - } - } - } - - @Override - public CompoundNBT serialize(CompoundNBT tag) - { - String ritualId = BloodMagic.RITUAL_MANAGER.getId(getCurrentRitual()); - if (owner != null) - tag.putUniqueId("owner", owner); - tag.putString(Constants.NBT.CURRENT_RITUAL, Strings.isNullOrEmpty(ritualId) ? "" : ritualId); - if (currentRitual != null) - { - CompoundNBT ritualTag = new CompoundNBT(); - currentRitual.writeToNBT(ritualTag); - for (Entry entry : modableRangeMap.entrySet()) - { - CompoundNBT descriptorTag = new CompoundNBT(); - entry.getValue().writeToNBT(descriptorTag); - ritualTag.put(entry.getKey(), descriptorTag); - } - tag.put(Constants.NBT.CURRENT_RITUAL_TAG, ritualTag); - } - tag.putBoolean(Constants.NBT.IS_RUNNING, isActive()); - tag.putInt(Constants.NBT.RUNTIME, getActiveTime()); - tag.putInt(Constants.NBT.DIRECTION, direction.getIndex()); - tag.putBoolean(Constants.NBT.IS_REDSTONED, redstoned); - - for (EnumDemonWillType type : currentActiveWillConfig) - { - tag.putBoolean("EnumWill" + type, true); - } - - return tag; - } - - @Override - public boolean activateRitual(ItemStack activationCrystal, @Nullable PlayerEntity activator, Ritual ritual) - { - if (PlayerHelper.isFakePlayer(activator)) - return false; - - Binding binding = ((IBindable) activationCrystal.getItem()).getBinding(activationCrystal); - if (binding != null && ritual != null) - { - if (activationCrystal.getItem() instanceof ItemActivationCrystal) - { - int crystalLevel = ((ItemActivationCrystal) activationCrystal.getItem()).getCrystalLevel(activationCrystal); - if (RitualHelper.canCrystalActivate(ritual, crystalLevel)) - { - if (!getWorld().isRemote) - { - SoulNetwork network = NetworkHelper.getSoulNetwork(binding); - - if (!isRedstoned() && network.getCurrentEssence() < ritual.getActivationCost() - && (activator != null && !activator.isCreative())) - { - activator.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.weak"), true); - return false; - } - - if (currentRitual != null) - currentRitual.stopRitual(this, Ritual.BreakType.ACTIVATE); - - RitualEvent.RitualActivatedEvent event = new RitualEvent.RitualActivatedEvent(this, binding.getOwnerId(), ritual, activator, activationCrystal, crystalLevel); - - if (MinecraftForge.EVENT_BUS.post(event)) - { - if (activator != null) - activator.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.prevent"), true); - return false; - } - - if (ritual.activateRitual(this, activator, binding.getOwnerId())) - { - if (!isRedstoned() && (activator != null && !activator.isCreative())) - network.syphon(ticket(ritual.getActivationCost())); - - if (activator != null) - activator.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.activate"), true); - - this.active = true; - this.owner = binding.getOwnerId(); - this.cachedNetwork = network; - this.currentRitual = ritual; - - if (!checkBlockRanges(ritual.getModableRangeMap())) - addBlockRanges(ritual.getModableRangeMap()); - - notifyUpdate(); - return true; - } - } - - notifyUpdate(); - return true; - } - } - } else - { - if (activator != null) - activator.sendStatusMessage(new TranslationTextComponent("chat.bloodmagic.ritual.notValid"), true); - } - - return false; - } - - @Override - public void performRitual(World world, BlockPos pos) - { - if (!world.isRemote && getCurrentRitual() != null - && BloodMagic.RITUAL_MANAGER.enabled(BloodMagic.RITUAL_MANAGER.getId(currentRitual), false)) - { - if (RitualHelper.checkValidRitual(getWorld(), getPos(), currentRitual, getDirection())) - { - Ritual ritual = getCurrentRitual(); - RitualEvent.RitualRunEvent event = new RitualEvent.RitualRunEvent(this, getOwner(), ritual); - - if (MinecraftForge.EVENT_BUS.post(event)) - return; - - if (!checkBlockRanges(getCurrentRitual().getModableRangeMap())) - addBlockRanges(getCurrentRitual().getModableRangeMap()); - - getCurrentRitual().performRitual(this); - } else - { - stopRitual(Ritual.BreakType.BREAK_STONE); - } - } - } - - @Override - public void stopRitual(Ritual.BreakType breakType) - { - if (!getWorld().isRemote && getCurrentRitual() != null) - { - RitualEvent.RitualStopEvent event = new RitualEvent.RitualStopEvent(this, getOwner(), getCurrentRitual(), breakType); - - if (MinecraftForge.EVENT_BUS.post(event)) - return; - - getCurrentRitual().stopRitual(this, breakType); - if (breakType != Ritual.BreakType.REDSTONE) - { - this.currentRitual = null; - this.active = false; - this.activeTime = 0; - } - notifyUpdate(); - } - } - - @Override - public int getCooldown() - { - return cooldown; - } - - @Override - public void setCooldown(int cooldown) - { - this.cooldown = cooldown; - } - - @Override - public Direction getDirection() - { - return direction; - } - - public void setDirection(Direction direction) - { - this.direction = direction; - } - - @Override - public boolean areTanksEmpty() - { - return false; - } - - @Override - public int getRunningTime() - { - return activeTime; - } - - @Override - public UUID getOwner() - { - return owner; - } - - public void setOwner(UUID owner) - { - this.owner = owner; - } - - @Override - public SoulNetwork getOwnerNetwork() - { - return cachedNetwork; - } - - @Override - public World getWorld() - { - return super.getWorld(); - } - - @Override - public BlockPos getPos() - { - return super.getPos(); - } - - @Override - public World getWorldObj() - { - return getWorld(); - } - - @Override - public BlockPos getBlockPos() - { - return getPos(); - } - - @Override - public String getNextBlockRange(String range) - { - if (this.currentRitual != null) - { - return this.currentRitual.getNextBlockRange(range); - } - - return ""; - } - - @Override - public void provideInformationOfRitualToPlayer(PlayerEntity player) - { - if (this.currentRitual != null) - { - ChatUtil.sendNoSpam(player, this.currentRitual.provideInformationOfRitualToPlayer(player)); - } - } - - @Override - public void provideInformationOfRangeToPlayer(PlayerEntity player, String range) - { - if (this.currentRitual != null && this.currentRitual.getListOfRanges().contains(range)) - { - ChatUtil.sendNoSpam(player, this.currentRitual.provideInformationOfRangeToPlayer(player, range)); - } - } - - @Override - public void setActiveWillConfig(PlayerEntity player, List typeList) - { - this.currentActiveWillConfig = typeList; - } - - @Override - public EnumReaderBoundaries setBlockRangeByBounds(PlayerEntity player, String range, BlockPos offset1, BlockPos offset2) - { - AreaDescriptor descriptor = this.getBlockRange(range); - DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(world, getBlockPos()); - - EnumReaderBoundaries modificationType = currentRitual.canBlockRangeBeModified(range, descriptor, this, offset1, offset2, holder); - if (modificationType == EnumReaderBoundaries.SUCCESS) - descriptor.modifyAreaByBlockPositions(offset1, offset2); - - world.notifyBlockUpdate(pos, this.getBlockState(), this.getBlockState(), 3); - - return modificationType; - } - - @Override - public List getActiveWillConfig() - { - return new ArrayList<>(currentActiveWillConfig); - } - - @Override - public void provideInformationOfWillConfigToPlayer(PlayerEntity player, List typeList) - { - // There is probably an easier way to make expanded chat messages - if (typeList.size() >= 1) - { - Object[] translations = new TranslationTextComponent[typeList.size()]; - StringBuilder constructedString = new StringBuilder("%s"); - - for (int i = 1; i < typeList.size(); i++) - { - constructedString.append(", %s"); - } - - for (int i = 0; i < typeList.size(); i++) - { - translations[i] = new TranslationTextComponent("tooltip.bloodmagic.currentBaseType." + typeList.get(i).name.toLowerCase()); - } - - ChatUtil.sendNoSpam(player, new TranslationTextComponent("ritual.bloodmagic.willConfig.set", new TranslationTextComponent(constructedString.toString(), translations))); - } else - { - ChatUtil.sendNoSpam(player, new TranslationTextComponent("ritual.bloodmagic.willConfig.void")); - } - } - - public boolean isPowered() - { - if (inverted) - return !getWorld().isBlockPowered(getPos()); - - return getWorld().isBlockPowered(getPos()); - } - - public SoulNetwork getCachedNetwork() - { - return cachedNetwork; - } - - public void setCachedNetwork(SoulNetwork cachedNetwork) - { - this.cachedNetwork = cachedNetwork; - } - - public boolean isActive() - { - return active; - } - - @Override - public void setActive(boolean active) - { - this.active = active; - } - - public boolean isRedstoned() - { - return redstoned; - } - - public void setRedstoned(boolean redstoned) - { - this.redstoned = redstoned; - } - - public int getActiveTime() - { - return activeTime; - } - - public void setActiveTime(int activeTime) - { - this.activeTime = activeTime; - } - - public Ritual getCurrentRitual() - { - return currentRitual; - } - - public void setCurrentRitual(Ritual currentRitual) - { - this.currentRitual = currentRitual; - } - - public boolean isInverted() - { - return inverted; - } - - public void setInverted(boolean inverted) - { - this.inverted = inverted; - } - - public List getCurrentActiveWillConfig() - { - return currentActiveWillConfig; - } - - public void setCurrentActiveWillConfig(List currentActiveWillConfig) - { - this.currentActiveWillConfig = currentActiveWillConfig; - } - - /** - * Used to grab the range of a ritual for a given effect. - * - * @param range - Range that needs to be pulled. - * @return - - */ - public AreaDescriptor getBlockRange(String range) - { - if (modableRangeMap.containsKey(range)) - { - return modableRangeMap.get(range); - } - - return null; - } - - @Override - public void addBlockRange(String range, AreaDescriptor defaultRange) - { - modableRangeMap.putIfAbsent(range, defaultRange.copy()); - } - - @Override - public void addBlockRanges(Map blockRanges) - { - for (Map.Entry entry : blockRanges.entrySet()) - { - modableRangeMap.putIfAbsent(entry.getKey(), entry.getValue().copy()); - } - } - - @Override - public void setBlockRange(String range, AreaDescriptor defaultRange) - { - modableRangeMap.put(range, defaultRange.copy()); - } - - @Override - public void setBlockRanges(Map blockRanges) - { - for (Map.Entry entry : blockRanges.entrySet()) - { - modableRangeMap.put(entry.getKey(), entry.getValue().copy()); - } - } - - public boolean checkBlockRanges(Map blockRanges) - { - for (Map.Entry entry : blockRanges.entrySet()) - { - if (modableRangeMap.get(entry.getKey()) == null) - return false; - } - return true; - } - -} diff --git a/src/main/java/wayoftime/bloodmagic/tile/TileMimic.java b/src/main/java/wayoftime/bloodmagic/tile/TileMimic.java deleted file mode 100644 index 6652fc9b..00000000 --- a/src/main/java/wayoftime/bloodmagic/tile/TileMimic.java +++ /dev/null @@ -1,357 +0,0 @@ -package wayoftime.bloodmagic.tile; - -import java.util.List; -import java.util.Objects; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.InventoryHelper; -import net.minecraft.item.BlockItem; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.NBTUtil; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.play.server.SUpdateTileEntityPacket; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.PotionUtils; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.client.model.ModelDataManager; -import net.minecraftforge.client.model.data.IModelData; -import net.minecraftforge.client.model.data.ModelDataMap; -import net.minecraftforge.client.model.data.ModelProperty; -import net.minecraftforge.common.util.Constants; -import net.minecraftforge.registries.ObjectHolder; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.util.ChatUtil; -import wayoftime.bloodmagic.util.Utils; - -public class TileMimic extends TileInventory -{ - @ObjectHolder("bloodmagic:mimic") - public static TileEntityType TYPE; - - public static final ModelProperty MIMIC = new ModelProperty<>(); - - private BlockState mimic; - - public boolean dropItemsOnBreak = true; - public CompoundNBT tileTag = new CompoundNBT(); - public TileEntity mimicedTile = null; - - public int playerCheckRadius = 5; - public int potionSpawnRadius = 5; - public int potionSpawnInterval = 40; - - private int internalCounter = 0; - - public TileMimic(TileEntityType type) - { - super(type, 2, "mimic"); - } - - public TileMimic() - { - this(TYPE); - } - - public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, Hand hand, ItemStack heldItem, Direction side) - { - if (!heldItem.isEmpty() && player.isCreative()) - { - List list = PotionUtils.getEffectsFromStack(heldItem); - if (!list.isEmpty()) - { - if (!world.isRemote) - { - setInventorySlotContents(1, heldItem.copy()); - world.notifyBlockUpdate(pos, state, state, 3); - ChatUtil.sendNoSpam(player, new TranslationTextComponent("chat.bloodmagic.mimic.potionSet")); - } - return true; - } -// } else if (heldItem.getItem() == RegistrarBloodMagicItems.POTION_FLASK) -// { -// // The potion flask is empty, therefore we have to reset the stored potion. -// if (!world.isRemote) -// { -// setInventorySlotContents(1, ItemStack.EMPTY); -// world.notifyBlockUpdate(pos, state, state, 3); -// ChatUtil.sendNoSpam(player, new TranslationTextComponent("chat.bloodmagic.mimic.potionRemove")); -// } -// return true; -// } - } - - if (performSpecialAbility(player, side)) - { - return true; - } - - if (player.isSneaking()) - return false; - - if (!player.getHeldItem(hand).isEmpty() && player.getHeldItem(hand).getItem() == new ItemStack(BloodMagicBlocks.MIMIC.get()).getItem()) - return false; - - if (!getStackInSlot(0).isEmpty() && !player.getHeldItem(hand).isEmpty()) - return false; - - if (!dropItemsOnBreak && !player.isCreative()) - return false; - - Utils.insertItemToTile(this, player, 0); - ItemStack stack = getStackInSlot(0); - if (mimic == null || mimic == Blocks.AIR.getDefaultState()) - { - if (!stack.isEmpty() && stack.getItem() instanceof BlockItem && !world.isRemote) - { - Block block = ((BlockItem) stack.getItem()).getBlock(); - this.setMimic(block.getDefaultState()); -// mimic = block.getDefaultState(); -// markDirty(); - } - } - this.refreshTileEntity(); - - if (player.isCreative()) - { - dropItemsOnBreak = getStackInSlot(0).isEmpty(); - } - -// world.notifyBlockUpdate(pos, state, state, 3); - return true; - } - - public boolean performSpecialAbility(PlayerEntity player, Direction sideHit) - { - if (!player.isCreative()) - { - return false; - } - - if (player.getActiveItemStack().isEmpty() && !getStackInSlot(1).isEmpty()) - { - switch (sideHit) - { - case EAST: // When the block is clicked on the EAST or WEST side, potionSpawnRadius is - // edited. - case WEST: - if (player.isSneaking()) - { - potionSpawnRadius = Math.max(potionSpawnRadius - 1, 0); - ChatUtil.sendNoSpam(player, new TranslationTextComponent("chat.bloodmagic.mimic.potionSpawnRadius.down", potionSpawnRadius)); - } else - { - potionSpawnRadius++; - ChatUtil.sendNoSpam(player, new TranslationTextComponent("chat.bloodmagic.mimic.potionSpawnRadius.up", potionSpawnRadius)); - } - break; - case NORTH: // When the block is clicked on the NORTH or SOUTH side, detectRadius is edited. - case SOUTH: - if (player.isSneaking()) - { - playerCheckRadius = Math.max(playerCheckRadius - 1, 0); - ChatUtil.sendNoSpam(player, new TranslationTextComponent("chat.bloodmagic.mimic.detectRadius.down", playerCheckRadius)); - } else - { - playerCheckRadius++; - ChatUtil.sendNoSpam(player, new TranslationTextComponent("chat.bloodmagic.mimic.detectRadius.up", playerCheckRadius)); - } - break; - case UP: // When the block is clicked on the UP or DOWN side, potionSpawnInterval is - // edited. - case DOWN: - if (player.isSneaking()) - { - potionSpawnInterval = Math.max(potionSpawnInterval - 1, 1); - ChatUtil.sendNoSpam(player, new TranslationTextComponent("chat.bloodmagic.mimic.potionInterval.down", potionSpawnInterval)); - } else - { - potionSpawnInterval++; - ChatUtil.sendNoSpam(player, new TranslationTextComponent("chat.bloodmagic.mimic.potionInterval.up", potionSpawnInterval)); - } - break; - default: - break; - - } - - return true; - } - - return false; - } - - public void refreshTileEntity() - { - if (mimicedTile != null) - { - dropMimicedTileInventory(); - } - mimicedTile = getTileFromStackWithTag(getWorld(), pos, getStackInSlot(0), tileTag, mimic); - } - - public void dropMimicedTileInventory() - { - if (!getWorld().isRemote && mimicedTile instanceof IInventory) - { - InventoryHelper.dropInventoryItems(getWorld(), getPos(), (IInventory) mimicedTile); - } - } - - @Nullable - public static TileEntity getTileFromStackWithTag(World world, BlockPos pos, ItemStack stack, @Nullable CompoundNBT tag, BlockState replacementState) - { - if (!stack.isEmpty() && stack.getItem() instanceof BlockItem) - { - Block block = ((BlockItem) stack.getItem()).getBlock(); - BlockState state = replacementState; - if (block.hasTileEntity(state)) - { - TileEntity tile = block.createTileEntity(state, world); - - if (tile == null) - return null; - - if (tag != null) - { - CompoundNBT copyTag = tag.copy(); - copyTag.putInt("x", pos.getX()); - copyTag.putInt("y", pos.getY()); - copyTag.putInt("z", pos.getZ()); - tile.deserializeNBT(copyTag); - } - - tile.setWorldAndPos(world, pos); - - return tile; - } - } - - return null; - } - - public void setMimic(BlockState mimic) - { - this.mimic = mimic; - markDirty(); - world.notifyBlockUpdate(pos, getBlockState(), getBlockState(), Constants.BlockFlags.BLOCK_UPDATE + Constants.BlockFlags.NOTIFY_NEIGHBORS); - } - - public BlockState getMimic() - { - return mimic; - } - - // The getUpdateTag()/handleUpdateTag() pair is called whenever the client - // receives a new chunk - // it hasn't seen before. i.e. the chunk is loaded - - @Override - public CompoundNBT getUpdateTag() - { - CompoundNBT tag = super.getUpdateTag(); - writeMimic(tag); - return tag; - } - - // The getUpdatePacket()/onDataPacket() pair is used when a block update happens - // on the client - // (a blockstate change or an explicit notificiation of a block update from the - // server). It's - // easiest to implement them based on getUpdateTag()/handleUpdateTag() - - @Nullable - @Override - public SUpdateTileEntityPacket getUpdatePacket() - { - return new SUpdateTileEntityPacket(pos, 1, getUpdateTag()); - } - - @Override - public void onDataPacket(NetworkManager net, SUpdateTileEntityPacket pkt) - { - BlockState oldMimic = mimic; - CompoundNBT tag = pkt.getNbtCompound(); - deserialize(tag); - if (!Objects.equals(oldMimic, mimic)) - { - ModelDataManager.requestModelDataRefresh(this); - world.notifyBlockUpdate(pos, getBlockState(), getBlockState(), Constants.BlockFlags.BLOCK_UPDATE + Constants.BlockFlags.NOTIFY_NEIGHBORS); - } - } - - @Nonnull - @Override - public IModelData getModelData() - { - return new ModelDataMap.Builder().withInitial(MIMIC, mimic).build(); - } - - @Override - public void deserialize(CompoundNBT tag) - { - super.deserialize(tag); - - dropItemsOnBreak = tag.getBoolean("dropItemsOnBreak"); - tileTag = tag.getCompound("tileTag"); -// stateOfReplacedBlock = StateUtil.parseState(tag.getString("stateOfReplacedBlock")); - readMimic(tag); - mimicedTile = getTileFromStackWithTag(getWorld(), pos, getStackInSlot(0), tileTag, mimic); - playerCheckRadius = tag.getInt("playerCheckRadius"); - potionSpawnRadius = tag.getInt("potionSpawnRadius"); - potionSpawnInterval = Math.max(1, tag.getInt("potionSpawnInterval")); - } - - private void readMimic(CompoundNBT tag) - { - if (tag.contains("mimic")) - { - mimic = NBTUtil.readBlockState(tag.getCompound("mimic")); - } - } - - @Override - public CompoundNBT serialize(CompoundNBT tag) - { - tag.putBoolean("dropItemsOnBreak", dropItemsOnBreak); - tag.put("tileTag", tileTag); - tag.putInt("playerCheckRadius", playerCheckRadius); - tag.putInt("potionSpawnRadius", potionSpawnRadius); - tag.putInt("potionSpawnInterval", potionSpawnInterval); -// tag.putString("stateOfReplacedBlock", stateOfReplacedBlock.toString()); - writeMimic(tag); - return super.serialize(tag); - } - - private void writeMimic(CompoundNBT tag) - { - if (mimic != null) - { - tag.put("mimic", NBTUtil.writeBlockState(mimic)); - } - } - - @Override - public void dropItems() - { - if (dropItemsOnBreak) - { - InventoryHelper.dropInventoryItems(getWorld(), getPos(), this); - } - - dropMimicedTileInventory(); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/tile/TileShapedExplosive.java b/src/main/java/wayoftime/bloodmagic/tile/TileShapedExplosive.java deleted file mode 100644 index 5fe75fcd..00000000 --- a/src/main/java/wayoftime/bloodmagic/tile/TileShapedExplosive.java +++ /dev/null @@ -1,176 +0,0 @@ -package wayoftime.bloodmagic.tile; - -import com.mojang.datafixers.util.Pair; - -import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.loot.LootContext; -import net.minecraft.loot.LootParameters; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.particles.ParticleTypes; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.world.server.ServerWorld; -import net.minecraftforge.registries.ObjectHolder; -import wayoftime.bloodmagic.common.block.BlockShapedExplosive; - -public class TileShapedExplosive extends TileExplosiveCharge -{ - @ObjectHolder("bloodmagic:shaped_explosive") - public static TileEntityType TYPE; - - public double internalCounter = 0; - public int explosionRadius; - public int explosionDepth; - - public TileShapedExplosive(TileEntityType type, int explosionRadius, int explosionDepth) - { - super(type); - this.explosionRadius = explosionRadius; - this.explosionDepth = explosionDepth; - } - - public TileShapedExplosive() - { - this(TYPE, 2, 5); - } - - @Override - public void onUpdate() - { - if (world.isRemote) - { - return; - } -// System.out.println("Counter: " + internalCounter); - - internalCounter++; - if (internalCounter == 20) - { -// worldIn.playSound((PlayerEntity)null, tntentity.getPosX(), tntentity.getPosY(), tntentity.getPosZ(), SoundEvents.ENTITY_TNT_PRIMED, SoundCategory.BLOCKS, 1.0F, 1.0F); - world.playSound((PlayerEntity) null, this.getPos().getX() + 0.5, this.getPos().getY() + 0.5, this.getPos().getZ() + 0.5, SoundEvents.ITEM_FLINTANDSTEEL_USE, SoundCategory.BLOCKS, 1.0F, world.rand.nextFloat() * 0.4F + 0.8F); - ((ServerWorld) this.world).spawnParticle(ParticleTypes.FLAME, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 5, 0.02, 0.03, 0.02, 0); - } - - if (internalCounter == 30) - { - world.playSound((PlayerEntity) null, this.getPos().getX() + 0.5, this.getPos().getY() + 0.5, this.getPos().getZ() + 0.5, SoundEvents.ENTITY_TNT_PRIMED, SoundCategory.BLOCKS, 1.0F, 1.0F); - } - - if (internalCounter < 30) - { - return; - } - - if (world.rand.nextDouble() < 0.3) - { - ((ServerWorld) this.world).spawnParticle(ParticleTypes.SMOKE, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 1, 0.0D, 0.0D, 0.0D, 0); - } - - if (internalCounter == 100) - { - world.playSound((PlayerEntity) null, this.getPos().getX() + 0.5, this.getPos().getY() + 0.5, this.getPos().getZ() + 0.5, SoundEvents.ENTITY_GENERIC_EXPLODE, SoundCategory.BLOCKS, 4.0F, (1.0F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); - - Direction explosiveDirection = this.getBlockState().get(BlockShapedExplosive.ATTACHED).getOpposite(); - Direction sweepDir1 = Direction.UP; - Direction sweepDir2 = Direction.UP; - - int numParticles = explosionDepth * (explosionRadius + 1); - - ((ServerWorld) this.world).spawnParticle(ParticleTypes.EXPLOSION, pos.getX() + 0.5 + explosiveDirection.getXOffset() * explosionDepth / 2d, pos.getY() + 0.5 + explosiveDirection.getYOffset() * explosionDepth / 2d, pos.getZ() + 0.5 + explosiveDirection.getZOffset() * explosionDepth / 2d, numParticles, 1.0D, 1.0D, 1.0D, 0); - - switch (explosiveDirection) - { - case UP: - case DOWN: - sweepDir1 = Direction.NORTH; - sweepDir2 = Direction.EAST; - break; - case EAST: - case WEST: - sweepDir1 = Direction.NORTH; - sweepDir2 = Direction.UP; - break; - case NORTH: - case SOUTH: - sweepDir1 = Direction.EAST; - sweepDir2 = Direction.UP; - break; - } - - ItemStack toolStack = this.getHarvestingTool(); - - ObjectArrayList> objectarraylist = new ObjectArrayList<>(); - - BlockPos initialPos = getPos(); - for (int i = 1; i <= explosionDepth; i++) - { - for (int j = -explosionRadius; j <= explosionRadius; j++) - { - for (int k = -explosionRadius; k <= explosionRadius; k++) - { - BlockPos blockpos = initialPos.offset(explosiveDirection, i).offset(sweepDir1, j).offset(sweepDir2, k); - - BlockState blockstate = this.world.getBlockState(blockpos); - Block block = blockstate.getBlock(); - if (!blockstate.isAir(this.world, blockpos) && blockstate.getBlockHardness(world, blockpos) != -1.0F) - { - BlockPos blockpos1 = blockpos.toImmutable(); -// this.world.getProfiler().startSection("explosion_blocks"); - if (this.world instanceof ServerWorld) - { - TileEntity tileentity = blockstate.hasTileEntity() ? this.world.getTileEntity(blockpos) - : null; - LootContext.Builder lootcontext$builder = (new LootContext.Builder((ServerWorld) this.world)).withRandom(this.world.rand).withParameter(LootParameters.field_237457_g_, Vector3d.copyCentered(blockpos)).withParameter(LootParameters.TOOL, toolStack).withNullableParameter(LootParameters.BLOCK_ENTITY, tileentity); -// if (this.mode == Explosion.Mode.DESTROY) { -// lootcontext$builder.withParameter(LootParameters.EXPLOSION_RADIUS, this.size); -// } - - blockstate.getDrops(lootcontext$builder).forEach((stack) -> { - handleExplosionDrops(objectarraylist, stack, blockpos1); - }); - - world.setBlockState(blockpos, Blocks.AIR.getDefaultState(), 3); - -// blockstate.onBlockExploded(this.world, blockpos, null); -// this.world.getProfiler().endSection(); - } - } - } - } - } - - for (Pair pair : objectarraylist) - { - Block.spawnAsEntity(this.world, pair.getSecond(), pair.getFirst()); - } - - world.setBlockState(getPos(), Blocks.AIR.getDefaultState()); - } - } - - @Override - public void deserialize(CompoundNBT tag) - { - super.deserialize(tag); - internalCounter = tag.getDouble("internalCounter"); - } - - @Override - public CompoundNBT serialize(CompoundNBT tag) - { - super.serialize(tag); - tag.putDouble("internalCounter", internalCounter); - - return tag; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/tile/TileSoulForge.java b/src/main/java/wayoftime/bloodmagic/tile/TileSoulForge.java deleted file mode 100644 index 76c8aee2..00000000 --- a/src/main/java/wayoftime/bloodmagic/tile/TileSoulForge.java +++ /dev/null @@ -1,448 +0,0 @@ -package wayoftime.bloodmagic.tile; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.container.Container; -import net.minecraft.inventory.container.INamedContainerProvider; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.IIntArray; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.items.ItemHandlerHelper; -import net.minecraftforge.registries.ObjectHolder; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; -import wayoftime.bloodmagic.api.compat.IDemonWill; -import wayoftime.bloodmagic.api.compat.IDemonWillConduit; -import wayoftime.bloodmagic.api.compat.IDemonWillGem; -import wayoftime.bloodmagic.api.event.BloodMagicCraftedEvent; -import wayoftime.bloodmagic.demonaura.WorldDemonWillHandler; -import wayoftime.bloodmagic.impl.BloodMagicAPI; -import wayoftime.bloodmagic.recipe.RecipeTartaricForge; -import wayoftime.bloodmagic.tile.container.ContainerSoulForge; -import wayoftime.bloodmagic.util.Constants; - -public class TileSoulForge extends TileInventory implements ITickableTileEntity, INamedContainerProvider, IDemonWillConduit -{ - @ObjectHolder("bloodmagic:soulforge") - public static TileEntityType TYPE; - - public static final int ticksRequired = 100; - public static final double worldWillTransferRate = 1; - - public static final int soulSlot = 4; - public static final int outputSlot = 5; - - // Input slots are from 0 to 3. - - public int burnTime = 0; - - public TileSoulForge(TileEntityType type) - { - super(type, 6, "soulforge"); - } - - public TileSoulForge() - { - this(TYPE); - } - - @Override - public void deserialize(CompoundNBT tag) - { - super.deserialize(tag); - - burnTime = tag.getInt(Constants.NBT.SOUL_FORGE_BURN); - } - - @Override - public CompoundNBT serialize(CompoundNBT tag) - { - super.serialize(tag); - - tag.putInt(Constants.NBT.SOUL_FORGE_BURN, burnTime); - return tag; - } - - public final IIntArray TileData = new IIntArray() - { - @Override - public int get(int index) - { - switch (index) - { - case 0: - return burnTime; - case 1: - return ticksRequired; - case 2: - return 0; - default: - throw new IllegalArgumentException("Invalid index: " + index); - } - } - - @Override - public void set(int index, int value) - { - throw new IllegalStateException("Cannot set values through IIntArray"); - } - - @Override - public int size() - { - return 3; - } - }; - - @Override - public void tick() - { - if (!hasSoulGemOrSoul()) - { - burnTime = 0; - return; - } - - if (!getWorld().isRemote) - { - for (EnumDemonWillType type : EnumDemonWillType.values()) - { - double willInWorld = WorldDemonWillHandler.getCurrentWill(getWorld(), pos, type); - double filled = Math.min(willInWorld, worldWillTransferRate); - - if (filled > 0) - { - filled = this.fillDemonWill(type, filled, false); - filled = WorldDemonWillHandler.drainWill(getWorld(), pos, type, filled, false); - - if (filled > 0) - { - this.fillDemonWill(type, filled, true); - WorldDemonWillHandler.drainWill(getWorld(), pos, type, filled, true); - } - } - } - } - - double soulsInGem = getWill(EnumDemonWillType.DEFAULT); - - List inputList = new ArrayList<>(); - - for (int i = 0; i < 4; i++) if (!getStackInSlot(i).isEmpty()) - inputList.add(getStackInSlot(i)); - - RecipeTartaricForge recipe = BloodMagicAPI.INSTANCE.getRecipeRegistrar().getTartaricForge(world, inputList); - if (recipe != null && (soulsInGem >= recipe.getMinimumSouls() || burnTime > 0)) - { - if (canCraft(recipe)) - { - burnTime++; - - if (burnTime == ticksRequired) - { - if (!getWorld().isRemote) - { - double requiredSouls = recipe.getSoulDrain(); - if (requiredSouls > 0) - { - if (!getWorld().isRemote && soulsInGem >= recipe.getMinimumSouls()) - { - consumeSouls(EnumDemonWillType.DEFAULT, requiredSouls); - } - } - - if (!getWorld().isRemote && soulsInGem >= recipe.getMinimumSouls()) - craftItem(recipe); - } - - burnTime = 0; - } else if (burnTime > ticksRequired + 10) - { - burnTime = 0; - } - } else - { - burnTime = 0; - } - } else - { - burnTime = 0; - } - } - - private boolean canCraft(RecipeTartaricForge recipe) - { - if (recipe == null) - return false; - - ItemStack currentOutputStack = getStackInSlot(outputSlot); - if (recipe.getOutput().isEmpty()) - return false; - if (currentOutputStack.isEmpty()) - return true; - if (!currentOutputStack.isItemEqual(recipe.getOutput())) - return false; - int result = currentOutputStack.getCount() + recipe.getOutput().getCount(); - return result <= getInventoryStackLimit() && result <= currentOutputStack.getMaxStackSize(); - - } - - public void craftItem(RecipeTartaricForge recipe) - { - if (this.canCraft(recipe)) - { - ItemStack currentOutputStack = getStackInSlot(outputSlot); - - List inputList = new ArrayList<>(); - for (int i = 0; i < 4; i++) if (!getStackInSlot(i).isEmpty()) - inputList.add(getStackInSlot(i).copy()); - - BloodMagicCraftedEvent.SoulForge event = new BloodMagicCraftedEvent.SoulForge(recipe.getOutput().copy(), inputList.toArray(new ItemStack[0])); - MinecraftForge.EVENT_BUS.post(event); - - if (currentOutputStack.isEmpty()) - { - setInventorySlotContents(outputSlot, event.getOutput()); - } else if (ItemHandlerHelper.canItemStacksStack(currentOutputStack, event.getOutput())) - { - currentOutputStack.grow(event.getOutput().getCount()); - } - - moveRemainingWillInConsumedInv(); - - consumeInventory(); - } - } - - @Override - public Container createMenu(int p_createMenu_1_, PlayerInventory p_createMenu_2_, PlayerEntity p_createMenu_3_) - { - assert world != null; - return new ContainerSoulForge(this, TileData, p_createMenu_1_, p_createMenu_2_); - } - - @Override - public ITextComponent getDisplayName() - { - return new StringTextComponent("Hellfire Forge"); - } - - public boolean hasSoulGemOrSoul() - { - for (int i = 0; i <= 4; i++) - { - ItemStack soulStack = getStackInSlot(i); - - if (!soulStack.isEmpty()) - { - if (soulStack.getItem() instanceof IDemonWill || soulStack.getItem() instanceof IDemonWillGem) - { - return true; - } - } - } - - return false; - } - - public double getProgressForGui() - { - return ((double) burnTime) / ticksRequired; - } - - public double getWill(EnumDemonWillType type) - { - double will = 0; - for (int i = 0; i <= 4; i++) - { - ItemStack soulStack = getStackInSlot(i); - - if (soulStack != null) - { - if (soulStack.getItem() instanceof IDemonWill && ((IDemonWill) soulStack.getItem()).getType(soulStack) == type) - { - IDemonWill soul = (IDemonWill) soulStack.getItem(); - will += soul.getWill(type, soulStack); - } - - if (soulStack.getItem() instanceof IDemonWillGem) - { - IDemonWillGem soul = (IDemonWillGem) soulStack.getItem(); - will += soul.getWill(type, soulStack); - } - } - } - - return will; - } - - public void moveRemainingWillInConsumedInv() - { - ItemStack outputStack = getStackInSlot(outputSlot); - if (outputStack != null) - { - if (outputStack.getItem() instanceof IDemonWillGem) - { - IDemonWillGem filledGem = (IDemonWillGem) outputStack.getItem(); - for (int i = 0; i < 4; i++) - { - ItemStack soulStack = getStackInSlot(i); - if (soulStack != null && soulStack.getItem() instanceof IDemonWillGem) - { - IDemonWillGem syphonedGem = (IDemonWillGem) soulStack.getItem(); - for (EnumDemonWillType type : EnumDemonWillType.values()) - { - // Skipped a few possibly redundant checks. Also could blow up in my face rooVV - double willInGem = syphonedGem.getWill(type, soulStack); - if (willInGem > 0) - { - filledGem.fillWill(type, outputStack, willInGem, true); - } - } - } - - } - } - } - } - - public double consumeSouls(EnumDemonWillType type, double requested) - { - double consumed = 0; - - for (int i = 0; i <= 4; i++) - { - ItemStack soulStack = getStackInSlot(i); - if (soulStack != null) - { - if (soulStack.getItem() instanceof IDemonWill && ((IDemonWill) soulStack.getItem()).getType(soulStack) == type) - { - IDemonWill soul = (IDemonWill) soulStack.getItem(); - double souls = soul.drainWill(type, soulStack, requested - consumed); - if (soul.getWill(type, soulStack) <= 0) - { - setInventorySlotContents(i, ItemStack.EMPTY); - } - consumed += souls; -// return souls; - } - - if (soulStack.getItem() instanceof IDemonWillGem) - { - IDemonWillGem soul = (IDemonWillGem) soulStack.getItem(); - double souls = soul.drainWill(type, soulStack, requested - consumed, true); - consumed += souls; - } - } - - if (consumed >= requested) - { - return consumed; - } - } - - return consumed; - } - - public void consumeInventory() - { - for (int i = 0; i < 4; i++) - { - ItemStack inputStack = getStackInSlot(i); - if (!inputStack.isEmpty()) - { - if (inputStack.getItem().hasContainerItem(inputStack)) - { - setInventorySlotContents(i, inputStack.getItem().getContainerItem(inputStack)); - continue; - } - - inputStack.shrink(1); - if (inputStack.isEmpty()) - { - setInventorySlotContents(i, ItemStack.EMPTY); - } - } - } - } - - @Override - public int getWeight() - { - return 50; - } - - @Override - public double fillDemonWill(EnumDemonWillType type, double amount, boolean doFill) - { - if (amount <= 0) - { - return 0; - } - - if (!canFill(type)) - { - return 0; - } - - ItemStack stack = this.getStackInSlot(soulSlot); - if (stack.isEmpty() || !(stack.getItem() instanceof IDemonWillGem)) - { - return 0; - } - - IDemonWillGem willGem = (IDemonWillGem) stack.getItem(); - return willGem.fillWill(type, stack, amount, doFill); - } - - @Override - public double drainDemonWill(EnumDemonWillType type, double amount, boolean doDrain) - { - ItemStack stack = this.getStackInSlot(soulSlot); - if (stack.isEmpty() || !(stack.getItem() instanceof IDemonWillGem)) - { - return 0; - } - - IDemonWillGem willGem = (IDemonWillGem) stack.getItem(); - - double drained = amount; - double current = willGem.getWill(type, stack); - if (current < drained) - { - drained = current; - } - - if (doDrain) - { - drained = willGem.drainWill(type, stack, drained, true); - } - - return drained; - } - - @Override - public boolean canFill(EnumDemonWillType type) - { - return true; - } - - @Override - public boolean canDrain(EnumDemonWillType type) - { - return true; - } - - @Override - public double getCurrentWill(EnumDemonWillType type) - { - return 0; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/tile/TileVeinMineCharge.java b/src/main/java/wayoftime/bloodmagic/tile/TileVeinMineCharge.java deleted file mode 100644 index 60222fb0..00000000 --- a/src/main/java/wayoftime/bloodmagic/tile/TileVeinMineCharge.java +++ /dev/null @@ -1,285 +0,0 @@ -package wayoftime.bloodmagic.tile; - -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import com.mojang.datafixers.util.Pair; - -import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.loot.LootContext; -import net.minecraft.loot.LootParameters; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.particles.ParticleTypes; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.util.math.vector.Vector3i; -import net.minecraft.world.server.ServerWorld; -import net.minecraftforge.registries.ObjectHolder; -import wayoftime.bloodmagic.common.block.BlockShapedExplosive; - -public class TileVeinMineCharge extends TileExplosiveCharge -{ - @ObjectHolder("bloodmagic:veinmine_charge") - public static TileEntityType TYPE; - - private Map veinPartsMap; - private List veinPartsCache; - private boolean finishedAnalysis; - - private Vector3i[] diagonals = new Vector3i[] { new Vector3i(0, 1, 1), new Vector3i(0, 1, -1), - new Vector3i(0, -1, 1), new Vector3i(0, -1, -1), new Vector3i(1, 0, 1), new Vector3i(-1, 0, 1), - new Vector3i(1, 0, -1), new Vector3i(-1, 0, -1), new Vector3i(1, 1, 0), new Vector3i(-1, 1, 0), - new Vector3i(1, -1, 0), new Vector3i(-1, -1, 0) }; - - public double internalCounter = 0; - - public int currentBlocks = 0; - - public int maxBlocks = 128; - - public TileVeinMineCharge(TileEntityType type, int maxBlocks) - { - super(type); - - this.maxBlocks = maxBlocks; - } - - public TileVeinMineCharge() - { - this(TYPE, 64 * 3); - } - - @Override - public void onUpdate() - { - if (world.isRemote) - { - return; - } -// System.out.println("Counter: " + internalCounter); - - Direction explosiveDirection = this.getBlockState().get(BlockShapedExplosive.ATTACHED).getOpposite(); - BlockState attachedState = world.getBlockState(pos.offset(explosiveDirection)); - Block attachedBlock = attachedState.getBlock(); - if (!isValidStartingBlock(attachedState)) - { - return; - } -// if (!BlockTags.LOGS.contains(attachedState.getBlock()) && !BlockTags.LEAVES.contains(attachedState.getBlock())) -// { -// return; -// } - - if (veinPartsMap == null) - { - veinPartsMap = new HashMap(); - veinPartsMap.put(pos.offset(explosiveDirection), false); - veinPartsCache = new LinkedList(); - veinPartsCache.add(pos.offset(explosiveDirection)); - internalCounter = 0; -// veinPartsMap.add(pos.offset(explosiveDirection)); - } - - boolean foundNew = false; - List newPositions = new LinkedList(); - for (BlockPos currentPos : veinPartsCache) - { - if (!veinPartsMap.getOrDefault(currentPos, false)) // If the BlockPos wasn't checked yet - { -// BlockPos currentPos = entry.getKey(); - for (Direction dir : Direction.values()) - { - BlockPos checkPos = currentPos.offset(dir); - if (veinPartsMap.containsKey(checkPos)) - { - continue; - } - - BlockState checkState = world.getBlockState(checkPos); - - boolean isTree = false; - if (currentBlocks >= maxBlocks) - { - continue; - } - if (isValidBlock(attachedState, checkState)) - { - currentBlocks++; - isTree = true; - - } - - if (isTree) - { - veinPartsMap.put(checkPos, false); - newPositions.add(checkPos); - foundNew = true; - } - } - - if (this.checkDiagonals()) - { - for (Vector3i vec : this.diagonals) - { - BlockPos checkPos = currentPos.add(vec); - if (veinPartsMap.containsKey(checkPos)) - { - continue; - } - - BlockState checkState = world.getBlockState(checkPos); - - boolean isTree = false; - if (currentBlocks >= maxBlocks) - { - continue; - } - if (isValidBlock(attachedState, checkState)) - { - currentBlocks++; - isTree = true; - - } - - if (isTree) - { - veinPartsMap.put(checkPos, false); - newPositions.add(checkPos); - foundNew = true; - } - } - } - - veinPartsMap.put(currentPos, true); - if (currentBlocks >= maxBlocks) - { - finishedAnalysis = true; - break; - } - } - } - - veinPartsCache.addAll(newPositions); - -// System.out.println("Found blocks: " + veinPartsMap.size()); - - if (foundNew) - { - return; - } - - internalCounter++; - if (internalCounter == 20) - { -// worldIn.playSound((PlayerEntity)null, tntentity.getPosX(), tntentity.getPosY(), tntentity.getPosZ(), SoundEvents.ENTITY_TNT_PRIMED, SoundCategory.BLOCKS, 1.0F, 1.0F); - world.playSound((PlayerEntity) null, this.getPos().getX() + 0.5, this.getPos().getY() + 0.5, this.getPos().getZ() + 0.5, SoundEvents.ITEM_FLINTANDSTEEL_USE, SoundCategory.BLOCKS, 1.0F, world.rand.nextFloat() * 0.4F + 0.8F); - ((ServerWorld) this.world).spawnParticle(ParticleTypes.FLAME, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 5, 0.02, 0.03, 0.02, 0); - } - - if (internalCounter == 30) - { - world.playSound((PlayerEntity) null, this.getPos().getX() + 0.5, this.getPos().getY() + 0.5, this.getPos().getZ() + 0.5, SoundEvents.ENTITY_TNT_PRIMED, SoundCategory.BLOCKS, 1.0F, 1.0F); - } - - if (internalCounter < 30) - { - return; - } - - if (world.rand.nextDouble() < 0.3) - { - ((ServerWorld) this.world).spawnParticle(ParticleTypes.SMOKE, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 1, 0.0D, 0.0D, 0.0D, 0); - } - - if (internalCounter == 100) - { - ItemStack toolStack = this.getHarvestingTool(); - world.playSound((PlayerEntity) null, this.getPos().getX() + 0.5, this.getPos().getY() + 0.5, this.getPos().getZ() + 0.5, SoundEvents.ENTITY_GENERIC_EXPLODE, SoundCategory.BLOCKS, 4.0F, (1.0F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); - - int numParticles = 10; - - ((ServerWorld) this.world).spawnParticle(ParticleTypes.EXPLOSION, pos.getX() + 0.5 + explosiveDirection.getXOffset(), pos.getY() + 0.5 + explosiveDirection.getYOffset(), pos.getZ() + 0.5 + explosiveDirection.getZOffset(), numParticles, 1.0D, 1.0D, 1.0D, 0); - - ObjectArrayList> objectarraylist = new ObjectArrayList<>(); - - for (BlockPos blockPos : veinPartsCache) - { -// BlockPos blockpos = initialPos.offset(explosiveDirection, i).offset(sweepDir1, j).offset(sweepDir2, k); - - BlockState blockstate = this.world.getBlockState(blockPos); - Block block = blockstate.getBlock(); - if (!blockstate.isAir(this.world, blockPos)) - { - BlockPos blockpos1 = blockPos.toImmutable(); -// this.world.getProfiler().startSection("explosion_blocks"); - if (this.world instanceof ServerWorld) - { - TileEntity tileentity = blockstate.hasTileEntity() ? this.world.getTileEntity(blockPos) : null; - LootContext.Builder lootcontext$builder = (new LootContext.Builder((ServerWorld) this.world)).withRandom(this.world.rand).withParameter(LootParameters.field_237457_g_, Vector3d.copyCentered(blockPos)).withParameter(LootParameters.TOOL, toolStack).withNullableParameter(LootParameters.BLOCK_ENTITY, tileentity); -// if (this.mode == Explosion.Mode.DESTROY) { -// lootcontext$builder.withParameter(LootParameters.EXPLOSION_RADIUS, this.size); -// } - - blockstate.getDrops(lootcontext$builder).forEach((stack) -> { - handleExplosionDrops(objectarraylist, stack, blockpos1); - }); - - world.setBlockState(blockPos, Blocks.AIR.getDefaultState(), 3); - -// blockstate.onBlockExploded(this.world, blockpos, null); -// this.world.getProfiler().endSection(); - } - } - } - - for (Pair pair : objectarraylist) - { - Block.spawnAsEntity(this.world, pair.getSecond(), pair.getFirst()); - } - - world.setBlockState(getPos(), Blocks.AIR.getDefaultState()); - } - } - - @Override - public void deserialize(CompoundNBT tag) - { - internalCounter = tag.getDouble("internalCounter"); - maxBlocks = tag.getInt("maxBlocks"); - } - - @Override - public CompoundNBT serialize(CompoundNBT tag) - { - tag.putDouble("internalCounter", internalCounter); - tag.putInt("maxBlocks", maxBlocks); - return tag; - } - - public boolean isValidBlock(BlockState originalBlockState, BlockState testState) - { - return originalBlockState.getBlock() == testState.getBlock(); - } - - public boolean isValidStartingBlock(BlockState originalBlockState) - { - return true; - } - - public boolean checkDiagonals() - { - return true; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/tile/base/TileBase.java b/src/main/java/wayoftime/bloodmagic/tile/base/TileBase.java deleted file mode 100644 index 6e7171db..00000000 --- a/src/main/java/wayoftime/bloodmagic/tile/base/TileBase.java +++ /dev/null @@ -1,138 +0,0 @@ -package wayoftime.bloodmagic.tile.base; - -import net.minecraft.block.BlockState; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.play.server.SUpdateTileEntityPacket; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -/** - * Base tile class. - *

- * Handles data syncing and core data writing/reading. - */ -public abstract class TileBase extends TileEntity -{ - public TileBase(TileEntityType type) - { - super(type); - } - - /** - * read method - */ - @Override - public final void read(BlockState state, CompoundNBT compound) - { - super.read(state, compound); - deserializeBase(compound); - deserialize(compound); - } - - @Override - public final CompoundNBT write(CompoundNBT compound) - { - super.write(compound); - serializeBase(compound); - return serialize(compound); - } - - /** - * Called by {@link #func_230337_a_(BlockState, CompoundNBT)} - *

- * Internal data (such as coordinates) are handled for you. Just read the data - * you need. - * - * @param tagCompound - The tag compound to read from - */ - public void deserialize(CompoundNBT tagCompound) - { - - } - - /** - * Package private method for reading base data from the tag compound. - * - * @param tagCompound - The tag compound to read from - * @see TileTicking - */ - void deserializeBase(CompoundNBT tagCompound) - { - - } - - /** - * Called by {@link #writeToNBT(CompoundNBT)} - *

- * Internal data (such as coordinates) are handled for you. Just read the data - * you need. - * - * @param tagCompound - The tag compound to write to. - * @return the modified tag compound - */ - public CompoundNBT serialize(CompoundNBT tagCompound) - { - return tagCompound; - } - - /** - * Package private method for writing base data to the tag compound. - * - * @param tagCompound - The tag compound to write to. - * @return the modified tag compound - * @see TileTicking - */ - CompoundNBT serializeBase(CompoundNBT tagCompound) - { - return tagCompound; - } - - public void notifyUpdate() - { - BlockState state = getWorld().getBlockState(getPos()); - getWorld().notifyBlockUpdate(getPos(), state, state, 3); - } - -// // Data syncing -// -// @Override -// public boolean shouldRefresh(World world, BlockPos pos, BlockState oldState, BlockState newState) -// { -// return oldState.getBlock() != newState.getBlock(); -// } - - @Override - public SUpdateTileEntityPacket getUpdatePacket() - { - return new SUpdateTileEntityPacket(getPos(), -999, getUpdateTag()); - } - -// @Override -// public void handleUpdateTag(BlockState state, CompoundNBT tag) -// { -// read(state, tag); -// } - - @Override - @OnlyIn(Dist.CLIENT) - public void onDataPacket(NetworkManager net, SUpdateTileEntityPacket pkt) - { - super.onDataPacket(net, pkt); - handleUpdateTag(getBlockState(), pkt.getNbtCompound()); - } - - @Override - public CompoundNBT getUpdateTag() - { - return write(new CompoundNBT()); - } - - @Override - public void handleUpdateTag(BlockState state, CompoundNBT tag) - { - read(state, tag); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/tile/base/TileTicking.java b/src/main/java/wayoftime/bloodmagic/tile/base/TileTicking.java deleted file mode 100644 index ffc70ebc..00000000 --- a/src/main/java/wayoftime/bloodmagic/tile/base/TileTicking.java +++ /dev/null @@ -1,71 +0,0 @@ -package wayoftime.bloodmagic.tile.base; - -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; - -/** - * Base class for tiles that tick. Allows disabling the ticking - * programmatically. - */ -// TODO - Move implementations that depend on existed ticks to new methods from here. -public abstract class TileTicking extends TileBase implements ITickableTileEntity -{ - private int ticksExisted; - private boolean shouldTick = true; - - public TileTicking(TileEntityType type) - { - super(type); - } - - @Override - public final void tick() - { - if (shouldTick()) - { - ticksExisted++; - onUpdate(); - } - } - - @Override - void deserializeBase(CompoundNBT tagCompound) - { - this.ticksExisted = tagCompound.getInt("ticksExisted"); - this.shouldTick = tagCompound.getBoolean("shouldTick"); - } - - @Override - CompoundNBT serializeBase(CompoundNBT tagCompound) - { - tagCompound.putInt("ticksExisted", getTicksExisted()); - tagCompound.putBoolean("shouldTick", shouldTick()); - return tagCompound; - } - - /** - * Called every tick that {@link #shouldTick()} is true. - */ - public abstract void onUpdate(); - - public int getTicksExisted() - { - return ticksExisted; - } - - public void resetLifetime() - { - ticksExisted = 0; - } - - public boolean shouldTick() - { - return shouldTick; - } - - public void setShouldTick(boolean shouldTick) - { - this.shouldTick = shouldTick; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/tile/container/ContainerAlchemicalReactionChamber.java b/src/main/java/wayoftime/bloodmagic/tile/container/ContainerAlchemicalReactionChamber.java deleted file mode 100644 index 75dd0583..00000000 --- a/src/main/java/wayoftime/bloodmagic/tile/container/ContainerAlchemicalReactionChamber.java +++ /dev/null @@ -1,198 +0,0 @@ -package wayoftime.bloodmagic.tile.container; - -import java.util.Optional; - -import javax.annotation.Nullable; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.container.Container; -import net.minecraft.inventory.container.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidUtil; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.common.tags.BloodMagicTags; -import wayoftime.bloodmagic.tile.TileAlchemicalReactionChamber; - -public class ContainerAlchemicalReactionChamber extends Container -{ - public final TileAlchemicalReactionChamber tileARC; - -// public ContainerSoulForge(InventoryPlayer inventoryPlayer, IInventory tileARC) -// { -// this.tileARC = tileARC; -// -// } - - public ContainerAlchemicalReactionChamber(int windowId, PlayerInventory playerInventory, PacketBuffer extraData) - { - this((TileAlchemicalReactionChamber) playerInventory.player.world.getTileEntity(extraData.readBlockPos()), windowId, playerInventory); - } - - public ContainerAlchemicalReactionChamber(@Nullable TileAlchemicalReactionChamber tile, int windowId, PlayerInventory playerInventory) - { - super(BloodMagicBlocks.ARC_CONTAINER.get(), windowId); - this.tileARC = tile; - this.setup(playerInventory, tile); - } - - public void setup(PlayerInventory inventory, IInventory tileARC) - { - this.addSlot(new SlotARCTool(tileARC, TileAlchemicalReactionChamber.ARC_TOOL_SLOT, 35, 51)); - for (int i = 0; i < TileAlchemicalReactionChamber.NUM_OUTPUTS; i++) - { - this.addSlot(new SlotOutput(tileARC, TileAlchemicalReactionChamber.OUTPUT_SLOT + i, 116, 15 + i * 18)); - } - this.addSlot(new Slot(tileARC, TileAlchemicalReactionChamber.INPUT_SLOT, 71, 15)); - this.addSlot(new SlotBucket(tileARC, TileAlchemicalReactionChamber.INPUT_BUCKET_SLOT, 8, 15, true)); - this.addSlot(new SlotBucket(tileARC, TileAlchemicalReactionChamber.OUTPUT_BUCKET_SLOT, 152, 87, false)); - -// this.addSlot(new SlotSoul(tileARC, TileSoulForge.soulSlot, 152, 51)); - - for (int i = 0; i < 3; i++) - { - for (int j = 0; j < 9; j++) - { - addSlot(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 123 + i * 18)); - } - } - - for (int i = 0; i < 9; i++) - { - addSlot(new Slot(inventory, i, 8 + i * 18, 181)); - } - } - - @Override - public ItemStack transferStackInSlot(PlayerEntity playerIn, int index) - { - ItemStack itemstack = ItemStack.EMPTY; - Slot slot = this.inventorySlots.get(index); - - if (slot != null && slot.getHasStack()) - { - ItemStack itemstack1 = slot.getStack(); - itemstack = itemstack1.copy(); - - if ((index >= 1 && index < 1 + 5) || (index == 7 || index == 8))// Attempting to transfer from output slots - // or bucket slots - { - if (!this.mergeItemStack(itemstack1, 9, 9 + 36, true)) - { - return ItemStack.EMPTY; - } - - slot.onSlotChange(itemstack1, itemstack); - } else if (index > 9) // Attempting to transfer from main inventory - { - if (itemstack1.getItem().isIn(BloodMagicTags.ARC_TOOL)) // Try the tool slot first - { - if (!this.mergeItemStack(itemstack1, 0, 1, false)) - { - return ItemStack.EMPTY; - } - } else if (isBucket(itemstack1, true)) // If it's a full bucket, transfer to tank filler slot. - { - if (!this.mergeItemStack(itemstack1, 7, 8, false)) - { - return ItemStack.EMPTY; - } - } else if (isBucket(itemstack1, false)) // If it's an empty bucket, transfer to tank emptier slot. - { - if (!this.mergeItemStack(itemstack1, 8, 9, false)) - { - return ItemStack.EMPTY; - } - } else if (!this.mergeItemStack(itemstack1, 6, 7, false)) - { - return ItemStack.EMPTY; - } - } else if (!this.mergeItemStack(itemstack1, 9, 45, false)) // Attempting to transfer from input slots - { - return ItemStack.EMPTY; - } - - if (itemstack1.getCount() == 0) - { - slot.putStack(ItemStack.EMPTY); - } else - { - slot.onSlotChanged(); - } - - if (itemstack1.getCount() == itemstack.getCount()) - { - return ItemStack.EMPTY; - } - - slot.onTake(playerIn, itemstack1); - } - - return itemstack; - } - - @Override - public boolean canInteractWith(PlayerEntity playerIn) - { - return this.tileARC.isUsableByPlayer(playerIn); - } - - private class SlotARCTool extends Slot - { - public SlotARCTool(IInventory inventory, int slotIndex, int x, int y) - { - super(inventory, slotIndex, x, y); - } - - @Override - public boolean isItemValid(ItemStack itemStack) - { - return itemStack.getItem().isIn(BloodMagicTags.ARC_TOOL); - } - } - - private class SlotBucket extends Slot - { - private final boolean needsFullBucket; - - public SlotBucket(IInventory inventory, int slotIndex, int x, int y, boolean needsFullBucket) - { - super(inventory, slotIndex, x, y); - this.needsFullBucket = needsFullBucket; - } - - @Override - public boolean isItemValid(ItemStack itemStack) - { - Optional fluidStackOptional = FluidUtil.getFluidContained(itemStack); - - return fluidStackOptional.isPresent() && ((needsFullBucket && !fluidStackOptional.get().isEmpty()) - || (!needsFullBucket && fluidStackOptional.get().isEmpty())); - } - } - - private static boolean isBucket(ItemStack stack, boolean requiredFull) - { - Optional fluidStackOptional = FluidUtil.getFluidContained(stack); - - return fluidStackOptional.isPresent() && ((requiredFull && !fluidStackOptional.get().isEmpty()) - || (!requiredFull && fluidStackOptional.get().isEmpty())); - } - - private class SlotOutput extends Slot - { - public SlotOutput(IInventory inventory, int slotIndex, int x, int y) - { - super(inventory, slotIndex, x, y); - } - - @Override - public boolean isItemValid(ItemStack stack) - { - return false; - } - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/tile/container/ContainerAlchemyTable.java b/src/main/java/wayoftime/bloodmagic/tile/container/ContainerAlchemyTable.java deleted file mode 100644 index ab509370..00000000 --- a/src/main/java/wayoftime/bloodmagic/tile/container/ContainerAlchemyTable.java +++ /dev/null @@ -1,176 +0,0 @@ -package wayoftime.bloodmagic.tile.container; - -import javax.annotation.Nullable; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.container.ClickType; -import net.minecraft.inventory.container.Container; -import net.minecraft.inventory.container.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.common.item.IBloodOrb; -import wayoftime.bloodmagic.tile.TileAlchemyTable; - -public class ContainerAlchemyTable extends Container -{ - public final TileAlchemyTable tileTable; - -// public ContainerSoulForge(InventoryPlayer inventoryPlayer, IInventory tileForge) -// { -// this.tileForge = tileForge; -// -// } - - public ContainerAlchemyTable(int windowId, PlayerInventory playerInventory, PacketBuffer extraData) - { - this((TileAlchemyTable) playerInventory.player.world.getTileEntity(extraData.readBlockPos()), windowId, playerInventory); - } - - public ContainerAlchemyTable(@Nullable TileAlchemyTable tile, int windowId, PlayerInventory playerInventory) - { - super(BloodMagicBlocks.ALCHEMY_TABLE_CONTAINER.get(), windowId); - this.tileTable = tile; - this.setup(playerInventory, tile); - } - - public void setup(PlayerInventory inventory, IInventory tileForge) - { - this.addSlot(new Slot(tileTable, 0, 62, 15)); - this.addSlot(new Slot(tileTable, 1, 80, 51)); - this.addSlot(new Slot(tileTable, 2, 62, 87)); - this.addSlot(new Slot(tileTable, 3, 26, 87)); - this.addSlot(new Slot(tileTable, 4, 8, 51)); - this.addSlot(new Slot(tileTable, 5, 26, 15)); - this.addSlot(new SlotOrb(tileTable, TileAlchemyTable.orbSlot, 143, 24)); - this.addSlot(new SlotOutput(tileTable, TileAlchemyTable.outputSlot, 44, 51)); - - for (int i = 0; i < 3; i++) - { - for (int j = 0; j < 9; j++) - { - addSlot(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 123 + i * 18)); - } - } - - for (int i = 0; i < 9; i++) - { - addSlot(new Slot(inventory, i, 8 + i * 18, 181)); - } - } - - @Override - public ItemStack slotClick(int slotId, int dragType, ClickType clickTypeIn, PlayerEntity player) - { - PlayerInventory inventoryPlayer = player.inventory; - - if (slotId <= TileAlchemyTable.outputSlot && slotId >= 0) - { - Slot slot = this.getSlot(slotId); - if (!slot.getHasStack() && inventoryPlayer.getItemStack().isEmpty()) - { -// ((TileAlchemyTable) tileTable).toggleInputSlotAccessible(slotId); - if (tileTable.activeSlot == slotId) - { - tileTable.activeSlot = -1; - } else - { - tileTable.activeSlot = slotId; - } - } - } - - return super.slotClick(slotId, dragType, clickTypeIn, player); - } - - @Override - public ItemStack transferStackInSlot(PlayerEntity playerIn, int index) - { - ItemStack itemstack = ItemStack.EMPTY; - Slot slot = this.inventorySlots.get(index); - - if (slot != null && slot.getHasStack()) - { - ItemStack itemstack1 = slot.getStack(); - itemstack = itemstack1.copy(); - - if (index == 7) - { - if (!this.mergeItemStack(itemstack1, 8, 8 + 36, true)) - { - return ItemStack.EMPTY; - } - - slot.onSlotChange(itemstack1, itemstack); - } else if (index > 7) - { - if (itemstack1.getItem() instanceof IBloodOrb) - { - if (!this.mergeItemStack(itemstack1, 6, 7, false)) - { - return ItemStack.EMPTY; - } - } else if (!this.mergeItemStack(itemstack1, 0, 6, false)) - { - return ItemStack.EMPTY; - } - } else if (!this.mergeItemStack(itemstack1, 8, 8 + 36, false)) - { - return ItemStack.EMPTY; - } - - if (itemstack1.getCount() == 0) - { - slot.putStack(ItemStack.EMPTY); - } else - { - slot.onSlotChanged(); - } - - if (itemstack1.getCount() == itemstack.getCount()) - { - return ItemStack.EMPTY; - } - - slot.onTake(playerIn, itemstack1); - } - - return itemstack; - } - - @Override - public boolean canInteractWith(PlayerEntity playerIn) - { - return this.tileTable.isUsableByPlayer(playerIn); - } - - private class SlotOrb extends Slot - { - public SlotOrb(IInventory inventory, int slotIndex, int x, int y) - { - super(inventory, slotIndex, x, y); - } - - @Override - public boolean isItemValid(ItemStack itemStack) - { - return itemStack.getItem() instanceof IBloodOrb; - } - } - - private class SlotOutput extends Slot - { - public SlotOutput(IInventory inventory, int slotIndex, int x, int y) - { - super(inventory, slotIndex, x, y); - } - - @Override - public boolean isItemValid(ItemStack stack) - { - return false; - } - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/tile/container/ContainerSoulForge.java b/src/main/java/wayoftime/bloodmagic/tile/container/ContainerSoulForge.java deleted file mode 100644 index 9dd10330..00000000 --- a/src/main/java/wayoftime/bloodmagic/tile/container/ContainerSoulForge.java +++ /dev/null @@ -1,154 +0,0 @@ -package wayoftime.bloodmagic.tile.container; - -import javax.annotation.Nullable; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.container.Container; -import net.minecraft.inventory.container.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.IIntArray; -import net.minecraft.util.IntArray; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.tile.TileSoulForge; -import wayoftime.bloodmagic.api.compat.IDemonWill; -import wayoftime.bloodmagic.api.compat.IDemonWillGem; - -public class ContainerSoulForge extends Container -{ - public final IInventory tileForge; - public final IIntArray data; - -// public ContainerSoulForge(InventoryPlayer inventoryPlayer, IInventory tileForge) -// { -// this.tileForge = tileForge; -// -// } - - public ContainerSoulForge(int windowId, PlayerInventory playerInventory, PacketBuffer extraData) - { - this((TileSoulForge) playerInventory.player.world.getTileEntity(extraData.readBlockPos()), new IntArray(5), windowId, playerInventory); - } - - public ContainerSoulForge(@Nullable TileSoulForge tile, IIntArray data, int windowId, PlayerInventory playerInventory) - { - super(BloodMagicBlocks.SOUL_FORGE_CONTAINER.get(), windowId); - this.tileForge = tile; - this.setup(playerInventory, tile); - this.data = data; - } - - public void setup(PlayerInventory inventory, IInventory tileForge) - { - this.addSlot(new Slot(tileForge, 0, 8, 15)); - this.addSlot(new Slot(tileForge, 1, 80, 15)); - this.addSlot(new Slot(tileForge, 2, 8, 87)); - this.addSlot(new Slot(tileForge, 3, 80, 87)); - this.addSlot(new SlotSoul(tileForge, TileSoulForge.soulSlot, 152, 51)); - this.addSlot(new SlotOutput(tileForge, TileSoulForge.outputSlot, 44, 51)); - - for (int i = 0; i < 3; i++) - { - for (int j = 0; j < 9; j++) - { - addSlot(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 123 + i * 18)); - } - } - - for (int i = 0; i < 9; i++) - { - addSlot(new Slot(inventory, i, 8 + i * 18, 181)); - } - } - - @Override - public ItemStack transferStackInSlot(PlayerEntity playerIn, int index) - { - ItemStack itemstack = ItemStack.EMPTY; - Slot slot = this.inventorySlots.get(index); - - if (slot != null && slot.getHasStack()) - { - ItemStack itemstack1 = slot.getStack(); - itemstack = itemstack1.copy(); - - if (index == 5) - { - if (!this.mergeItemStack(itemstack1, 6, 6 + 36, true)) - { - return ItemStack.EMPTY; - } - - slot.onSlotChange(itemstack1, itemstack); - } else if (index > 5) - { - if (itemstack1.getItem() instanceof IDemonWill || itemstack1.getItem() instanceof IDemonWillGem) - { - if (!this.mergeItemStack(itemstack1, 4, 5, false)) - { - return ItemStack.EMPTY; - } - } else if (!this.mergeItemStack(itemstack1, 0, 4, false)) - { - return ItemStack.EMPTY; - } - } else if (!this.mergeItemStack(itemstack1, 6, 42, false)) - { - return ItemStack.EMPTY; - } - - if (itemstack1.getCount() == 0) - { - slot.putStack(ItemStack.EMPTY); - } else - { - slot.onSlotChanged(); - } - - if (itemstack1.getCount() == itemstack.getCount()) - { - return ItemStack.EMPTY; - } - - slot.onTake(playerIn, itemstack1); - } - - return itemstack; - } - - @Override - public boolean canInteractWith(PlayerEntity playerIn) - { - return this.tileForge.isUsableByPlayer(playerIn); - } - - private class SlotSoul extends Slot - { - public SlotSoul(IInventory inventory, int slotIndex, int x, int y) - { - super(inventory, slotIndex, x, y); - } - - @Override - public boolean isItemValid(ItemStack itemStack) - { - return itemStack.getItem() instanceof IDemonWillGem || itemStack.getItem() instanceof IDemonWill; - } - } - - private class SlotOutput extends Slot - { - public SlotOutput(IInventory inventory, int slotIndex, int x, int y) - { - super(inventory, slotIndex, x, y); - } - - @Override - public boolean isItemValid(ItemStack stack) - { - return false; - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/util/BMLog.java b/src/main/java/wayoftime/bloodmagic/util/BMLog.java deleted file mode 100644 index c3b164a5..00000000 --- a/src/main/java/wayoftime/bloodmagic/util/BMLog.java +++ /dev/null @@ -1,79 +0,0 @@ -package wayoftime.bloodmagic.util; - -import org.apache.commons.lang3.text.WordUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import wayoftime.bloodmagic.BloodMagic; - -public enum BMLog -{ - - DEFAULT(BloodMagic.MODID) - { - @Override - boolean enabled() - { - return true; - } - }, - DEBUG() - { - @Override - boolean enabled() - { - return false; -// return ConfigHandler.general.enableDebugLogging; - } - }, - API() - { - @Override - boolean enabled() - { - return false; -// return ConfigHandler.general.enableAPILogging; - } - }, - API_VERBOSE() - { - @Override - boolean enabled() - { - return false; -// return ConfigHandler.general.enableVerboseAPILogging; - } - },; - - private final Logger logger; - - BMLog(String logName) - { - logger = LogManager.getLogger(logName); - } - - BMLog() - { - logger = LogManager.getLogger(BloodMagic.MODID + "|" + WordUtils.capitalizeFully(name().replace("_", " "))); - } - - abstract boolean enabled(); - - public void info(String input, Object... args) - { - if (enabled()) - logger.info(input, args); - } - - public void error(String input, Object... args) - { - if (enabled()) - logger.error(input, args); - } - - public void warn(String input, Object... args) - { - if (enabled()) - logger.warn(input, args); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/util/BooleanResult.java b/src/main/java/wayoftime/bloodmagic/util/BooleanResult.java deleted file mode 100644 index 1bba4aa6..00000000 --- a/src/main/java/wayoftime/bloodmagic/util/BooleanResult.java +++ /dev/null @@ -1,28 +0,0 @@ -package wayoftime.bloodmagic.util; - -public class BooleanResult -{ - private final boolean result; - private final T value; - - private BooleanResult(boolean result, T value) - { - this.result = result; - this.value = value; - } - - public boolean isSuccess() - { - return result; - } - - public T getValue() - { - return value; - } - - public static BooleanResult newResult(boolean success, T value) - { - return new BooleanResult<>(success, value); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/util/ChatUtil.java b/src/main/java/wayoftime/bloodmagic/util/ChatUtil.java deleted file mode 100644 index 1bc22f5b..00000000 --- a/src/main/java/wayoftime/bloodmagic/util/ChatUtil.java +++ /dev/null @@ -1,270 +0,0 @@ -package wayoftime.bloodmagic.util; - -import java.text.DecimalFormat; -import java.util.function.Supplier; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.NewChatGui; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.Util; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraftforge.fml.network.NetworkEvent.Context; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.util.helper.TextHelper; - -public class ChatUtil -{ - private static final int DELETION_ID = 2525277; - private static int lastAdded; - public static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("###,###.##"); - - private static void sendNoSpamMessages(ITextComponent[] messages) - { - NewChatGui chat = Minecraft.getInstance().ingameGUI.getChatGUI(); -// Minecraft.getMinecraft().ingameGUI.getChatGUI(); -// for (int i = DELETION_ID + messages.length - 1; i <= lastAdded; i++) -// { -// chat. -//// chat.deleteChatLine(i); -// } - for (int i = 0; i < messages.length; i++) - { - chat.printChatMessage(messages[i]); -// chat.printChatMessageWithOptionalDeletion(messages[i], DELETION_ID + i); - } - lastAdded = DELETION_ID + messages.length - 1; - } - - /** - * Returns a standard {@link TextComponentString} for the given {@link String} . - * - * @param s The string to wrap. - * @return An {@link ITextComponent} containing the string. - */ - public static ITextComponent wrap(String s) - { - return new StringTextComponent(s); - } - - /** - * @see #wrap(String) - */ - public static ITextComponent[] wrap(String... s) - { - ITextComponent[] ret = new ITextComponent[s.length]; - for (int i = 0; i < ret.length; i++) - { - ret[i] = wrap(s[i]); - } - return ret; - } - - /** - * Returns a translatable chat component for the given string and format args. - * - * @param s The string to format - * @param args The args to apply to the format - */ - public static ITextComponent wrapFormatted(String s, Object... args) - { - return new TranslationTextComponent(s, args); - } - - /** - * Simply sends the passed lines to the player in a chat message. - * - * @param player The player to send the chat to - * @param lines The lines to send - */ - public static void sendChat(PlayerEntity player, String... lines) - { - sendChat(player, wrap(lines)); - } - - /** - * Localizes the lines before sending them. - * - * @see #sendChat(EntityPlayer, String...) - */ - public static void sendChatUnloc(PlayerEntity player, String... unlocLines) - { - sendChat(player, TextHelper.localizeAll(unlocLines)); - } - - /** - * Sends all passed chat components to the player. - * - * @param player The player to send the chat lines to. - * @param lines The {@link ITextComponent chat components} to send.yes - */ - public static void sendChat(PlayerEntity player, ITextComponent... lines) - { - for (ITextComponent c : lines) - { -// BloodMagic.packetHandler.send - player.sendMessage(c, Util.DUMMY_UUID); -// player.sendMessage(c); - } - } - - /** - * Localizes the strings before sending them. - * - * @see #sendNoSpamClient(String...) - */ - public static void sendNoSpamClientUnloc(String... unlocLines) - { - sendNoSpamClient(TextHelper.localizeAll(unlocLines)); - } - - /** - * Same as {@link #sendNoSpamClient(ITextComponent...)}, but wraps the Strings - * automatically. - * - * @param lines The chat lines to send - * @see #wrap(String) - */ - public static void sendNoSpamClient(String... lines) - { - sendNoSpamClient(wrap(lines)); - } - - /** - * Skips the packet sending, unsafe to call on servers. - * - * @see #sendNoSpam(ServerPlayerEntity, ITextComponent...) - */ - public static void sendNoSpamClient(ITextComponent... lines) - { - sendNoSpamMessages(lines); - } - - /** - * Localizes the strings before sending them. - * - * @see #sendNoSpam(EntityPlayer, String...) - */ - public static void sendNoSpamUnloc(PlayerEntity player, String... unlocLines) - { - sendNoSpam(player, TextHelper.localizeAll(unlocLines)); - } - - /** - * @see #wrap(String) - * @see #sendNoSpam(EntityPlayer, ITextComponent...) - */ - public static void sendNoSpam(PlayerEntity player, String... lines) - { - sendNoSpam(player, wrap(lines)); - } - - /** - * First checks if the player is instanceof {@link ServerPlayerEntity} before - * casting. - * - * @see #sendNoSpam(ServerPlayerEntity, ITextComponent...) - */ - public static void sendNoSpam(PlayerEntity player, ITextComponent... lines) - { - if (player instanceof ServerPlayerEntity) - { - sendNoSpam((ServerPlayerEntity) player, lines); - } - } - - /** - * Localizes the strings before sending them. - * - * @see #sendNoSpam(ServerPlayerEntity, String...) - */ - public static void sendNoSpamUnloc(ServerPlayerEntity player, String... unlocLines) - { - sendNoSpam(player, TextHelper.localizeAll(unlocLines)); - } - - /** - * @see #wrap(String) - * @see #sendNoSpam(ServerPlayerEntity, ITextComponent...) - */ - public static void sendNoSpam(ServerPlayerEntity player, String... lines) - { - sendNoSpam(player, wrap(lines)); - } - - /** - * Sends a chat message to the client, deleting past messages also sent via this - * method. - *

- * Credit to RWTema for the idea - * - * @param player The player to send the chat message to - * @param lines The chat lines to send. - */ - public static void sendNoSpam(ServerPlayerEntity player, ITextComponent... lines) - { - if (lines.length > 0) - BloodMagic.packetHandler.sendTo(new PacketNoSpamChat(lines), player); - } - - /** - * @author tterrag1098 - *

- * Ripped from EnderCore (and slightly altered) - */ - public static class PacketNoSpamChat - { - private ITextComponent[] chatLines; - - public PacketNoSpamChat() - { - chatLines = new ITextComponent[0]; - } - - private PacketNoSpamChat(ITextComponent... lines) - { - // this is guaranteed to be >1 length by accessing methods - this.chatLines = lines; - } - - public static void encode(PacketNoSpamChat pkt, PacketBuffer buf) - { - buf.writeInt(pkt.chatLines.length); - for (ITextComponent c : pkt.chatLines) - { -// ByteBufUtils.writeUTF8String(buf, ITextComponent.Serializer.componentToJson(c)); - buf.writeString(ITextComponent.Serializer.toJson(c)); - } - } - - public static PacketNoSpamChat decode(PacketBuffer buf) - { - PacketNoSpamChat pkt = new PacketNoSpamChat(new ITextComponent[buf.readInt()]); - for (int i = 0; i < pkt.chatLines.length; i++) - { -// pkt.chatLines[i] = ITextComponent.Serializer.jsonToComponent(ByteBufUtils.readUTF8String(buf)); - pkt.chatLines[i] = ITextComponent.Serializer.getComponentFromJsonLenient(buf.readString()); - } - return pkt; - } - - public static void handle(PacketNoSpamChat message, Supplier context) - { - context.get().enqueueWork(() -> sendNoSpamMessages(message.chatLines)); - context.get().setPacketHandled(true); - } - -// public static class Handler implements IMessageHandler -// { -// @Override -// public IMessage onMessage(final PacketNoSpamChat message, MessageContext ctx) -// { -// Minecraft.getMinecraft().addScheduledTask(() -> sendNoSpamMessages(message.chatLines)); -// return null; -// } -// } - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/util/Constants.java b/src/main/java/wayoftime/bloodmagic/util/Constants.java deleted file mode 100644 index a264b5dc..00000000 --- a/src/main/java/wayoftime/bloodmagic/util/Constants.java +++ /dev/null @@ -1,186 +0,0 @@ -package wayoftime.bloodmagic.util; - -import wayoftime.bloodmagic.BloodMagic; - -public class Constants -{ - public static final String SPEED_RUNE = "speed_rune"; - - public static class NBT - { - public static final String OWNER_UUID = "ownerUUID"; - public static final String OWNER_NAME = "ownerNAME"; - public static final String USES = "uses"; - public static final String ACTIVATED = "activated"; - public static final String UNUSABLE = "unusable"; - public static final String SACRIFICE = "sacrifice"; - public static final String DIMENSION_ID = "dimensionId"; - public static final String X_COORD = "xCoord"; - public static final String Y_COORD = "yCoord"; - public static final String Z_COORD = "zCoord"; - public static final String PORTAL_LOCATION = "portalLocation"; - public static final String ORB_TIER = "orbTier"; - public static final String CURRENT_ESSENCE = "currentEssence"; - public static final String CURRENT_RITUAL = "currentRitual"; - public static final String CURRENT_RITUAL_TAG = "currentRitualTag"; - public static final String IS_RUNNING = "isRunning"; - public static final String IS_REDSTONED = "isStoned"; - public static final String RUNTIME = "runtime"; - public static final String DIRECTION = "direction"; - public static final String REAGENT_TANKS = "reagentTanks"; - public static final String CURRENT_INCENSE = "BM:CurrentIncense"; - public static final String MAX_INCENSE = "BM:MaxIncenseFromLastAltar"; - public static final String HAS_MAX_INCENSE = "BM:CurrentIsMaxIncense"; - public static final String CURRENT_PURITY = "BM:CurrentPurity"; - public static final String EMPTY = "Empty"; - public static final String OUTPUT_AMOUNT = "outputAmount"; - public static final String INPUT_AMOUNT = "inputAmount"; - public static final String STORED_LP = "storedLP"; - public static final String RITUAL_READER = "ritualReaderState"; - public static final String ITEMS = "Items"; - public static final String SLOT = "Slot"; - - public static final String ALTAR = "bloodAltar"; - public static final String ALTAR_TIER = "upgradeLevel"; - public static final String ALTAR_ACTIVE = "isActive"; - public static final String ALTAR_LIQUID_REQ = "liquidRequired"; - public static final String ALTAR_FILLABLE = "fillable"; - public static final String ALTAR_UPGRADED = "isUpgraded"; - public static final String ALTAR_CONSUMPTION_RATE = "consumptionRate"; - public static final String ALTAR_DRAIN_RATE = "drainRate"; - public static final String ALTAR_CONSUMPTION_MULTIPLIER = "consumptionMultiplier"; - public static final String ALTAR_EFFICIENCY_MULTIPLIER = "efficiencyMultiplier"; - public static final String ALTAR_SELF_SACRIFICE_MULTIPLIER = "selfSacrificeMultiplier"; - public static final String ALTAR_SACRIFICE_MULTIPLIER = "sacrificeMultiplier"; - public static final String ALTAR_CAPACITY_MULTIPLIER = "capacityMultiplier"; - public static final String ALTAR_ORB_CAPACITY_MULTIPLIER = "orbCapacityMultiplier"; - public static final String ALTAR_DISLOCATION_MULTIPLIER = "dislocationMultiplier"; - public static final String ALTAR_CAPACITY = "capacity"; - public static final String ALTAR_BUFFER_CAPACITY = "bufferCapacity"; - public static final String ALTAR_PROGRESS = "progress"; - public static final String ALTAR_IS_RESULT_BLOCK = "isResultBlock"; - public static final String ALTAR_LOCKDOWN_DURATION = "lockdownDuration"; - public static final String ALTAR_ACCELERATION_UPGRADES = "accelerationUpgrades"; - public static final String ALTAR_DEMON_BLOOD_DURATION = "demonBloodDuration"; - public static final String ALTAR_COOLDOWN_AFTER_CRAFTING = "cooldownAfterCrafting"; - public static final String ALTAR_TOTAL_CHARGE = "totalCharge"; - public static final String ALTAR_MAX_CHARGE = "maxCharge"; - public static final String ALTAR_CHARGE_RATE = "chargeRate"; - public static final String ALTAR_CHARGE_FREQUENCY = "chargeFrequency"; - public static final String ALTAR_CURRENT_TIER_DISPLAYED = "currentTierDisplayed"; - - public static final String ALTARMAKER_CURRENT_TIER = "currentTier"; - - public static final String PROJECTILE_TICKS_IN_AIR = "projectileTicksInAir"; - public static final String PROJECTILE_MAX_TICKS_IN_AIR = "projectileMaxTicksInAir"; - - public static final String TICKS_REMAINING = "ticksRemaining"; - public static final String CONTAINED_BLOCK_NAME = "containedBlockName"; - public static final String CONTAINED_BLOCK_META = "containedBlockMeta"; - public static final String CONTAINED_TILE_ENTITY = "containedTileEntity"; - - public static final String PREVIOUS_INPUT = "previousInput"; - - public static final String LIVING_ARMOUR = "livingArmour"; - - public static final String CHARGE_TIME = "chargeTime"; - public static final String HELD_DOWN = "heldDown"; - - public static final String UPGRADE_POISON_TIMER = "poisonTimer"; - public static final String UPGRADE_FIRE_TIMER = "fireTimer"; - - public static final String SOULS = "souls"; - public static final String SOUL_SWORD_DAMAGE = "soulSwordDamage"; - public static final String SOUL_SWORD_ACTIVE_DRAIN = "soulSwordActiveDrain"; - public static final String SOUL_SWORD_DROP = "soulSwordDrop"; - public static final String SOUL_SWORD_STATIC_DROP = "soulSwordStaticDrop"; - public static final String SOUL_SWORD_HEALTH = "soulSwordHealth"; - public static final String SOUL_SWORD_ATTACK_SPEED = "soulSwordAttackSpeed"; - public static final String SOUL_SWORD_SPEED = "soulSwordSpeed"; - public static final String SOUL_SWORD_DIG_SPEED = "soulSwordDigSpeed"; - public static final String WILL_TYPE = "demonWillType"; - - public static final String SOUL_FORGE_BURN = "burnTime"; - public static final String SOUL_FORGE_CONSUMED = "consumedSouls"; - - public static final String ARC_PROGRESS = "progress"; - - public static final String ROUTING_MASTER = "master"; - public static final String ROUTING_CONNECTION = "connections"; - public static final String ROUTING_PRIORITY = "prioritiesPeople"; - public static final String ROUTING_MASTER_GENERAL = "generalList"; - public static final String ROUTING_MASTER_INPUT = "inputList"; - public static final String ROUTING_MASTER_OUTPUT = "outputList"; - - public static final String GHOST_STACK_SIZE = "stackSize"; - - public static final String ITEM_INVENTORY = "itemInventory"; - - public static final String BLOCKPOS_CONNECTION = "connections"; - - public static final String CURRENT_SIGIL = "currentSigil"; - public static final String MOST_SIG = "mostSig"; - public static final String LEAST_SIG = "leastSig"; - public static final String COLOR = "color"; - - public static final String POTION_AUGMENT_LENGHT = "length:"; - public static final String POTION_AUGMENT_STRENGTH = "strength:"; - public static final String POTION_IMPURITY = "impurity"; - - public static final String TANK = "tank"; - - public static final String BREATH = "breath"; - - public static final String ANOINTMENTS = "anointment_holder"; - } - - public static class JSON - { - public static final String INPUT = "input"; - public static final String TOOL = "tool"; - public static final String BASEINPUT = "baseinput"; - public static final String ADDEDINPUT = "addedinput"; - public static final String ADDEDOUTPUT = "addedoutput"; - public static final String OUTPUT = "output"; - public static final String ITEM = "item"; - public static final String COUNT = "count"; - public static final String NBT = "nbt"; - public static final String TAG = "tag"; - public static final String TYPE = "type"; - public static final String TEXTURE = "texture"; - public static final String CONDITIONS = "conditions"; - public static final String CHANCE = "chance"; - public static final String FLUID = "fluid"; - public static final String AMOUNT = "amount"; - public static final String INPUT_FLUID = "inputfluid"; - public static final String OUTPUT_FLUID = "outputfluid"; - - public static final String SYPHON = "syphon"; - public static final String TICKS = "ticks"; - - public static final String ALTAR_TIER = Constants.NBT.ALTAR_TIER; - public static final String ALTAR_SYPHON = "altarSyphon"; - public static final String ALTAR_CONSUMPTION_RATE = Constants.NBT.ALTAR_CONSUMPTION_RATE; - public static final String ALTAR_DRAIN_RATE = Constants.NBT.ALTAR_DRAIN_RATE; - - public static final String TARTARIC_DRAIN = "drain"; - public static final String TARTARIC_MINIMUM = "minimumDrain"; - } - - public static class Compat - { - public static final String JEI_CATEGORY_ALTAR = "altar"; - public static final String JEI_CATEGORY_BINDING = "binding"; - public static final String JEI_CATEGORY_ALCHEMYARRAY = "alchemyarray"; - public static final String JEI_CATEGORY_SOULFORGE = "soulforge"; - public static final String JEI_CATEGORY_ALCHEMYTABLE = "alchemytable"; - public static final String JEI_CATEGORY_ARMOURDOWNGRADE = "armourdowngrade"; - public static final String JEI_CATEGORY_ARC = "arc"; - - public static final String WAILA_CONFIG_ALTAR = BloodMagic.MODID + ".bloodaltar"; - public static final String WAILA_CONFIG_TELEPOSER = BloodMagic.MODID + ".teleposer"; - public static final String WAILA_CONFIG_RITUAL = BloodMagic.MODID + ".ritualController"; - public static final String WAILA_CONFIG_ARRAY = BloodMagic.MODID + ".array"; - public static final String WAILA_CONFIG_BLOOD_TANK = BloodMagic.MODID + ".bloodTank"; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/util/DamageSourceBloodMagic.java b/src/main/java/wayoftime/bloodmagic/util/DamageSourceBloodMagic.java deleted file mode 100644 index 19ff1231..00000000 --- a/src/main/java/wayoftime/bloodmagic/util/DamageSourceBloodMagic.java +++ /dev/null @@ -1,25 +0,0 @@ -package wayoftime.bloodmagic.util; - -import net.minecraft.entity.LivingEntity; -import net.minecraft.util.DamageSource; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; - -public class DamageSourceBloodMagic extends DamageSource -{ - public static final DamageSourceBloodMagic INSTANCE = new DamageSourceBloodMagic(); - - public DamageSourceBloodMagic() - { - super("bloodMagic"); - - setDamageBypassesArmor(); - setDamageIsAbsolute(); - } - - @Override - public ITextComponent getDeathMessage(LivingEntity livingBase) - { - return new TranslationTextComponent("chat.bloodmagic.damageSource", livingBase.getName()); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/util/MultiSlotItemHandler.java b/src/main/java/wayoftime/bloodmagic/util/MultiSlotItemHandler.java deleted file mode 100644 index 5125c26f..00000000 --- a/src/main/java/wayoftime/bloodmagic/util/MultiSlotItemHandler.java +++ /dev/null @@ -1,295 +0,0 @@ -package wayoftime.bloodmagic.util; - -import java.util.List; - -import javax.annotation.Nonnull; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.items.ItemHandlerHelper; - -public class MultiSlotItemHandler implements IItemHandler -{ - private ItemStack[] items; - - private final int invLimit; - - public MultiSlotItemHandler(int size, int invLimit) - { - items = new ItemStack[size]; - for (int i = 0; i < size; i++) - { - items[i] = ItemStack.EMPTY; - } - - this.invLimit = invLimit; - } - - public MultiSlotItemHandler(ItemStack[] items, int invLimit) - { - this.items = items; - this.invLimit = invLimit; - } - - @Override - public int getSlots() - { - return items.length; - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return items[slot]; - } - - public boolean isItemValid(int slot, ItemStack stack) - { - return true; - } - - public void setInventorySlotContents(int slot, ItemStack stack) - { - items[slot] = stack; - } - - @Override - @Nonnull - public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) - { - if (stack.isEmpty()) - return ItemStack.EMPTY; - - ItemStack stackInSlot = getStackInSlot(slot); - - int m; - if (!stackInSlot.isEmpty()) - { - if (stackInSlot.getCount() >= Math.min(stackInSlot.getMaxStackSize(), getSlotLimit(slot))) - return stack; - - if (!ItemHandlerHelper.canItemStacksStack(stack, stackInSlot)) - return stack; - - if (!isItemValid(slot, stack)) - return stack; - - m = Math.min(stack.getMaxStackSize(), getSlotLimit(slot)) - stackInSlot.getCount(); - - if (stack.getCount() <= m) - { - if (!simulate) - { - ItemStack copy = stack.copy(); - copy.grow(stackInSlot.getCount()); - setInventorySlotContents(slot, copy); - } - - return ItemStack.EMPTY; - } else - { - // copy the stack to not modify the original one - stack = stack.copy(); - if (!simulate) - { - ItemStack copy = stack.split(m); - copy.grow(stackInSlot.getCount()); - setInventorySlotContents(slot, copy); - return stack; - } else - { - stack.shrink(m); - return stack; - } - } - } else - { - if (!isItemValid(slot, stack)) - return stack; - - m = Math.min(stack.getMaxStackSize(), getSlotLimit(slot)); - if (m < stack.getCount()) - { - // copy the stack to not modify the original one - stack = stack.copy(); - if (!simulate) - { - setInventorySlotContents(slot, stack.split(m)); - return stack; - } else - { - stack.shrink(m); - return stack; - } - } else - { - if (!simulate) - { - setInventorySlotContents(slot, stack); - } - return ItemStack.EMPTY; - } - } - } - - public boolean canTransferAllItemsToSlots(List stackList, boolean simulate) - { - ItemStack[] copyList = new ItemStack[items.length]; - for (int i = 0; i < copyList.length; i++) - { - copyList[i] = items[i].copy(); - } - - boolean hasStashedAll = true; - - for (ItemStack stack : stackList) - { - if (stack.isEmpty()) - { - continue; - } - - slots: for (int slot = 0; slot < copyList.length; slot++) - { - ItemStack stackInSlot = copyList[slot]; - - int m; - if (!stackInSlot.isEmpty()) - { - if (stackInSlot.getCount() >= Math.min(stackInSlot.getMaxStackSize(), getSlotLimit(slot))) - continue; - - if (!ItemHandlerHelper.canItemStacksStack(stack, stackInSlot)) - continue; - - if (!isItemValid(slot, stack)) - continue; - - m = Math.min(stack.getMaxStackSize(), getSlotLimit(slot)) - stackInSlot.getCount(); - - if (stack.getCount() <= m) - { - ItemStack copy = stack.copy(); - if (!simulate) - { - copy.grow(stackInSlot.getCount()); - copyList[slot] = copy; - } - stack = ItemStack.EMPTY; - - break slots; - } else - { - // copy the stack to not modify the original one - stack = stack.copy(); - if (!simulate) - { - ItemStack copy = stack.split(m); - copy.grow(stackInSlot.getCount()); - copyList[slot] = copy; - } else - { - stack.shrink(m); - } - } - } else - { - if (!isItemValid(slot, stack)) - continue; - - m = Math.min(stack.getMaxStackSize(), getSlotLimit(slot)); - if (m < stack.getCount()) - { - // copy the stack to not modify the original one - stack = stack.copy(); - if (!simulate) - { - copyList[slot] = stack.split(m); - } else - { - stack.shrink(m); - } - } else - { - if (!simulate) - { - copyList[slot] = stack; - } - - stack = ItemStack.EMPTY; - } - } - } - - if (!stack.isEmpty()) - { - hasStashedAll = false; - break; - } - } - - if (!simulate) - { - items = copyList; - } - - return hasStashedAll; - } - - @Override - @Nonnull - public ItemStack extractItem(int slot, int amount, boolean simulate) - { - if (amount == 0) - return ItemStack.EMPTY; - - ItemStack stackInSlot = getStackInSlot(slot); - - if (stackInSlot.isEmpty()) - return ItemStack.EMPTY; - - if (simulate) - { - if (stackInSlot.getCount() < amount) - { - return stackInSlot.copy(); - } else - { - ItemStack copy = stackInSlot.copy(); - copy.setCount(amount); - return copy; - } - } else - { - int m = Math.min(stackInSlot.getCount(), amount); - - ItemStack decrStackSize = decrStackSize(slot, m); - return decrStackSize; - } - } - - public ItemStack decrStackSize(int slot, int amount) - { - if (!getStackInSlot(slot).isEmpty()) - { - if (getStackInSlot(slot).getCount() <= amount) - { - ItemStack itemStack = getStackInSlot(slot); - setInventorySlotContents(slot, ItemStack.EMPTY); - return itemStack; - } - - ItemStack itemStack = getStackInSlot(slot).split(amount); - return itemStack; - } - - return ItemStack.EMPTY; - } - - @Override - public int getSlotLimit(int slot) - { - return invLimit; - } - -} diff --git a/src/main/java/wayoftime/bloodmagic/util/Utils.java b/src/main/java/wayoftime/bloodmagic/util/Utils.java deleted file mode 100644 index cfcf2328..00000000 --- a/src/main/java/wayoftime/bloodmagic/util/Utils.java +++ /dev/null @@ -1,763 +0,0 @@ -package wayoftime.bloodmagic.util; - -import java.util.List; -import java.util.Locale; -import java.util.UUID; - -import javax.annotation.Nullable; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.FlowingFluidBlock; -import net.minecraft.block.NetherPortalBlock; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.common.IPlantable; -import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.fluids.IFluidBlock; -import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.items.ItemHandlerHelper; -import net.minecraftforge.items.wrapper.InvWrapper; -import net.minecraftforge.items.wrapper.PlayerMainInvWrapper; -import net.minecraftforge.items.wrapper.SidedInvWrapper; -import wayoftime.bloodmagic.api.compat.IDemonWillViewer; -import wayoftime.bloodmagic.tile.TileInventory; -import wayoftime.bloodmagic.util.helper.NBTHelper; - -public class Utils -{ - /** - * @param tile - The {@link TileInventory} to input the item to - * @param player - The player to take the item from. - * @return {@code true} if the ItemStack is inserted, {@code false} otherwise - * @see #insertItemToTile(TileInventory, PlayerEntity, int) - */ - public static boolean insertItemToTile(TileInventory tile, PlayerEntity player) - { - return insertItemToTile(tile, player, 0); - } - - /** - * Used for inserting an ItemStack with a stacksize of 1 to a tile's inventory - * at slot 0 - *

- * EG: Block Altar - * - * @param tile - The {@link TileInventory} to input the item to - * @param player - The player to take the item from. - * @param slot - The slot to attempt to insert to - * @return {@code true} if the ItemStack is inserted, {@code false} otherwise - */ - public static boolean insertItemToTile(TileInventory tile, PlayerEntity player, int slot) - { - ItemStack slotStack = tile.getStackInSlot(slot); - if (slotStack.isEmpty() && !player.getHeldItemMainhand().isEmpty()) - { - ItemStack input = player.getHeldItemMainhand().copy(); - input.setCount(1); - player.getHeldItemMainhand().shrink(1); - tile.setInventorySlotContents(slot, input); - return true; - } else if (!slotStack.isEmpty() && player.getHeldItemMainhand().isEmpty()) - { - ItemHandlerHelper.giveItemToPlayer(player, slotStack); - tile.clear(); - return false; - } - - return false; - } - - public static String toFancyCasing(String input) - { - return String.valueOf(input.charAt(0)).toUpperCase(Locale.ENGLISH) + input.substring(1); - } - - public static boolean isImmuneToFireDamage(LivingEntity entity) - { - return entity.isImmuneToFire() || entity.isPotionActive(Effects.FIRE_RESISTANCE); - } - - public static boolean isBlockLiquid(BlockState state) - { - return (state instanceof IFluidBlock || state.getMaterial().isLiquid()); - } - - public static boolean isFlowingLiquid(World world, BlockPos pos, BlockState state) - { - Block block = state.getBlock(); - return ((block instanceof IFluidBlock && Math.abs(((IFluidBlock) block).getFilledPercentage(world, pos)) == 1) || (block instanceof FlowingFluidBlock && !((FlowingFluidBlock) block).getFluidState(state).isSource())); - } - - public static boolean spawnStackAtBlock(World world, BlockPos pos, @Nullable Direction pushDirection, ItemStack stack) - { - BlockPos spawnPos = new BlockPos(pos); - - double velX = 0; - double velY = 0; - double velZ = 0; - double velocity = 0.15D; - if (pushDirection != null) - { - spawnPos = spawnPos.offset(pushDirection); - - switch (pushDirection) - { - case DOWN: - { - velY = -velocity; - break; - } - case UP: - { - velY = velocity; - break; - } - case NORTH: - { - velZ = -velocity; - break; - } - case SOUTH: - { - velZ = velocity; - break; - } - case WEST: - { - velX = -velocity; - break; - } - case EAST: - { - velX = velocity; - break; - } - } - } - - double posX = spawnPos.getX() + 0.5; - double posY = spawnPos.getY() + 0.5; - double posZ = spawnPos.getZ() + 0.5; - - ItemEntity entityItem = new ItemEntity(world, posX, posY, posZ, stack); - entityItem.setMotion(velX, velY, velZ); - - entityItem.setItem(stack); - return world.addEntity(entityItem); - } - - public static boolean swapLocations(World initialWorld, BlockPos initialPos, World finalWorld, BlockPos finalPos) - { - return swapLocations(initialWorld, initialPos, finalWorld, finalPos, true); - } - - public static boolean swapLocations(World initialWorld, BlockPos initialPos, World finalWorld, BlockPos finalPos, boolean playSound) - { - TileEntity initialTile = initialWorld.getTileEntity(initialPos); - TileEntity finalTile = finalWorld.getTileEntity(finalPos); - CompoundNBT initialTag = new CompoundNBT(); - CompoundNBT finalTag = new CompoundNBT(); - if (initialTile != null) - initialTile.write(initialTag); - if (finalTile != null) - finalTile.write(finalTag); - - BlockState initialState = initialWorld.getBlockState(initialPos); - BlockState finalState = finalWorld.getBlockState(finalPos); - - if ((initialState.getBlock().equals(Blocks.AIR) && finalState.getBlock().equals(Blocks.AIR)) || initialState.getBlock() instanceof NetherPortalBlock || finalState.getBlock() instanceof NetherPortalBlock) - return false; - - if (playSound) - { - initialWorld.playSound(null, initialPos.getX(), initialPos.getY(), initialPos.getZ(), SoundEvents.ENTITY_ENDERMAN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F); - finalWorld.playSound(null, finalPos.getX(), finalPos.getY(), finalPos.getZ(), SoundEvents.ENTITY_ENDERMAN_TELEPORT, SoundCategory.AMBIENT, 1.0F, 1.0F); - } - - // Finally, we get to do something! (CLEARING TILES) - if (finalState.getBlock().hasTileEntity(finalState)) - finalWorld.removeTileEntity(finalPos); - if (initialState.getBlock().hasTileEntity(initialState)) - initialWorld.removeTileEntity(initialPos); - - // TILES CLEARED - BlockState initialBlockState = initialWorld.getBlockState(initialPos); - BlockState finalBlockState = finalWorld.getBlockState(finalPos); - finalWorld.setBlockState(finalPos, initialBlockState, 3); - - if (initialTile != null) - { -// TileEntity newTileInitial = TileEntity.create(finalWorld, initialTag); - TileEntity newTileInitial = TileEntity.readTileEntity(finalBlockState, initialTag); - - finalWorld.setTileEntity(finalPos, newTileInitial); -// newTileInitial.setPos(finalPos); - newTileInitial.setWorldAndPos(finalWorld, finalPos); - } - - initialWorld.setBlockState(initialPos, finalBlockState, 3); - - if (finalTile != null) - { -// TileEntity newTileFinal = TileEntity.create(initialWorld, finalTag); - TileEntity newTileFinal = TileEntity.readTileEntity(initialBlockState, finalTag); - - initialWorld.setTileEntity(initialPos, newTileFinal); -// newTileFinal.setPos(initialPos); - newTileFinal.setWorldAndPos(initialWorld, initialPos); - } - - initialWorld.notifyNeighborsOfStateChange(initialPos, finalState.getBlock()); - finalWorld.notifyNeighborsOfStateChange(finalPos, initialState.getBlock()); - - return true; - } - - public static ItemStack insertStackIntoTile(ItemStack stack, TileEntity tile, Direction dir) - { - LazyOptional capability = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, dir); - if (capability.isPresent()) - { - IItemHandler handler = capability.resolve().get(); - - return insertStackIntoTile(stack, handler); - } else if (tile instanceof IInventory) - { - return insertStackIntoInventory(stack, (IInventory) tile, dir); - } - - return stack; - } - - public static ItemStack insertStackIntoTile(ItemStack stack, IItemHandler handler) - { - int numberOfSlots = handler.getSlots(); - - ItemStack copyStack = stack.copy(); - - for (int slot = 0; slot < numberOfSlots; slot++) - { - copyStack = handler.insertItem(slot, copyStack, false); - if (copyStack.isEmpty()) - { - return ItemStack.EMPTY; - } - } - - return copyStack; - } - - public static int getNumberOfFreeSlots(TileEntity tile, Direction dir) - { - int slots = 0; - - LazyOptional capability = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, dir); - if (capability.isPresent()) - { - IItemHandler handler = capability.resolve().get(); - - for (int i = 0; i < handler.getSlots(); i++) - { - if (handler.getStackInSlot(i).isEmpty()) - { - slots++; - } - } - } else if (tile instanceof IInventory) - { - for (int i = 0; i < ((IInventory) tile).getSizeInventory(); i++) - { - if (((IInventory) tile).getStackInSlot(i).isEmpty()) - { - slots++; - } - } - } - - return slots; - } - - public static ItemStack insertStackIntoInventory(ItemStack stack, IInventory inventory, Direction dir) - { - if (stack.isEmpty()) - { - return ItemStack.EMPTY; - } - - boolean[] canBeInserted = new boolean[inventory.getSizeInventory()]; - - if (inventory instanceof ISidedInventory) - { - int[] array = ((ISidedInventory) inventory).getSlotsForFace(dir); - for (int in : array) - { - canBeInserted[in] = inventory.isItemValidForSlot(in, stack) && ((ISidedInventory) inventory).canInsertItem(in, stack, dir); - } - } else - { - for (int i = 0; i < canBeInserted.length; i++) - { - canBeInserted[i] = inventory.isItemValidForSlot(i, stack); - } - } - - for (int i = 0; i < inventory.getSizeInventory(); i++) - { - if (!canBeInserted[i]) - { - continue; - } - - ItemStack[] combinedStacks = combineStacks(stack, inventory.getStackInSlot(i)); - stack = combinedStacks[0]; - inventory.setInventorySlotContents(i, combinedStacks[1]); - - if (stack.isEmpty()) - { - return ItemStack.EMPTY; - } - } - - return stack; - } - - public static boolean canInsertStackFullyIntoInventory(ItemStack stack, IInventory inventory, Direction dir, boolean fillToLimit, int limit) - { - if (stack.isEmpty()) - { - return true; - } - - int itemsLeft = stack.getCount(); - - boolean[] canBeInserted = new boolean[inventory.getSizeInventory()]; - - if (inventory instanceof ISidedInventory) - { - int[] array = ((ISidedInventory) inventory).getSlotsForFace(dir); - for (int in : array) - { - canBeInserted[in] = inventory.isItemValidForSlot(in, stack) && ((ISidedInventory) inventory).canInsertItem(in, stack, dir); - } - } else - { - for (int i = 0; i < canBeInserted.length; i++) - { - canBeInserted[i] = inventory.isItemValidForSlot(i, stack); - } - } - - int numberMatching = 0; - - if (fillToLimit) - { - for (int i = 0; i < inventory.getSizeInventory(); i++) - { - if (!canBeInserted[i]) - { - continue; - } - - ItemStack invStack = inventory.getStackInSlot(i); - - if (!invStack.isEmpty() && ItemHandlerHelper.canItemStacksStack(stack, invStack)) - { - numberMatching += invStack.getCount(); - } - } - } - - if (fillToLimit && limit < stack.getCount() + numberMatching) - { - return false; - } - - for (int i = 0; i < inventory.getSizeInventory(); i++) - { - if (!canBeInserted[i]) - { - continue; - } - - ItemStack invStack = inventory.getStackInSlot(i); - boolean canCombine = ItemHandlerHelper.canItemStacksStack(stack, invStack); - if (canCombine) - { - if (invStack.isEmpty()) - { - itemsLeft = 0; - } else - { - itemsLeft -= (invStack.getMaxStackSize() - invStack.getCount()); - } - } - - if (itemsLeft <= 0) - { - return true; - } - } - - return false; - } - - /** - * @param stack1 Stack that is placed into a slot - * @param stack2 Slot content that stack1 is placed into - * @return Stacks after stacking - */ - public static ItemStack[] combineStacks(ItemStack stack1, ItemStack stack2) - { - ItemStack[] returned = new ItemStack[2]; - - if (ItemHandlerHelper.canItemStacksStack(stack1, stack2)) - { - int transferedAmount = stack2.isEmpty() ? stack1.getCount() - : Math.min(stack2.getMaxStackSize() - stack2.getCount(), stack1.getCount()); - if (transferedAmount > 0) - { - ItemStack copyStack = stack1.split(transferedAmount); - if (stack2.isEmpty()) - { - stack2 = copyStack; - } else - { - stack2.grow(transferedAmount); - } - } - } - - returned[0] = stack1; - returned[1] = stack2; - - return returned; - } - - public static boolean canPlayerSeeDemonWill(PlayerEntity player) - { - IItemHandler inventory = new PlayerMainInvWrapper(player.inventory); - - for (int i = 0; i < inventory.getSlots(); i++) - { - ItemStack stack = inventory.getStackInSlot(i); - if (stack.isEmpty()) - { - continue; - } - - if (stack.getItem() instanceof IDemonWillViewer && ((IDemonWillViewer) stack.getItem()).canSeeDemonWillAura(player.getEntityWorld(), stack, player)) - { - return true; - } - } - - return false; - } - - public static double getDemonWillResolution(PlayerEntity player) - { - IItemHandler inventory = new PlayerMainInvWrapper(player.inventory); - - for (int i = 0; i < inventory.getSlots(); i++) - { - ItemStack stack = inventory.getStackInSlot(i); - if (stack.isEmpty()) - { - continue; - } - - if (stack.getItem() instanceof IDemonWillViewer && ((IDemonWillViewer) stack.getItem()).canSeeDemonWillAura(player.getEntityWorld(), stack, player)) - { - return ((IDemonWillViewer) stack.getItem()).getDemonWillAuraResolution(player.getEntityWorld(), stack, player); - } - } - - return 100; - } - - public static int plantSeedsInArea(World world, AxisAlignedBB aabb, int horizontalRadius, int verticalRadius) - { - int placedBlocks = 0; - List itemEntities = world.getEntitiesWithinAABB(ItemEntity.class, aabb); - - for (ItemEntity itemEntity : itemEntities) - { - placedBlocks += plantEntityItem(itemEntity, horizontalRadius, verticalRadius); - } - - return placedBlocks; - } - - public static int plantItemStack(World world, BlockPos centralPos, ItemStack stack, int horizontalRadius, int verticalRadius) - { - if (stack.isEmpty()) - { - return 0; - } - - Item item = stack.getItem(); - if (!(item instanceof IPlantable)) - { - return 0; - } - - int planted = 0; - - for (int hR = 0; hR <= horizontalRadius; hR++) - { - for (int vR = 0; vR <= verticalRadius; vR++) - { - for (int i = -hR; i <= hR; i++) - { - for (int k = -hR; k <= hR; k++) - { - for (int j = -vR; j <= vR; j += 2 * vR + (vR > 0 ? 0 : 1)) - { - if (!(Math.abs(i) == hR || Math.abs(k) == hR)) - { - continue; - } - - BlockPos newPos = centralPos.add(i, j, k); - if (world.isAirBlock(newPos)) - { - BlockPos offsetPos = newPos.offset(Direction.DOWN); - BlockState state = world.getBlockState(offsetPos); - if (state.getBlock().canSustainPlant(state, world, offsetPos, Direction.UP, (IPlantable) item)) - { - BlockState plantState = ((IPlantable) item).getPlant(world, newPos); - world.setBlockState(newPos, plantState, 3); -// Block. - world.playEvent(2001, newPos, Block.getStateId(plantState)); - stack.shrink(1); - planted++; - if (stack.isEmpty() || stack.getCount() <= 0) - { - return planted; - } - } - } - } - } - } - } - } - - return planted; - } - - public static int plantEntityItem(ItemEntity itemEntity, int horizontalRadius, int verticalRadius) - { - if (itemEntity == null || !itemEntity.isAlive()) - { - return 0; - } - - World world = itemEntity.getEntityWorld(); - BlockPos pos = itemEntity.getPosition(); - ItemStack stack = itemEntity.getItem(); - - int planted = plantItemStack(world, pos, stack, horizontalRadius, verticalRadius); - - if (stack.isEmpty()) - { - itemEntity.remove(); - } - - return planted; - } - - @Nullable - public static IItemHandler getInventory(TileEntity tile, @Nullable Direction facing) - { - if (facing == null) - facing = Direction.DOWN; - - IItemHandler itemHandler = null; - - if (tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, facing).isPresent()) - itemHandler = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, facing).resolve().get(); - else if (tile instanceof ISidedInventory) - itemHandler = ((ISidedInventory) tile).getSlotsForFace(facing).length != 0 - ? new SidedInvWrapper((ISidedInventory) tile, facing) - : null; - else if (tile instanceof IInventory) - itemHandler = new InvWrapper((IInventory) tile); - - return itemHandler; - } - - public static float addAbsorptionToMaximum(LivingEntity entity, float added, int maximum, int duration) - { - float currentAmount = entity.getAbsorptionAmount(); - added = Math.min(maximum - currentAmount, added); - - if (added <= 0) - { - return 0; - } - - if (duration > 0) - { - int potionLevel = (int) ((currentAmount + added) / 4); - entity.addPotionEffect(new EffectInstance(Effects.ABSORPTION, duration, potionLevel, true, false)); - } - - entity.setAbsorptionAmount(currentAmount + added); - - return added; - } - -// public static float getModifiedDamage(LivingEntity attackedEntity, DamageSource source, float amount) -// { -// if (!attackedEntity.isInvulnerableTo(source)) -// { -// if (amount <= 0) -// return 0; -// -// amount = applyArmor(attackedEntity, Iterables.toArray(attackedEntity.getEquipmentAndArmor(), ItemStack.class), source, amount); -// if (amount <= 0) -// return 0; -// amount = applyPotionDamageCalculations(attackedEntity, source, amount); -// -// return amount; -// } -// -// return 0; -// } -// -// public static float applyArmor(LivingEntity entity, ItemStack[] inventory, DamageSource source, double damage) -// { -// damage *= 25; -// ArrayList dmgVals = new ArrayList<>(); -// for (int x = 0; x < inventory.length; x++) -// { -// ItemStack stack = inventory[x]; -// if (stack.isEmpty()) -// { -// continue; -// } -// ArmorProperties prop = null; -// if (stack.getItem() instanceof ISpecialArmor) -// { -// ISpecialArmor armor = (ISpecialArmor) stack.getItem(); -// prop = armor.getProperties(entity, stack, source, damage / 25D, x).copy(); -// } else if (stack.getItem() instanceof ArmorItem && !source.isUnblockable()) -// { -// ArmorItem armor = (ArmorItem) stack.getItem(); -// prop = new ArmorProperties(0, armor.damageReduceAmount / 25D, Integer.MAX_VALUE); -// } -// if (prop != null) -// { -// prop.Slot = x; -// dmgVals.add(prop); -// } -// } -// if (dmgVals.size() > 0) -// { -// ArmorProperties[] props = dmgVals.toArray(new ArmorProperties[dmgVals.size()]); -// int level = props[0].Priority; -// double ratio = 0; -// for (ArmorProperties prop : props) -// { -// if (level != prop.Priority) -// { -// damage -= (damage * ratio); -// ratio = 0; -// level = prop.Priority; -// } -// ratio += prop.AbsorbRatio; -// -// } -// damage -= (damage * ratio); -// } -// -// return (float) (damage / 25.0F); -// } -// -// public static float applyPotionDamageCalculations(LivingEntity attackedEntity, DamageSource source, float damage) -// { -// Effect resistance = Effects.RESISTANCE; -// -// if (source.isDamageAbsolute()) -// { -// return damage; -// } else -// { -// if (attackedEntity.isPotionActive(resistance) && source != DamageSource.OUT_OF_WORLD) -// { -// int i = (attackedEntity.getActivePotionEffect(resistance).getAmplifier() + 1) * 5; -// int j = 25 - i; -// float f = damage * (float) j; -// damage = f / 25.0F; -// } -// -// if (damage <= 0.0F) -// { -// return 0.0F; -// } else -// { -// int k = EnchantmentHelper.getEnchantmentModifierDamage(attackedEntity.getArmorInventoryList(), source); -// -// if (k > 20) -// { -// k = 20; -// } -// -// if (k > 0 && k <= 20) -// { -// int l = 25 - k; -// float f1 = damage * (float) l; -// damage = f1 / 25.0F; -// } -// -// return damage; -// } -// } -// } - - public static boolean hasUUID(ItemStack stack) - { - return stack.hasTag() && stack.getTag().contains(Constants.NBT.MOST_SIG) && stack.getTag().contains(Constants.NBT.LEAST_SIG); - } - - public static UUID getUUID(ItemStack stack) - { - if (!hasUUID(stack)) - { - return null; - } - - return new UUID(stack.getTag().getLong(Constants.NBT.MOST_SIG), stack.getTag().getLong(Constants.NBT.LEAST_SIG)); - } - - public static void setUUID(ItemStack stack) - { - stack = NBTHelper.checkNBT(stack); - - if (!stack.getTag().contains(Constants.NBT.MOST_SIG) && !stack.getTag().contains(Constants.NBT.LEAST_SIG)) - { - UUID itemUUID = UUID.randomUUID(); - stack.getTag().putLong(Constants.NBT.MOST_SIG, itemUUID.getMostSignificantBits()); - stack.getTag().putLong(Constants.NBT.LEAST_SIG, itemUUID.getLeastSignificantBits()); - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/wayoftime/bloodmagic/util/handler/event/ClientHandler.java deleted file mode 100644 index c2235560..00000000 --- a/src/main/java/wayoftime/bloodmagic/util/handler/event/ClientHandler.java +++ /dev/null @@ -1,563 +0,0 @@ -package wayoftime.bloodmagic.util.handler.event; - -import java.util.HashMap; -import java.util.List; - -import com.google.common.collect.Lists; -import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.IVertexBuilder; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.player.ClientPlayerEntity; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.renderer.ActiveRenderInfo; -import net.minecraft.client.renderer.Atlases; -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.AtlasTexture; -import net.minecraft.client.renderer.texture.OverlayTexture; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.inventory.container.PlayerContainer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.vector.Matrix4f; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.util.text.IFormattableTextComponent; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.Style; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.client.event.RenderWorldLastEvent; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidTank; -import net.minecraftforge.fml.common.Mod; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.client.render.BloodMagicRenderer; -import wayoftime.bloodmagic.client.render.BloodMagicRenderer.Model3D; -import wayoftime.bloodmagic.client.render.RenderResizableCuboid; -import wayoftime.bloodmagic.client.utils.BMRenderTypes; -import wayoftime.bloodmagic.common.item.ItemRitualDiviner; -import wayoftime.bloodmagic.common.item.ItemRitualReader; -import wayoftime.bloodmagic.ritual.AreaDescriptor; -import wayoftime.bloodmagic.ritual.EnumRitualReaderState; -import wayoftime.bloodmagic.ritual.Ritual; -import wayoftime.bloodmagic.ritual.RitualComponent; -import wayoftime.bloodmagic.tile.TileMasterRitualStone; -import wayoftime.bloodmagic.will.DemonWillHolder; - -@Mod.EventBusSubscriber(modid = BloodMagic.MODID, value = Dist.CLIENT) -//@OnlyIn(Dist.CLIENT) -public class ClientHandler -{ - public static final boolean SUPPRESS_ASSET_ERRORS = true; - public static ResourceLocation ritualStoneBlank = BloodMagic.rl("block/ritualstone");; - public static ResourceLocation ritualStoneWater = BloodMagic.rl("block/waterritualstone");; - public static ResourceLocation ritualStoneFire = BloodMagic.rl("block/fireritualstone");; - public static ResourceLocation ritualStoneEarth = BloodMagic.rl("block/earthritualstone");; - public static ResourceLocation ritualStoneAir = BloodMagic.rl("block/airritualstone");; - public static ResourceLocation ritualStoneDawn = BloodMagic.rl("block/dawnritualstone");; - public static ResourceLocation ritualStoneDusk = BloodMagic.rl("block/duskritualstone");; - public static ResourceLocation boarder = new ResourceLocation("block/chiseled_sandstone"); - public static TextureAtlasSprite blankBloodRune; - public static TextureAtlasSprite stoneBrick; - public static TextureAtlasSprite glowstone; -// public static TextureAtlasSprite bloodStoneBrick; - public static TextureAtlasSprite beacon; -// public static TextureAtlasSprite crystalCluster; - public static Minecraft minecraft = Minecraft.getInstance(); - private static TileMasterRitualStone mrsHoloTile; - private static TileMasterRitualStone mrsRangeTile; - private static Ritual mrsHoloRitual; - private static Direction mrsHoloDirection; - private static boolean mrsHoloDisplay; - private static boolean mrsRangeDisplay; - - public static DemonWillHolder currentAura; - - static HashMap resourceMap = new HashMap(); - - public static Minecraft mc() - { - return Minecraft.getInstance(); - } - - public static void bindTexture(String path) - { - mc().getTextureManager().bindTexture(getResource(path)); - } - - public static void bindAtlas() - { - mc().getTextureManager().bindTexture(PlayerContainer.LOCATION_BLOCKS_TEXTURE); - } - - public static ResourceLocation getResource(String path) - { - ResourceLocation rl = resourceMap.containsKey(path) ? resourceMap.get(path) : new ResourceLocation(path); - if (!resourceMap.containsKey(path)) - resourceMap.put(path, rl); - return rl; - } - - public static TextureAtlasSprite getSprite(ResourceLocation rl) - { - return mc().getModelManager().getAtlasTexture(PlayerContainer.LOCATION_BLOCKS_TEXTURE).getSprite(rl); - } - - @SubscribeEvent - public static void onTextureStitch(TextureStitchEvent.Pre event) - { - final String BLOCKS = "block/"; - -// ritualStoneBlank = Minecraft.getInstance().getAtlasSpriteGetter(AtlasTexture.LOCATION_BLOCKS_TEXTURE).apply(BloodMagic.rl(block//" + "blankrune")); -//// ritualStoneBlank = forName(event.getMap(), "ritualstone", BLOCKS); -// ritualStoneWater = forName(event.getMap(), "waterritualstone", BLOCKS); -// ritualStoneFire = forName(event.getMap(), "fireritualstone", BLOCKS); -// ritualStoneEarth = forName(event.getMap(), "earthritualstone", BLOCKS); -// ritualStoneAir = forName(event.getMap(), "airritualstone", BLOCKS); -// ritualStoneDawn = forName(event.getMap(), "lightritualstone", BLOCKS); -// ritualStoneDusk = forName(event.getMap(), "duskritualstone", BLOCKS); - - blankBloodRune = forName(event.getMap(), "blankrune", BLOCKS); - stoneBrick = event.getMap().getSprite(new ResourceLocation("minecraft:block/stonebrick")); - glowstone = event.getMap().getSprite(new ResourceLocation("minecraft:block/glowstone")); -// bloodStoneBrick = forName(event.getMap(), "BloodStoneBrick", BLOCKS); - beacon = event.getMap().getSprite(new ResourceLocation("minecraft:block/beacon")); -// crystalCluster = forName(event.getMap(), "ShardCluster", BLOCKS); - } - - @SubscribeEvent - public static void render(RenderWorldLastEvent event) - { - ClientPlayerEntity player = minecraft.player; - World world = player.getEntityWorld(); - - if (mrsHoloTile != null) - { - if (world.getTileEntity(mrsHoloTile.getPos()) instanceof TileMasterRitualStone) - { - if (mrsHoloDisplay) - { - IRenderTypeBuffer.Impl buffers = Minecraft.getInstance().getRenderTypeBuffers().getBufferSource(); - MatrixStack stack = event.getMatrixStack(); - renderRitualStones(stack, buffers, mrsHoloTile, event.getPartialTicks()); - RenderSystem.disableDepthTest(); - buffers.finish(); - } else - ClientHandler.setRitualHoloToNull(); - } else - { - ClientHandler.setRitualHoloToNull(); - } - } - - if (mrsRangeTile != null) - { - if (world.getTileEntity(mrsRangeTile.getPos()) instanceof TileMasterRitualStone) - { - if (mrsRangeDisplay) - { - IRenderTypeBuffer.Impl buffers = Minecraft.getInstance().getRenderTypeBuffers().getBufferSource(); - MatrixStack stack = event.getMatrixStack(); - renderRangeHologram(stack, buffers, mrsRangeTile, event.getPartialTicks()); - RenderSystem.disableDepthTest(); - buffers.finish(); - } else - ClientHandler.setRitualRangeHoloToNull(); - } else - { - ClientHandler.setRitualRangeHoloToNull(); - } - } - - if (minecraft.objectMouseOver == null || minecraft.objectMouseOver.getType() != RayTraceResult.Type.BLOCK) - return; - - TileEntity tileEntity = world.getTileEntity(((BlockRayTraceResult) minecraft.objectMouseOver).getPos()); - - if (tileEntity instanceof TileMasterRitualStone && !player.getHeldItemMainhand().isEmpty() && player.getHeldItemMainhand().getItem() instanceof ItemRitualDiviner) - { - IRenderTypeBuffer.Impl buffers = Minecraft.getInstance().getRenderTypeBuffers().getBufferSource(); - MatrixStack stack = event.getMatrixStack(); - renderRitualStones(stack, buffers, player, event.getPartialTicks()); - RenderSystem.disableDepthTest(); - buffers.finish(); - } - } - - private static TextureAtlasSprite forName(AtlasTexture textureMap, String name, String dir) - { - return textureMap.getSprite(new ResourceLocation(BloodMagic.MODID + dir + "/" + name)); - } - - private static void renderRitualStones(MatrixStack stack, IRenderTypeBuffer renderer, ClientPlayerEntity player, float partialTicks) - { - ActiveRenderInfo activerenderinfo = Minecraft.getInstance().gameRenderer.getActiveRenderInfo(); - Vector3d eyePos = activerenderinfo.getProjectedView(); - IVertexBuilder buffer = renderer.getBuffer(Atlases.getTranslucentCullBlockType()); - World world = player.getEntityWorld(); - ItemRitualDiviner ritualDiviner = (ItemRitualDiviner) player.inventory.getCurrentItem().getItem(); - Direction direction = ritualDiviner.getDirection(player.inventory.getCurrentItem()); - Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(ritualDiviner.getCurrentRitual(player.inventory.getCurrentItem())); - - if (ritual == null) - return; - - BlockPos vec3, vX; - vec3 = ((BlockRayTraceResult) minecraft.objectMouseOver).getPos(); - - List components = Lists.newArrayList(); - ritual.gatherComponents(components::add); - for (RitualComponent ritualComponent : components) - { - stack.push(); - vX = vec3.add(ritualComponent.getOffset(direction)); - double minX = vX.getX() - eyePos.x; - double minY = vX.getY() - eyePos.y; - double minZ = vX.getZ() - eyePos.z; - - stack.translate(minX, minY, minZ); - - if (!world.getBlockState(vX).isOpaqueCube(world, vX)) - { - ResourceLocation rl = null; - - switch (ritualComponent.getRuneType()) - { - case BLANK: - rl = ritualStoneBlank; - break; - case WATER: - rl = ritualStoneWater; - break; - case FIRE: - rl = ritualStoneFire; - break; - case EARTH: - rl = ritualStoneEarth; - break; - case AIR: - rl = ritualStoneAir; - break; - case DAWN: - rl = ritualStoneDawn; - break; - case DUSK: - rl = ritualStoneDusk; - break; - } - - Model3D model = getBlockModel(rl); - - RenderResizableCuboid.INSTANCE.renderCube(model, stack, buffer, 0xDDFFFFFF, 0x00F000F0, OverlayTexture.NO_OVERLAY); - } - stack.pop(); - } - } - - public static void renderRitualStones(MatrixStack stack, IRenderTypeBuffer renderer, TileMasterRitualStone masterRitualStone, float partialTicks) - { - ActiveRenderInfo activerenderinfo = Minecraft.getInstance().gameRenderer.getActiveRenderInfo(); - Vector3d eyePos = activerenderinfo.getProjectedView(); - IVertexBuilder buffer = renderer.getBuffer(Atlases.getTranslucentCullBlockType()); - ClientPlayerEntity player = minecraft.player; - World world = player.getEntityWorld(); - Direction direction = mrsHoloDirection; - Ritual ritual = mrsHoloRitual; - - if (ritual == null) - { - return; - } - - BlockPos vec3, vX; - vec3 = masterRitualStone.getPos(); - - List components = Lists.newArrayList(); - ritual.gatherComponents(components::add); - for (RitualComponent ritualComponent : components) - { - stack.push(); - vX = vec3.add(ritualComponent.getOffset(direction)); - - double minX = vX.getX() - eyePos.x; - double minY = vX.getY() - eyePos.y; - double minZ = vX.getZ() - eyePos.z; - - stack.translate(minX, minY, minZ); - - if (!world.getBlockState(vX).isOpaqueCube(world, vX)) - { - ResourceLocation rl = null; - - switch (ritualComponent.getRuneType()) - { - case BLANK: - rl = ritualStoneBlank; - break; - case WATER: - rl = ritualStoneWater; - break; - case FIRE: - rl = ritualStoneFire; - break; - case EARTH: - rl = ritualStoneEarth; - break; - case AIR: - rl = ritualStoneAir; - break; - case DAWN: - rl = ritualStoneDawn; - break; - case DUSK: - rl = ritualStoneDusk; - break; - } - - Model3D model = getBlockModel(rl); - - RenderResizableCuboid.INSTANCE.renderCube(model, stack, buffer, 0xDDFFFFFF, 0x00F000F0, OverlayTexture.NO_OVERLAY); - } - - stack.pop(); - } - } - - public static void renderRangeHologram(MatrixStack stack, IRenderTypeBuffer renderer, TileMasterRitualStone masterRitualStone, float partialTicks) - { - ActiveRenderInfo activerenderinfo = Minecraft.getInstance().gameRenderer.getActiveRenderInfo(); - Vector3d eyePos = activerenderinfo.getProjectedView(); - IVertexBuilder buffer = renderer.getBuffer(Atlases.getTranslucentCullBlockType()); - ClientPlayerEntity player = minecraft.player; - World world = player.getEntityWorld(); - - if (!player.getHeldItemMainhand().isEmpty() && player.getHeldItemMainhand().getItem() instanceof ItemRitualReader) - { - ItemStack itemStack = player.getHeldItemMainhand(); - EnumRitualReaderState state = ((ItemRitualReader) itemStack.getItem()).getState(itemStack); - if (state == EnumRitualReaderState.SET_AREA) - { - String range = ((ItemRitualReader) itemStack.getItem()).getCurrentBlockRange(itemStack); - AreaDescriptor descriptor = masterRitualStone.getBlockRange(range); - if (descriptor == null) - { - return; - } - - stack.push(); - BlockPos vec3; - vec3 = masterRitualStone.getPos(); - AxisAlignedBB aabb = descriptor.getAABB(vec3); - double sizeOffset = -1d / 16d; - if (aabb.contains(eyePos)) - { - sizeOffset *= -1; - } - - double minX = aabb.minX - eyePos.x + sizeOffset; - double minY = aabb.minY - eyePos.y + sizeOffset; - double minZ = aabb.minZ - eyePos.z + sizeOffset; - - stack.translate(minX, minY, minZ); - - ResourceLocation rl = boarder; - Model3D model = getBlockModelWithSize(rl, aabb.getXSize() - 2 * sizeOffset, aabb.getYSize() - 2 * sizeOffset, aabb.getZSize() - 2 * sizeOffset); - RenderResizableCuboid.INSTANCE.renderCube(model, stack, buffer, 0x99FF4444, 0x00F000F0, OverlayTexture.NO_OVERLAY); - stack.pop(); - } - } - } - - private static Model3D getBlockModel(ResourceLocation rl) - { - Model3D model = new BloodMagicRenderer.Model3D(); - model.setTexture(Minecraft.getInstance().getAtlasSpriteGetter(AtlasTexture.LOCATION_BLOCKS_TEXTURE).apply(rl)); - model.minX = 0; - model.minY = 0; - model.minZ = 0; - model.maxX = 1; - model.maxY = 1; - model.maxZ = 1; - - return model; - } - - private static Model3D getBlockModelWithSize(ResourceLocation rl, double maxX, double maxY, double maxZ) - { - Model3D model = new BloodMagicRenderer.Model3D(); - model.setTexture(Minecraft.getInstance().getAtlasSpriteGetter(AtlasTexture.LOCATION_BLOCKS_TEXTURE).apply(rl)); - model.minX = 0; - model.minY = 0; - model.minZ = 0; - model.maxX = maxX; - model.maxY = maxY; - model.maxZ = maxZ; - - return model; - } - - public static void setRitualHolo(TileMasterRitualStone masterRitualStone, Ritual ritual, Direction direction, boolean displayed) - { - mrsHoloDisplay = displayed; - mrsHoloTile = masterRitualStone; - mrsHoloRitual = ritual; - mrsHoloDirection = direction; - } - - public static void setRitualHoloToNull() - { - mrsHoloDisplay = false; - mrsHoloTile = null; - mrsHoloRitual = null; - mrsHoloDirection = Direction.NORTH; - } - - public static void setRitualRangeHolo(TileMasterRitualStone masterRitualStone, boolean displayed) - { - mrsRangeDisplay = displayed; - mrsRangeTile = masterRitualStone; - } - - public static void setRitualRangeHoloToNull() - { - mrsRangeDisplay = false; - mrsRangeTile = null; - } - - public static void handleGuiTank(MatrixStack transform, IFluidTank tank, int x, int y, int w, int h, int oX, int oY, int oW, int oH, int mX, int mY, String originalTexture, List tooltip) - { - handleGuiTank(transform, tank.getFluid(), tank.getCapacity(), x, y, w, h, oX, oY, oW, oH, mX, mY, originalTexture, tooltip); - } - - public static void handleGuiTank(MatrixStack transform, FluidStack fluid, int capacity, int x, int y, int w, int h, int oX, int oY, int oW, int oH, int mX, int mY, String originalTexture, List tooltip) - { - if (tooltip == null) - { - transform.push(); - IRenderTypeBuffer.Impl buffer = IRenderTypeBuffer.getImpl(Tessellator.getInstance().getBuffer()); - if (fluid != null && fluid.getFluid() != null) - { - int fluidHeight = (int) (h * (fluid.getAmount() / (float) capacity)); - drawRepeatedFluidSpriteGui(buffer, transform, fluid, x, y + h - fluidHeight, w, fluidHeight); - RenderSystem.color3f(1, 1, 1); - } - int xOff = (w - oW) / 2; - int yOff = (h - oH) / 2; - RenderType renderType = BMRenderTypes.getGui(new ResourceLocation(originalTexture)); - drawTexturedRect(buffer.getBuffer(renderType), transform, x + xOff, y + yOff, oW, oH, 256f, oX, oX + oW, oY, oY + oH); - buffer.finish(renderType); - transform.pop(); - } else - { - if (mX >= x && mX < x + w && mY >= y && mY < y + h) - addFluidTooltip(fluid, tooltip, capacity); - } - } - - public static void drawRepeatedFluidSpriteGui(IRenderTypeBuffer buffer, MatrixStack transform, FluidStack fluid, float x, float y, float w, float h) - { - RenderType renderType = BMRenderTypes.getGui(PlayerContainer.LOCATION_BLOCKS_TEXTURE); - IVertexBuilder builder = buffer.getBuffer(renderType); - drawRepeatedFluidSprite(builder, transform, fluid, x, y, w, h); - } - - public static void drawRepeatedFluidSprite(IVertexBuilder builder, MatrixStack transform, FluidStack fluid, float x, float y, float w, float h) - { - TextureAtlasSprite sprite = getSprite(fluid.getFluid().getAttributes().getStillTexture(fluid)); - int col = fluid.getFluid().getAttributes().getColor(fluid); - int iW = sprite.getWidth(); - int iH = sprite.getHeight(); - if (iW > 0 && iH > 0) - drawRepeatedSprite(builder, transform, x, y, w, h, iW, iH, sprite.getMinU(), sprite.getMaxU(), sprite.getMinV(), sprite.getMaxV(), (col >> 16 & 255) / 255.0f, (col >> 8 & 255) / 255.0f, (col & 255) / 255.0f, 1); - } - - public static void drawRepeatedSprite(IVertexBuilder builder, MatrixStack transform, float x, float y, float w, float h, int iconWidth, int iconHeight, float uMin, float uMax, float vMin, float vMax, float r, float g, float b, float alpha) - { - int iterMaxW = (int) (w / iconWidth); - int iterMaxH = (int) (h / iconHeight); - float leftoverW = w % iconWidth; - float leftoverH = h % iconHeight; - float leftoverWf = leftoverW / (float) iconWidth; - float leftoverHf = leftoverH / (float) iconHeight; - float iconUDif = uMax - uMin; - float iconVDif = vMax - vMin; - for (int ww = 0; ww < iterMaxW; ww++) - { - for (int hh = 0; hh < iterMaxH; hh++) - drawTexturedRect(builder, transform, x + ww * iconWidth, y + hh * iconHeight, iconWidth, iconHeight, r, g, b, alpha, uMin, uMax, vMin, vMax); - drawTexturedRect(builder, transform, x + ww * iconWidth, y + iterMaxH * iconHeight, iconWidth, leftoverH, r, g, b, alpha, uMin, uMax, vMin, (vMin + iconVDif * leftoverHf)); - } - if (leftoverW > 0) - { - for (int hh = 0; hh < iterMaxH; hh++) - drawTexturedRect(builder, transform, x + iterMaxW * iconWidth, y + hh * iconHeight, leftoverW, iconHeight, r, g, b, alpha, uMin, (uMin + iconUDif * leftoverWf), vMin, vMax); - drawTexturedRect(builder, transform, x + iterMaxW * iconWidth, y + iterMaxH * iconHeight, leftoverW, leftoverH, r, g, b, alpha, uMin, (uMin + iconUDif * leftoverWf), vMin, (vMin + iconVDif * leftoverHf)); - } - } - - public static void drawTexturedRect(IVertexBuilder builder, MatrixStack transform, float x, float y, float w, float h, float r, float g, float b, float alpha, float u0, float u1, float v0, float v1) - { - Matrix4f mat = transform.getLast().getMatrix(); - builder.pos(mat, x, y + h, 0).color(r, g, b, alpha).tex(u0, v1).overlay(OverlayTexture.NO_OVERLAY).lightmap(0xf000f0).normal(1, 1, 1).endVertex(); - builder.pos(mat, x + w, y + h, 0).color(r, g, b, alpha).tex(u1, v1).overlay(OverlayTexture.NO_OVERLAY).lightmap(15728880).normal(1, 1, 1).endVertex(); - builder.pos(mat, x + w, y, 0).color(r, g, b, alpha).tex(u1, v0).overlay(OverlayTexture.NO_OVERLAY).lightmap(15728880).normal(1, 1, 1).endVertex(); - builder.pos(mat, x, y, 0).color(r, g, b, alpha).tex(u0, v0).overlay(OverlayTexture.NO_OVERLAY).lightmap(15728880).normal(1, 1, 1).endVertex(); - } - - public static void drawTexturedRect(IVertexBuilder builder, MatrixStack transform, int x, int y, int w, int h, float picSize, int u0, int u1, int v0, int v1) - { - drawTexturedRect(builder, transform, x, y, w, h, 1, 1, 1, 1, u0 / picSize, u1 / picSize, v0 / picSize, v1 / picSize); - } - - public static void addFluidTooltip(FluidStack fluid, List tooltip, int tankCapacity) - { - if (!fluid.isEmpty()) - tooltip.add(applyFormat(fluid.getDisplayName(), fluid.getFluid().getAttributes().getRarity(fluid).color)); - else - tooltip.add(new TranslationTextComponent("gui.bloodmagic.empty")); -// if (fluid.getFluid() instanceof IEFluid) -// ((IEFluid) fluid.getFluid()).addTooltipInfo(fluid, null, tooltip); - - if (mc().gameSettings.advancedItemTooltips && !fluid.isEmpty()) - { - if (!Screen.hasShiftDown()) - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.holdShiftForInfo")); - else - { - // TODO translation keys - tooltip.add(applyFormat(new StringTextComponent("Fluid Registry: " + fluid.getFluid().getRegistryName()), TextFormatting.DARK_GRAY)); - tooltip.add(applyFormat(new StringTextComponent("Density: " + fluid.getFluid().getAttributes().getDensity(fluid)), TextFormatting.DARK_GRAY)); - tooltip.add(applyFormat(new StringTextComponent("Temperature: " + fluid.getFluid().getAttributes().getTemperature(fluid)), TextFormatting.DARK_GRAY)); - tooltip.add(applyFormat(new StringTextComponent("Viscosity: " + fluid.getFluid().getAttributes().getViscosity(fluid)), TextFormatting.DARK_GRAY)); - tooltip.add(applyFormat(new StringTextComponent("NBT Data: " + fluid.getTag()), TextFormatting.DARK_GRAY)); - } - } - - if (tankCapacity > 0) - tooltip.add(applyFormat(new StringTextComponent(fluid.getAmount() + "/" + tankCapacity + "mB"), TextFormatting.GRAY)); - else - tooltip.add(applyFormat(new StringTextComponent(fluid.getAmount() + "mB"), TextFormatting.GRAY)); - } - - public static IFormattableTextComponent applyFormat(ITextComponent component, TextFormatting... color) - { - Style style = component.getStyle(); - for (TextFormatting format : color) style = style.applyFormatting(format); - return component.deepCopy().setStyle(style); - } - -} diff --git a/src/main/java/wayoftime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/wayoftime/bloodmagic/util/handler/event/GenericHandler.java deleted file mode 100644 index 7ccf30fe..00000000 --- a/src/main/java/wayoftime/bloodmagic/util/handler/event/GenericHandler.java +++ /dev/null @@ -1,717 +0,0 @@ -package wayoftime.bloodmagic.util.handler.event; - -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.UUID; - -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.enchantment.Enchantments; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.entity.projectile.ArrowEntity; -import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.BowItem; -import net.minecraft.item.CrossbowItem; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.EffectInstance; -import net.minecraft.potion.Effects; -import net.minecraft.util.DamageSource; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.Tags; -import net.minecraftforge.common.ToolType; -import net.minecraftforge.event.entity.EntityJoinWorldEvent; -import net.minecraftforge.event.entity.living.LivingDamageEvent; -import net.minecraftforge.event.entity.living.LivingEntityUseItemEvent; -import net.minecraftforge.event.entity.living.LivingEvent; -import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent; -import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; -import net.minecraftforge.event.entity.living.LivingHealEvent; -import net.minecraftforge.event.entity.living.LivingHurtEvent; -import net.minecraftforge.event.entity.living.LootingLevelEvent; -import net.minecraftforge.event.entity.player.PlayerEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.event.entity.player.PlayerXpEvent; -import net.minecraftforge.event.world.BlockEvent; -import net.minecraftforge.event.world.BlockEvent.BlockToolInteractEvent; -import net.minecraftforge.eventbus.api.EventPriority; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.anointment.AnointmentHolder; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.common.item.BloodOrb; -import wayoftime.bloodmagic.common.item.IBindable; -import wayoftime.bloodmagic.common.item.IBloodOrb; -import wayoftime.bloodmagic.common.item.ItemExperienceBook; -import wayoftime.bloodmagic.core.AnointmentRegistrar; -import wayoftime.bloodmagic.core.LivingArmorRegistrar; -import wayoftime.bloodmagic.core.data.Binding; -import wayoftime.bloodmagic.core.data.SoulNetwork; -import wayoftime.bloodmagic.core.living.LivingStats; -import wayoftime.bloodmagic.core.living.LivingUtil; -import wayoftime.bloodmagic.demonaura.WorldDemonWillHandler; -import wayoftime.bloodmagic.event.ItemBindEvent; -import wayoftime.bloodmagic.event.SacrificeKnifeUsedEvent; -import wayoftime.bloodmagic.network.DemonAuraClientPacket; -import wayoftime.bloodmagic.potion.BMPotionUtils; -import wayoftime.bloodmagic.potion.BloodMagicPotions; -import wayoftime.bloodmagic.util.helper.BindableHelper; -import wayoftime.bloodmagic.util.helper.NetworkHelper; -import wayoftime.bloodmagic.util.helper.PlayerHelper; -import wayoftime.bloodmagic.will.DemonWillHolder; - -@Mod.EventBusSubscriber(modid = BloodMagic.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) -public class GenericHandler -{ - // Handles binding of IBindable's as well as setting a player's highest orb tier - @SubscribeEvent - public void onInteract(PlayerInteractEvent.RightClickItem event) - { - if (event.getWorld().isRemote) - return; - - PlayerEntity player = event.getPlayer(); - - if (PlayerHelper.isFakePlayer(player)) - return; - - ItemStack held = event.getItemStack(); - if (!held.isEmpty() && held.getItem() instanceof IBindable) - { // Make sure it's bindable - IBindable bindable = (IBindable) held.getItem(); - Binding binding = bindable.getBinding(held); - if (binding == null) - { // If the binding is null, let's create one - if (bindable.onBind(player, held)) - { - ItemBindEvent toPost = new ItemBindEvent(player, held); - if (MinecraftForge.EVENT_BUS.post(toPost)) // Allow cancellation of binding - return; - - BindableHelper.applyBinding(held, player); // Bind item to the player - } - // If the binding exists, we'll check if the player's name has changed since - // they last used it and update that if so. - } else if (binding.getOwnerId().equals(player.getGameProfile().getId()) && !binding.getOwnerName().equals(player.getGameProfile().getName())) - { - binding.setOwnerName(player.getGameProfile().getName()); - BindableHelper.applyBinding(held, binding); - } - } - - if (!held.isEmpty() && held.getItem() instanceof IBloodOrb) - { - IBloodOrb bloodOrb = (IBloodOrb) held.getItem(); - SoulNetwork network = NetworkHelper.getSoulNetwork(player); - - BloodOrb orb = bloodOrb.getOrb(held); - if (orb == null) - return; - - if (orb.getTier() > network.getOrbTier()) - network.setOrbTier(orb.getTier()); - } - } - - @SubscribeEvent - public void onPlayerLeftClickAir(PlayerInteractEvent.LeftClickEmpty event) - { -// if (event.getItemStack().getItem() instanceof ItemSentientScythe) -// { -// ((ItemSentientScythe) event.getItemStack().getItem()).onLeftClickAir(event.getItemStack(), event.getEntityLiving()); -// } - } - - @SubscribeEvent - // Called when an entity is set to be hurt. Called before vanilla armour - // calculations. - public void onLivingHurt(LivingHurtEvent event) - { - Entity sourceEntity = event.getSource().getTrueSource(); - LivingEntity living = event.getEntityLiving(); - - if (sourceEntity instanceof PlayerEntity) - { - PlayerEntity sourcePlayer = (PlayerEntity) sourceEntity; - if (LivingUtil.hasFullSet(sourcePlayer)) - { - ItemStack mainWeapon = sourcePlayer.getActiveItemStack(); - double additionalDamage = LivingUtil.getAdditionalDamage(sourcePlayer, mainWeapon, living, event.getAmount()); - event.setAmount((float) (event.getAmount() + additionalDamage)); - } - - ItemStack heldStack = sourcePlayer.getHeldItemMainhand(); - AnointmentHolder holder = AnointmentHolder.fromItemStack(heldStack); - - if (holder != null) - { - double additionalDamage = holder.getAdditionalDamage(sourcePlayer, heldStack, event.getAmount(), living); - - event.setAmount((float) (event.getAmount() + additionalDamage)); - } - } - - if (living instanceof PlayerEntity) - { - PlayerEntity player = (PlayerEntity) living; - if (LivingUtil.hasFullSet(player)) - { - event.setAmount((float) LivingUtil.getDamageReceivedForArmour(player, event.getSource(), event.getAmount())); - } - } - } - - @SubscribeEvent - // Called after armour calculations (including LivingHurtEvent) are parsed. - // Damage that the player should receive after armour/absorption hearts. - public void onLivingDamage(LivingDamageEvent event) - { - Entity sourceEntity = event.getSource().getTrueSource(); - LivingEntity living = event.getEntityLiving(); - - if (sourceEntity instanceof PlayerEntity) - { - PlayerEntity sourcePlayer = (PlayerEntity) sourceEntity; - if (LivingUtil.hasFullSet(sourcePlayer)) - { - if (sourcePlayer.isSprinting()) - { - LivingUtil.applyNewExperience(sourcePlayer, LivingArmorRegistrar.UPGRADE_SPRINT_ATTACK.get(), event.getAmount()); - } - } - - ItemStack heldStack = sourcePlayer.getHeldItemMainhand(); - AnointmentHolder holder = AnointmentHolder.fromItemStack(heldStack); -// AnointmentHolder holder = AnointmentHolder.fromPlayer(sourcePlayer, Hand.MAIN_HAND); - -// System.out.println("Checking consumption. Holder is: " + holder); - if (holder != null && holder.consumeAnointmentDurabilityOnHit(heldStack, EquipmentSlotType.MAINHAND)) - { - holder.toItemStack(heldStack); - } - } - - if (living instanceof PlayerEntity) - { - PlayerEntity player = (PlayerEntity) living; - if (LivingUtil.hasFullSet(player)) - { - if (event.getSource().isProjectile()) - { -// LivingStats stats = LivingStats.fromPlayer(player); -// stats.addExperience(LivingArmorRegistrar.TEST_UPGRADE.get().getKey(), 10); - LivingUtil.applyNewExperience(player, LivingArmorRegistrar.UPGRADE_ARROW_PROTECT.get(), event.getAmount()); - } else - { - LivingUtil.applyNewExperience(player, LivingArmorRegistrar.UPGRADE_PHYSICAL_PROTECT.get(), event.getAmount()); - } - - if (event.getSource() == DamageSource.FALL) - { - LivingUtil.applyNewExperience(player, LivingArmorRegistrar.UPGRADE_FALL_PROTECT.get(), event.getAmount()); - } - } - } - } - - @SubscribeEvent(priority = EventPriority.HIGHEST) - public void onExperiencePickupHighest(PlayerXpEvent.PickupXp event) - { - LivingEntity living = event.getEntityLiving(); - if (living instanceof PlayerEntity) - { - PlayerEntity player = (PlayerEntity) living; - if (LivingUtil.hasFullSet(player)) - { - LivingStats stats = LivingStats.fromPlayer(player, true); - double expModifier = 1 + LivingArmorRegistrar.UPGRADE_EXPERIENCE.get().getBonusValue("exp", stats.getLevel(LivingArmorRegistrar.UPGRADE_EXPERIENCE.get().getKey())).doubleValue(); -// System.out.println("Experience modifier: " + expModifier); - - int xp = event.getOrb().xpValue; - - event.getOrb().xpValue = ((int) Math.floor(xp * expModifier) + (player.world.rand.nextDouble() < (xp * expModifier) % 1 - ? 1 - : 0)); - - LivingUtil.applyNewExperience(player, LivingArmorRegistrar.UPGRADE_EXPERIENCE.get(), event.getOrb().getXpValue()); - } - } - } - - @SubscribeEvent - public void onHoe(BlockToolInteractEvent event) - { - if (event.getToolType() == ToolType.HOE && Tags.Blocks.NETHERRACK.contains(event.getState().getBlock())) - { - event.setFinalState(BloodMagicBlocks.NETHER_SOIL.get().getDefaultState()); - } - } - - // Experience Tome - @SubscribeEvent(priority = EventPriority.LOWEST) - public void onExperiencePickup(PlayerXpEvent.PickupXp event) - { - PlayerEntity player = event.getPlayer(); - Entry entry = EnchantmentHelper.getRandomItemWithEnchantment(Enchantments.MENDING, player); - - if (entry != null) - { - ItemStack itemStack = entry.getValue(); - if (!itemStack.isEmpty() && itemStack.isDamaged()) - { - int i = Math.min(xpToDurability(event.getOrb().xpValue), itemStack.getDamage()); - event.getOrb().xpValue -= durabilityToXp(i); - itemStack.setDamage(itemStack.getDamage() - i); - } - } - - if (!player.getEntityWorld().isRemote) - { - for (ItemStack stack : player.inventory.mainInventory) - { - if (stack.getItem() instanceof ItemExperienceBook) - { - ItemExperienceBook.addExperience(stack, event.getOrb().xpValue); - event.getOrb().xpValue = 0; - break; - } - } - } - } - - private static int xpToDurability(int xp) - { - return xp * 2; - } - - private static int durabilityToXp(int durability) - { - return durability / 2; - } - - public static void sendPlayerDemonWillAura(PlayerEntity player) - { - if (player instanceof ServerPlayerEntity) - { - BlockPos pos = player.getPosition(); - DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(WorldDemonWillHandler.getDimensionResourceLocation(player.world), pos.getX() >> 4, pos.getZ() >> 4); - if (holder != null) - { - BloodMagic.packetHandler.sendTo(new DemonAuraClientPacket(holder), (ServerPlayerEntity) player); - } else - { - BloodMagic.packetHandler.sendTo(new DemonAuraClientPacket(new DemonWillHolder()), (ServerPlayerEntity) player); - } - } - } - - // Handles sending the client the Demon Will Aura updates - @SubscribeEvent - public void onLivingUpdate(LivingUpdateEvent event) - { - if (!event.getEntityLiving().getEntityWorld().isRemote) - { - LivingEntity entity = event.getEntityLiving(); - if (entity.isPotionActive(BloodMagicPotions.PLANT_LEECH)) - { - int amplifier = entity.getActivePotionEffect(BloodMagicPotions.PLANT_LEECH).getAmplifier(); - int timeRemaining = entity.getActivePotionEffect(BloodMagicPotions.PLANT_LEECH).getDuration(); - if (timeRemaining % 10 == 0) - { - BMPotionUtils.damageMobAndGrowSurroundingPlants(entity, 2 + amplifier, 1, 0.5 * 3 / (amplifier + 3), 25 * (1 + amplifier)); - } - } - } - } - - @SubscribeEvent - public void onHeal(LivingHealEvent event) - { - LivingEntity living = event.getEntityLiving(); - if (living instanceof PlayerEntity) - { - PlayerEntity player = (PlayerEntity) living; - if (LivingUtil.hasFullSet(player)) - { - LivingUtil.applyNewExperience(player, LivingArmorRegistrar.UPGRADE_HEALTH.get(), event.getAmount()); - } - } - } - - @SubscribeEvent - public void onSelfSacrifice(SacrificeKnifeUsedEvent event) - { - if (LivingUtil.hasFullSet(event.player)) - { - LivingStats stats = LivingStats.fromPlayer(event.player, true); - double bonus = LivingArmorRegistrar.UPGRADE_SELF_SACRIFICE.get().getBonusValue("self_mod", stats.getLevel(LivingArmorRegistrar.UPGRADE_SELF_SACRIFICE.get().getKey())).doubleValue(); - event.lpAdded = (int) Math.round(event.lpAdded * (1 + bonus)); - LivingUtil.applyNewExperience(event.player, LivingArmorRegistrar.UPGRADE_SELF_SACRIFICE.get(), event.healthDrained); - } - } - - public static Map posXMap = new HashMap<>(); - public static Map posZMap = new HashMap<>(); - public static Map foodMap = new HashMap<>(); - - @SubscribeEvent(priority = EventPriority.HIGHEST) - public void onEntityUpdate(LivingEvent.LivingUpdateEvent event) - { - if (event.getEntity().world.isRemote) - { - if (event.getEntityLiving() instanceof PlayerEntity) - { - PlayerEntity player = (PlayerEntity) event.getEntityLiving(); - if (LivingUtil.hasFullSet(player)) - { - LivingStats stats = LivingStats.fromPlayer(player, true); - if (!player.isOnGround() && player.getMotion().getY() < 0) - { - - int jumpLevel = stats.getLevel(LivingArmorRegistrar.UPGRADE_JUMP.get().getKey()); - double fallDistanceMultiplier = LivingArmorRegistrar.UPGRADE_JUMP.get().getBonusValue("fall", jumpLevel).doubleValue(); - player.fallDistance = (float) Math.max(0, player.fallDistance + fallDistanceMultiplier * player.getMotion().getY()); -// System.out.println("Player's motion: " + player.getMotion().getY() + ", Player's fall reduction multiplier: " + fallDistanceMultiplier + ", Player's final fall distance: " + player.fallDistance); - } - return; - } - } - } - if (event.getEntityLiving() instanceof PlayerEntity) - { - PlayerEntity player = (PlayerEntity) event.getEntityLiving(); - float percentIncrease = 0; - -// System.out.println("Player's motion: " + player.getMotion().getY() + ", Player's final fall distance: " + player.fallDistance); - - if (LivingUtil.hasFullSet(player)) - { - LivingStats stats = LivingStats.fromPlayer(player, true); - ItemStack chestStack = player.getItemStackFromSlot(EquipmentSlotType.CHEST); -// percentIncrease += LivingArmorRegistrar.UPGRADE_SPEED.get().getBonusValue("speed_modifier", stats.getLevel(LivingArmorRegistrar.UPGRADE_SPEED.get().getKey())).doubleValue(); - if (player.isSprinting()) - { - int speedTime = LivingArmorRegistrar.UPGRADE_SPEED.get().getBonusValue("speed_time", stats.getLevel(LivingArmorRegistrar.UPGRADE_SPEED.get().getKey())).intValue(); - if (speedTime > 0) - { - int speedLevel = LivingArmorRegistrar.UPGRADE_SPEED.get().getBonusValue("speed_level", stats.getLevel(LivingArmorRegistrar.UPGRADE_SPEED.get().getKey())).intValue(); - player.addPotionEffect(new EffectInstance(Effects.SPEED, speedTime, speedLevel, true, false)); - } - } - - double distance = 0; - - if (posXMap.containsKey(player.getUniqueID())) - { - distance = Math.sqrt((player.getPosX() - posXMap.get(player.getUniqueID())) * (player.getPosX() - posXMap.get(player.getUniqueID())) + (player.getPosZ() - posZMap.get(player.getUniqueID())) * (player.getPosZ() - posZMap.get(player.getUniqueID()))); - } - - int currentFood = player.getFoodStats().getFoodLevel(); - - if (foodMap.getOrDefault(player.getUniqueID(), 19) < currentFood) - { - LivingUtil.applyNewExperience(player, LivingArmorRegistrar.UPGRADE_KNOCKBACK_RESIST.get(), currentFood - foodMap.getOrDefault(player.getUniqueID(), 19)); - } - - foodMap.put(player.getUniqueID(), currentFood); - -// System.out.println("Distance travelled: " + distance); - if (player.isOnGround() && distance > 0 && distance < 50) - { - distance *= (1 + percentIncrease); - LivingUtil.applyNewExperience(player, LivingArmorRegistrar.UPGRADE_SPEED.get(), distance); - } - - if (!player.isOnGround() && player.getMotion().getY() < 0) - { - - int jumpLevel = stats.getLevel(LivingArmorRegistrar.UPGRADE_JUMP.get().getKey()); - double fallDistanceMultiplier = LivingArmorRegistrar.UPGRADE_JUMP.get().getBonusValue("fall", jumpLevel).doubleValue(); - player.fallDistance = (float) Math.max(0, player.fallDistance + fallDistanceMultiplier * player.getMotion().getY()); -// System.out.println("Player's motion: " + player.getMotion().getY() + ", Player's fall reduction multiplier: " + fallDistanceMultiplier + ", Player's final fall distance: " + player.fallDistance); - } - - if (player.getFireTimer() > 0) - { - LivingUtil.applyNewExperience(player, LivingArmorRegistrar.UPGRADE_FIRE_RESIST.get(), 1); - int fireLevel = stats.getLevel(LivingArmorRegistrar.UPGRADE_FIRE_RESIST.get().getKey()); - if (fireLevel > 0) - { - boolean hasChanged = false; - int fireCooldown = chestStack.getTag().getInt("fire_cooldown"); - if (fireCooldown > 0) - { - fireCooldown--; - hasChanged = true; - } - - if (player.getFireTimer() > 0 && fireCooldown <= 0) - { - fireCooldown = LivingArmorRegistrar.UPGRADE_FIRE_RESIST.get().getBonusValue("cooldown_time", fireLevel).intValue(); - player.addPotionEffect(new EffectInstance(Effects.FIRE_RESISTANCE, LivingArmorRegistrar.UPGRADE_FIRE_RESIST.get().getBonusValue("resist_duration", fireLevel).intValue(), 0, true, false)); - hasChanged = true; - } - - if (hasChanged) - { - chestStack.getTag().putInt("fire_cooldown", fireCooldown); - } - } - } - - int poisonLevel = stats.getLevel(LivingArmorRegistrar.UPGRADE_POISON_RESIST.get().getKey()); - if (player.isPotionActive(Effects.POISON)) - { - LivingUtil.applyNewExperience(player, LivingArmorRegistrar.UPGRADE_POISON_RESIST.get(), 1); - } - if (poisonLevel > 0) - { - boolean hasChanged = false; - int poisonCooldown = chestStack.getTag().getInt("poison_cooldown"); - if (poisonCooldown > 0) - { - poisonCooldown--; - hasChanged = true; - } - - if (player.isPotionActive(Effects.POISON) && poisonCooldown <= 0 && LivingArmorRegistrar.UPGRADE_POISON_RESIST.get().getBonusValue("max_cure", poisonLevel).intValue() >= player.getActivePotionEffect(Effects.POISON).getAmplifier()) - { - poisonCooldown = LivingArmorRegistrar.UPGRADE_POISON_RESIST.get().getBonusValue("cooldown", poisonLevel).intValue(); - player.removePotionEffect(Effects.POISON); - hasChanged = true; - } - - if (hasChanged) - { - chestStack.getTag().putInt("poison_cooldown", poisonCooldown); - } - } - } - -// if (percentIncrease > 0 && (player.isOnGround()) && (Math.abs(player.moveForward) > 0 || Math.abs(player.moveStrafing) > 0)) -// { -// player.travel(new Vector3d(player.moveStrafing * percentIncrease, 0, player.moveForward * percentIncrease)); -// } - - posXMap.put(player.getUniqueID(), player.getPosX()); - posZMap.put(player.getUniqueID(), player.getPosZ()); - } - } - - @SubscribeEvent - public void onMiningSpeedCheck(PlayerEvent.BreakSpeed event) - { - PlayerEntity player = event.getPlayer(); - float percentIncrease = 0; - - if (LivingUtil.hasFullSet(player)) - { - LivingStats stats = LivingStats.fromPlayer(player, true); - percentIncrease += LivingArmorRegistrar.UPGRADE_DIGGING.get().getBonusValue("speed_modifier", stats.getLevel(LivingArmorRegistrar.UPGRADE_DIGGING.get().getKey())).doubleValue(); - } - - event.setNewSpeed((1 + percentIncrease) * event.getNewSpeed()); - } - - @SubscribeEvent(priority = EventPriority.HIGHEST) - public void onBreakBlock(BlockEvent.BreakEvent event) - { - PlayerEntity player = event.getPlayer(); - if (player != null) - { - if (LivingUtil.hasFullSet(player)) - { - LivingUtil.applyNewExperience(player, LivingArmorRegistrar.UPGRADE_DIGGING.get(), 1); - LivingStats stats = LivingStats.fromPlayer(player); - int mineTime = LivingArmorRegistrar.UPGRADE_DIGGING.get().getBonusValue("speed_time", stats.getLevel(LivingArmorRegistrar.UPGRADE_DIGGING.get().getKey())).intValue(); - if (mineTime > 0) - { - player.addPotionEffect(new EffectInstance(Effects.HASTE, mineTime, LivingArmorRegistrar.UPGRADE_DIGGING.get().getBonusValue("speed_level", stats.getLevel(LivingArmorRegistrar.UPGRADE_DIGGING.get().getKey())).intValue(), true, false)); - } - } - - ItemStack heldStack = player.getHeldItemMainhand(); - AnointmentHolder holder = AnointmentHolder.fromItemStack(heldStack); - - if (holder != null) - { - if (holder.getAnointmentLevel(AnointmentRegistrar.ANOINTMENT_SILK_TOUCH.get()) >= 1) - { - int bonusLevel = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, player.getHeldItemMainhand()); - int exp = event.getState().getExpDrop(event.getWorld(), event.getPos(), bonusLevel, holder.getAnointmentLevel(AnointmentRegistrar.ANOINTMENT_SILK_TOUCH.get())); - event.setExpToDrop(exp); - } - - int hiddenLevel = holder.getAnointmentLevel(AnointmentRegistrar.ANOINTMENT_HIDDEN_KNOWLEDGE.get()); - if (hiddenLevel > 0) - { - double expBonus = AnointmentRegistrar.ANOINTMENT_HIDDEN_KNOWLEDGE.get().getBonusValue("exp", hiddenLevel).doubleValue(); - int expAdded = (int) expBonus + (expBonus % 1 > event.getWorld().getRandom().nextDouble() ? 1 : 0); - event.setExpToDrop(event.getExpToDrop() + expAdded); - } - - if (holder.consumeAnointmentDurabilityOnHarvest(heldStack, EquipmentSlotType.MAINHAND)) - holder.toItemStack(heldStack); - } - } - } - - @SubscribeEvent - public void onJump(LivingJumpEvent event) - { - if (event.getEntityLiving() instanceof PlayerEntity) - { - PlayerEntity player = (PlayerEntity) event.getEntityLiving(); - - if (LivingUtil.hasFullSet(player)) - { - LivingUtil.applyNewExperience(player, LivingArmorRegistrar.UPGRADE_JUMP.get(), 1); - if (!player.isSneaking()) - { - LivingStats stats = LivingStats.fromPlayer(player); - double jumpModifier = LivingArmorRegistrar.UPGRADE_JUMP.get().getBonusValue("jump", stats.getLevel(LivingArmorRegistrar.UPGRADE_JUMP.get().getKey())).doubleValue(); - player.setMotion(player.getMotion().add(0, jumpModifier, 0)); - } - } - } - } - - private static final Map rollMap = new HashMap(); - - @SubscribeEvent - public void onEntityUseTick(LivingEntityUseItemEvent.Tick event) - { - ItemStack stack = event.getItem(); - if (stack.getItem() instanceof BowItem || stack.getItem() instanceof CrossbowItem) - { - AnointmentHolder holder = AnointmentHolder.fromItemStack(stack); - if (holder == null) - { - return; - } - int quickDrawLevel = holder.getAnointmentLevel(AnointmentRegistrar.ANOINTMENT_QUICK_DRAW.get()); - if (quickDrawLevel > 0) - { - double amount = rollMap.getOrDefault(stack, 0D) + AnointmentRegistrar.ANOINTMENT_QUICK_DRAW.get().getBonusValue("speed", quickDrawLevel).doubleValue(); - if (amount >= 1) - { - int drawReduction = (int) amount; - event.setDuration(event.getDuration() - drawReduction); - } else - { - rollMap.put(stack, amount); - } - } - } - } - - @SubscribeEvent - public void onEntityFinishUse(LivingEntityUseItemEvent.Stop event) - { - ItemStack stack = event.getItem(); - if (stack.getItem() instanceof CrossbowItem) - { - int i = stack.getUseDuration() - event.getDuration(); - float f = getCharge(i, stack); - if (f < 0) - { - return; - } - } - AnointmentHolder holder = AnointmentHolder.fromItemStack(stack); - if (holder != null) - { - if (holder.consumeAnointmentDurabilityOnUseFinish(stack, EquipmentSlotType.MAINHAND)) - { - - holder.toItemStack(stack); - } - } - } - - @SubscribeEvent - public void onEntityJoinEvent(EntityJoinWorldEvent event) - { - Entity entity = event.getEntity(); - if (entity instanceof ArrowEntity) - { - if (entity.ticksExisted <= 0) - { -// System.out.println("An arrow joined the world! Looking for the shooter..."); - ArrowEntity arrowEntity = (ArrowEntity) entity; - Entity shooter = arrowEntity.func_234616_v_(); - if (shooter instanceof PlayerEntity) - { - PlayerEntity playerShooter = (PlayerEntity) shooter; - for (Hand hand : Hand.values()) - { - ItemStack heldStack = playerShooter.getHeldItem(hand); - AnointmentHolder holder = AnointmentHolder.fromItemStack(heldStack); - if (holder == null) - { - continue; - } - - int powerLevel = holder.getAnointmentLevel(AnointmentRegistrar.ANOINTMENT_BOW_POWER.get()); - if (powerLevel > 0) - { - arrowEntity.setDamage(arrowEntity.getDamage() * AnointmentRegistrar.ANOINTMENT_BOW_POWER.get().getBonusValue("damage", powerLevel).doubleValue()); - -// System.out.println("Arrow damage is now: " + arrowEntity.getDamage()); - } - - break; - } - } - } - } - } - - @SubscribeEvent - public void onCheckLooting(LootingLevelEvent event) - { - DamageSource source = event.getDamageSource(); - if (source == null) - { - return; - } - Entity entity = source.getTrueSource(); - if (entity instanceof PlayerEntity) - { - ItemStack heldStack = ((PlayerEntity) entity).getHeldItemMainhand(); - AnointmentHolder holder = AnointmentHolder.fromItemStack(heldStack); - if (holder == null) - { - return; - } - - int plunderLevel = holder.getAnointmentLevel(AnointmentRegistrar.ANOINTMENT_LOOTING.get()); - if (plunderLevel > 0) - { - event.setLootingLevel(event.getLootingLevel() + plunderLevel); - } - } - } - - private static float getCharge(int useTime, ItemStack stack) - { - float f = (float) useTime / (float) getChargeTime(stack); - if (f > 1.0F) - { - f = 1.0F; - } - - return f; - } - - public static int getChargeTime(ItemStack stack) - { - int i = EnchantmentHelper.getEnchantmentLevel(Enchantments.QUICK_CHARGE, stack); - return i == 0 ? 25 : 25 - 5 * i; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/util/handler/event/WillHandler.java b/src/main/java/wayoftime/bloodmagic/util/handler/event/WillHandler.java deleted file mode 100644 index 1474aa41..00000000 --- a/src/main/java/wayoftime/bloodmagic/util/handler/event/WillHandler.java +++ /dev/null @@ -1,235 +0,0 @@ -package wayoftime.bloodmagic.util.handler.event; - -import java.util.HashMap; -import java.util.List; -import java.util.concurrent.ConcurrentLinkedQueue; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.MobEntity; -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.EffectInstance; -import net.minecraft.util.DamageSource; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.ChunkPos; -import net.minecraft.world.Difficulty; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorldReader; -import net.minecraft.world.World; -import net.minecraft.world.chunk.ChunkStatus; -import net.minecraft.world.chunk.IChunk; -import net.minecraftforge.event.TickEvent; -import net.minecraftforge.event.entity.living.LivingDropsEvent; -import net.minecraftforge.event.entity.player.EntityItemPickupEvent; -import net.minecraftforge.event.world.ChunkDataEvent; -import net.minecraftforge.eventbus.api.Event; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.common.item.BloodMagicItems; -import wayoftime.bloodmagic.demonaura.PosXY; -import wayoftime.bloodmagic.demonaura.WillChunk; -import wayoftime.bloodmagic.demonaura.WorldDemonWillHandler; -import wayoftime.bloodmagic.potion.BloodMagicPotions; -import wayoftime.bloodmagic.will.DemonWillHolder; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; -import wayoftime.bloodmagic.api.compat.IDemonWill; -import wayoftime.bloodmagic.api.compat.IDemonWillWeapon; -import wayoftime.bloodmagic.will.PlayerDemonWillHandler; - -@Mod.EventBusSubscriber(modid = BloodMagic.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) -public class WillHandler -{ - private static final HashMap SERVER_TICKS = new HashMap<>(); - - // Adds Will to player - @SubscribeEvent - public void onItemPickup(EntityItemPickupEvent event) - { - ItemStack stack = event.getItem().getItem(); - if (stack.getItem() instanceof IDemonWill) - { - PlayerEntity player = event.getPlayer(); - EnumDemonWillType pickupType = ((IDemonWill) stack.getItem()).getType(stack); - ItemStack remainder = PlayerDemonWillHandler.addDemonWill(player, stack); - - if (remainder == null || ((IDemonWill) stack.getItem()).getWill(pickupType, stack) < 0.0001 - || PlayerDemonWillHandler.isDemonWillFull(pickupType, player)) - { - stack.setCount(0); - event.setResult(Event.Result.ALLOW); - } - } - } - -// @SubscribeEvent -// public static void onEntityAttacked(LivingDeathEvent event) -// { -// if (event.getSource() instanceof EntityDamageSourceIndirect) -// { -// Entity sourceEntity = event.getSource().getImmediateSource(); -// -// if (sourceEntity instanceof EntitySentientArrow) -// { -// ((EntitySentientArrow) sourceEntity).reimbursePlayer(event.getEntityLiving(), event.getEntityLiving().getMaxHealth()); -// } -// } -// } - - // Add/Drop Demon Will for Player - @SubscribeEvent - public void onLivingDrops(LivingDropsEvent event) - { - LivingEntity attackedEntity = event.getEntityLiving(); - DamageSource source = event.getSource(); - Entity entity = source.getTrueSource(); - - if (attackedEntity.isPotionActive(BloodMagicPotions.SOUL_SNARE) && (attackedEntity instanceof MobEntity - || attackedEntity.getEntityWorld().getDifficulty() == Difficulty.PEACEFUL)) - { - EffectInstance eff = attackedEntity.getActivePotionEffect(BloodMagicPotions.SOUL_SNARE); - int lvl = eff.getAmplifier(); - - double amountOfSouls = attackedEntity.getEntityWorld().rand.nextDouble() * (lvl + 1) * (lvl + 1) * 4 + 1; - ItemStack soulStack = ((IDemonWill) BloodMagicItems.MONSTER_SOUL_RAW.get()).createWill(amountOfSouls); - event.getDrops().add(new ItemEntity(attackedEntity.getEntityWorld(), attackedEntity.getPosX(), attackedEntity.getPosY(), attackedEntity.getPosZ(), soulStack)); - } - - if (entity != null && entity instanceof PlayerEntity) - { - PlayerEntity player = (PlayerEntity) entity; - ItemStack heldStack = player.getHeldItemMainhand(); - if (heldStack.getItem() instanceof IDemonWillWeapon && !player.getEntityWorld().isRemote) - { - IDemonWillWeapon demonWillWeapon = (IDemonWillWeapon) heldStack.getItem(); - List droppedSouls = demonWillWeapon.getRandomDemonWillDrop(attackedEntity, player, heldStack, event.getLootingLevel()); - if (!droppedSouls.isEmpty()) - { - ItemStack remainder; - for (ItemStack willStack : droppedSouls) - { - remainder = PlayerDemonWillHandler.addDemonWill(player, willStack); - - if (!remainder.isEmpty()) - { - EnumDemonWillType pickupType = ((IDemonWill) remainder.getItem()).getType(remainder); - if (((IDemonWill) remainder.getItem()).getWill(pickupType, remainder) >= 0.0001) - { - event.getDrops().add(new ItemEntity(attackedEntity.getEntityWorld(), attackedEntity.getPosX(), attackedEntity.getPosY(), attackedEntity.getPosZ(), remainder)); - } - } - } - player.container.detectAndSendChanges(); - } - } - } - } - - @SubscribeEvent - public void onServerWorldTick(TickEvent.WorldTickEvent event) - { - if (event.world.isRemote) - return; - - ResourceLocation rl = WorldDemonWillHandler.getDimensionResourceLocation(event.world); -// int dim = event.world.provider.getDimension(); - if (event.phase == TickEvent.Phase.END) - { - if (!SERVER_TICKS.containsKey(rl)) - SERVER_TICKS.put(rl, 0); - - int ticks = (SERVER_TICKS.get(rl)); - - if (ticks % 20 == 0) - { -// CopyOnWriteArrayList dirtyChunks = WorldDemonWillHandler.dirtyChunks.get(rl); - ConcurrentLinkedQueue dirtyChunks = WorldDemonWillHandler.dirtyChunks.get(rl); - if ((dirtyChunks != null) && (dirtyChunks.size() > 0)) - { - for (PosXY pos : dirtyChunks) - { - IChunk chunk = event.world.getChunk(pos.x, pos.y, ChunkStatus.FULL, false); - if (chunk != null) - { - chunk.setModified(true); - } - } - - dirtyChunks.clear(); - } - } - - SERVER_TICKS.put(rl, ticks + 1); - } - - } - - public static boolean isBlockLoaded(IBlockReader world, BlockPos pos) - { - if (world == null || !World.isValid(pos)) - { - return false; - } else if (world instanceof IWorldReader) - { - // Note: We don't bother checking if it is a world and then isBlockPresent - // because - // all that does is also validate the y value is in bounds, and we already check - // to make - // sure the position is valid both in the y and xz directions - return ((IWorldReader) world).isBlockLoaded(pos); - } - return true; - } - - @SubscribeEvent - public void chunkSave(ChunkDataEvent.Save event) - { - if (!(event.getWorld() instanceof World)) - { - return; - } - ResourceLocation rl = WorldDemonWillHandler.getDimensionResourceLocation((World) event.getWorld()); -// int dim = event.getWorld().provider.getDimension(); - - ChunkPos loc = event.getChunk().getPos(); - - CompoundNBT nbt = new CompoundNBT(); - event.getData().put("BloodMagic", nbt); - - WillChunk ac = WorldDemonWillHandler.getWillChunk(rl, loc.x, loc.z); - if (ac != null) - { - nbt.putShort("base", ac.getBase()); - ac.getCurrentWill().writeToNBT(nbt, "current"); -// if (event.getChunk() instanceof Chunk && !((Chunk) event.getChunk()).setLoaded(loaded);) - if (!event.getWorld().getChunkProvider().isChunkLoaded(event.getChunk().getPos())) - WorldDemonWillHandler.removeWillChunk(rl, loc.x, loc.z); - } - } - - @SubscribeEvent - public void chunkLoad(ChunkDataEvent.Load event) - { - if (!(event.getWorld() instanceof World)) - { - return; - } - ResourceLocation rl = WorldDemonWillHandler.getDimensionResourceLocation((World) event.getWorld()); -// int dim = event.getWorld().provider.getDimension(); - if (event.getData().getCompound("BloodMagic").contains("base")) - { - CompoundNBT nbt = event.getData().getCompound("BloodMagic"); - short base = nbt.getShort("base"); - DemonWillHolder current = new DemonWillHolder(); - current.readFromNBT(nbt, "current"); - WorldDemonWillHandler.addWillChunk(rl, event.getChunk(), base, current); - } else - { - WorldDemonWillHandler.generateWill(event.getChunk(), (World) event.getWorld()); - } - } -} diff --git a/src/main/java/wayoftime/bloodmagic/util/helper/BindableHelper.java b/src/main/java/wayoftime/bloodmagic/util/helper/BindableHelper.java deleted file mode 100644 index 061e6c6a..00000000 --- a/src/main/java/wayoftime/bloodmagic/util/helper/BindableHelper.java +++ /dev/null @@ -1,54 +0,0 @@ -package wayoftime.bloodmagic.util.helper; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import wayoftime.bloodmagic.core.data.Binding; -import wayoftime.bloodmagic.event.ItemBindEvent; -import wayoftime.bloodmagic.util.Constants; - -public class BindableHelper -{ - - public static void applyBinding(ItemStack stack, PlayerEntity player) - { - Binding binding = new Binding(player.getGameProfile().getId(), player.getGameProfile().getName()); - applyBinding(stack, binding); - } - - public static void applyBinding(ItemStack stack, Binding binding) - { - if (!stack.hasTag()) - stack.setTag(new CompoundNBT()); - - stack.getTag().put("binding", binding.serializeNBT()); - } - - /** - * Sets the Owner Name of the item without checking if it is already bound. Also - * bypasses {@link ItemBindEvent}. - * - * @param stack - The ItemStack to bind - * @param ownerName - The username to bind the ItemStack to - */ - public static void setItemOwnerName(ItemStack stack, String ownerName) - { - stack = NBTHelper.checkNBT(stack); - - stack.getTag().putString(Constants.NBT.OWNER_NAME, ownerName); - } - - /** - * Sets the Owner UUID of the item without checking if it is already bound. Also - * bypasses {@link ItemBindEvent}. - * - * @param stack - The ItemStack to bind - * @param ownerUUID - The UUID to bind the ItemStack to - */ - public static void setItemOwnerUUID(ItemStack stack, String ownerUUID) - { - stack = NBTHelper.checkNBT(stack); - - stack.getTag().putString(Constants.NBT.OWNER_UUID, ownerUUID); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/util/helper/IncenseHelper.java b/src/main/java/wayoftime/bloodmagic/util/helper/IncenseHelper.java deleted file mode 100644 index 4e071189..00000000 --- a/src/main/java/wayoftime/bloodmagic/util/helper/IncenseHelper.java +++ /dev/null @@ -1,55 +0,0 @@ -package wayoftime.bloodmagic.util.helper; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import wayoftime.bloodmagic.util.Constants; - -public class IncenseHelper -{ - - public static double getCurrentIncense(PlayerEntity player) - { - CompoundNBT data = player.getPersistentData(); - if (data.contains(Constants.NBT.CURRENT_INCENSE)) - { - return data.getDouble(Constants.NBT.CURRENT_INCENSE); - } - - return 0; - } - - public static void setCurrentIncense(PlayerEntity player, double amount) - { - CompoundNBT data = player.getPersistentData(); - data.putDouble(Constants.NBT.CURRENT_INCENSE, amount); - } - - public static void setMaxIncense(PlayerEntity player, double amount) - { - CompoundNBT data = player.getPersistentData(); - data.putDouble(Constants.NBT.MAX_INCENSE, amount); - } - - public static double getMaxIncense(PlayerEntity player) - { - CompoundNBT data = player.getPersistentData(); - if (data.contains(Constants.NBT.MAX_INCENSE)) - { - return data.getDouble(Constants.NBT.MAX_INCENSE); - } - return 0; - } - - public static void setHasMaxIncense(ItemStack stack, PlayerEntity player, boolean isMax) - { - stack = NBTHelper.checkNBT(stack); - stack.getTag().putBoolean(Constants.NBT.HAS_MAX_INCENSE, isMax); - } - - public static boolean getHasMaxIncense(ItemStack stack) - { - stack = NBTHelper.checkNBT(stack); - return stack.getTag().getBoolean(Constants.NBT.HAS_MAX_INCENSE); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/util/helper/NBTHelper.java b/src/main/java/wayoftime/bloodmagic/util/helper/NBTHelper.java deleted file mode 100644 index f7fdaa52..00000000 --- a/src/main/java/wayoftime/bloodmagic/util/helper/NBTHelper.java +++ /dev/null @@ -1,15 +0,0 @@ -package wayoftime.bloodmagic.util.helper; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; - -public class NBTHelper -{ - public static ItemStack checkNBT(ItemStack stack) - { - if (stack.getTag() == null) - stack.setTag(new CompoundNBT()); - - return stack; - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/util/helper/NetworkHelper.java b/src/main/java/wayoftime/bloodmagic/util/helper/NetworkHelper.java deleted file mode 100644 index 0dc98add..00000000 --- a/src/main/java/wayoftime/bloodmagic/util/helper/NetworkHelper.java +++ /dev/null @@ -1,183 +0,0 @@ -package wayoftime.bloodmagic.util.helper; - -import java.util.UUID; - -import javax.annotation.Nullable; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.world.storage.DimensionSavedDataManager; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.server.ServerLifecycleHooks; -import wayoftime.bloodmagic.core.data.BMWorldSavedData; -import wayoftime.bloodmagic.core.data.Binding; -import wayoftime.bloodmagic.core.data.SoulNetwork; -import wayoftime.bloodmagic.core.data.SoulTicket; -import wayoftime.bloodmagic.core.registry.OrbRegistry; -import wayoftime.bloodmagic.event.SoulNetworkEvent; -import wayoftime.bloodmagic.common.item.IBindable; -import wayoftime.bloodmagic.common.item.BloodOrb; -import wayoftime.bloodmagic.common.item.IBloodOrb; - -public class NetworkHelper -{ - @Nullable - private static BMWorldSavedData dataHandler; - - /** - * Gets the SoulNetwork for the player. - * - * @param uuid - The UUID of the SoulNetwork owner - this is UUID.toString(). - * @return - The SoulNetwork for the given name. - */ - public static SoulNetwork getSoulNetwork(String uuid) - { - if (dataHandler == null) - { - if (ServerLifecycleHooks.getCurrentServer() == null) - return null; - - DimensionSavedDataManager savedData = ServerLifecycleHooks.getCurrentServer().func_241755_D_().getSavedData(); - dataHandler = savedData.getOrCreate(() -> new BMWorldSavedData(), BMWorldSavedData.ID); - } - - return dataHandler.getNetwork(UUID.fromString(uuid)); - } - - /** - * @param uuid - The Player's Mojang UUID - * @see NetworkHelper#getSoulNetwork(String) - */ - public static SoulNetwork getSoulNetwork(UUID uuid) - { - return getSoulNetwork(uuid.toString()); - } - - /** - * @param player - The Player - * @see NetworkHelper#getSoulNetwork(String) - */ - public static SoulNetwork getSoulNetwork(PlayerEntity player) - { - return getSoulNetwork(PlayerHelper.getUUIDFromPlayer(player)); - } - - public static SoulNetwork getSoulNetwork(Binding binding) - { - return getSoulNetwork(binding.getOwnerId()); - } - - /** - * Gets the current orb tier of the SoulNetwork. - * - * @param soulNetwork - SoulNetwork to get the tier of. - * @return - The Orb tier of the given SoulNetwork - */ - public static int getCurrentMaxOrb(SoulNetwork soulNetwork) - { - return soulNetwork.getOrbTier(); - } - - public static int getMaximumForTier(int tier) - { - int ret = 0; - - if (tier > OrbRegistry.getTierMap().size() || tier < 0) - return ret; - - for (ItemStack orbStack : OrbRegistry.getOrbsForTier(tier)) - { - BloodOrb orb = ((IBloodOrb) orbStack.getItem()).getOrb(orbStack); - if (orb.getCapacity() > ret) - ret = orb.getCapacity(); - } - - return ret; - } - - // Syphon - - /** - * Syphons from the player and damages them if there was not enough stored LP. - *

- * Handles null-checking the player for you. - * - * @param soulNetwork - SoulNetwork to syphon from - * @param user - User of the item. - * @param toSyphon - Amount of LP to syphon - * @return - Whether the action should be performed. - * @deprecated Use {@link #getSoulNetwork(PlayerEntity)} and - * {@link SoulNetwork#syphonAndDamage$(PlayerEntity, SoulTicket)} - */ - @Deprecated - public static boolean syphonAndDamage(SoulNetwork soulNetwork, PlayerEntity user, int toSyphon) - { - -// if (soulNetwork.getNewOwner() == null) -// { -// soulNetwork.syphon(toSyphon); -// return true; -// } - - return soulNetwork.syphonAndDamage(user, toSyphon); - } - - /** - * Syphons a player from within a container. - * - * @param stack - ItemStack in the Container. - * @param ticket - SoulTicket to syphon - * @return - If the syphon was successful. - */ - public static boolean syphonFromContainer(ItemStack stack, SoulTicket ticket) - { - if (!(stack.getItem() instanceof IBindable)) - return false; - - Binding binding = ((IBindable) stack.getItem()).getBinding(stack); - if (binding == null) - return false; - - SoulNetwork network = getSoulNetwork(binding); - SoulNetworkEvent.Syphon.Item event = new SoulNetworkEvent.Syphon.Item(network, ticket, stack); - - return !MinecraftForge.EVENT_BUS.post(event) && network.syphon(event.getTicket(), true) >= ticket.getAmount(); - } - - /** - * Checks if the ItemStack has a user to be syphoned from. - * - * @param stack - ItemStack to check - * @param toSyphon - Amount of LP to syphon - * @return - If syphoning is possible - */ - public static boolean canSyphonFromContainer(ItemStack stack, int toSyphon) - { - if (!(stack.getItem() instanceof IBindable)) - return false; - - Binding binding = ((IBindable) stack.getItem()).getBinding(stack); - if (binding == null) - return false; - - SoulNetwork network = getSoulNetwork(binding); - if (network == null) - return false; - - return network.getCurrentEssence() >= toSyphon; - } - - // Set - - /** - * Sets the orb tier of the SoulNetwork to the given orb. Will not set if the - * given tier is lower than the current tier. - * - * @param soulNetwork - SoulNetwork to set the orb tier of - * @param maxOrb - Tier of orb to set to - */ - public static void setMaxOrb(SoulNetwork soulNetwork, int maxOrb) - { - soulNetwork.setOrbTier(Math.max(maxOrb, soulNetwork.getOrbTier())); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/util/helper/NumeralHelper.java b/src/main/java/wayoftime/bloodmagic/util/helper/NumeralHelper.java deleted file mode 100644 index f2c5d320..00000000 --- a/src/main/java/wayoftime/bloodmagic/util/helper/NumeralHelper.java +++ /dev/null @@ -1,35 +0,0 @@ -package wayoftime.bloodmagic.util.helper; - -import java.util.TreeMap; - -public class NumeralHelper -{ - - private static final TreeMap romanNumerals = new TreeMap(); - - static - { - romanNumerals.put(1000, "M"); - romanNumerals.put(900, "CM"); - romanNumerals.put(500, "D"); - romanNumerals.put(400, "CD"); - romanNumerals.put(100, "C"); - romanNumerals.put(90, "XC"); - romanNumerals.put(50, "L"); - romanNumerals.put(40, "XL"); - romanNumerals.put(10, "X"); - romanNumerals.put(9, "IX"); - romanNumerals.put(5, "V"); - romanNumerals.put(4, "IV"); - romanNumerals.put(1, "I"); - } - - public static String toRoman(int arabic) - { - int convert = romanNumerals.floorKey(arabic); - if (arabic == convert) - return romanNumerals.get(convert); - - return romanNumerals.get(convert) + toRoman(arabic - convert); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/util/helper/PlayerHelper.java b/src/main/java/wayoftime/bloodmagic/util/helper/PlayerHelper.java deleted file mode 100644 index 7150adc2..00000000 --- a/src/main/java/wayoftime/bloodmagic/util/helper/PlayerHelper.java +++ /dev/null @@ -1,61 +0,0 @@ -package wayoftime.bloodmagic.util.helper; - -import java.util.ArrayList; -import java.util.UUID; - -import com.google.common.collect.Lists; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraftforge.common.UsernameCache; -import net.minecraftforge.common.util.FakePlayer; -import net.minecraftforge.fml.server.ServerLifecycleHooks; - -public class PlayerHelper -{ - /** - * A list of all known fake players that do not extend FakePlayer. - *

- * Will be added to as needed. - */ - private static final ArrayList knownFakePlayers = Lists.newArrayList(); - - public static PlayerEntity getPlayerFromId(UUID uuid) - { - // TODO: Need to find a reliable way to get whether the side is Client or Server - - if (ServerLifecycleHooks.getCurrentServer() == null) - { - return null; - } - - return ServerLifecycleHooks.getCurrentServer().getPlayerList().getPlayerByUUID(uuid); - -// return FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().getPlayerByUUID(uuid); - } - - public static PlayerEntity getPlayerFromUUID(UUID uuid) - { - return getPlayerFromId(uuid); - } - - public static UUID getUUIDFromPlayer(PlayerEntity player) - { - return player.getGameProfile().getId(); - } - - public static String getUsernameFromUUID(UUID uuid) - { - return UsernameCache.getLastKnownUsername(uuid); - } - - /** - * Checks whether or not the given player is an "actual" player - * - * @param player - The player in question - * @return If the player is fake or not - */ - public static boolean isFakePlayer(PlayerEntity player) - { - return player instanceof FakePlayer || (player != null && knownFakePlayers.contains(player.getClass().getCanonicalName())); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/util/helper/PlayerSacrificeHelper.java b/src/main/java/wayoftime/bloodmagic/util/helper/PlayerSacrificeHelper.java deleted file mode 100644 index 0f247bbc..00000000 --- a/src/main/java/wayoftime/bloodmagic/util/helper/PlayerSacrificeHelper.java +++ /dev/null @@ -1,159 +0,0 @@ -package wayoftime.bloodmagic.util.helper; - -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.potion.Potion; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import wayoftime.bloodmagic.ConfigHandler; -import wayoftime.bloodmagic.altar.IBloodAltar; -import wayoftime.bloodmagic.event.SacrificeKnifeUsedEvent; - -public class PlayerSacrificeHelper -{ - public static float scalingOfSacrifice = 1f; - public static int soulFrayDuration = 400; - public static Potion soulFrayId; - - public static double getPlayerIncense(PlayerEntity player) - { -// return 0; - return IncenseHelper.getCurrentIncense(player); - } - - public static void setPlayerIncense(PlayerEntity player, double amount) - { - IncenseHelper.setCurrentIncense(player, amount); - } - - public static boolean incrementIncense(PlayerEntity player, double min, double incenseAddition, double increment) - { -// return true; - double amount = getPlayerIncense(player); - if (amount < min || amount >= incenseAddition) - { - return false; - } - - amount = amount + Math.min(increment, incenseAddition - amount); - setPlayerIncense(player, amount); - - if (amount == incenseAddition) - { - IncenseHelper.setMaxIncense(player, incenseAddition); - } - // System.out.println("Amount of incense: " + amount + ", Increment: " + - // increment); - - return true; - } - - /** - * Sacrifices a player's health while the player is under the influence of - * incense - * - * @param player - The player sacrificing - * @return Whether or not the health sacrificing succeeded - */ - public static boolean sacrificePlayerHealth(PlayerEntity player) - { -// if (player.isPotionActive(soulFrayId)) -// { -// return false; -// } - - double amount = getPlayerIncense(player); - - if (amount >= 0) - { - float health = player.getHealth(); - float maxHealth = player.getMaxHealth(); - - if (health > maxHealth / 10.0) - { - float sacrificedHealth = health - maxHealth / 10.0f; - int lpAdded = (int) (sacrificedHealth * ConfigHandler.values.sacrificialDaggerConversion * getModifier(amount)); - - IBloodAltar altar = getAltar(player.getEntityWorld(), player.getPosition()); - if (altar != null) - { - SacrificeKnifeUsedEvent evt = new SacrificeKnifeUsedEvent(player, true, true, (int) sacrificedHealth, lpAdded); - if (MinecraftForge.EVENT_BUS.post(evt)) - return false; - - altar.sacrificialDaggerCall(evt.lpAdded, false); - altar.startCycle(); - - player.setHealth(maxHealth / 10.0f); - setPlayerIncense(player, 0); -// player.addPotionEffect(new PotionEffect(RegistrarBloodMagic.SOUL_FRAY, soulFrayDuration)); - - return true; - } - } - } - - return false; - } - - public static double getModifier(double amount) - { - return 1 + amount * scalingOfSacrifice; - } - - /** - * Finds the nearest {@link IBloodAltar} and attempts to fill it - * - * @param world - The world - * @param sacrificingEntity - The entity having the sacrifice done on (can be - * {@link PlayerEntity} for self-sacrifice) - * @param amount - The amount of which the altar should be filled - * @param isSacrifice - Whether this is a Sacrifice or a Self-Sacrifice - * @return Whether the altar is found and (attempted) filled - */ - public static boolean findAndFillAltar(World world, LivingEntity sacrificingEntity, int amount, boolean isSacrifice) - { - IBloodAltar altarEntity = getAltar(world, sacrificingEntity.getPosition()); - - if (altarEntity == null) - return false; - - altarEntity.sacrificialDaggerCall(amount, isSacrifice); - altarEntity.startCycle(); - - return true; - } - - /** - * Gets the nearest {@link IBloodAltar} - * - * @param world - The world - * @param blockPos - The position of where the check should be in (in a 2 block - * radius from this) - * @return The nearest altar, if no altar is found, then this will return null - */ - public static IBloodAltar getAltar(World world, BlockPos blockPos) - { - TileEntity tileEntity; - - for (int x = -2; x <= 2; x++) - { - for (int y = -2; y <= 1; y++) - { - for (int z = -2; z <= 2; z++) - { - tileEntity = world.getTileEntity(blockPos.add(x, y, z)); - - if (tileEntity instanceof IBloodAltar) - { - return (IBloodAltar) tileEntity; - } - } - } - } - - return null; - } -} diff --git a/src/main/java/wayoftime/bloodmagic/util/helper/RitualHelper.java b/src/main/java/wayoftime/bloodmagic/util/helper/RitualHelper.java deleted file mode 100644 index 3862d73a..00000000 --- a/src/main/java/wayoftime/bloodmagic/util/helper/RitualHelper.java +++ /dev/null @@ -1,253 +0,0 @@ -package wayoftime.bloodmagic.util.helper; - -import java.util.List; - -import org.apache.commons.lang3.tuple.Pair; - -import com.google.common.collect.Lists; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.capabilities.CapabilityInject; -import net.minecraftforge.common.util.LazyOptional; -import wayoftime.bloodmagic.BloodMagic; -import wayoftime.bloodmagic.common.block.BlockRitualStone; -import wayoftime.bloodmagic.common.block.BloodMagicBlocks; -import wayoftime.bloodmagic.ritual.EnumRuneType; -import wayoftime.bloodmagic.ritual.IRitualStone; -import wayoftime.bloodmagic.ritual.IRitualStone.Tile; -import wayoftime.bloodmagic.ritual.Ritual; -import wayoftime.bloodmagic.ritual.RitualComponent; -import wayoftime.bloodmagic.tile.TileMasterRitualStone; - -public class RitualHelper -{ - @CapabilityInject(IRitualStone.Tile.class) - static Capability RUNE_CAPABILITY = null; - - public static boolean canCrystalActivate(Ritual ritual, int crystalLevel) - { - return ritual.getCrystalLevel() <= crystalLevel - && BloodMagic.RITUAL_MANAGER.enabled(BloodMagic.RITUAL_MANAGER.getId(ritual), false); - } - - /** - * Checks the RitualRegistry to see if the configuration of the ritual stones in - * the world is valid for the given Direction. - * - * @param world - The world - * @param pos - Location of the MasterRitualStone - * @return The ID of the valid ritual - */ - public static String getValidRitual(World world, BlockPos pos) - { - for (Ritual ritual : BloodMagic.RITUAL_MANAGER.getRituals()) - { - for (int i = 0; i < 4; i++) - { - Direction direction = Direction.byHorizontalIndex(i); - - if (checkValidRitual(world, pos, ritual, direction)) - return BloodMagic.RITUAL_MANAGER.getId(ritual); - } - } - - return ""; - } - - public static Direction getDirectionOfRitual(World world, BlockPos pos, Ritual ritual) - { - for (int i = 0; i < 4; i++) - { - Direction direction = Direction.byHorizontalIndex(i); - if (checkValidRitual(world, pos, ritual, direction)) - return direction; - } - - return null; - } - - public static boolean checkValidRitual(World world, BlockPos pos, Ritual ritual, Direction direction) - { - if (ritual == null) - { - return false; - } - - List components = Lists.newArrayList(); - ritual.gatherComponents(components::add); - - for (RitualComponent component : components) - { - BlockPos newPos = pos.add(component.getOffset(direction)); - if (!isRuneType(world, newPos, component.getRuneType())) - return false; - } - - return true; - } - - public static boolean isRuneType(World world, BlockPos pos, EnumRuneType type) - { - if (world == null) - return false; - Block block = world.getBlockState(pos).getBlock(); - TileEntity tile = world.getTileEntity(pos); - - if (block instanceof IRitualStone) - return ((IRitualStone) block).isRuneType(world, pos, type); - else if (tile instanceof IRitualStone.Tile) - return ((IRitualStone.Tile) tile).isRuneType(type); - else if (tile != null && tile.getCapability(RUNE_CAPABILITY, null).isPresent()) - return tile.getCapability(RUNE_CAPABILITY, null).resolve().get().isRuneType(type); - - return false; - } - - public static boolean isRune(World world, BlockPos pos) - { - if (world == null) - return false; - Block block = world.getBlockState(pos).getBlock(); - TileEntity tile = world.getTileEntity(pos); - - if (block instanceof IRitualStone) - return true; - else if (tile instanceof IRitualStone.Tile) - return true; - else - return tile != null && tile.getCapability(RUNE_CAPABILITY, null).isPresent(); - - } - - public static void setRuneType(World world, BlockPos pos, EnumRuneType type) - { - if (world == null) - return; - BlockState state = world.getBlockState(pos); - TileEntity tile = world.getTileEntity(pos); - - if (state.getBlock() instanceof IRitualStone) - ((IRitualStone) state.getBlock()).setRuneType(world, pos, type); - else if (tile instanceof IRitualStone.Tile) - ((IRitualStone.Tile) tile).setRuneType(type); - else - { - LazyOptional cap = tile.getCapability(RUNE_CAPABILITY, null); - if (cap.isPresent()) - { - cap.resolve().get().setRuneType(type); - world.notifyBlockUpdate(pos, state, state, 3); - } - - } - } - - public static boolean createRitual(World world, BlockPos pos, Direction direction, Ritual ritual, boolean safe) - { - - List components = Lists.newArrayList(); - ritual.gatherComponents(components::add); - - if (abortConstruction(world, pos, direction, safe, components)) - return false; - - BlockState mrs = BloodMagicBlocks.MASTER_RITUAL_STONE.get().getDefaultState(); - world.setBlockState(pos, mrs); - - setRitualStones(direction, world, pos, components); - return true; - } - - public static boolean abortConstruction(World world, BlockPos pos, Direction direction, boolean safe, List components) - { - // TODO: can be optimized to check only for the first and last component if - // every ritual has those at the highest and lowest y-level respectivly. - for (RitualComponent component : components) - { - BlockPos offset = component.getOffset(direction); - BlockPos newPos = pos.add(offset); - if (world.isOutsideBuildHeight(newPos) || (safe && !world.isAirBlock(newPos))) - return true; - } - return false; - } - - public static boolean repairRitualFromRuins(TileMasterRitualStone tile, boolean safe) - { - Ritual ritual = tile.getCurrentRitual(); - Direction direction; - Pair pair; - if (ritual == null) - { - pair = getRitualFromRuins(tile); - ritual = pair.getKey(); - direction = pair.getValue(); - } else - direction = tile.getDirection(); - - World world = tile.getWorld(); - BlockPos pos = tile.getPos(); - - List components = Lists.newArrayList(); - ritual.gatherComponents(components::add); - - if (abortConstruction(world, pos, direction, safe, components)) - return false; - - setRitualStones(direction, world, pos, components); - return true; - } - - public static void setRitualStones(Direction direction, World world, BlockPos pos, List gatheredComponents) - { - for (RitualComponent component : gatheredComponents) - { - BlockPos offset = component.getOffset(direction); - BlockPos newPos = pos.add(offset); - ((BlockRitualStone) BloodMagicBlocks.BLANK_RITUAL_STONE.get()).setRuneType(world, newPos, component.getRuneType()); - } - } - - public static Pair getRitualFromRuins(TileMasterRitualStone tile) - { - BlockPos pos = tile.getPos(); - World world = tile.getWorld(); - Ritual possibleRitual = tile.getCurrentRitual(); - Direction possibleDirection = tile.getDirection(); - int highestCount = 0; - - if (possibleRitual == null || possibleDirection == null) - for (Ritual ritual : BloodMagic.RITUAL_MANAGER.getRituals()) - { - for (int i = 0; i < 4; i++) - { - Direction direction = Direction.byHorizontalIndex(i); - List components = Lists.newArrayList(); - ritual.gatherComponents(components::add); - int currentCount = 0; - - for (RitualComponent component : components) - { - BlockPos newPos = pos.add(component.getOffset(direction)); - if (isRuneType(world, newPos, component.getRuneType())) - currentCount += 1; - } - if (currentCount > highestCount) - { - highestCount = currentCount; - possibleRitual = ritual; - possibleDirection = direction; - } - - } - - } - return Pair.of(possibleRitual, possibleDirection); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/util/helper/TextHelper.java b/src/main/java/wayoftime/bloodmagic/util/helper/TextHelper.java deleted file mode 100644 index 34d1da08..00000000 --- a/src/main/java/wayoftime/bloodmagic/util/helper/TextHelper.java +++ /dev/null @@ -1,77 +0,0 @@ -package wayoftime.bloodmagic.util.helper; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang3.text.WordUtils; - -import net.minecraft.client.resources.I18n; - -public class TextHelper -{ - public static String getFormattedText(String string) - { - return string.replaceAll("&", "\u00A7"); - } - - public static String localize(String input, Object... format) - { - return I18n.format(input, format); - } - - public static String localizeEffect(String input, Object... format) - { - return getFormattedText(localize(input, format)); - } - - public static String[] localizeAll(String[] input) - { - String[] ret = new String[input.length]; - for (int i = 0; i < input.length; i++) - ret[i] = localize(input[i]); - - return ret; - } - - public static String[] localizeAllEffect(String[] input) - { - String[] ret = new String[input.length]; - for (int i = 0; i < input.length; i++) - ret[i] = localizeEffect(input[i]); - - return ret; - } - - public static ArrayList localizeAll(List input) - { - ArrayList ret = new ArrayList<>(input.size()); - for (int i = 0; i < input.size(); i++) - ret.add(i, localize(input.get(i))); - - return ret; - } - - public static ArrayList localizeAllEffect(List input) - { - ArrayList ret = new ArrayList<>(input.size()); - for (int i = 0; i < input.size(); i++) - ret.add(i, localizeEffect(input.get(i))); - - return ret; - } - - public static String[] cutLongString(String string, int characters) - { - return WordUtils.wrap(string, characters, "/cut", false).split("/cut"); - } - - public static String[] cutLongString(String string) - { - return cutLongString(string, 30); - } - - public static boolean canTranslate(String key) - { - return I18n.hasKey(key); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/util/providers/IBaseProvider.java b/src/main/java/wayoftime/bloodmagic/util/providers/IBaseProvider.java deleted file mode 100644 index af0a7f94..00000000 --- a/src/main/java/wayoftime/bloodmagic/util/providers/IBaseProvider.java +++ /dev/null @@ -1,23 +0,0 @@ -package wayoftime.bloodmagic.util.providers; - -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; -import wayoftime.bloodmagic.util.text.IHasTextComponent; -import wayoftime.bloodmagic.util.text.IHasTranslationKey; - -public interface IBaseProvider extends IHasTextComponent, IHasTranslationKey -{ - ResourceLocation getRegistryName(); - - default String getName() - { - return getRegistryName().getPath(); - } - - @Override - default ITextComponent getTextComponent() - { - return new TranslationTextComponent(getTranslationKey()); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/util/providers/IEntityTypeProvider.java b/src/main/java/wayoftime/bloodmagic/util/providers/IEntityTypeProvider.java deleted file mode 100644 index 07785354..00000000 --- a/src/main/java/wayoftime/bloodmagic/util/providers/IEntityTypeProvider.java +++ /dev/null @@ -1,32 +0,0 @@ -package wayoftime.bloodmagic.util.providers; - -import javax.annotation.Nonnull; - -import net.minecraft.entity.EntityType; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; - -public interface IEntityTypeProvider extends IBaseProvider -{ - - @Nonnull - EntityType getEntityType(); - - @Override - default ResourceLocation getRegistryName() - { - return getEntityType().getRegistryName(); - } - - @Override - default ITextComponent getTextComponent() - { - return getEntityType().getName(); - } - - @Override - default String getTranslationKey() - { - return getEntityType().getTranslationKey(); - } -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/util/text/IHasTextComponent.java b/src/main/java/wayoftime/bloodmagic/util/text/IHasTextComponent.java deleted file mode 100644 index 9f77ad56..00000000 --- a/src/main/java/wayoftime/bloodmagic/util/text/IHasTextComponent.java +++ /dev/null @@ -1,8 +0,0 @@ -package wayoftime.bloodmagic.util.text; - -import net.minecraft.util.text.ITextComponent; - -public interface IHasTextComponent -{ - ITextComponent getTextComponent(); -} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/util/text/IHasTranslationKey.java b/src/main/java/wayoftime/bloodmagic/util/text/IHasTranslationKey.java deleted file mode 100644 index b23d79b6..00000000 --- a/src/main/java/wayoftime/bloodmagic/util/text/IHasTranslationKey.java +++ /dev/null @@ -1,6 +0,0 @@ -package wayoftime.bloodmagic.util.text; - -public interface IHasTranslationKey -{ - String getTranslationKey(); -} diff --git a/src/main/java/wayoftime/bloodmagic/will/DemonWillHolder.java b/src/main/java/wayoftime/bloodmagic/will/DemonWillHolder.java deleted file mode 100644 index aa122e23..00000000 --- a/src/main/java/wayoftime/bloodmagic/will/DemonWillHolder.java +++ /dev/null @@ -1,100 +0,0 @@ -package wayoftime.bloodmagic.will; - -import java.util.HashMap; -import java.util.Map.Entry; - -import net.minecraft.nbt.CompoundNBT; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; - -public class DemonWillHolder -{ - public HashMap willMap = new HashMap<>(); - - public double addWill(EnumDemonWillType type, double amount, double max) - { - double current = 0; - if (willMap.containsKey(type)) - { - current = willMap.get(type); - } - - double added = Math.min(max - current, amount); - addWill(type, amount); - - return added; - } - - public void addWill(EnumDemonWillType type, double amount) - { - if (willMap.containsKey(type)) - { - willMap.put(type, amount + willMap.get(type)); - } else - { - willMap.put(type, amount); - } - } - - public double drainWill(EnumDemonWillType type, double amount) - { - if (willMap.containsKey(type)) - { - double current = willMap.get(type); - double reduced = Math.min(current, amount); - - if (reduced >= current) - { - willMap.remove(type); - } else - { - willMap.put(type, current - reduced); - } - - return reduced; - } - - return 0; - } - - public double getWill(EnumDemonWillType type) - { - if (willMap.containsKey(type)) - { - return willMap.get(type); - } - - return 0; - } - - public void readFromNBT(CompoundNBT tag, String key) - { - CompoundNBT willTag = tag.getCompound(key); - - willMap.clear(); - - for (EnumDemonWillType type : EnumDemonWillType.values()) - { - double amount = willTag.getDouble("EnumWill" + type.name()); - if (amount > 0) - { - willMap.put(type, amount); - } - } - } - - public void writeToNBT(CompoundNBT tag, String key) - { - CompoundNBT willTag = new CompoundNBT(); - for (Entry entry : willMap.entrySet()) - { - willTag.putDouble("EnumWill" + entry.getKey().name(), entry.getValue()); - } - - tag.put(key, willTag); - } - - public void clearWill() - { - willMap.clear(); - } -} diff --git a/src/main/java/wayoftime/bloodmagic/will/PlayerDemonWillHandler.java b/src/main/java/wayoftime/bloodmagic/will/PlayerDemonWillHandler.java deleted file mode 100644 index 3a9de35a..00000000 --- a/src/main/java/wayoftime/bloodmagic/will/PlayerDemonWillHandler.java +++ /dev/null @@ -1,203 +0,0 @@ -package wayoftime.bloodmagic.will; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import wayoftime.bloodmagic.api.compat.EnumDemonWillType; -import wayoftime.bloodmagic.api.compat.IDemonWill; -import wayoftime.bloodmagic.api.compat.IDemonWillGem; -import wayoftime.bloodmagic.util.helper.NetworkHelper; - -/** - * This class provides several helper methods in order to handle soul - * consumption and use for a player. This refers to the Soul System, meaning - * Monster Souls and Soul Gems, etc. The Soul Network's helper methods are found - * in {@link NetworkHelper} - */ -public class PlayerDemonWillHandler -{ - /** - * Gets the total amount of Will a player contains in their inventory - * - * @param type - The type of Will to check for - * @param player - The player to check the will of - * @return - The amount of will the player contains - */ - public static double getTotalDemonWill(EnumDemonWillType type, PlayerEntity player) - { - NonNullList inventory = player.inventory.mainInventory; - double souls = 0; - - for (ItemStack stack : inventory) - { - if (stack.getItem() instanceof IDemonWill && ((IDemonWill) stack.getItem()).getType(stack) == type) - { - souls += ((IDemonWill) stack.getItem()).getWill(type, stack); - } else if (stack.getItem() instanceof IDemonWillGem) - { - souls += ((IDemonWillGem) stack.getItem()).getWill(type, stack); - } - } - - return souls; - } - - public static EnumDemonWillType getLargestWillType(PlayerEntity player) - { - EnumDemonWillType type = EnumDemonWillType.DEFAULT; - double max = getTotalDemonWill(type, player); - - for (EnumDemonWillType testType : EnumDemonWillType.values()) - { - double value = getTotalDemonWill(testType, player); - if (value > max) - { - type = testType; - } - } - - return type; - } - - /** - * Checks if the player's Tartaric gems are completely full. - * - * @param type - The type of Will to check for - * @param player - The player to check the Will of - * @return - True if all Will containers are full, false if not. - */ - public static boolean isDemonWillFull(EnumDemonWillType type, PlayerEntity player) - { - NonNullList inventory = player.inventory.mainInventory; - - boolean hasGem = false; - for (ItemStack stack : inventory) - { - if (stack.getItem() instanceof IDemonWillGem) - { - hasGem = true; - if (((IDemonWillGem) stack.getItem()).getWill(type, stack) < ((IDemonWillGem) stack.getItem()).getMaxWill(type, stack)) - return false; - } - } - - return hasGem; - } - - /** - * Consumes Will from the inventory of a given player - * - * @param player - The player to consume the will of - * @param amount - The amount of will to consume - * @return - The amount of will consumed. - */ - public static double consumeDemonWill(EnumDemonWillType type, PlayerEntity player, double amount) - { - double consumed = 0; - - NonNullList inventory = player.inventory.mainInventory; - - for (int i = 0; i < inventory.size(); i++) - { - if (consumed >= amount) - return consumed; - - ItemStack stack = inventory.get(i); - if (stack.getItem() instanceof IDemonWill && ((IDemonWill) stack.getItem()).getType(stack) == type) - { - consumed += ((IDemonWill) stack.getItem()).drainWill(type, stack, amount - consumed); - if (((IDemonWill) stack.getItem()).getWill(type, stack) <= 0) - inventory.set(i, ItemStack.EMPTY); - } else if (stack.getItem() instanceof IDemonWillGem) - { - consumed += ((IDemonWillGem) stack.getItem()).drainWill(type, stack, amount - consumed, true); - } - } - - return consumed; - } - - /** - * Adds an IDemonWill contained in an ItemStack to one of the Soul Gems in the - * player's inventory. - * - * @param player - The player to add will to - * @param willStack - ItemStack that contains an IDemonWill to be added - * @return - The modified willStack - */ - public static ItemStack addDemonWill(PlayerEntity player, ItemStack willStack) - { - if (willStack.isEmpty()) - return ItemStack.EMPTY; - - NonNullList inventory = player.inventory.mainInventory; - - for (ItemStack stack : inventory) - { - if (stack.getItem() instanceof IDemonWillGem) - { - ItemStack newStack = ((IDemonWillGem) stack.getItem()).fillDemonWillGem(stack, willStack); - if (newStack.isEmpty()) - return ItemStack.EMPTY; - } - } - - return willStack; - } - - /** - * Adds an IDiscreteDemonWill contained in an ItemStack to one of the Soul Gems - * in the player's inventory. - * - * @param type - The type of Will to add - * @param player - The player to check the Will of - * @param amount - The amount of will to add - * @return - The amount of will added - */ - public static double addDemonWill(EnumDemonWillType type, PlayerEntity player, double amount) - { - NonNullList inventory = player.inventory.mainInventory; - double remaining = amount; - - for (ItemStack stack : inventory) - { - if (stack.getItem() instanceof IDemonWillGem) - { - remaining -= ((IDemonWillGem) stack.getItem()).fillWill(type, stack, remaining, true); - if (remaining <= 0) - break; - } - } - - return amount - remaining; - } - - /** - * Adds an IDiscreteDemonWill contained in an ItemStack to one of the Soul Gems - * in the player's inventory while ignoring a specified stack. - * - * @param type - The type of Will to add - * @param player - The player to check the Will of - * @param amount - The amount of will to add - * @param ignored - A stack to ignore - * @return - The amount of will added - */ - public static double addDemonWill(EnumDemonWillType type, PlayerEntity player, double amount, ItemStack ignored) - { - NonNullList inventory = player.inventory.mainInventory; - double remaining = amount; - - for (ItemStack stack : inventory) - { - if (!stack.equals(ignored) && stack.getItem() instanceof IDemonWillGem) - { - remaining -= ((IDemonWillGem) stack.getItem()).fillWill(type, stack, remaining, true); - - if (remaining <= 0) - break; - } - } - - return amount - remaining; - } -} \ No newline at end of file diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml deleted file mode 100644 index 182a4fe5..00000000 --- a/src/main/resources/META-INF/mods.toml +++ /dev/null @@ -1,55 +0,0 @@ -# This is an example mods.toml file. It contains the data relating to the loading mods. -# There are several mandatory fields (#mandatory), and many more that are optional (#optional). -# The overall format is standard TOML format, v0.5.0. -# Note that there are a couple of TOML lists in this file. -# Find more information on toml format here: https://github.com/toml-lang/toml -# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml -modLoader="javafml" #mandatory -# A version range to match for said mod loader - for regular FML @Mod it will be the forge version -loaderVersion="[34,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. -# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. -# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. -license="All rights reserved" -# A URL to refer people to when problems occur with this mod -issueTrackerURL="http://my.issue.tracker/" #optional -# A list of mods - how many allowed here is determined by the individual mod loader -[[mods]] #mandatory -# The modid of the mod -modId="bloodmagic" #mandatory -# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it -version="${file.jarVersion}" #mandatory - # A display name for the mod -displayName="Blood Magic" #mandatory -# A file name (in the root of the mod JAR) containing a logo for display -logoFile="examplemod.png" #optional -# A text field displayed in the mod UI -credits="Thanks for this example mod goes to Java" #optional -# A text field displayed in the mod UI -authors="WayofTime" #optional -# The description text for the mod (multi line!) (#mandatory) -description=''' -This is a long form description of the mod. You can write whatever you want here - -Have some lorem ipsum. - -Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis lacinia magna. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed sagittis luctus odio eu tempus. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque volutpat ligula eget lacus auctor sagittis. In hac habitasse platea dictumst. Nunc gravida elit vitae sem vehicula efficitur. Donec mattis ipsum et arcu lobortis, eleifend sagittis sem rutrum. Cras pharetra quam eget posuere fermentum. Sed id tincidunt justo. Lorem ipsum dolor sit amet, consectetur adipiscing elit. -''' -# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. -[[dependencies.bloodmagic]] #optional - # the modid of the dependency - modId="forge" #mandatory - # Does this dependency have to exist - if not, ordering below must be specified - mandatory=true #mandatory - # The version range of the dependency - versionRange="[34,)" #mandatory - # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory - ordering="NONE" - # Side this dependency is applied on - BOTH, CLIENT or SERVER - side="BOTH" -# Here's another dependency -[[dependencies.bloodmagic]] - modId="minecraft" - mandatory=true - versionRange="[1.16.3,)" - ordering="NONE" - side="BOTH" diff --git a/src/main/resources/assets/bloodmagic/blockstates/alchemy_array.json b/src/main/resources/assets/bloodmagic/blockstates/alchemy_array.json deleted file mode 100644 index 38eed1f0..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/alchemy_array.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/blockalchemyarray" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/alchemytable.json b/src/main/resources/assets/bloodmagic/blockstates/alchemytable.json deleted file mode 100644 index 3e963f47..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/alchemytable.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "variants": { - "direction=north,invisible=false": { - "model": "bloodmagic:block/alchemytable", - "y": 90 - }, - "direction=south,invisible=false": { - "model": "bloodmagic:block/alchemytable", - "y": 270 - }, - "direction=east,invisible=false": { - "model": "bloodmagic:block/alchemytable", - "y": 180 - }, - "direction=west,invisible=false": { - "model": "bloodmagic:block/alchemytable" - }, - "direction=north,invisible=true": { - "model": "bloodmagic:block/alchemytable_invis" - }, - "direction=south,invisible=true": { - "model": "bloodmagic:block/alchemytable_invis" - }, - "direction=east,invisible=true": { - "model": "bloodmagic:block/alchemytable_invis" - }, - "direction=west,invisible=true": { - "model": "bloodmagic:block/alchemytable_invis" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/altar.json b/src/main/resources/assets/bloodmagic/blockstates/altar.json deleted file mode 100644 index 256d4acd..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/altar.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/bloodaltar" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/blood_altar.json b/src/main/resources/assets/bloodmagic/blockstates/blood_altar.json new file mode 100644 index 00000000..1a3b5045 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/blood_altar.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "bloodmagic:blood_altar.obj", + "custom": { + "flip-v": true + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/blood_rune_acceleration.json b/src/main/resources/assets/bloodmagic/blockstates/blood_rune_acceleration.json new file mode 100644 index 00000000..61a00210 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/blood_rune_acceleration.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/blood_rune/blood_rune_acceleration" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/blood_rune_augmented_capacity.json b/src/main/resources/assets/bloodmagic/blockstates/blood_rune_augmented_capacity.json new file mode 100644 index 00000000..c00d2f66 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/blood_rune_augmented_capacity.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/blood_rune/blood_rune_augmented_capacity" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/blood_rune_blank.json b/src/main/resources/assets/bloodmagic/blockstates/blood_rune_blank.json new file mode 100644 index 00000000..8ff6a295 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/blood_rune_blank.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/blood_rune/blood_rune_blank" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/blood_rune_capacity.json b/src/main/resources/assets/bloodmagic/blockstates/blood_rune_capacity.json new file mode 100644 index 00000000..b40b4ed0 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/blood_rune_capacity.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/blood_rune/blood_rune_capacity" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/blood_rune_charging.json b/src/main/resources/assets/bloodmagic/blockstates/blood_rune_charging.json new file mode 100644 index 00000000..934fc499 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/blood_rune_charging.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/blood_rune/blood_rune_charging" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/blood_rune_displacement.json b/src/main/resources/assets/bloodmagic/blockstates/blood_rune_displacement.json new file mode 100644 index 00000000..849bff07 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/blood_rune_displacement.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/blood_rune/blood_rune_displacement" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/blood_rune_efficiency.json b/src/main/resources/assets/bloodmagic/blockstates/blood_rune_efficiency.json new file mode 100644 index 00000000..3e5a2d65 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/blood_rune_efficiency.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/blood_rune/blood_rune_efficiency" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/blood_rune_orb.json b/src/main/resources/assets/bloodmagic/blockstates/blood_rune_orb.json new file mode 100644 index 00000000..0d6d1984 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/blood_rune_orb.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/blood_rune/blood_rune_orb" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/blood_rune_sacrifice.json b/src/main/resources/assets/bloodmagic/blockstates/blood_rune_sacrifice.json new file mode 100644 index 00000000..8cb6f9a9 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/blood_rune_sacrifice.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/blood_rune/blood_rune_sacrifice" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/blood_rune_self_sacrifice.json b/src/main/resources/assets/bloodmagic/blockstates/blood_rune_self_sacrifice.json new file mode 100644 index 00000000..1287f246 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/blood_rune_self_sacrifice.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/blood_rune/blood_rune_self_sacrifice" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/blood_rune_speed.json b/src/main/resources/assets/bloodmagic/blockstates/blood_rune_speed.json new file mode 100644 index 00000000..6d8a5bea --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/blood_rune_speed.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/blood_rune/blood_rune_speed" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/bloodstone_brick.json b/src/main/resources/assets/bloodmagic/blockstates/bloodstone_brick.json new file mode 100644 index 00000000..666e4b56 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/bloodstone_brick.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/bloodstone_brick" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/bloodstone_tile.json b/src/main/resources/assets/bloodmagic/blockstates/bloodstone_tile.json new file mode 100644 index 00000000..2dc29fcf --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/bloodstone_tile.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/bloodstone_tile" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_brick_corrosive.json b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_corrosive.json new file mode 100644 index 00000000..8845f9a6 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_corrosive.json @@ -0,0 +1,30 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_1_corrosive" + } + }, + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_2_corrosive" + } + }, + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_3_corrosive" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_stairs.json b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_corrosive_stairs.json similarity index 60% rename from src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_stairs.json rename to src/main/resources/assets/bloodmagic/blockstates/demon_brick_corrosive_stairs.json index f36609c1..48580ae8 100644 --- a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_stairs.json +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_corrosive_stairs.json @@ -1,209 +1,225 @@ { + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "bloodmagic:blocks/dungeon/demon_brick_1_corrosive", + "top": "bloodmagic:blocks/dungeon/demon_brick_1_corrosive", + "side": "bloodmagic:blocks/dungeon/demon_brick_1_corrosive" + }, + "model": "cube_all", + "transform": "forge:default-block" + }, "variants": { - "facing=north,half=top,shape=straight": { - "model": "bloodmagic:block/dungeon_brick_stairs", - "x": 180, - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=straight": { + "model": "stairs" }, - "facing=south,half=top,shape=straight": { - "model": "bloodmagic:block/dungeon_brick_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "bloodmagic:block/dungeon_brick_stairs", - "x": 180, + "facing=west,half=bottom,shape=straight": { + "model": "stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { - "model": "bloodmagic:block/dungeon_brick_stairs", - "x": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "bloodmagic:block/dungeon_brick_stairs", - "y": 270, - "uvlock": true - }, "facing=south,half=bottom,shape=straight": { - "model": "bloodmagic:block/dungeon_brick_stairs", + "model": "stairs", "y": 90, "uvlock": true }, - "facing=west,half=bottom,shape=straight": { - "model": "bloodmagic:block/dungeon_brick_stairs", - "y": 180, - "uvlock": true - }, - "facing=east,half=bottom,shape=straight": { - "model": "bloodmagic:block/dungeon_brick_stairs" - }, - "facing=north,half=top,shape=inner_left": { - "model": "bloodmagic:block/dungeon_brick_stairs_inner", - "x": 180, + "facing=north,half=bottom,shape=straight": { + "model": "stairs", "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { - "model": "bloodmagic:block/dungeon_brick_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "outer_stairs" }, - "facing=west,half=top,shape=inner_left": { - "model": "bloodmagic:block/dungeon_brick_stairs_inner", - "x": 180, + "facing=west,half=bottom,shape=outer_right": { + "model": "outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { - "model": "bloodmagic:block/dungeon_brick_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "bloodmagic:block/dungeon_brick_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "bloodmagic:block/dungeon_brick_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "bloodmagic:block/dungeon_brick_stairs_inner", + "facing=south,half=bottom,shape=outer_right": { + "model": "outer_stairs", "y": 90, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { - "model": "bloodmagic:block/dungeon_brick_stairs_inner", + "facing=north,half=bottom,shape=outer_right": { + "model": "outer_stairs", "y": 270, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { - "model": "bloodmagic:block/dungeon_brick_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "bloodmagic:block/dungeon_brick_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "bloodmagic:block/dungeon_brick_stairs_inner", - "x": 180, + "facing=east,half=bottom,shape=outer_left": { + "model": "outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { - "model": "bloodmagic:block/dungeon_brick_stairs_inner", - "x": 180, + "facing=west,half=bottom,shape=outer_left": { + "model": "outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { - "model": "bloodmagic:block/dungeon_brick_stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=outer_left": { + "model": "outer_stairs" }, - "facing=south,half=bottom,shape=inner_right": { - "model": "bloodmagic:block/dungeon_brick_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "bloodmagic:block/dungeon_brick_stairs_inner", + "facing=north,half=bottom,shape=outer_left": { + "model": "outer_stairs", "y": 180, "uvlock": true }, "facing=east,half=bottom,shape=inner_right": { - "model": "bloodmagic:block/dungeon_brick_stairs_inner" + "model": "inner_stairs" }, - "facing=north,half=top,shape=outer_left": { - "model": "bloodmagic:block/dungeon_brick_stairs_outer", - "x": 180, + "facing=west,half=bottom,shape=inner_right": { + "model": "inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "inner_stairs", "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { - "model": "bloodmagic:block/dungeon_brick_stairs_outer", + "facing=east,half=bottom,shape=inner_left": { + "model": "inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "inner_stairs" + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "stairs", + "x": 180, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { - "model": "bloodmagic:block/dungeon_brick_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "bloodmagic:block/dungeon_brick_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "bloodmagic:block/dungeon_brick_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "bloodmagic:block/dungeon_brick_stairs_outer" - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "bloodmagic:block/dungeon_brick_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "bloodmagic:block/dungeon_brick_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "bloodmagic:block/dungeon_brick_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "bloodmagic:block/dungeon_brick_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "bloodmagic:block/dungeon_brick_stairs_outer", + "facing=north,half=top,shape=straight": { + "model": "stairs", "x": 180, "y": 270, "uvlock": true }, "facing=east,half=top,shape=outer_right": { - "model": "bloodmagic:block/dungeon_brick_stairs_outer", + "model": "outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { - "model": "bloodmagic:block/dungeon_brick_stairs_outer", + "facing=west,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { - "model": "bloodmagic:block/dungeon_brick_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "bloodmagic:block/dungeon_brick_stairs_outer", + "facing=south,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { - "model": "bloodmagic:block/dungeon_brick_stairs_outer" - } + "facing=north,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "normal": [ + {} + ], + "inventory": [ + {} + ] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_brick_destructive.json b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_destructive.json new file mode 100644 index 00000000..16dd9cd1 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_destructive.json @@ -0,0 +1,30 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_1_destructive" + } + }, + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_2_destructive" + } + }, + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_3_destructive" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_brick_destructive_stairs.json b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_destructive_stairs.json new file mode 100644 index 00000000..29f21f2d --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_destructive_stairs.json @@ -0,0 +1,225 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "bloodmagic:blocks/dungeon/demon_brick_1_destructive", + "top": "bloodmagic:blocks/dungeon/demon_brick_1_destructive", + "side": "bloodmagic:blocks/dungeon/demon_brick_1_destructive" + }, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "facing=east,half=bottom,shape=straight": { + "model": "stairs" + }, + "facing=west,half=bottom,shape=straight": { + "model": "stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "stairs", + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "stairs", + "y": 270, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "outer_stairs" + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "outer_stairs" + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "inner_stairs" + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "inner_stairs" + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "stairs", + "x": 180, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=top,shape=straight": { + "model": "stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_brick_raw.json b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_raw.json new file mode 100644 index 00000000..02e934dd --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_raw.json @@ -0,0 +1,30 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_1_raw" + } + }, + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_2_raw" + } + }, + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_3_raw" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_brick_raw_stairs.json b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_raw_stairs.json new file mode 100644 index 00000000..e5923dc3 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_raw_stairs.json @@ -0,0 +1,225 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "bloodmagic:blocks/dungeon/demon_brick_1_raw", + "top": "bloodmagic:blocks/dungeon/demon_brick_1_raw", + "side": "bloodmagic:blocks/dungeon/demon_brick_1_raw" + }, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "facing=east,half=bottom,shape=straight": { + "model": "stairs" + }, + "facing=west,half=bottom,shape=straight": { + "model": "stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "stairs", + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "stairs", + "y": 270, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "outer_stairs" + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "outer_stairs" + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "inner_stairs" + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "inner_stairs" + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "stairs", + "x": 180, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=top,shape=straight": { + "model": "stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_brick_small_corrosive.json b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_small_corrosive.json new file mode 100644 index 00000000..d10adb35 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_small_corrosive.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_small_corrosive" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_brick_small_destructive.json b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_small_destructive.json new file mode 100644 index 00000000..d8814ea5 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_small_destructive.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_small_destructive" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_brick_small_raw.json b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_small_raw.json new file mode 100644 index 00000000..80a1f8b5 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_small_raw.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_small_raw" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_brick_small_steadfast.json b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_small_steadfast.json new file mode 100644 index 00000000..0c5c0ec5 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_small_steadfast.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_small_steadfast" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_brick_small_vengeful.json b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_small_vengeful.json new file mode 100644 index 00000000..d4343a09 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_small_vengeful.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_small_vengeful" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_brick_steadfast.json b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_steadfast.json new file mode 100644 index 00000000..4a655b98 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_steadfast.json @@ -0,0 +1,30 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_1_steadfast" + } + }, + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_2_steadfast" + } + }, + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_3_steadfast" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_brick_steadfast_stairs.json b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_steadfast_stairs.json new file mode 100644 index 00000000..2b63b93a --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_steadfast_stairs.json @@ -0,0 +1,225 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "bloodmagic:blocks/dungeon/demon_brick_1_steadfast", + "top": "bloodmagic:blocks/dungeon/demon_brick_1_steadfast", + "side": "bloodmagic:blocks/dungeon/demon_brick_1_steadfast" + }, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "facing=east,half=bottom,shape=straight": { + "model": "stairs" + }, + "facing=west,half=bottom,shape=straight": { + "model": "stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "stairs", + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "stairs", + "y": 270, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "outer_stairs" + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "outer_stairs", + "y": 270, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "outer_stairs", + "y": 90, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "outer_stairs" + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "outer_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "inner_stairs" + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "inner_stairs" + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "stairs", + "x": 180, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=top,shape=straight": { + "model": "stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_brick_vengeful.json b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_vengeful.json new file mode 100644 index 00000000..44f900a7 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_vengeful.json @@ -0,0 +1,30 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_1_vengeful" + } + }, + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_2_vengeful" + } + }, + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_3_vengeful" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_polished_stairs.json b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_vengeful_stairs.json similarity index 59% rename from src/generated/resources/assets/bloodmagic/blockstates/dungeon_polished_stairs.json rename to src/main/resources/assets/bloodmagic/blockstates/demon_brick_vengeful_stairs.json index 0b576e77..196922f8 100644 --- a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_polished_stairs.json +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_brick_vengeful_stairs.json @@ -1,209 +1,225 @@ { + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "bloodmagic:blocks/dungeon/demon_brick_1_vengeful", + "top": "bloodmagic:blocks/dungeon/demon_brick_1_vengeful", + "side": "bloodmagic:blocks/dungeon/demon_brick_1_vengeful" + }, + "model": "cube_all", + "transform": "forge:default-block" + }, "variants": { - "facing=north,half=top,shape=straight": { - "model": "bloodmagic:block/dungeon_polished_stairs", - "x": 180, - "y": 270, - "uvlock": true + "facing=east,half=bottom,shape=straight": { + "model": "stairs" }, - "facing=south,half=top,shape=straight": { - "model": "bloodmagic:block/dungeon_polished_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "bloodmagic:block/dungeon_polished_stairs", - "x": 180, + "facing=west,half=bottom,shape=straight": { + "model": "stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { - "model": "bloodmagic:block/dungeon_polished_stairs", - "x": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "bloodmagic:block/dungeon_polished_stairs", - "y": 270, - "uvlock": true - }, "facing=south,half=bottom,shape=straight": { - "model": "bloodmagic:block/dungeon_polished_stairs", + "model": "stairs", "y": 90, "uvlock": true }, - "facing=west,half=bottom,shape=straight": { - "model": "bloodmagic:block/dungeon_polished_stairs", - "y": 180, - "uvlock": true - }, - "facing=east,half=bottom,shape=straight": { - "model": "bloodmagic:block/dungeon_polished_stairs" - }, - "facing=north,half=top,shape=inner_left": { - "model": "bloodmagic:block/dungeon_polished_stairs_inner", - "x": 180, + "facing=north,half=bottom,shape=straight": { + "model": "stairs", "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { - "model": "bloodmagic:block/dungeon_polished_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true + "facing=east,half=bottom,shape=outer_right": { + "model": "outer_stairs" }, - "facing=west,half=top,shape=inner_left": { - "model": "bloodmagic:block/dungeon_polished_stairs_inner", - "x": 180, + "facing=west,half=bottom,shape=outer_right": { + "model": "outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { - "model": "bloodmagic:block/dungeon_polished_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "bloodmagic:block/dungeon_polished_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "bloodmagic:block/dungeon_polished_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "bloodmagic:block/dungeon_polished_stairs_inner", + "facing=south,half=bottom,shape=outer_right": { + "model": "outer_stairs", "y": 90, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { - "model": "bloodmagic:block/dungeon_polished_stairs_inner", + "facing=north,half=bottom,shape=outer_right": { + "model": "outer_stairs", "y": 270, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { - "model": "bloodmagic:block/dungeon_polished_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "bloodmagic:block/dungeon_polished_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "bloodmagic:block/dungeon_polished_stairs_inner", - "x": 180, + "facing=east,half=bottom,shape=outer_left": { + "model": "outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { - "model": "bloodmagic:block/dungeon_polished_stairs_inner", - "x": 180, + "facing=west,half=bottom,shape=outer_left": { + "model": "outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { - "model": "bloodmagic:block/dungeon_polished_stairs_inner", - "y": 270, - "uvlock": true + "facing=south,half=bottom,shape=outer_left": { + "model": "outer_stairs" }, - "facing=south,half=bottom,shape=inner_right": { - "model": "bloodmagic:block/dungeon_polished_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "bloodmagic:block/dungeon_polished_stairs_inner", + "facing=north,half=bottom,shape=outer_left": { + "model": "outer_stairs", "y": 180, "uvlock": true }, "facing=east,half=bottom,shape=inner_right": { - "model": "bloodmagic:block/dungeon_polished_stairs_inner" + "model": "inner_stairs" }, - "facing=north,half=top,shape=outer_left": { - "model": "bloodmagic:block/dungeon_polished_stairs_outer", - "x": 180, + "facing=west,half=bottom,shape=inner_right": { + "model": "inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "inner_stairs", "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { - "model": "bloodmagic:block/dungeon_polished_stairs_outer", + "facing=east,half=bottom,shape=inner_left": { + "model": "inner_stairs", + "y": 270, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "inner_stairs", + "y": 90, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "inner_stairs" + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "inner_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "stairs", + "x": 180, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { - "model": "bloodmagic:block/dungeon_polished_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "bloodmagic:block/dungeon_polished_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "bloodmagic:block/dungeon_polished_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "bloodmagic:block/dungeon_polished_stairs_outer" - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "bloodmagic:block/dungeon_polished_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "bloodmagic:block/dungeon_polished_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "bloodmagic:block/dungeon_polished_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "bloodmagic:block/dungeon_polished_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "bloodmagic:block/dungeon_polished_stairs_outer", + "facing=north,half=top,shape=straight": { + "model": "stairs", "x": 180, "y": 270, "uvlock": true }, "facing=east,half=top,shape=outer_right": { - "model": "bloodmagic:block/dungeon_polished_stairs_outer", + "model": "outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { - "model": "bloodmagic:block/dungeon_polished_stairs_outer", + "facing=west,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { - "model": "bloodmagic:block/dungeon_polished_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "bloodmagic:block/dungeon_polished_stairs_outer", + "facing=south,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { - "model": "bloodmagic:block/dungeon_polished_stairs_outer" - } + "facing=north,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "normal": [ + {} + ], + "inventory": [ + {} + ] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_metal_corrosive.json b/src/main/resources/assets/bloodmagic/blockstates/demon_metal_corrosive.json new file mode 100644 index 00000000..1bba8485 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_metal_corrosive.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_metal_corrosive" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_metal_destructive.json b/src/main/resources/assets/bloodmagic/blockstates/demon_metal_destructive.json new file mode 100644 index 00000000..b3fbc47d --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_metal_destructive.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_metal_destructive" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_metal_raw.json b/src/main/resources/assets/bloodmagic/blockstates/demon_metal_raw.json new file mode 100644 index 00000000..6205fff4 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_metal_raw.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_metal_raw" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_metal_steadfast.json b/src/main/resources/assets/bloodmagic/blockstates/demon_metal_steadfast.json new file mode 100644 index 00000000..1e261251 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_metal_steadfast.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_metal_steadfast" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_metal_vengeful.json b/src/main/resources/assets/bloodmagic/blockstates/demon_metal_vengeful.json new file mode 100644 index 00000000..b213e41d --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_metal_vengeful.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_metal_vengeful" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_stone_corrosive.json b/src/main/resources/assets/bloodmagic/blockstates/demon_stone_corrosive.json new file mode 100644 index 00000000..d72da25a --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_stone_corrosive.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_stone_corrosive" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_stone_destructive.json b/src/main/resources/assets/bloodmagic/blockstates/demon_stone_destructive.json new file mode 100644 index 00000000..18b394e8 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_stone_destructive.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_stone_destructive" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_stone_polished_corrosive.json b/src/main/resources/assets/bloodmagic/blockstates/demon_stone_polished_corrosive.json new file mode 100644 index 00000000..fc8eecb6 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_stone_polished_corrosive.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_stone_polished_corrosive" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_stone_polished_destructive.json b/src/main/resources/assets/bloodmagic/blockstates/demon_stone_polished_destructive.json new file mode 100644 index 00000000..6ce01f91 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_stone_polished_destructive.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_stone_polished_destructive" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_stone_polished_raw.json b/src/main/resources/assets/bloodmagic/blockstates/demon_stone_polished_raw.json new file mode 100644 index 00000000..8007b3c9 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_stone_polished_raw.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_stone_polished_raw" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_stone_polished_steadfast.json b/src/main/resources/assets/bloodmagic/blockstates/demon_stone_polished_steadfast.json new file mode 100644 index 00000000..9359b4cb --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_stone_polished_steadfast.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_stone_polished_steadfast" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_stone_polished_vengeful.json b/src/main/resources/assets/bloodmagic/blockstates/demon_stone_polished_vengeful.json new file mode 100644 index 00000000..568fb643 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_stone_polished_vengeful.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_stone_polished_vengeful" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_stone_raw.json b/src/main/resources/assets/bloodmagic/blockstates/demon_stone_raw.json new file mode 100644 index 00000000..3862ba36 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_stone_raw.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_stone_raw" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_stone_steadfast.json b/src/main/resources/assets/bloodmagic/blockstates/demon_stone_steadfast.json new file mode 100644 index 00000000..8fe18dba --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_stone_steadfast.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_stone_steadfast" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_stone_vengeful.json b/src/main/resources/assets/bloodmagic/blockstates/demon_stone_vengeful.json new file mode 100644 index 00000000..7676a132 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_stone_vengeful.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_stone_vengeful" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_tile_corrosive.json b/src/main/resources/assets/bloodmagic/blockstates/demon_tile_corrosive.json new file mode 100644 index 00000000..b820ca13 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_tile_corrosive.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_tile_corrosive" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_tile_destructive.json b/src/main/resources/assets/bloodmagic/blockstates/demon_tile_destructive.json new file mode 100644 index 00000000..90937fe8 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_tile_destructive.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_tile_destructive" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_tile_raw.json b/src/main/resources/assets/bloodmagic/blockstates/demon_tile_raw.json new file mode 100644 index 00000000..69295656 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_tile_raw.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_tile_raw" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_tile_special_corrosive.json b/src/main/resources/assets/bloodmagic/blockstates/demon_tile_special_corrosive.json new file mode 100644 index 00000000..3d43bcfe --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_tile_special_corrosive.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_tile_special_corrosive" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_tile_special_destructive.json b/src/main/resources/assets/bloodmagic/blockstates/demon_tile_special_destructive.json new file mode 100644 index 00000000..fae12190 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_tile_special_destructive.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_tile_special_destructive" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_tile_special_raw.json b/src/main/resources/assets/bloodmagic/blockstates/demon_tile_special_raw.json new file mode 100644 index 00000000..2fd2698f --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_tile_special_raw.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_tile_special_raw" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_tile_special_steadfast.json b/src/main/resources/assets/bloodmagic/blockstates/demon_tile_special_steadfast.json new file mode 100644 index 00000000..52fbd52f --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_tile_special_steadfast.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_tile_special_steadfast" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_tile_special_vengeful.json b/src/main/resources/assets/bloodmagic/blockstates/demon_tile_special_vengeful.json new file mode 100644 index 00000000..8e701c37 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_tile_special_vengeful.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_tile_special_vengeful" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_tile_steadfast.json b/src/main/resources/assets/bloodmagic/blockstates/demon_tile_steadfast.json new file mode 100644 index 00000000..bde86492 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_tile_steadfast.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_tile_steadfast" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demon_tile_vengeful.json b/src/main/resources/assets/bloodmagic/blockstates/demon_tile_vengeful.json new file mode 100644 index 00000000..e83f6adc --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/demon_tile_vengeful.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { + "textures": { + "all": "bloodmagic:blocks/dungeon/demon_brick_tile_vengeful" + } + } + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demoncrucible.json b/src/main/resources/assets/bloodmagic/blockstates/demoncrucible.json deleted file mode 100644 index 376ae6c6..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/demoncrucible.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/demoncrucible" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demoncrystallizer.json b/src/main/resources/assets/bloodmagic/blockstates/demoncrystallizer.json deleted file mode 100644 index b309aac3..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/demoncrystallizer.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/demoncrystallizer" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/demonpylon.json b/src/main/resources/assets/bloodmagic/blockstates/demonpylon.json deleted file mode 100644 index a3f6b11a..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/demonpylon.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/demonpylon" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/ethereal_mimic.json b/src/main/resources/assets/bloodmagic/blockstates/ethereal_mimic.json deleted file mode 100644 index 8ea12c85..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/ethereal_mimic.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "bloodmagic:block/ethereal_mimic" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/incensealtar.json b/src/main/resources/assets/bloodmagic/blockstates/incensealtar.json deleted file mode 100644 index a625a8b1..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/incensealtar.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/incensealtar" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/life_essence.json b/src/main/resources/assets/bloodmagic/blockstates/life_essence.json new file mode 100644 index 00000000..87b73269 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/blockstates/life_essence.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "variants": { + "fluid": { + "model": "forge:fluid", + "custom": { + "fluid": "bloodmagic:life_essence" + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/mimic.json b/src/main/resources/assets/bloodmagic/blockstates/mimic.json deleted file mode 100644 index 697c5514..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/mimic.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "bloodmagic:block/opaquemimic" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/blockstates/soulforge.json b/src/main/resources/assets/bloodmagic/blockstates/soulforge.json deleted file mode 100644 index 12e4803a..00000000 --- a/src/main/resources/assets/bloodmagic/blockstates/soulforge.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "bloodmagic:block/soulforge" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/gui/bookleft.png b/src/main/resources/assets/bloodmagic/gui/bookleft.png deleted file mode 100644 index 08b462df..00000000 Binary files a/src/main/resources/assets/bloodmagic/gui/bookleft.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/gui/jei/alchemy.png b/src/main/resources/assets/bloodmagic/gui/jei/alchemy.png deleted file mode 100644 index a84a5220..00000000 Binary files a/src/main/resources/assets/bloodmagic/gui/jei/alchemy.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/gui/jei/alchemytable.png b/src/main/resources/assets/bloodmagic/gui/jei/alchemytable.png deleted file mode 100644 index b4e27d58..00000000 Binary files a/src/main/resources/assets/bloodmagic/gui/jei/alchemytable.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/gui/jei/arc.png b/src/main/resources/assets/bloodmagic/gui/jei/arc.png deleted file mode 100644 index 3c507024..00000000 Binary files a/src/main/resources/assets/bloodmagic/gui/jei/arc.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/gui/jei/binding.png b/src/main/resources/assets/bloodmagic/gui/jei/binding.png deleted file mode 100644 index 390049da..00000000 Binary files a/src/main/resources/assets/bloodmagic/gui/jei/binding.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/gui/jei/soulforge.png b/src/main/resources/assets/bloodmagic/gui/jei/soulforge.png deleted file mode 100644 index d19cf8e7..00000000 Binary files a/src/main/resources/assets/bloodmagic/gui/jei/soulforge.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/gui/sigilholding.png b/src/main/resources/assets/bloodmagic/gui/sigilholding.png deleted file mode 100644 index d3468096..00000000 Binary files a/src/main/resources/assets/bloodmagic/gui/sigilholding.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/gui/teleposer.png b/src/main/resources/assets/bloodmagic/gui/teleposer.png deleted file mode 100644 index 2efcbe9a..00000000 Binary files a/src/main/resources/assets/bloodmagic/gui/teleposer.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/gui/writingtable.png b/src/main/resources/assets/bloodmagic/gui/writingtable.png deleted file mode 100644 index 9a873fc2..00000000 Binary files a/src/main/resources/assets/bloodmagic/gui/writingtable.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/alchemy_array/divination_array_1.png b/src/main/resources/assets/bloodmagic/images/entries/alchemy_array/divination_array_1.png deleted file mode 100644 index d2e4c7c4..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/alchemy_array/divination_array_1.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/alchemy_array/divination_array_2.png b/src/main/resources/assets/bloodmagic/images/entries/alchemy_array/divination_array_2.png deleted file mode 100644 index a6d20ae3..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/alchemy_array/divination_array_2.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/alchemy_array/simple_array.png b/src/main/resources/assets/bloodmagic/images/entries/alchemy_array/simple_array.png deleted file mode 100644 index 04771848..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/alchemy_array/simple_array.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/alchemy_table/alchemy_table_gui.png b/src/main/resources/assets/bloodmagic/images/entries/alchemy_table/alchemy_table_gui.png deleted file mode 100644 index ace6e562..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/alchemy_table/alchemy_table_gui.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/altar/altar_t1.png b/src/main/resources/assets/bloodmagic/images/entries/altar/altar_t1.png deleted file mode 100644 index bb04d3d8..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/altar/altar_t1.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/altar/altar_t2_1.png b/src/main/resources/assets/bloodmagic/images/entries/altar/altar_t2_1.png deleted file mode 100644 index 5eb54019..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/altar/altar_t2_1.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/altar/altar_t2_2.png b/src/main/resources/assets/bloodmagic/images/entries/altar/altar_t2_2.png deleted file mode 100644 index c3d953db..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/altar/altar_t2_2.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/altar/altar_t3_1.png b/src/main/resources/assets/bloodmagic/images/entries/altar/altar_t3_1.png deleted file mode 100644 index 8d93789b..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/altar/altar_t3_1.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/altar/altar_t3_2.png b/src/main/resources/assets/bloodmagic/images/entries/altar/altar_t3_2.png deleted file mode 100644 index 2d362a8d..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/altar/altar_t3_2.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/altar/altar_t4_1.png b/src/main/resources/assets/bloodmagic/images/entries/altar/altar_t4_1.png deleted file mode 100644 index d0f5bc83..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/altar/altar_t4_1.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/altar/altar_t4_2.png b/src/main/resources/assets/bloodmagic/images/entries/altar/altar_t4_2.png deleted file mode 100644 index 9f16d8f0..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/altar/altar_t4_2.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/demon_will/demon_crucible.png b/src/main/resources/assets/bloodmagic/images/entries/demon_will/demon_crucible.png deleted file mode 100644 index 143c444f..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/demon_will/demon_crucible.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/demon_will/demon_will.png b/src/main/resources/assets/bloodmagic/images/entries/demon_will/demon_will.png deleted file mode 100644 index f75a0af8..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/demon_will/demon_will.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/demon_will/snare_particles.png b/src/main/resources/assets/bloodmagic/images/entries/demon_will/snare_particles.png deleted file mode 100644 index b8723d3e..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/demon_will/snare_particles.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/demon_will/will_splitting.png b/src/main/resources/assets/bloodmagic/images/entries/demon_will/will_splitting.png deleted file mode 100644 index 9c0f66d0..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/demon_will/will_splitting.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/sigil/divination_sigil.png b/src/main/resources/assets/bloodmagic/images/entries/sigil/divination_sigil.png deleted file mode 100644 index e50354ec..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/sigil/divination_sigil.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/sigil/grove_sigil1.png b/src/main/resources/assets/bloodmagic/images/entries/sigil/grove_sigil1.png deleted file mode 100644 index b9855936..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/sigil/grove_sigil1.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/sigil/grove_sigil2.png b/src/main/resources/assets/bloodmagic/images/entries/sigil/grove_sigil2.png deleted file mode 100644 index dc31e01c..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/sigil/grove_sigil2.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/sigil/grove_sigil3.png b/src/main/resources/assets/bloodmagic/images/entries/sigil/grove_sigil3.png deleted file mode 100644 index 5dc6f01f..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/sigil/grove_sigil3.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/sigil/lava_sigil1.png b/src/main/resources/assets/bloodmagic/images/entries/sigil/lava_sigil1.png deleted file mode 100644 index 8eee1885..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/sigil/lava_sigil1.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/sigil/lava_sigil2.png b/src/main/resources/assets/bloodmagic/images/entries/sigil/lava_sigil2.png deleted file mode 100644 index 083b1862..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/sigil/lava_sigil2.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/sigil/mining_sigil1.png b/src/main/resources/assets/bloodmagic/images/entries/sigil/mining_sigil1.png deleted file mode 100644 index 7b8ed509..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/sigil/mining_sigil1.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/sigil/mining_sigil2.png b/src/main/resources/assets/bloodmagic/images/entries/sigil/mining_sigil2.png deleted file mode 100644 index 223eb030..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/sigil/mining_sigil2.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/sigil/seer_sigil_info.png b/src/main/resources/assets/bloodmagic/images/entries/sigil/seer_sigil_info.png deleted file mode 100644 index afb33dab..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/sigil/seer_sigil_info.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/sigil/water_sigil1.png b/src/main/resources/assets/bloodmagic/images/entries/sigil/water_sigil1.png deleted file mode 100644 index cf6e7ee9..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/sigil/water_sigil1.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/sigil/water_sigil2.png b/src/main/resources/assets/bloodmagic/images/entries/sigil/water_sigil2.png deleted file mode 100644 index e94e2021..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/sigil/water_sigil2.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/utility/incense_altar.png b/src/main/resources/assets/bloodmagic/images/entries/utility/incense_altar.png deleted file mode 100644 index 617e26c0..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/utility/incense_altar.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/utility/incense_altar1.png b/src/main/resources/assets/bloodmagic/images/entries/utility/incense_altar1.png deleted file mode 100644 index 24a50817..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/utility/incense_altar1.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/utility/incense_altar2.png b/src/main/resources/assets/bloodmagic/images/entries/utility/incense_altar2.png deleted file mode 100644 index 1a4ae8cf..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/utility/incense_altar2.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/utility/incense_altar3.png b/src/main/resources/assets/bloodmagic/images/entries/utility/incense_altar3.png deleted file mode 100644 index a8cb9062..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/utility/incense_altar3.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/images/entries/utility/incense_altar4.png b/src/main/resources/assets/bloodmagic/images/entries/utility/incense_altar4.png deleted file mode 100644 index dbdfe60e..00000000 Binary files a/src/main/resources/assets/bloodmagic/images/entries/utility/incense_altar4.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang new file mode 100644 index 00000000..c65b4d7a --- /dev/null +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -0,0 +1,102 @@ +# Creative Tab + +itemGroup.bloodmagic=Blood Magic + +# Blocks + +tile.bloodmagic:blood_altar.name=Blood Altar +tile.bloodmagic:bloodstone_brick.name=Bloodstone Brick +tile.bloodmagic:bloodstone_tile.name=Bloodstone Tile +tile.bloodmagic:blood_rune_blank.name=Blank Rune +tile.bloodmagic:blood_rune_speed.name=Rune of Speed +tile.bloodmagic:blood_rune_efficiency.name=Rune of Efficiency +tile.bloodmagic:blood_rune_sacrifice.name=Rune of Sacrifice +tile.bloodmagic:blood_rune_self_sacrifice.name=Rune of Self Sacrifice +tile.bloodmagic:blood_rune_displacement.name=Rune of Displacement +tile.bloodmagic:blood_rune_capacity.name=Rune of Capacity +tile.bloodmagic:blood_rune_augmented_capacity.name=Rune of Augmented Capacity +tile.bloodmagic:blood_rune_orb.name=Rune of the Orb +tile.bloodmagic:blood_rune_acceleration.name=Rune of Acceleration +tile.bloodmagic:blood_rune_charging.name=Rune of Charging +tile.bloodmagic:demon_brick.name=Demon Bricks +tile.bloodmagic:demon_brick_small.name=Small Demon Bricks +tile.bloodmagic:demon_tile.name=Demon Tiles +tile.bloodmagic:demon_tile_special.name=Accented Demon Tiles +tile.bloodmagic:demon_stone.name=Demon Stone +tile.bloodmagic:demon_stone_polished.name=Polished Demon Stone +tile.bloodmagic:demon_metal.name=Demon Alloy +tile.bloodmagic:demon_stairs.name=Demon Stone Stairs + +# Items + +item.bloodmagic:blood_orb_weak.name=Weak Blood Orb +item.bloodmagic:blood_orb_apprentice.name=Apprentice Blood Orb +item.bloodmagic:blood_orb_magician.name=Magician's Blood Orb +item.bloodmagic:blood_orb_master.name=Master Blood Orb +item.bloodmagic:blood_orb_archmage.name=Archmage Blood Orb +item.bloodmagic:blood_orb_transcendent.name=Transcendent Blood Orb +item.bloodmagic:dagger_self_sacrifice.name=Sacrificial Dagger +item.bloodmagic:dagger_self_sacrifice_creative.name=Creative Sacrificial Dagger +item.bloodmagic:altar_builder.name=Blood Altar Builder +item.bloodmagic:slate_blank.name=Blank Slate +item.bloodmagic:slate_reinforced.name=Reinforced Slate +item.bloodmagic:slate_imbued.name=Imbued Slate +item.bloodmagic:slate_demonic.name=Demonic Slate +item.bloodmagic:slate_ethereal.name=Ethereal Slate +item.bloodmagic:sigil_divination.name=Divination Sigil +item.bloodmagic:sigil_air.name=Air Sigil +item.bloodmagic:sigil_fast_miner.name=Sigil of the Fast Miner +item.bloodmagic:sigil_haste.name=Haste Sigil +item.bloodmagic:living_armor_head.name=Living Helmet +item.bloodmagic:living_armor_chest.name=Living Chestplate +item.bloodmagic:living_armor_legs.name=Living Leggings +item.bloodmagic:living_armor_feet.name=Living Boots +item.bloodmagic:living_tome.name=Living Tome +item.bloodmagic:demon_will_crystal_raw.name=Raw Demon Will Crystal +item.bloodmagic:demon_will_crystal_corrosive.name=Corrosive Demon Will Crystal +item.bloodmagic:demon_will_crystal_destructive.name=Destructive Demon Will Crystal +item.bloodmagic:demon_will_crystal_vengeful.name=Vengeful Demon Will Crystal +item.bloodmagic:demon_will_crystal_steadfast.name=Steadfast Demon Will Crystal +item.bloodmagic:sentient_sword.name=Sentient Sword +item.bloodmagic:monster_soul.name=Monster Soul + +# Death + +death.attack.bloodmagic:weak_soul=%s's soul was too weak + +# Fluids + +fluid.bloodmagic:life_essence=Life Essence + +# Living Upgrades + +upgrade.bloodmagic:arrow_protect.name=Arrow Protect +upgrade.bloodmagic:arrow_shot.name=Arrow Shot +upgrade.bloodmagic:critical_strike.name=Critical Strike +upgrade.bloodmagic:jump.name=Jump Boost + +# Chat + +chat.bloodmagic:living_upgrade_level_increase=%s has leveled up to %d +chat.bloodmagic:altar_builder_cycled=Set tier to %s + +# Tooltips + +tooltip.bloodmagic:bound_owner=Bound to: %s +tooltip.bloodmagic:object_owner=Added by: %s +tooltip.bloodmagic:living_points=%d / %d points used +tooltip.bloodmagic:tier=Tier: %s +tooltip.bloodmagic:progress=Progress: %s +tooltip.bloodmagic:demon_will_raw=Raw Will +tooltip.bloodmagic:demon_will_corrosive=Corrosive Will +tooltip.bloodmagic:demon_will_destructive=Destructive Will +tooltip.bloodmagic:demon_will_vengeful=Vengeful Will +tooltip.bloodmagic:demon_will_steadfast=Steadfast Will + +# JEI + +jei.bloodmagic:blood_altar=Blood Altar +jei.bloodmagic:drain_rate=Drain Rate: %d +jei.bloodmagic:consumption_rate=Consumption Rate: %d +jei.bloodmagic:required_tier=Tier: %s +jei.bloodmagic:required_lp=LP: %d \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/armor/sacrificearmour_layer_1.png b/src/main/resources/assets/bloodmagic/models/armor/sacrificearmour_layer_1.png deleted file mode 100644 index db260f2f..00000000 Binary files a/src/main/resources/assets/bloodmagic/models/armor/sacrificearmour_layer_1.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/models/armor/selfsacrificearmour_layer_1.png b/src/main/resources/assets/bloodmagic/models/armor/selfsacrificearmour_layer_1.png deleted file mode 100644 index 98048cbf..00000000 Binary files a/src/main/resources/assets/bloodmagic/models/armor/selfsacrificearmour_layer_1.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_corrosive_layer_1.png b/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_corrosive_layer_1.png deleted file mode 100644 index a1f3b53f..00000000 Binary files a/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_corrosive_layer_1.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_corrosive_layer_2.png b/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_corrosive_layer_2.png deleted file mode 100644 index f31effeb..00000000 Binary files a/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_corrosive_layer_2.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_destructive_layer_1.png b/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_destructive_layer_1.png deleted file mode 100644 index 7f000064..00000000 Binary files a/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_destructive_layer_1.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_destructive_layer_2.png b/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_destructive_layer_2.png deleted file mode 100644 index 4228a2ef..00000000 Binary files a/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_destructive_layer_2.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_layer_1.png b/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_layer_1.png deleted file mode 100644 index 79a2b1db..00000000 Binary files a/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_layer_1.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_layer_2.png b/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_layer_2.png deleted file mode 100644 index 184ad5c6..00000000 Binary files a/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_layer_2.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_steadfast_layer_1.png b/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_steadfast_layer_1.png deleted file mode 100644 index 834c126b..00000000 Binary files a/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_steadfast_layer_1.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_steadfast_layer_2.png b/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_steadfast_layer_2.png deleted file mode 100644 index c2a85f7b..00000000 Binary files a/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_steadfast_layer_2.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_vengeful_layer_1.png b/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_vengeful_layer_1.png deleted file mode 100644 index d1a85eb2..00000000 Binary files a/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_vengeful_layer_1.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_vengeful_layer_2.png b/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_vengeful_layer_2.png deleted file mode 100644 index 66b73bca..00000000 Binary files a/src/main/resources/assets/bloodmagic/models/armor/sentientarmour_vengeful_layer_2.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/models/block/alchemytable.json b/src/main/resources/assets/bloodmagic/models/block/alchemytable.json deleted file mode 100644 index 60db6215..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/alchemytable.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "block/block", - "loader": "forge:obj", - "flip-v": true, - "model": "bloodmagic:models/block/modelalchemytable.obj", - "textures": { - "default": "bloodmagic:models/alchemytable", - "particle": "#default" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/alchemytable_invis.json b/src/main/resources/assets/bloodmagic/models/block/alchemytable_invis.json deleted file mode 100644 index 24550069..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/alchemytable_invis.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "bloodmagic:models/alchemytable" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/blockalchemyarray.json b/src/main/resources/assets/bloodmagic/models/block/blockalchemyarray.json deleted file mode 100644 index 7cb890db..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/blockalchemyarray.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:models/AlchemyArrays/StupidArray" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/block/blockblank.json b/src/main/resources/assets/bloodmagic/models/block/blockblank.json deleted file mode 100644 index 3e405550..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/blockblank.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 0, 0, 0 ], - "faces": { - "up": { "uv": [ 16, 0, 0, 16 ], "texture": "bloodmagic:empty" }, - "down": { "uv": [ 16, 0, 0, 16 ], "texture": "bloodmagic:empty" }, - "north": { "uv": [ 16, 0, 0, 16 ], "texture": "bloodmagic:empty" }, - "south": { "uv": [ 16, 0, 0, 16 ], "texture": "bloodmagic:empty" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "bloodmagic:empty" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "bloodmagic:empty" } - } - } - ] -} - diff --git a/src/main/resources/assets/bloodmagic/models/block/blockbloodlight.json b/src/main/resources/assets/bloodmagic/models/block/blockbloodlight.json deleted file mode 100644 index 5a2673b2..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/blockbloodlight.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "elements": [ - { "from": [ 0, 0, 0 ], - "to": [ 0, 0, 0 ], - "faces": { - "down": { "texture": "#down", "cullface": "down" }, - "up": { "texture": "#up", "cullface": "up" }, - "north": { "texture": "#north", "cullface": "north" }, - "south": { "texture": "#south", "cullface": "south" }, - "west": { "texture": "#west", "cullface": "west" }, - "east": { "texture": "#east", "cullface": "east" } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/blockbloodtank.json b/src/main/resources/assets/bloodmagic/models/block/blockbloodtank.json deleted file mode 100644 index 8ec58735..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/blockbloodtank.json +++ /dev/null @@ -1,433 +0,0 @@ -{ - "__comment": "Copyright © InsomniaKitten 2017", - "textures": { - "particle": "bloodmagic:blocks/BlankRune", - "texture": "bloodmagic:blocks/BloodTank" - }, - "elements": [ - { - "__comment": "Voxels-80FF00", - "from": [ 3, 0, 3 ], - "to": [ 13, 1, 13 ], - "faces": { - "down": { "uv": [ 5, 0, 10, 5 ], "texture": "#texture", "cullface": "down" }, - "up": { "uv": [ 5, 0, 10, 5 ], "texture": "#texture" }, - "north": { "uv": [ 0, 6.5, 5, 7 ], "texture": "#texture" }, - "south": { "uv": [ 0, 6.5, 5, 7 ], "texture": "#texture" }, - "west": { "uv": [ 0, 6.5, 5, 7 ], "texture": "#texture" }, - "east": { "uv": [ 0, 6.5, 5, 7 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-FF00FF", - "from": [ 3, 1, 3 ], - "to": [ 4, 14, 4 ], - "faces": { - "up": { "uv": [ 4.5, 11.5, 5, 12 ], "texture": "#texture" }, - "north": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" }, - "west": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-FF0000", - "from": [ 3, 1, 4 ], - "to": [ 4, 12, 5 ], - "faces": { - "up": { "uv": [ 4.5, 11, 5, 11.5 ], "texture": "#texture" }, - "south": { "uv": [ 4, 1, 4.5, 6.5 ], "texture": "#texture" }, - "west": { "uv": [ 0.5, 1, 1, 6.5 ], "texture": "#texture" }, - "east": { "uv": [ 4, 1, 4.5, 6.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-71FFFF", - "from": [ 3, 1, 5 ], - "to": [ 4, 2, 11 ], - "faces": { - "up": { "uv": [ 0.5, 1.5, 1, 4.5 ], "texture": "#texture" }, - "west": { "uv": [ 1, 6, 4, 6.5 ], "texture": "#texture" }, - "east": { "uv": [ 1, 6, 4, 6.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-FF0000", - "from": [ 3, 1, 11 ], - "to": [ 4, 12, 12 ], - "faces": { - "up": { "uv": [ 4.5, 7.5, 5, 8 ], "texture": "#texture" }, - "north": { "uv": [ 0.5, 1, 1, 6.5 ], "texture": "#texture" }, - "west": { "uv": [ 0.5, 1, 1, 6.5 ], "texture": "#texture" }, - "east": { "uv": [ 4, 1, 4.5, 6.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-FF00FF", - "from": [ 3, 1, 12 ], - "to": [ 4, 14, 13 ], - "faces": { - "up": { "uv": [ 4.5, 7, 5, 7.5 ], "texture": "#texture" }, - "north": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" }, - "west": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-FFFF00", - "from": [ 3, 10, 5 ], - "to": [ 4, 12, 11 ], - "faces": { - "up": { "uv": [ 4.5, 8, 5, 11.5 ], "texture": "#texture" }, - "west": { "uv": [ 1, 1, 4, 2 ], "texture": "#texture" }, - "east": { "uv": [ 1, 1, 4, 2 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-FF8000", - "from": [ 3, 13, 4 ], - "to": [ 4, 14, 12 ], - "faces": { - "down": { "uv": [ 0, 7.5, 0.5, 11.5 ], "texture": "#texture" }, - "up": { "uv": [ 4.5, 7.5, 5, 11.5 ], "texture": "#texture" }, - "west": { "uv": [ 0.5, 0, 4.5, 0.5 ], "texture": "#texture" }, - "east": { "uv": [ 0.5, 0, 4.5, 0.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-FF0000", - "from": [ 4, 1, 3 ], - "to": [ 5, 12, 4 ], - "faces": { - "up": { "uv": [ 4, 11.5, 4.5, 12 ], "texture": "#texture" }, - "north": { "uv": [ 0.5, 1, 1, 6.5 ], "texture": "#texture" }, - "south": { "uv": [ 4, 1, 4.5, 6.5 ], "texture": "#texture" }, - "east": { "uv": [ 0.5, 1, 1, 6.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-FF0000", - "from": [ 4, 1, 12 ], - "to": [ 5, 12, 13 ], - "faces": { - "up": { "uv": [ 4, 7, 4.5, 7.5 ], "texture": "#texture" }, - "north": { "uv": [ 0.5, 1, 1, 6.5 ], "texture": "#texture" }, - "south": { "uv": [ 4, 1, 4.5, 6.5 ], "texture": "#texture" }, - "east": { "uv": [ 4, 1, 4.5, 6.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-3AC6FF", - "from": [ 4, 11, 4 ], - "to": [ 12, 12, 12 ], - "faces": { - "down": { "uv": [ 5.5, 0.5, 9.5, 4.5 ], "texture": "#texture" }, - "up": { "uv": [ 5.5, 0.5, 9.5, 4.5 ], "texture": "#texture" }, - "north": { "uv": [ 0.5, 7.5, 4.5, 8 ], "texture": "#texture" }, - "south": { "uv": [ 0.5, 11, 4.5, 11.5 ], "texture": "#texture" }, - "west": { "uv": [ 0.5, 7.5, 1, 11.5 ], "texture": "#texture" }, - "east": { "uv": [ 4, 7.5, 4.5, 11.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-71FFFF", - "from": [ 5, 1, 3 ], - "to": [ 11, 2, 4 ], - "faces": { - "up": { "uv": [ 1, 1.5, 4, 2 ], "texture": "#texture" }, - "north": { "uv": [ 1, 6, 4, 6.5 ], "texture": "#texture" }, - "south": { "uv": [ 1, 6, 4, 6.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-71FFFF", - "from": [ 5, 1, 12 ], - "to": [ 11, 2, 13 ], - "faces": { - "up": { "uv": [ 1, 1.5, 4, 2 ], "texture": "#texture" }, - "north": { "uv": [ 1, 6, 4, 6.5 ], "texture": "#texture" }, - "south": { "uv": [ 1, 6, 4, 6.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-FFFF00", - "from": [ 5, 10, 3 ], - "to": [ 11, 12, 4 ], - "faces": { - "down": { "uv": [ 1, 1.5, 4, 2 ], "texture": "#texture" }, - "up": { "uv": [ 1, 7, 4, 7.5 ], "texture": "#texture" }, - "north": { "uv": [ 1, 1, 4, 2 ], "texture": "#texture" }, - "south": { "uv": [ 1, 1, 4, 2 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-FFFF00", - "from": [ 5, 10, 12 ], - "to": [ 11, 12, 13 ], - "faces": { - "down": { "uv": [ 1, 1.5, 4, 2 ], "texture": "#texture" }, - "up": { "uv": [ 1, 7, 4, 7.5 ], "texture": "#texture" }, - "north": { "uv": [ 1, 1, 4, 2 ], "texture": "#texture" }, - "south": { "uv": [ 1, 1, 4, 2 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-FF9571", - "from": [ 5, 12, 5 ], - "to": [ 11, 13, 11 ], - "faces": { - "up": { "uv": [ 1, 8, 4, 11 ], "texture": "#texture" }, - "north": { "uv": [ 5, 5.5, 8, 6 ], "texture": "#texture" }, - "south": { "uv": [ 5, 5.5, 8, 6 ], "texture": "#texture" }, - "west": { "uv": [ 5, 5.5, 8, 6 ], "texture": "#texture" }, - "east": { "uv": [ 5, 5.5, 8, 6 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-FF8000", - "from": [ 4, 13, 3 ], - "to": [ 12, 14, 4 ], - "faces": { - "down": { "uv": [ 0.5, 11.5, 4.5, 12 ], "texture": "#texture" }, - "up": { "uv": [ 0.5, 7, 4.5, 7.5 ], "texture": "#texture" }, - "north": { "uv": [ 0.5, 0, 4.5, 0.5 ], "texture": "#texture" }, - "south": { "uv": [ 0.5, 0, 4.5, 0.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-EBAAFF", - "from": [ 5, 13, 6 ], - "to": [ 6, 14, 10 ], - "faces": { - "up": { "uv": [ 3.5, 8.5, 4, 10.5 ], "texture": "#texture" }, - "north": { "uv": [ 7.5, 5, 8, 5.5 ], "texture": "#texture" }, - "south": { "uv": [ 5, 5, 5.5, 5.5 ], "texture": "#texture" }, - "west": { "uv": [ 5.5, 5, 7.5, 5.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-FF8000", - "from": [ 4, 13, 12 ], - "to": [ 12, 14, 13 ], - "faces": { - "down": { "uv": [ 0.5, 11.5, 4.5, 12 ], "texture": "#texture" }, - "up": { "uv": [ 0.5, 7, 4.5, 7.5 ], "texture": "#texture" }, - "north": { "uv": [ 0.5, 0, 4.5, 0.5 ], "texture": "#texture" }, - "south": { "uv": [ 0.5, 0, 4.5, 0.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-EBAAFF", - "from": [ 6, 13, 5 ], - "to": [ 10, 14, 6 ], - "faces": { - "up": { "uv": [ 1.5, 10.5, 3.5, 11 ], "texture": "#texture" }, - "north": { "uv": [ 5.5, 5, 7.5, 5.5 ], "texture": "#texture" }, - "west": { "uv": [ 5, 5, 5.5, 5.5 ], "texture": "#texture" }, - "east": { "uv": [ 7.5, 5, 8, 5.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-5595FF", - "from": [ 6, 13, 6 ], - "to": [ 10, 14, 10 ], - "faces": { - "up": { "uv": [ 1.5, 8.499999, 3.5, 10.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-EBAAFF", - "from": [ 6, 13, 10 ], - "to": [ 10, 14, 11 ], - "faces": { - "up": { "uv": [ 1.5, 8, 3.5, 8.5 ], "texture": "#texture" }, - "south": { "uv": [ 5.5, 5, 7.5, 5.5 ], "texture": "#texture" }, - "west": { "uv": [ 5, 5, 5.5, 5.5 ], "texture": "#texture" }, - "east": { "uv": [ 7.5, 5, 8, 5.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-EBAAFF", - "from": [ 10, 13, 6 ], - "to": [ 11, 14, 10 ], - "faces": { - "up": { "uv": [ 1, 8.5, 1.5, 10.5 ], "texture": "#texture" }, - "north": { "uv": [ 5, 5, 5.5, 5.5 ], "texture": "#texture" }, - "south": { "uv": [ 7.5, 5, 8, 5.5 ], "texture": "#texture" }, - "east": { "uv": [ 5.5, 5, 7.5, 5.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-FF0000", - "from": [ 11, 1, 3 ], - "to": [ 12, 12, 4 ], - "faces": { - "up": { "uv": [ 0.5, 11.5, 1, 12 ], "texture": "#texture" }, - "north": { "uv": [ 0.5, 1, 1, 6.499999 ], "texture": "#texture" }, - "south": { "uv": [ 4, 1, 4.5, 6.5 ], "texture": "#texture" }, - "west": { "uv": [ 0.5, 1, 1, 6.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-FF0000", - "from": [ 11, 1, 12 ], - "to": [ 12, 12, 13 ], - "faces": { - "up": { "uv": [ 0.5, 7, 1, 7.5 ], "texture": "#texture" }, - "north": { "uv": [ 0.5, 1, 1, 6.5 ], "texture": "#texture" }, - "south": { "uv": [ 4, 1, 4.5, 6.5 ], "texture": "#texture" }, - "west": { "uv": [ 0.5, 1, 1, 6.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-FF00FF", - "from": [ 12, 1, 3 ], - "to": [ 13, 14, 4 ], - "faces": { - "up": { "uv": [ 0, 11.5, 0.5, 12 ], "texture": "#texture" }, - "north": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" }, - "west": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-FF0000", - "from": [ 12, 1, 4 ], - "to": [ 13, 12, 5 ], - "faces": { - "up": { "uv": [ 0, 11, 0.5, 11.5 ], "texture": "#texture" }, - "south": { "uv": [ 4, 1, 4.5, 6.5 ], "texture": "#texture" }, - "west": { "uv": [ 0.5, 1, 1, 6.5 ], "texture": "#texture" }, - "east": { "uv": [ 4, 1, 4.5, 6.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-71FFFF", - "from": [ 12, 1, 5 ], - "to": [ 13, 2, 11 ], - "faces": { - "up": { "uv": [ 0.5, 1.5, 1, 4.5 ], "texture": "#texture" }, - "west": { "uv": [ 1, 6, 4, 6.5 ], "texture": "#texture" }, - "east": { "uv": [ 1, 6, 4, 6.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-FF0000", - "from": [ 12, 1, 11 ], - "to": [ 13, 12, 12 ], - "faces": { - "up": { "uv": [ 0, 7.5, 0.5, 8 ], "texture": "#texture" }, - "north": { "uv": [ 0.5, 1, 1, 6.5 ], "texture": "#texture" }, - "west": { "uv": [ 0.5, 1, 1, 6.5 ], "texture": "#texture" }, - "east": { "uv": [ 4, 1, 4.5, 6.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-FF00FF", - "from": [ 12, 1, 12 ], - "to": [ 13, 14, 13 ], - "faces": { - "up": { "uv": [ 0, 7, 0.5, 7.5 ], "texture": "#texture" }, - "north": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" }, - "west": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 0.5, 6.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-FFFF00", - "from": [ 12, 10, 5 ], - "to": [ 13, 12, 11 ], - "faces": { - "down": { "uv": [ 0, 8, 0.5, 11 ], "texture": "#texture" }, - "up": { "uv": [ 0, 8, 0.5, 11 ], "texture": "#texture" }, - "west": { "uv": [ 1, 1, 4, 2 ], "texture": "#texture" }, - "east": { "uv": [ 1, 1, 4, 2 ], "texture": "#texture" } - } - }, - { - "__comment": "Voxels-FF8000", - "from": [ 12, 13, 4 ], - "to": [ 13, 14, 12 ], - "faces": { - "down": { "uv": [ 4.5, 7.5, 5, 11.5 ], "texture": "#texture" }, - "up": { "uv": [ 0, 7.5, 0.5, 11.5 ], "texture": "#texture" }, - "west": { "uv": [ 0.5, 0, 4.5, 0.5 ], "texture": "#texture" }, - "east": { "uv": [ 0.5, 0, 4.5, 0.5 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube33", - "from": [ 5, 2, 3 ], - "to": [ 11, 10, 4 ], - "faces": { - "north": { "uv": [ 1, 2, 4, 6 ], "texture": "#texture" }, - "south": { "uv": [ 1, 2, 4, 6 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube33", - "from": [ 3, 2, 5 ], - "to": [ 4, 10, 11 ], - "faces": { - "west": { "uv": [ 1, 2, 4, 6 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 4, 6 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube33", - "from": [ 12, 2, 5 ], - "to": [ 13, 10, 11 ], - "faces": { - "west": { "uv": [ 1, 2, 4, 6 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 4, 6 ], "texture": "#texture" } - } - }, - { - "__comment": "Cube33", - "from": [ 5, 2, 12 ], - "to": [ 11, 10, 13 ], - "faces": { - "north": { "uv": [ 1, 2, 4, 6 ], "texture": "#texture" }, - "south": { "uv": [ 1, 2, 4, 6 ], "texture": "#texture" } - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [ 75, 45, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "thirdperson_lefthand": { - "rotation": [ 75, 45, 0 ], - "translation": [ 0, 2.5, 0 ], - "scale": [ 0.375, 0.375, 0.375 ] - }, - "firstperson_righthand": { - "rotation": [ 0, 45, 0 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 45, 0 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "gui": { - "rotation": [ 30, 225, 0 ], - "scale": [ 0.625, 0.625, 0.625 ] - }, - "head": { - "translation": [ 0, 12, 0 ], - "scale": [ 0.5, 0.5, 0.5 ] - }, - "ground": { - "translation": [ 0, 3, 0 ], - "scale": [ 0.25, 0.25, 0.25 ] - }, - "fixed": { - "scale": [ 0.5, 0.5, 0.5 ] - } - } -} diff --git a/src/main/resources/assets/bloodmagic/models/block/blockdemoncrucible.mtl b/src/main/resources/assets/bloodmagic/models/block/blockdemoncrucible.mtl deleted file mode 100644 index 8632a57a..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/blockdemoncrucible.mtl +++ /dev/null @@ -1,11 +0,0 @@ -# Blender MTL File: 'None' -# Material Count: 1 - -newmtl None -#Ns 0 -Ka 0.000000 0.000000 0.000000 -Kd 0.8 0.8 0.8 -#Ks 0.8 0.8 0.8 -d 1 -#illum 2 -map_Kd bloodmagic:models/demoncrucible \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/blockdemoncrucible.obj b/src/main/resources/assets/bloodmagic/models/block/blockdemoncrucible.obj deleted file mode 100644 index 423f18c5..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/blockdemoncrucible.obj +++ /dev/null @@ -1,937 +0,0 @@ -# Blender v2.76 (sub 0) OBJ File: '' -# www.blender.org -mtllib blockdemoncrucible.mtl -o BlockDemonCrucible -v 0.125000 0.125000 0.875000 -v 0.125000 -0.000000 0.875000 -v 0.375000 -0.000000 0.875000 -v 0.375000 0.125000 0.875000 -v 0.375000 0.125000 0.625000 -v 0.375000 -0.000000 0.625000 -v 0.125000 -0.000000 0.625000 -v 0.125000 0.125000 0.625000 -v 0.193151 0.473851 0.803768 -v 0.151353 0.103509 0.845306 -v 0.337685 0.082741 0.847635 -v 0.379483 0.453082 0.806098 -v 0.379483 0.432183 0.619766 -v 0.337685 0.061842 0.661303 -v 0.151353 0.082610 0.658974 -v 0.193151 0.452952 0.617437 -v 0.625000 0.125000 0.375000 -v 0.625000 0.000000 0.375000 -v 0.875000 0.000000 0.375000 -v 0.875000 0.125000 0.375000 -v 0.875000 0.125000 0.125000 -v 0.875000 0.000000 0.125000 -v 0.625000 0.000000 0.125000 -v 0.625000 0.125000 0.125000 -v 0.620517 0.432206 0.380235 -v 0.662315 0.061873 0.338698 -v 0.848645 0.082641 0.341027 -v 0.806847 0.452974 0.382564 -v 0.806847 0.473873 0.196235 -v 0.848645 0.103540 0.154698 -v 0.662315 0.082772 0.152368 -v 0.620517 0.453105 0.193905 -v 0.125000 0.125000 0.375000 -v 0.125000 0.000000 0.375000 -v 0.375000 0.000000 0.375000 -v 0.375000 0.125000 0.375000 -v 0.375000 0.125000 0.125000 -v 0.375000 0.000000 0.125000 -v 0.125000 0.000000 0.125000 -v 0.125000 0.125000 0.125000 -v 0.193151 0.452963 0.382563 -v 0.151353 0.082626 0.341026 -v 0.337685 0.061857 0.338696 -v 0.379483 0.432194 0.380234 -v 0.379483 0.453093 0.193904 -v 0.337685 0.082756 0.152367 -v 0.151353 0.103525 0.154696 -v 0.193151 0.473862 0.196233 -v 0.625000 0.125000 0.875000 -v 0.625000 -0.000000 0.875000 -v 0.875000 -0.000000 0.875000 -v 0.875000 0.125000 0.875000 -v 0.875000 0.125000 0.625000 -v 0.875000 -0.000000 0.625000 -v 0.625000 -0.000000 0.625000 -v 0.625000 0.125000 0.625000 -v 0.620517 0.453093 0.806096 -v 0.662315 0.082756 0.847633 -v 0.848645 0.103525 0.845304 -v 0.806847 0.473862 0.803767 -v 0.806847 0.452963 0.617435 -v 0.848645 0.082626 0.658972 -v 0.662315 0.061857 0.661302 -v 0.620517 0.432194 0.619765 -v 0.125000 0.500000 0.875000 -v 0.125000 0.437500 0.875000 -v 0.875000 0.437500 0.875000 -v 0.875000 0.500000 0.875000 -v 0.875000 0.500000 0.125000 -v 0.875000 0.437500 0.125000 -v 0.125000 0.437500 0.125000 -v 0.125000 0.500000 0.125000 -v 0.187500 0.562500 0.812500 -v 0.187500 0.500000 0.812500 -v 0.812500 0.500000 0.812500 -v 0.812500 0.562500 0.812500 -v 0.812500 0.562500 0.187500 -v 0.812500 0.500000 0.187500 -v 0.187500 0.500000 0.187500 -v 0.187500 0.562500 0.187500 -v 0.125000 0.625000 0.875000 -v 0.125000 0.562500 0.875000 -v 0.875000 0.562500 0.875000 -v 0.875000 0.625000 0.875000 -v 0.875000 0.625000 0.125000 -v 0.875000 0.562500 0.125000 -v 0.125000 0.562500 0.125000 -v 0.125000 0.625000 0.125000 -v 0.218750 0.875000 0.781250 -v 0.218750 0.625000 0.781250 -v 0.781250 0.625000 0.781250 -v 0.781250 0.875000 0.781250 -v 0.781250 0.875000 0.218750 -v 0.781250 0.625000 0.218750 -v 0.218750 0.625000 0.218750 -v 0.218750 0.875000 0.218750 -v 0.218750 1.093750 0.843750 -v 0.218750 0.718750 0.843750 -v 0.781250 0.718750 0.843750 -v 0.781250 1.093750 0.843750 -v 0.781250 1.093750 0.781250 -v 0.781250 0.718750 0.781250 -v 0.218750 0.718750 0.781250 -v 0.218750 1.093750 0.781250 -v 0.343750 1.281250 0.968750 -v 0.343750 0.843750 0.968750 -v 0.656250 0.843750 0.968750 -v 0.656250 1.281250 0.968750 -v 0.656250 1.281250 0.843750 -v 0.656250 0.843750 0.843750 -v 0.343750 0.843750 0.843750 -v 0.343750 1.281250 0.843750 -v 0.406250 1.531250 0.968750 -v 0.406250 1.281250 0.968750 -v 0.593750 1.281250 0.968750 -v 0.593750 1.531250 0.968750 -v 0.593750 1.531250 0.906250 -v 0.593750 1.281250 0.906250 -v 0.406250 1.281250 0.906250 -v 0.406250 1.531250 0.906250 -v 0.156250 1.093750 0.781250 -v 0.156250 0.718750 0.781250 -v 0.218750 0.718750 0.781250 -v 0.218750 1.093750 0.781250 -v 0.218750 1.093750 0.218750 -v 0.218750 0.718750 0.218750 -v 0.156250 0.718750 0.218750 -v 0.156250 1.093750 0.218750 -v 0.031250 1.281250 0.656250 -v 0.031250 0.843750 0.656250 -v 0.156250 0.843750 0.656250 -v 0.156250 1.281250 0.656250 -v 0.156250 1.281250 0.343750 -v 0.156250 0.843750 0.343750 -v 0.031250 0.843750 0.343750 -v 0.031250 1.281250 0.343750 -v 0.031250 1.531250 0.593750 -v 0.031250 1.281250 0.593750 -v 0.093750 1.281250 0.593750 -v 0.093750 1.531250 0.593750 -v 0.093750 1.531250 0.406250 -v 0.093750 1.281250 0.406250 -v 0.031250 1.281250 0.406250 -v 0.031250 1.531250 0.406250 -v 0.218750 1.093750 0.218750 -v 0.218750 0.718750 0.218750 -v 0.781250 0.718750 0.218750 -v 0.781250 1.093750 0.218750 -v 0.781250 1.093750 0.156250 -v 0.781250 0.718750 0.156250 -v 0.218750 0.718750 0.156250 -v 0.218750 1.093750 0.156250 -v 0.343750 1.281250 0.156250 -v 0.343750 0.843750 0.156250 -v 0.656250 0.843750 0.156250 -v 0.656250 1.281250 0.156250 -v 0.656250 1.281250 0.031250 -v 0.656250 0.843750 0.031250 -v 0.343750 0.843750 0.031250 -v 0.343750 1.281250 0.031250 -v 0.406250 1.531250 0.093750 -v 0.406250 1.281250 0.093750 -v 0.593750 1.281250 0.093750 -v 0.593750 1.531250 0.093750 -v 0.593750 1.531250 0.031250 -v 0.593750 1.281250 0.031250 -v 0.406250 1.281250 0.031250 -v 0.406250 1.531250 0.031250 -v 0.781250 1.093750 0.781250 -v 0.781250 0.718750 0.781250 -v 0.843750 0.718750 0.781250 -v 0.843750 1.093750 0.781250 -v 0.843750 1.093750 0.218750 -v 0.843750 0.718750 0.218750 -v 0.781250 0.718750 0.218750 -v 0.781250 1.093750 0.218750 -v 0.843750 1.281250 0.656250 -v 0.843750 0.843750 0.656250 -v 0.968750 0.843750 0.656250 -v 0.968750 1.281250 0.656250 -v 0.968750 1.281250 0.343750 -v 0.968750 0.843750 0.343750 -v 0.843750 0.843750 0.343750 -v 0.843750 1.281250 0.343750 -v 0.906250 1.531250 0.593750 -v 0.906250 1.281250 0.593750 -v 0.968750 1.281250 0.593750 -v 0.968750 1.531250 0.593750 -v 0.968750 1.531250 0.406250 -v 0.968750 1.281250 0.406250 -v 0.906250 1.281250 0.406250 -v 0.906250 1.531250 0.406250 -v 0.193151 0.473851 0.803768 -v 0.151353 0.103509 0.845306 -v 0.337685 0.082741 0.847635 -v 0.379483 0.453082 0.806098 -v 0.379483 0.432183 0.619766 -v 0.337685 0.061842 0.661303 -v 0.151353 0.082610 0.658974 -v 0.193151 0.452952 0.617437 -v 0.620517 0.432206 0.380235 -v 0.662315 0.061873 0.338698 -v 0.848645 0.082641 0.341027 -v 0.806847 0.452974 0.382564 -v 0.806847 0.473873 0.196235 -v 0.848645 0.103540 0.154698 -v 0.662315 0.082772 0.152368 -v 0.620517 0.453105 0.193905 -v 0.193151 0.452963 0.382563 -v 0.151353 0.082626 0.341026 -v 0.337685 0.061857 0.338696 -v 0.379483 0.432194 0.380234 -v 0.379483 0.453093 0.193904 -v 0.337685 0.082756 0.152367 -v 0.151353 0.103525 0.154696 -v 0.193151 0.473862 0.196233 -v 0.620517 0.453093 0.806096 -v 0.662315 0.082756 0.847633 -v 0.848645 0.103525 0.845304 -v 0.806847 0.473862 0.803767 -v 0.806847 0.452963 0.617435 -v 0.848645 0.082626 0.658972 -v 0.662315 0.061857 0.661302 -v 0.620517 0.432194 0.619765 -v 0.218750 1.093750 0.843750 -v 0.218750 0.718750 0.843750 -v 0.781250 0.718750 0.843750 -v 0.781250 1.093750 0.843750 -v 0.781250 1.093750 0.781250 -v 0.781250 0.718750 0.781250 -v 0.218750 0.718750 0.781250 -v 0.218750 1.093750 0.781250 -v 0.343750 1.281250 0.968750 -v 0.343750 0.843750 0.968750 -v 0.656250 0.843750 0.968750 -v 0.656250 1.281250 0.968750 -v 0.656250 1.281250 0.843750 -v 0.656250 0.843750 0.843750 -v 0.343750 0.843750 0.843750 -v 0.343750 1.281250 0.843750 -v 0.406250 1.531250 0.968750 -v 0.406250 1.281250 0.968750 -v 0.593750 1.281250 0.968750 -v 0.593750 1.531250 0.968750 -v 0.593750 1.531250 0.906250 -v 0.593750 1.281250 0.906250 -v 0.406250 1.281250 0.906250 -v 0.406250 1.531250 0.906250 -v 0.156250 1.093750 0.781250 -v 0.156250 0.718750 0.781250 -v 0.218750 0.718750 0.781250 -v 0.218750 1.093750 0.781250 -v 0.218750 1.093750 0.218750 -v 0.218750 0.718750 0.218750 -v 0.156250 0.718750 0.218750 -v 0.156250 1.093750 0.218750 -v 0.031250 1.281250 0.656250 -v 0.031250 0.843750 0.656250 -v 0.156250 0.843750 0.656250 -v 0.156250 1.281250 0.656250 -v 0.156250 1.281250 0.343750 -v 0.156250 0.843750 0.343750 -v 0.031250 0.843750 0.343750 -v 0.031250 1.281250 0.343750 -v 0.031250 1.531250 0.593750 -v 0.031250 1.281250 0.593750 -v 0.093750 1.281250 0.593750 -v 0.093750 1.531250 0.593750 -v 0.093750 1.531250 0.406250 -v 0.093750 1.281250 0.406250 -v 0.031250 1.281250 0.406250 -v 0.031250 1.531250 0.406250 -v 0.218750 1.093750 0.218750 -v 0.218750 0.718750 0.218750 -v 0.781250 0.718750 0.218750 -v 0.781250 1.093750 0.218750 -v 0.781250 1.093750 0.156250 -v 0.781250 0.718750 0.156250 -v 0.218750 0.718750 0.156250 -v 0.218750 1.093750 0.156250 -v 0.343750 1.281250 0.156250 -v 0.343750 0.843750 0.156250 -v 0.656250 0.843750 0.156250 -v 0.656250 1.281250 0.156250 -v 0.656250 1.281250 0.031250 -v 0.656250 0.843750 0.031250 -v 0.343750 0.843750 0.031250 -v 0.343750 1.281250 0.031250 -v 0.406250 1.531250 0.093750 -v 0.406250 1.281250 0.093750 -v 0.593750 1.281250 0.093750 -v 0.593750 1.531250 0.093750 -v 0.593750 1.531250 0.031250 -v 0.593750 1.281250 0.031250 -v 0.406250 1.281250 0.031250 -v 0.406250 1.531250 0.031250 -v 0.781250 1.093750 0.781250 -v 0.781250 0.718750 0.781250 -v 0.843750 0.718750 0.781250 -v 0.843750 1.093750 0.781250 -v 0.843750 1.093750 0.218750 -v 0.843750 0.718750 0.218750 -v 0.781250 0.718750 0.218750 -v 0.781250 1.093750 0.218750 -v 0.843750 1.281250 0.656250 -v 0.843750 0.843750 0.656250 -v 0.968750 0.843750 0.656250 -v 0.968750 1.281250 0.656250 -v 0.968750 1.281250 0.343750 -v 0.968750 0.843750 0.343750 -v 0.843750 0.843750 0.343750 -v 0.843750 1.281250 0.343750 -v 0.906250 1.531250 0.593750 -v 0.906250 1.281250 0.593750 -v 0.968750 1.281250 0.593750 -v 0.968750 1.531250 0.593750 -v 0.968750 1.531250 0.406250 -v 0.968750 1.281250 0.406250 -v 0.906250 1.281250 0.406250 -v 0.906250 1.531250 0.406250 -v 0.343750 1.281250 0.968750 -v 0.343750 0.843750 0.968750 -v 0.656250 0.843750 0.968750 -v 0.656250 1.281250 0.968750 -v 0.656250 1.281250 0.843750 -v 0.656250 0.843750 0.843750 -v 0.343750 0.843750 0.843750 -v 0.343750 1.281250 0.843750 -v 0.406250 1.531250 0.968750 -v 0.406250 1.281250 0.968750 -v 0.593750 1.281250 0.968750 -v 0.593750 1.531250 0.968750 -v 0.593750 1.531250 0.906250 -v 0.593750 1.281250 0.906250 -v 0.406250 1.281250 0.906250 -v 0.406250 1.531250 0.906250 -v 0.406250 1.531250 0.968750 -v 0.406250 1.281250 0.968750 -v 0.593750 1.281250 0.968750 -v 0.593750 1.531250 0.968750 -v 0.593750 1.531250 0.906250 -v 0.593750 1.281250 0.906250 -v 0.406250 1.281250 0.906250 -v 0.406250 1.531250 0.906250 -v 0.031250 1.281250 0.656250 -v 0.031250 0.843750 0.656250 -v 0.156250 0.843750 0.656250 -v 0.156250 1.281250 0.656250 -v 0.156250 1.281250 0.343750 -v 0.156250 0.843750 0.343750 -v 0.031250 0.843750 0.343750 -v 0.031250 1.281250 0.343750 -v 0.031250 1.531250 0.593750 -v 0.031250 1.281250 0.593750 -v 0.093750 1.281250 0.593750 -v 0.093750 1.531250 0.593750 -v 0.093750 1.531250 0.406250 -v 0.093750 1.281250 0.406250 -v 0.031250 1.281250 0.406250 -v 0.031250 1.531250 0.406250 -v 0.031250 1.531250 0.593750 -v 0.031250 1.281250 0.593750 -v 0.093750 1.281250 0.593750 -v 0.093750 1.531250 0.593750 -v 0.093750 1.531250 0.406250 -v 0.093750 1.281250 0.406250 -v 0.031250 1.281250 0.406250 -v 0.031250 1.531250 0.406250 -v 0.343750 1.281250 0.156250 -v 0.343750 0.843750 0.156250 -v 0.656250 0.843750 0.156250 -v 0.656250 1.281250 0.156250 -v 0.656250 1.281250 0.031250 -v 0.656250 0.843750 0.031250 -v 0.343750 0.843750 0.031250 -v 0.343750 1.281250 0.031250 -v 0.406250 1.531250 0.093750 -v 0.406250 1.281250 0.093750 -v 0.593750 1.281250 0.093750 -v 0.593750 1.531250 0.093750 -v 0.593750 1.531250 0.031250 -v 0.593750 1.281250 0.031250 -v 0.406250 1.281250 0.031250 -v 0.406250 1.531250 0.031250 -v 0.406250 1.531250 0.093750 -v 0.406250 1.281250 0.093750 -v 0.593750 1.281250 0.093750 -v 0.593750 1.531250 0.093750 -v 0.593750 1.531250 0.031250 -v 0.593750 1.281250 0.031250 -v 0.406250 1.281250 0.031250 -v 0.406250 1.531250 0.031250 -v 0.843750 1.281250 0.656250 -v 0.843750 0.843750 0.656250 -v 0.968750 0.843750 0.656250 -v 0.968750 1.281250 0.656250 -v 0.968750 1.281250 0.343750 -v 0.968750 0.843750 0.343750 -v 0.843750 0.843750 0.343750 -v 0.843750 1.281250 0.343750 -v 0.906250 1.531250 0.593750 -v 0.906250 1.281250 0.593750 -v 0.968750 1.281250 0.593750 -v 0.968750 1.531250 0.593750 -v 0.968750 1.531250 0.406250 -v 0.968750 1.281250 0.406250 -v 0.906250 1.281250 0.406250 -v 0.906250 1.531250 0.406250 -v 0.906250 1.531250 0.593750 -v 0.906250 1.281250 0.593750 -v 0.968750 1.281250 0.593750 -v 0.968750 1.531250 0.593750 -v 0.968750 1.531250 0.406250 -v 0.968750 1.281250 0.406250 -v 0.906250 1.281250 0.406250 -v 0.906250 1.531250 0.406250 -vt 0.062500 0.937500 -vt 0.062500 0.906250 -vt 0.125000 0.906250 -vt 0.125000 0.937500 -vt 0.187500 0.937500 -vt 0.187500 0.906250 -vt 0.250000 0.906250 -vt 0.250000 0.937500 -vt 0.062500 1.000000 -vt 0.125000 1.000000 -vt 0.187500 1.000000 -vt 0.000000 0.937500 -vt 0.000000 0.906250 -vt 0.046875 0.843750 -vt 0.046875 0.750000 -vt 0.093750 0.750000 -vt 0.093750 0.843750 -vt 0.140625 0.843750 -vt 0.140625 0.750000 -vt 0.187500 0.750000 -vt 0.187500 0.843750 -vt 0.046875 0.890625 -vt 0.093750 0.890625 -vt 0.140625 0.890625 -vt 0.000000 0.843750 -vt 0.000000 0.750000 -vt 0.437500 0.015625 -vt 0.437500 0.000000 -vt 0.625000 0.000000 -vt 0.625000 0.015625 -vt 0.812500 0.015625 -vt 0.812500 0.000000 -vt 1.000000 0.000000 -vt 1.000000 0.015625 -vt 0.437500 0.203125 -vt 0.625000 0.203125 -vt 0.812500 0.203125 -vt 0.250000 0.015625 -vt 0.250000 0.000000 -vt 0.531250 0.234375 -vt 0.531250 0.218750 -vt 0.687500 0.218750 -vt 0.687500 0.234375 -vt 0.843750 0.234375 -vt 0.843750 0.218750 -vt 1.000000 0.218750 -vt 1.000000 0.234375 -vt 0.531250 0.390625 -vt 0.687500 0.390625 -vt 0.843750 0.390625 -vt 0.375000 0.234375 -vt 0.375000 0.218750 -vt 0.578125 0.468750 -vt 0.578125 0.406250 -vt 0.718750 0.406250 -vt 0.718750 0.468750 -vt 0.859375 0.468750 -vt 0.859375 0.406250 -vt 1.000000 0.406250 -vt 1.000000 0.468750 -vt 0.578125 0.609375 -vt 0.718750 0.609375 -vt 0.859375 0.609375 -vt 0.437500 0.468750 -vt 0.437500 0.406250 -vt 0.703125 0.984375 -vt 0.703125 0.890625 -vt 0.843750 0.890625 -vt 0.843750 0.984375 -vt 0.859375 0.984375 -vt 0.859375 0.890625 -vt 1.000000 0.890625 -vt 1.000000 0.984375 -vt 0.703125 1.000000 -vt 0.843750 1.000000 -vt 0.984375 0.984375 -vt 0.984375 1.000000 -vt 0.687500 0.984375 -vt 0.687500 0.890625 -vt 0.578125 0.843750 -vt 0.578125 0.734375 -vt 0.656250 0.734375 -vt 0.656250 0.843750 -vt 0.687500 0.843750 -vt 0.687500 0.734375 -vt 0.765625 0.734375 -vt 0.765625 0.843750 -vt 0.578125 0.875000 -vt 0.656250 0.875000 -vt 0.734375 0.843750 -vt 0.734375 0.875000 -vt 0.546875 0.843750 -vt 0.546875 0.734375 -vt 0.890625 0.703125 -vt 0.890625 0.640625 -vt 0.937500 0.640625 -vt 0.937500 0.703125 -vt 0.953125 0.703125 -vt 0.953125 0.640625 -vt 1.000000 0.640625 -vt 1.000000 0.703125 -vt 0.890625 0.718750 -vt 0.937500 0.718750 -vt 0.984375 0.703125 -vt 0.984375 0.718750 -vt 0.875000 0.703125 -vt 0.875000 0.640625 -vt 0.140625 0.593750 -vt 0.140625 0.500000 -vt 0.156250 0.500000 -vt 0.156250 0.593750 -vt 0.296875 0.593750 -vt 0.296875 0.500000 -vt 0.312500 0.500000 -vt 0.312500 0.593750 -vt 0.140625 0.734375 -vt 0.156250 0.734375 -vt 0.171875 0.593750 -vt 0.171875 0.734375 -vt 0.000000 0.593750 -vt 0.000000 0.500000 -vt 0.421875 0.671875 -vt 0.421875 0.562500 -vt 0.453125 0.562500 -vt 0.453125 0.671875 -vt 0.531250 0.671875 -vt 0.531250 0.562500 -vt 0.562500 0.562500 -vt 0.562500 0.671875 -vt 0.421875 0.750000 -vt 0.453125 0.750000 -vt 0.484375 0.671875 -vt 0.484375 0.750000 -vt 0.343750 0.671875 -vt 0.343750 0.562500 -vt 0.343750 0.484375 -vt 0.343750 0.421875 -vt 0.359375 0.421875 -vt 0.359375 0.484375 -vt 0.406250 0.484375 -vt 0.406250 0.421875 -vt 0.421875 0.421875 -vt 0.421875 0.484375 -vt 0.343750 0.531250 -vt 0.359375 0.531250 -vt 0.375000 0.484375 -vt 0.375000 0.531250 -vt 0.296875 0.484375 -vt 0.296875 0.421875 -vt 0.375000 0.984375 -vt 0.375000 0.890625 -vt 0.515625 0.890625 -vt 0.515625 0.984375 -vt 0.531250 0.984375 -vt 0.531250 0.890625 -vt 0.671875 0.890625 -vt 0.671875 0.984375 -vt 0.375000 1.000000 -vt 0.515625 1.000000 -vt 0.656250 0.984375 -vt 0.656250 1.000000 -vt 0.359375 0.984375 -vt 0.359375 0.890625 -vt 0.812500 0.843750 -vt 0.812500 0.734375 -vt 0.890625 0.734375 -vt 0.890625 0.843750 -vt 0.921875 0.843750 -vt 0.921875 0.734375 -vt 1.000000 0.734375 -vt 1.000000 0.843750 -vt 0.812500 0.875000 -vt 0.890625 0.875000 -vt 0.968750 0.843750 -vt 0.968750 0.875000 -vt 0.781250 0.843750 -vt 0.781250 0.734375 -vn 0.000000 0.000000 1.000000 -vn 0.000000 0.000000 -1.000000 -vn 0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 -0.000000 -vn 1.000000 0.000000 0.000000 -vn -1.000000 0.000000 0.000000 -vn -0.000000 0.111500 0.993800 -vn -0.000000 -0.111500 -0.993800 -vn 0.111500 0.987600 -0.110800 -vn -0.111500 -0.987600 0.110800 -vn 0.993800 -0.110800 0.012400 -vn -0.993800 0.110800 -0.012400 -vn 0.000000 -0.111500 0.993800 -vn 0.000000 0.111500 -0.993800 -vn -0.111500 0.987600 0.110800 -vn 0.111500 -0.987600 -0.110800 -vn 0.993800 0.110800 0.012400 -vn -0.993800 -0.110800 -0.012400 -vn 0.111500 0.987600 0.110800 -vn -0.111500 -0.987600 -0.110800 -vn 0.993800 -0.110800 -0.012400 -vn -0.993800 0.110800 0.012400 -vn -0.111500 0.987600 -0.110800 -vn 0.111500 -0.987600 0.110800 -vn 0.993800 0.110800 -0.012400 -vn -0.993800 -0.110800 0.012400 -usemtl None -#s 1 -f 1/1/1 2/2/1 3/3/1 4/4/1 -f 5/5/2 6/6/2 7/7/2 8/8/2 -f 8/9/3 1/1/3 4/4/3 5/10/3 -f 2/5/4 7/11/4 6/10/4 3/4/4 -f 5/5/5 4/4/5 3/3/5 6/6/5 -f 8/12/6 7/13/6 2/2/6 1/1/6 -f 9/14/7 10/15/7 11/16/7 12/17/7 -f 13/18/8 14/19/8 15/20/8 16/21/8 -f 16/22/9 9/14/9 12/17/9 13/23/9 -f 10/18/10 15/24/10 14/23/10 11/17/10 -f 13/18/11 12/17/11 11/16/11 14/19/11 -f 16/25/12 15/26/12 10/15/12 9/14/12 -f 17/1/1 18/2/1 19/3/1 20/4/1 -f 21/5/2 22/6/2 23/7/2 24/8/2 -f 24/9/3 17/1/3 20/4/3 21/10/3 -f 18/5/4 23/11/4 22/10/4 19/4/4 -f 21/5/5 20/4/5 19/3/5 22/6/5 -f 24/12/6 23/13/6 18/2/6 17/1/6 -f 25/14/13 26/15/13 27/16/13 28/17/13 -f 29/18/14 30/19/14 31/20/14 32/21/14 -f 32/22/15 25/14/15 28/17/15 29/23/15 -f 26/18/16 31/24/16 30/23/16 27/17/16 -f 29/18/17 28/17/17 27/16/17 30/19/17 -f 32/25/18 31/26/18 26/15/18 25/14/18 -f 33/1/1 34/2/1 35/3/1 36/4/1 -f 37/5/2 38/6/2 39/7/2 40/8/2 -f 40/9/3 33/1/3 36/4/3 37/10/3 -f 34/5/4 39/11/4 38/10/4 35/4/4 -f 37/5/5 36/4/5 35/3/5 38/6/5 -f 40/12/6 39/13/6 34/2/6 33/1/6 -f 41/14/13 42/15/13 43/16/13 44/17/13 -f 45/18/14 46/19/14 47/20/14 48/21/14 -f 48/22/19 41/14/19 44/17/19 45/23/19 -f 42/18/20 47/24/20 46/23/20 43/17/20 -f 45/18/21 44/17/21 43/16/21 46/19/21 -f 48/25/22 47/26/22 42/15/22 41/14/22 -f 49/1/1 50/2/1 51/3/1 52/4/1 -f 53/5/2 54/6/2 55/7/2 56/8/2 -f 56/9/3 49/1/3 52/4/3 53/10/3 -f 50/5/4 55/11/4 54/10/4 51/4/4 -f 53/5/5 52/4/5 51/3/5 54/6/5 -f 56/12/6 55/13/6 50/2/6 49/1/6 -f 57/14/7 58/15/7 59/16/7 60/17/7 -f 61/18/8 62/19/8 63/20/8 64/21/8 -f 64/22/23 57/14/23 60/17/23 61/23/23 -f 58/18/24 63/24/24 62/23/24 59/17/24 -f 61/18/25 60/17/25 59/16/25 62/19/25 -f 64/25/26 63/26/26 58/15/26 57/14/26 -f 65/27/1 66/28/1 67/29/1 68/30/1 -f 69/31/2 70/32/2 71/33/2 72/34/2 -f 72/35/3 65/27/3 68/30/3 69/36/3 -f 66/31/4 71/37/4 70/36/4 67/30/4 -f 69/31/5 68/30/5 67/29/5 70/32/5 -f 72/38/6 71/39/6 66/28/6 65/27/6 -f 73/40/1 74/41/1 75/42/1 76/43/1 -f 77/44/2 78/45/2 79/46/2 80/47/2 -f 80/48/3 73/40/3 76/43/3 77/49/3 -f 74/44/4 79/50/4 78/49/4 75/43/4 -f 77/44/5 76/43/5 75/42/5 78/45/5 -f 80/51/6 79/52/6 74/41/6 73/40/6 -f 81/27/1 82/28/1 83/29/1 84/30/1 -f 85/31/2 86/32/2 87/33/2 88/34/2 -f 88/35/3 81/27/3 84/30/3 85/36/3 -f 82/31/4 87/37/4 86/36/4 83/30/4 -f 85/31/5 84/30/5 83/29/5 86/32/5 -f 88/38/6 87/39/6 82/28/6 81/27/6 -f 89/53/1 90/54/1 91/55/1 92/56/1 -f 93/57/2 94/58/2 95/59/2 96/60/2 -f 96/61/3 89/53/3 92/56/3 93/62/3 -f 90/57/4 95/63/4 94/62/4 91/56/4 -f 93/57/5 92/56/5 91/55/5 94/58/5 -f 96/64/6 95/65/6 90/54/6 89/53/6 -f 97/66/1 98/67/1 99/68/1 100/69/1 -f 101/70/2 102/71/2 103/72/2 104/73/2 -f 104/74/3 97/66/3 100/69/3 101/75/3 -f 98/76/4 103/77/4 102/75/4 99/69/4 -f 101/70/5 100/69/5 99/68/5 102/71/5 -f 104/78/6 103/79/6 98/67/6 97/66/6 -f 105/80/1 106/81/1 107/82/1 108/83/1 -f 109/84/2 110/85/2 111/86/2 112/87/2 -f 112/88/3 105/80/3 108/83/3 109/89/3 -f 106/90/4 111/91/4 110/89/4 107/83/4 -f 109/84/5 108/83/5 107/82/5 110/85/5 -f 112/92/6 111/93/6 106/81/6 105/80/6 -f 113/94/1 114/95/1 115/96/1 116/97/1 -f 117/98/2 118/99/2 119/100/2 120/101/2 -f 120/102/3 113/94/3 116/97/3 117/103/3 -f 114/104/4 119/105/4 118/103/4 115/97/4 -f 117/98/5 116/97/5 115/96/5 118/99/5 -f 120/106/6 119/107/6 114/95/6 113/94/6 -f 121/108/1 122/109/1 123/110/1 124/111/1 -f 125/112/2 126/113/2 127/114/2 128/115/2 -f 128/116/3 121/108/3 124/111/3 125/117/3 -f 122/118/4 127/119/4 126/117/4 123/111/4 -f 125/112/5 124/111/5 123/110/5 126/113/5 -f 128/120/6 127/121/6 122/109/6 121/108/6 -f 129/122/1 130/123/1 131/124/1 132/125/1 -f 133/126/2 134/127/2 135/128/2 136/129/2 -f 136/130/3 129/122/3 132/125/3 133/131/3 -f 130/132/4 135/133/4 134/131/4 131/125/4 -f 133/126/5 132/125/5 131/124/5 134/127/5 -f 136/134/6 135/135/6 130/123/6 129/122/6 -f 137/136/1 138/137/1 139/138/1 140/139/1 -f 141/140/2 142/141/2 143/142/2 144/143/2 -f 144/144/3 137/136/3 140/139/3 141/145/3 -f 138/146/4 143/147/4 142/145/4 139/139/4 -f 141/140/5 140/139/5 139/138/5 142/141/5 -f 144/148/6 143/149/6 138/137/6 137/136/6 -f 145/150/1 146/151/1 147/152/1 148/153/1 -f 149/154/2 150/155/2 151/156/2 152/157/2 -f 152/158/3 145/150/3 148/153/3 149/159/3 -f 146/160/4 151/161/4 150/159/4 147/153/4 -f 149/154/5 148/153/5 147/152/5 150/155/5 -f 152/162/6 151/163/6 146/151/6 145/150/6 -f 153/164/1 154/165/1 155/166/1 156/167/1 -f 157/168/2 158/169/2 159/170/2 160/171/2 -f 160/172/3 153/164/3 156/167/3 157/173/3 -f 154/174/4 159/175/4 158/173/4 155/167/4 -f 157/168/5 156/167/5 155/166/5 158/169/5 -f 160/176/6 159/177/6 154/165/6 153/164/6 -f 161/94/1 162/95/1 163/96/1 164/97/1 -f 165/98/2 166/99/2 167/100/2 168/101/2 -f 168/102/3 161/94/3 164/97/3 165/103/3 -f 162/104/4 167/105/4 166/103/4 163/97/4 -f 165/98/5 164/97/5 163/96/5 166/99/5 -f 168/106/6 167/107/6 162/95/6 161/94/6 -f 169/108/1 170/109/1 171/110/1 172/111/1 -f 173/112/2 174/113/2 175/114/2 176/115/2 -f 176/116/3 169/108/3 172/111/3 173/117/3 -f 170/118/4 175/119/4 174/117/4 171/111/4 -f 173/112/5 172/111/5 171/110/5 174/113/5 -f 176/120/6 175/121/6 170/109/6 169/108/6 -f 177/122/1 178/123/1 179/124/1 180/125/1 -f 181/126/2 182/127/2 183/128/2 184/129/2 -f 184/130/3 177/122/3 180/125/3 181/131/3 -f 178/132/4 183/133/4 182/131/4 179/125/4 -f 181/126/5 180/125/5 179/124/5 182/127/5 -f 184/134/6 183/135/6 178/123/6 177/122/6 -f 185/136/1 186/137/1 187/138/1 188/139/1 -f 189/140/2 190/141/2 191/142/2 192/143/2 -f 192/144/3 185/136/3 188/139/3 189/145/3 -f 186/146/4 191/147/4 190/145/4 187/139/4 -f 189/140/5 188/139/5 187/138/5 190/141/5 -f 192/148/6 191/149/6 186/137/6 185/136/6 -f 193/14/7 194/15/7 195/16/7 196/17/7 -f 197/18/8 198/19/8 199/20/8 200/21/8 -f 200/22/9 193/14/9 196/17/9 197/23/9 -f 194/18/10 199/24/10 198/23/10 195/17/10 -f 197/18/11 196/17/11 195/16/11 198/19/11 -f 200/25/12 199/26/12 194/15/12 193/14/12 -f 201/14/13 202/15/13 203/16/13 204/17/13 -f 205/18/14 206/19/14 207/20/14 208/21/14 -f 208/22/15 201/14/15 204/17/15 205/23/15 -f 202/18/16 207/24/16 206/23/16 203/17/16 -f 205/18/17 204/17/17 203/16/17 206/19/17 -f 208/25/18 207/26/18 202/15/18 201/14/18 -f 209/14/13 210/15/13 211/16/13 212/17/13 -f 213/18/14 214/19/14 215/20/14 216/21/14 -f 216/22/19 209/14/19 212/17/19 213/23/19 -f 210/18/20 215/24/20 214/23/20 211/17/20 -f 213/18/21 212/17/21 211/16/21 214/19/21 -f 216/25/22 215/26/22 210/15/22 209/14/22 -f 217/14/7 218/15/7 219/16/7 220/17/7 -f 221/18/8 222/19/8 223/20/8 224/21/8 -f 224/22/23 217/14/23 220/17/23 221/23/23 -f 218/18/24 223/24/24 222/23/24 219/17/24 -f 221/18/25 220/17/25 219/16/25 222/19/25 -f 224/25/26 223/26/26 218/15/26 217/14/26 -f 225/66/1 226/67/1 227/68/1 228/69/1 -f 229/70/2 230/71/2 231/72/2 232/73/2 -f 232/74/3 225/66/3 228/69/3 229/75/3 -f 226/76/4 231/77/4 230/75/4 227/69/4 -f 229/70/5 228/69/5 227/68/5 230/71/5 -f 232/78/6 231/79/6 226/67/6 225/66/6 -f 233/80/1 234/81/1 235/82/1 236/83/1 -f 237/84/2 238/85/2 239/86/2 240/87/2 -f 240/88/3 233/80/3 236/83/3 237/89/3 -f 234/90/4 239/91/4 238/89/4 235/83/4 -f 237/84/5 236/83/5 235/82/5 238/85/5 -f 240/92/6 239/93/6 234/81/6 233/80/6 -f 241/94/1 242/95/1 243/96/1 244/97/1 -f 245/98/2 246/99/2 247/100/2 248/101/2 -f 248/102/3 241/94/3 244/97/3 245/103/3 -f 242/104/4 247/105/4 246/103/4 243/97/4 -f 245/98/5 244/97/5 243/96/5 246/99/5 -f 248/106/6 247/107/6 242/95/6 241/94/6 -f 249/108/1 250/109/1 251/110/1 252/111/1 -f 253/112/2 254/113/2 255/114/2 256/115/2 -f 256/116/3 249/108/3 252/111/3 253/117/3 -f 250/118/4 255/119/4 254/117/4 251/111/4 -f 253/112/5 252/111/5 251/110/5 254/113/5 -f 256/120/6 255/121/6 250/109/6 249/108/6 -f 257/122/1 258/123/1 259/124/1 260/125/1 -f 261/126/2 262/127/2 263/128/2 264/129/2 -f 264/130/3 257/122/3 260/125/3 261/131/3 -f 258/132/4 263/133/4 262/131/4 259/125/4 -f 261/126/5 260/125/5 259/124/5 262/127/5 -f 264/134/6 263/135/6 258/123/6 257/122/6 -f 265/136/1 266/137/1 267/138/1 268/139/1 -f 269/140/2 270/141/2 271/142/2 272/143/2 -f 272/144/3 265/136/3 268/139/3 269/145/3 -f 266/146/4 271/147/4 270/145/4 267/139/4 -f 269/140/5 268/139/5 267/138/5 270/141/5 -f 272/148/6 271/149/6 266/137/6 265/136/6 -f 273/150/1 274/151/1 275/152/1 276/153/1 -f 277/154/2 278/155/2 279/156/2 280/157/2 -f 280/158/3 273/150/3 276/153/3 277/159/3 -f 274/160/4 279/161/4 278/159/4 275/153/4 -f 277/154/5 276/153/5 275/152/5 278/155/5 -f 280/162/6 279/163/6 274/151/6 273/150/6 -f 281/164/1 282/165/1 283/166/1 284/167/1 -f 285/168/2 286/169/2 287/170/2 288/171/2 -f 288/172/3 281/164/3 284/167/3 285/173/3 -f 282/174/4 287/175/4 286/173/4 283/167/4 -f 285/168/5 284/167/5 283/166/5 286/169/5 -f 288/176/6 287/177/6 282/165/6 281/164/6 -f 289/94/1 290/95/1 291/96/1 292/97/1 -f 293/98/2 294/99/2 295/100/2 296/101/2 -f 296/102/3 289/94/3 292/97/3 293/103/3 -f 290/104/4 295/105/4 294/103/4 291/97/4 -f 293/98/5 292/97/5 291/96/5 294/99/5 -f 296/106/6 295/107/6 290/95/6 289/94/6 -f 297/108/1 298/109/1 299/110/1 300/111/1 -f 301/112/2 302/113/2 303/114/2 304/115/2 -f 304/116/3 297/108/3 300/111/3 301/117/3 -f 298/118/4 303/119/4 302/117/4 299/111/4 -f 301/112/5 300/111/5 299/110/5 302/113/5 -f 304/120/6 303/121/6 298/109/6 297/108/6 -f 305/122/1 306/123/1 307/124/1 308/125/1 -f 309/126/2 310/127/2 311/128/2 312/129/2 -f 312/130/3 305/122/3 308/125/3 309/131/3 -f 306/132/4 311/133/4 310/131/4 307/125/4 -f 309/126/5 308/125/5 307/124/5 310/127/5 -f 312/134/6 311/135/6 306/123/6 305/122/6 -f 313/136/1 314/137/1 315/138/1 316/139/1 -f 317/140/2 318/141/2 319/142/2 320/143/2 -f 320/144/3 313/136/3 316/139/3 317/145/3 -f 314/146/4 319/147/4 318/145/4 315/139/4 -f 317/140/5 316/139/5 315/138/5 318/141/5 -f 320/148/6 319/149/6 314/137/6 313/136/6 -f 321/80/1 322/81/1 323/82/1 324/83/1 -f 325/84/2 326/85/2 327/86/2 328/87/2 -f 328/88/3 321/80/3 324/83/3 325/89/3 -f 322/90/4 327/91/4 326/89/4 323/83/4 -f 325/84/5 324/83/5 323/82/5 326/85/5 -f 328/92/6 327/93/6 322/81/6 321/80/6 -f 329/94/1 330/95/1 331/96/1 332/97/1 -f 333/98/2 334/99/2 335/100/2 336/101/2 -f 336/102/3 329/94/3 332/97/3 333/103/3 -f 330/104/4 335/105/4 334/103/4 331/97/4 -f 333/98/5 332/97/5 331/96/5 334/99/5 -f 336/106/6 335/107/6 330/95/6 329/94/6 -f 337/94/1 338/95/1 339/96/1 340/97/1 -f 341/98/2 342/99/2 343/100/2 344/101/2 -f 344/102/3 337/94/3 340/97/3 341/103/3 -f 338/104/4 343/105/4 342/103/4 339/97/4 -f 341/98/5 340/97/5 339/96/5 342/99/5 -f 344/106/6 343/107/6 338/95/6 337/94/6 -f 345/122/1 346/123/1 347/124/1 348/125/1 -f 349/126/2 350/127/2 351/128/2 352/129/2 -f 352/130/3 345/122/3 348/125/3 349/131/3 -f 346/132/4 351/133/4 350/131/4 347/125/4 -f 349/126/5 348/125/5 347/124/5 350/127/5 -f 352/134/6 351/135/6 346/123/6 345/122/6 -f 353/136/1 354/137/1 355/138/1 356/139/1 -f 357/140/2 358/141/2 359/142/2 360/143/2 -f 360/144/3 353/136/3 356/139/3 357/145/3 -f 354/146/4 359/147/4 358/145/4 355/139/4 -f 357/140/5 356/139/5 355/138/5 358/141/5 -f 360/148/6 359/149/6 354/137/6 353/136/6 -f 361/136/1 362/137/1 363/138/1 364/139/1 -f 365/140/2 366/141/2 367/142/2 368/143/2 -f 368/144/3 361/136/3 364/139/3 365/145/3 -f 362/146/4 367/147/4 366/145/4 363/139/4 -f 365/140/5 364/139/5 363/138/5 366/141/5 -f 368/148/6 367/149/6 362/137/6 361/136/6 -f 369/164/1 370/165/1 371/166/1 372/167/1 -f 373/168/2 374/169/2 375/170/2 376/171/2 -f 376/172/3 369/164/3 372/167/3 373/173/3 -f 370/174/4 375/175/4 374/173/4 371/167/4 -f 373/168/5 372/167/5 371/166/5 374/169/5 -f 376/176/6 375/177/6 370/165/6 369/164/6 -f 377/94/1 378/95/1 379/96/1 380/97/1 -f 381/98/2 382/99/2 383/100/2 384/101/2 -f 384/102/3 377/94/3 380/97/3 381/103/3 -f 378/104/4 383/105/4 382/103/4 379/97/4 -f 381/98/5 380/97/5 379/96/5 382/99/5 -f 384/106/6 383/107/6 378/95/6 377/94/6 -f 385/94/1 386/95/1 387/96/1 388/97/1 -f 389/98/2 390/99/2 391/100/2 392/101/2 -f 392/102/3 385/94/3 388/97/3 389/103/3 -f 386/104/4 391/105/4 390/103/4 387/97/4 -f 389/98/5 388/97/5 387/96/5 390/99/5 -f 392/106/6 391/107/6 386/95/6 385/94/6 -f 393/122/1 394/123/1 395/124/1 396/125/1 -f 397/126/2 398/127/2 399/128/2 400/129/2 -f 400/130/3 393/122/3 396/125/3 397/131/3 -f 394/132/4 399/133/4 398/131/4 395/125/4 -f 397/126/5 396/125/5 395/124/5 398/127/5 -f 400/134/6 399/135/6 394/123/6 393/122/6 -f 401/136/1 402/137/1 403/138/1 404/139/1 -f 405/140/2 406/141/2 407/142/2 408/143/2 -f 408/144/3 401/136/3 404/139/3 405/145/3 -f 402/146/4 407/147/4 406/145/4 403/139/4 -f 405/140/5 404/139/5 403/138/5 406/141/5 -f 408/148/6 407/149/6 402/137/6 401/136/6 -f 409/136/1 410/137/1 411/138/1 412/139/1 -f 413/140/2 414/141/2 415/142/2 416/143/2 -f 416/144/3 409/136/3 412/139/3 413/145/3 -f 410/146/4 415/147/4 414/145/4 411/139/4 -f 413/140/5 412/139/5 411/138/5 414/141/5 -f 416/148/6 415/149/6 410/137/6 409/136/6 diff --git a/src/main/resources/assets/bloodmagic/models/block/blockdemoncrystallizer.mtl b/src/main/resources/assets/bloodmagic/models/block/blockdemoncrystallizer.mtl deleted file mode 100644 index 5475fc76..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/blockdemoncrystallizer.mtl +++ /dev/null @@ -1,11 +0,0 @@ -# Blender MTL File: 'None' -# Material Count: 1 - -newmtl None -#Ns 0 -Ka 0.000000 0.000000 0.000000 -Kd 0.8 0.8 0.8 -#Ks 0.8 0.8 0.8 -d 1 -#illum 2 -map_Kd bloodmagic:models/demoncrystallizer \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/blockdemoncrystallizer.obj b/src/main/resources/assets/bloodmagic/models/block/blockdemoncrystallizer.obj deleted file mode 100644 index 7558622b..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/blockdemoncrystallizer.obj +++ /dev/null @@ -1,1359 +0,0 @@ -# Blender v2.76 (sub 0) OBJ File: '' -# www.blender.org -mtllib blockdemoncrystallizer.mtl -o BlockDemonCrystallizer.001 -v 0.125000 0.062500 0.875000 -v 0.125000 -0.000000 0.875000 -v 0.875000 -0.000000 0.875000 -v 0.875000 0.062500 0.875000 -v 0.875000 0.062500 0.125000 -v 0.875000 0.000000 0.125000 -v 0.125000 0.000000 0.125000 -v 0.125000 0.062500 0.125000 -v 0.187500 0.125000 0.812500 -v 0.187500 0.062500 0.812500 -v 0.812500 0.062500 0.812500 -v 0.812500 0.125000 0.812500 -v 0.812500 0.125000 0.187500 -v 0.812500 0.062500 0.187500 -v 0.187500 0.062500 0.187500 -v 0.187500 0.125000 0.187500 -v 0.125000 0.187500 0.875000 -v 0.125000 0.125000 0.875000 -v 0.875000 0.125000 0.875000 -v 0.875000 0.187500 0.875000 -v 0.875000 0.187500 0.125000 -v 0.875000 0.125000 0.125000 -v 0.125000 0.125000 0.125000 -v 0.125000 0.187500 0.125000 -v 0.631420 0.815976 0.370107 -v 0.556035 0.136742 0.445037 -v 0.742405 0.116307 0.447292 -v 0.817789 0.795541 0.372362 -v 0.817789 0.774981 0.185992 -v 0.742405 0.095747 0.260922 -v 0.556035 0.116183 0.258668 -v 0.631420 0.795417 0.183738 -v 0.580484 0.643738 0.420547 -v 0.573631 0.581989 0.427359 -v 0.822124 0.554742 0.430365 -v 0.828977 0.616490 0.423553 -v 0.828977 0.589078 0.175061 -v 0.822124 0.527329 0.181873 -v 0.573631 0.554577 0.178867 -v 0.580484 0.616325 0.172055 -v 0.631420 0.795416 0.816259 -v 0.556035 0.116189 0.741328 -v 0.742405 0.095754 0.739074 -v 0.817789 0.774980 0.814004 -v 0.817789 0.795540 0.627637 -v 0.742405 0.116313 0.552707 -v 0.556035 0.136748 0.554961 -v 0.631420 0.815975 0.629891 -v 0.548960 0.332286 0.796607 -v 0.542106 0.270538 0.789795 -v 0.790599 0.243291 0.786789 -v 0.797452 0.305039 0.793601 -v 0.797452 0.332451 0.545111 -v 0.790599 0.270704 0.538299 -v 0.542106 0.297951 0.541305 -v 0.548960 0.359699 0.548117 -v 0.182214 0.774979 0.814004 -v 0.257599 0.095760 0.739075 -v 0.443966 0.116195 0.741329 -v 0.368581 0.795415 0.816258 -v 0.368581 0.815974 0.629891 -v 0.443966 0.136755 0.554962 -v 0.257599 0.116319 0.552707 -v 0.182214 0.795539 0.627637 -v 0.192272 0.397664 0.803819 -v 0.199125 0.335916 0.797007 -v 0.447615 0.363163 0.800013 -v 0.440762 0.424911 0.806825 -v 0.440762 0.452323 0.558335 -v 0.447615 0.390576 0.551523 -v 0.199125 0.363329 0.548517 -v 0.192272 0.425076 0.555329 -v 0.182214 0.795540 0.372362 -v 0.257599 0.116313 0.447291 -v 0.443966 0.136748 0.445037 -v 0.368581 0.815975 0.370107 -v 0.368581 0.795416 0.183738 -v 0.443966 0.116189 0.258667 -v 0.257599 0.095753 0.260922 -v 0.182214 0.774980 0.185992 -v 0.178886 0.517012 0.431383 -v 0.185739 0.455264 0.438195 -v 0.434229 0.482511 0.435189 -v 0.427376 0.544259 0.428378 -v 0.427376 0.516846 0.179885 -v 0.434229 0.455098 0.186697 -v 0.185739 0.427851 0.189703 -v 0.178886 0.489599 0.182891 -v 0.125000 1.000000 0.875000 -v 0.125000 0.875000 0.875000 -v 0.875000 0.875000 0.875000 -v 0.875000 1.000000 0.875000 -v 0.875000 1.000000 0.125000 -v 0.875000 0.875000 0.125000 -v 0.125000 0.875000 0.125000 -v 0.125000 1.000000 0.125000 -v 0.125000 1.000000 0.125000 -v 0.125000 0.875000 0.125000 -v 0.875000 0.875000 0.125000 -v 0.875000 1.000000 0.125000 -v 0.875000 1.000000 0.000000 -v 0.875000 0.875000 0.000000 -v 0.125000 0.875000 0.000000 -v 0.125000 1.000000 0.000000 -v 0.125000 1.000000 1.000000 -v 0.125000 0.875000 1.000000 -v 0.875000 0.875000 1.000000 -v 0.875000 1.000000 1.000000 -v 0.875000 1.000000 0.875000 -v 0.875000 0.875000 0.875000 -v 0.125000 0.875000 0.875000 -v 0.125000 1.000000 0.875000 -v 0.875000 1.000000 0.875000 -v 0.875000 0.875000 0.875000 -v 1.000000 0.875000 0.875000 -v 1.000000 1.000000 0.875000 -v 1.000000 1.000000 0.125000 -v 1.000000 0.875000 0.125000 -v 0.875000 0.875000 0.125000 -v 0.875000 1.000000 0.125000 -v 0.000000 1.000000 0.875000 -v 0.000000 0.875000 0.875000 -v 0.125000 0.875000 0.875000 -v 0.125000 1.000000 0.875000 -v 0.125000 1.000000 0.125000 -v 0.125000 0.875000 0.125000 -v 0.000000 0.875000 0.125000 -v 0.000000 1.000000 0.125000 -v 0.343750 1.062500 0.656250 -v 0.343750 1.000000 0.656250 -v 0.656250 1.000000 0.656250 -v 0.656250 1.062500 0.656250 -v 0.656250 1.062500 0.343750 -v 0.656250 1.000000 0.343750 -v 0.343750 1.000000 0.343750 -v 0.343750 1.062500 0.343750 -v 0.343667 1.062449 0.656250 -v 0.255279 0.974061 0.656250 -v 0.299473 0.929867 0.656250 -v 0.387862 1.018255 0.656250 -v 0.387862 1.018255 0.343750 -v 0.299473 0.929867 0.343750 -v 0.255279 0.974061 0.343750 -v 0.343667 1.062449 0.343750 -v 0.343750 1.062449 0.656332 -v 0.343750 0.974061 0.744721 -v 0.656250 0.974061 0.744721 -v 0.656250 1.062449 0.656332 -v 0.656250 1.018255 0.612138 -v 0.656250 0.929866 0.700527 -v 0.343750 0.929866 0.700527 -v 0.343750 1.018255 0.612138 -v 0.343750 1.018255 0.388125 -v 0.343750 0.929867 0.299737 -v 0.656250 0.929867 0.299737 -v 0.656250 1.018255 0.388125 -v 0.656250 1.062449 0.343931 -v 0.656250 0.974061 0.255542 -v 0.343750 0.974061 0.255542 -v 0.343750 1.062449 0.343931 -v 0.612138 1.018255 0.656250 -v 0.700527 0.929867 0.656250 -v 0.744721 0.974061 0.656250 -v 0.656333 1.062449 0.656250 -v 0.656333 1.062449 0.343750 -v 0.744721 0.974061 0.343750 -v 0.700527 0.929867 0.343750 -v 0.612138 1.018255 0.343750 -v 0.875000 1.187500 0.125000 -v 0.875000 0.937500 0.125000 -v 1.000000 0.937500 0.125000 -v 1.000000 1.187500 0.125000 -v 1.000000 1.187500 0.000000 -v 1.000000 0.937500 0.000000 -v 0.875000 0.937500 0.000000 -v 0.875000 1.187500 0.000000 -v 0.937500 1.250000 0.062500 -v 0.937500 1.187500 0.062500 -v 1.000000 1.187500 0.062500 -v 1.000000 1.250000 0.062500 -v 1.000000 1.250000 0.000000 -v 1.000000 1.187500 0.000000 -v 0.937500 1.187500 0.000000 -v 0.937500 1.250000 0.000000 -v 0.937500 1.375000 0.062500 -v 0.937500 1.312500 0.062500 -v 1.000000 1.312500 0.062500 -v 1.000000 1.375000 0.062500 -v 1.000000 1.375000 0.000000 -v 1.000000 1.312500 0.000000 -v 0.937500 1.312500 0.000000 -v 0.937500 1.375000 0.000000 -v 0.000000 1.187500 1.000000 -v 0.000000 0.937500 1.000000 -v 0.125000 0.937500 1.000000 -v 0.125000 1.187500 1.000000 -v 0.125000 1.187500 0.875000 -v 0.125000 0.937500 0.875000 -v 0.000000 0.937500 0.875000 -v 0.000000 1.187500 0.875000 -v 0.000000 1.250000 1.000000 -v 0.000000 1.187500 1.000000 -v 0.062500 1.187500 1.000000 -v 0.062500 1.250000 1.000000 -v 0.062500 1.250000 0.937500 -v 0.062500 1.187500 0.937500 -v 0.000000 1.187500 0.937500 -v 0.000000 1.250000 0.937500 -v 0.000000 1.375000 1.000000 -v 0.000000 1.312500 1.000000 -v 0.062500 1.312500 1.000000 -v 0.062500 1.375000 1.000000 -v 0.062500 1.375000 0.937500 -v 0.062500 1.312500 0.937500 -v 0.000000 1.312500 0.937500 -v 0.000000 1.375000 0.937500 -v 0.875000 1.187500 1.000000 -v 0.875000 0.937500 1.000000 -v 1.000000 0.937500 1.000000 -v 1.000000 1.187500 1.000000 -v 1.000000 1.187500 0.875000 -v 1.000000 0.937500 0.875000 -v 0.875000 0.937500 0.875000 -v 0.875000 1.187500 0.875000 -v 0.937500 1.250000 1.000000 -v 0.937500 1.187500 1.000000 -v 1.000000 1.187500 1.000000 -v 1.000000 1.250000 1.000000 -v 1.000000 1.250000 0.937500 -v 1.000000 1.187500 0.937500 -v 0.937500 1.187500 0.937500 -v 0.937500 1.250000 0.937500 -v 0.937500 1.375000 1.000000 -v 0.937500 1.312500 1.000000 -v 1.000000 1.312500 1.000000 -v 1.000000 1.375000 1.000000 -v 1.000000 1.375000 0.937500 -v 1.000000 1.312500 0.937500 -v 0.937500 1.312500 0.937500 -v 0.937500 1.375000 0.937500 -v 0.000000 1.187500 0.125000 -v 0.000000 0.937500 0.125000 -v 0.125000 0.937500 0.125000 -v 0.125000 1.187500 0.125000 -v 0.125000 1.187500 0.000000 -v 0.125000 0.937500 0.000000 -v 0.000000 0.937500 0.000000 -v 0.000000 1.187500 0.000000 -v 0.000000 1.250000 0.062500 -v 0.000000 1.187500 0.062500 -v 0.062500 1.187500 0.062500 -v 0.062500 1.250000 0.062500 -v 0.062500 1.250000 0.000000 -v 0.062500 1.187500 0.000000 -v 0.000000 1.187500 0.000000 -v 0.000000 1.250000 0.000000 -v 0.000000 1.375000 0.062500 -v 0.000000 1.312500 0.062500 -v 0.062500 1.312500 0.062500 -v 0.062500 1.375000 0.062500 -v 0.062500 1.375000 0.000000 -v 0.062500 1.312500 0.000000 -v 0.000000 1.312500 0.000000 -v 0.000000 1.375000 0.000000 -v 0.187500 0.875000 0.812500 -v 0.187500 0.750000 0.812500 -v 0.812500 0.750000 0.812500 -v 0.812500 0.875000 0.812500 -v 0.812500 0.875000 0.187500 -v 0.812500 0.750000 0.187500 -v 0.187500 0.750000 0.187500 -v 0.187500 0.875000 0.187500 -v 0.062500 0.875000 0.812500 -v 0.062500 0.750000 0.812500 -v 0.187500 0.750000 0.812500 -v 0.187500 0.875000 0.812500 -v 0.187500 0.875000 0.187500 -v 0.187500 0.750000 0.187500 -v 0.062500 0.750000 0.187500 -v 0.062500 0.875000 0.187500 -v 0.187500 0.875000 0.187500 -v 0.187500 0.750000 0.187500 -v 0.812500 0.750000 0.187500 -v 0.812500 0.875000 0.187500 -v 0.812500 0.875000 0.062500 -v 0.812500 0.750000 0.062500 -v 0.187500 0.750000 0.062500 -v 0.187500 0.875000 0.062500 -v 0.187500 0.875000 0.937500 -v 0.187500 0.750000 0.937500 -v 0.812500 0.750000 0.937500 -v 0.812500 0.875000 0.937500 -v 0.812500 0.875000 0.812500 -v 0.812500 0.750000 0.812500 -v 0.187500 0.750000 0.812500 -v 0.187500 0.875000 0.812500 -v 0.812500 0.875000 0.812500 -v 0.812500 0.750000 0.812500 -v 0.937500 0.750000 0.812500 -v 0.937500 0.875000 0.812500 -v 0.937500 0.875000 0.187500 -v 0.937500 0.750000 0.187500 -v 0.812500 0.750000 0.187500 -v 0.812500 0.875000 0.187500 -v 0.187500 0.125000 0.812500 -v 0.187500 0.062500 0.812500 -v 0.812500 0.062500 0.812500 -v 0.812500 0.125000 0.812500 -v 0.812500 0.125000 0.187500 -v 0.812500 0.062500 0.187500 -v 0.187500 0.062500 0.187500 -v 0.187500 0.125000 0.187500 -v 0.125000 0.187500 0.875000 -v 0.125000 0.125000 0.875000 -v 0.875000 0.125000 0.875000 -v 0.875000 0.187500 0.875000 -v 0.875000 0.187500 0.125000 -v 0.875000 0.125000 0.125000 -v 0.125000 0.125000 0.125000 -v 0.125000 0.187500 0.125000 -v 0.125000 0.187500 0.875000 -v 0.125000 0.125000 0.875000 -v 0.875000 0.125000 0.875000 -v 0.875000 0.187500 0.875000 -v 0.875000 0.187500 0.125000 -v 0.875000 0.125000 0.125000 -v 0.125000 0.125000 0.125000 -v 0.125000 0.187500 0.125000 -v 0.580484 0.643738 0.420547 -v 0.573631 0.581989 0.427359 -v 0.822124 0.554742 0.430365 -v 0.828977 0.616490 0.423553 -v 0.828977 0.589078 0.175061 -v 0.822124 0.527329 0.181873 -v 0.573631 0.554577 0.178867 -v 0.580484 0.616325 0.172055 -v 0.548960 0.332286 0.796607 -v 0.542106 0.270538 0.789795 -v 0.790599 0.243291 0.786789 -v 0.797452 0.305039 0.793601 -v 0.797452 0.332451 0.545111 -v 0.790599 0.270704 0.538299 -v 0.542106 0.297951 0.541305 -v 0.548960 0.359699 0.548117 -v 0.192272 0.397664 0.803819 -v 0.199125 0.335916 0.797007 -v 0.447615 0.363163 0.800013 -v 0.440762 0.424911 0.806825 -v 0.440762 0.452323 0.558335 -v 0.447615 0.390576 0.551523 -v 0.199125 0.363329 0.548517 -v 0.192272 0.425076 0.555329 -v 0.178886 0.517012 0.431383 -v 0.185739 0.455264 0.438195 -v 0.434229 0.482511 0.435189 -v 0.427376 0.544259 0.428378 -v 0.427376 0.516846 0.179885 -v 0.434229 0.455098 0.186697 -v 0.185739 0.427851 0.189703 -v 0.178886 0.489599 0.182891 -v 0.125000 1.000000 0.125000 -v 0.125000 0.875000 0.125000 -v 0.875000 0.875000 0.125000 -v 0.875000 1.000000 0.125000 -v 0.875000 1.000000 0.000000 -v 0.875000 0.875000 0.000000 -v 0.125000 0.875000 0.000000 -v 0.125000 1.000000 0.000000 -v 0.125000 1.000000 1.000000 -v 0.125000 0.875000 1.000000 -v 0.875000 0.875000 1.000000 -v 0.875000 1.000000 1.000000 -v 0.875000 1.000000 0.875000 -v 0.875000 0.875000 0.875000 -v 0.125000 0.875000 0.875000 -v 0.125000 1.000000 0.875000 -v 0.875000 1.000000 0.875000 -v 0.875000 0.875000 0.875000 -v 1.000000 0.875000 0.875000 -v 1.000000 1.000000 0.875000 -v 1.000000 1.000000 0.125000 -v 1.000000 0.875000 0.125000 -v 0.875000 0.875000 0.125000 -v 0.875000 1.000000 0.125000 -v 0.000000 1.000000 0.875000 -v 0.000000 0.875000 0.875000 -v 0.125000 0.875000 0.875000 -v 0.125000 1.000000 0.875000 -v 0.125000 1.000000 0.125000 -v 0.125000 0.875000 0.125000 -v 0.000000 0.875000 0.125000 -v 0.000000 1.000000 0.125000 -v 0.343750 1.062500 0.656250 -v 0.343750 1.000000 0.656250 -v 0.656250 1.000000 0.656250 -v 0.656250 1.062500 0.656250 -v 0.656250 1.062500 0.343750 -v 0.656250 1.000000 0.343750 -v 0.343750 1.000000 0.343750 -v 0.343750 1.062500 0.343750 -v 0.343667 1.062449 0.656250 -v 0.255279 0.974061 0.656250 -v 0.299473 0.929867 0.656250 -v 0.387862 1.018255 0.656250 -v 0.387862 1.018255 0.343750 -v 0.299473 0.929867 0.343750 -v 0.255279 0.974061 0.343750 -v 0.343667 1.062449 0.343750 -v 0.343750 1.062449 0.656332 -v 0.343750 0.974061 0.744721 -v 0.656250 0.974061 0.744721 -v 0.656250 1.062449 0.656332 -v 0.656250 1.018255 0.612138 -v 0.656250 0.929866 0.700527 -v 0.343750 0.929866 0.700527 -v 0.343750 1.018255 0.612138 -v 0.343750 1.018255 0.388125 -v 0.343750 0.929867 0.299737 -v 0.656250 0.929867 0.299737 -v 0.656250 1.018255 0.388125 -v 0.656250 1.062449 0.343931 -v 0.656250 0.974061 0.255542 -v 0.343750 0.974061 0.255542 -v 0.343750 1.062449 0.343931 -v 0.612138 1.018255 0.656250 -v 0.700527 0.929867 0.656250 -v 0.744721 0.974061 0.656250 -v 0.656333 1.062449 0.656250 -v 0.656333 1.062449 0.343750 -v 0.744721 0.974061 0.343750 -v 0.700527 0.929867 0.343750 -v 0.612138 1.018255 0.343750 -v 0.343667 1.062449 0.656250 -v 0.255279 0.974061 0.656250 -v 0.299473 0.929867 0.656250 -v 0.387862 1.018255 0.656250 -v 0.387862 1.018255 0.343750 -v 0.299473 0.929867 0.343750 -v 0.255279 0.974061 0.343750 -v 0.343667 1.062449 0.343750 -v 0.343750 1.062449 0.656332 -v 0.343750 0.974061 0.744721 -v 0.656250 0.974061 0.744721 -v 0.656250 1.062449 0.656332 -v 0.656250 1.018255 0.612138 -v 0.656250 0.929866 0.700527 -v 0.343750 0.929866 0.700527 -v 0.343750 1.018255 0.612138 -v 0.343750 1.018255 0.388125 -v 0.343750 0.929867 0.299737 -v 0.656250 0.929867 0.299737 -v 0.656250 1.018255 0.388125 -v 0.656250 1.062449 0.343931 -v 0.656250 0.974061 0.255542 -v 0.343750 0.974061 0.255542 -v 0.343750 1.062449 0.343931 -v 0.612138 1.018255 0.656250 -v 0.700527 0.929867 0.656250 -v 0.744721 0.974061 0.656250 -v 0.656333 1.062449 0.656250 -v 0.656333 1.062449 0.343750 -v 0.744721 0.974061 0.343750 -v 0.700527 0.929867 0.343750 -v 0.612138 1.018255 0.343750 -v 0.937500 1.250000 0.062500 -v 0.937500 1.187500 0.062500 -v 1.000000 1.187500 0.062500 -v 1.000000 1.250000 0.062500 -v 1.000000 1.250000 0.000000 -v 1.000000 1.187500 0.000000 -v 0.937500 1.187500 0.000000 -v 0.937500 1.250000 0.000000 -v 0.937500 1.375000 0.062500 -v 0.937500 1.312500 0.062500 -v 1.000000 1.312500 0.062500 -v 1.000000 1.375000 0.062500 -v 1.000000 1.375000 0.000000 -v 1.000000 1.312500 0.000000 -v 0.937500 1.312500 0.000000 -v 0.937500 1.375000 0.000000 -v 0.937500 1.375000 0.062500 -v 0.937500 1.312500 0.062500 -v 1.000000 1.312500 0.062500 -v 1.000000 1.375000 0.062500 -v 1.000000 1.375000 0.000000 -v 1.000000 1.312500 0.000000 -v 0.937500 1.312500 0.000000 -v 0.937500 1.375000 0.000000 -v 0.000000 1.250000 1.000000 -v 0.000000 1.187500 1.000000 -v 0.062500 1.187500 1.000000 -v 0.062500 1.250000 1.000000 -v 0.062500 1.250000 0.937500 -v 0.062500 1.187500 0.937500 -v 0.000000 1.187500 0.937500 -v 0.000000 1.250000 0.937500 -v 0.000000 1.375000 1.000000 -v 0.000000 1.312500 1.000000 -v 0.062500 1.312500 1.000000 -v 0.062500 1.375000 1.000000 -v 0.062500 1.375000 0.937500 -v 0.062500 1.312500 0.937500 -v 0.000000 1.312500 0.937500 -v 0.000000 1.375000 0.937500 -v 0.000000 1.375000 1.000000 -v 0.000000 1.312500 1.000000 -v 0.062500 1.312500 1.000000 -v 0.062500 1.375000 1.000000 -v 0.062500 1.375000 0.937500 -v 0.062500 1.312500 0.937500 -v 0.000000 1.312500 0.937500 -v 0.000000 1.375000 0.937500 -v 0.937500 1.250000 1.000000 -v 0.937500 1.187500 1.000000 -v 1.000000 1.187500 1.000000 -v 1.000000 1.250000 1.000000 -v 1.000000 1.250000 0.937500 -v 1.000000 1.187500 0.937500 -v 0.937500 1.187500 0.937500 -v 0.937500 1.250000 0.937500 -v 0.937500 1.375000 1.000000 -v 0.937500 1.312500 1.000000 -v 1.000000 1.312500 1.000000 -v 1.000000 1.375000 1.000000 -v 1.000000 1.375000 0.937500 -v 1.000000 1.312500 0.937500 -v 0.937500 1.312500 0.937500 -v 0.937500 1.375000 0.937500 -v 0.937500 1.375000 1.000000 -v 0.937500 1.312500 1.000000 -v 1.000000 1.312500 1.000000 -v 1.000000 1.375000 1.000000 -v 1.000000 1.375000 0.937500 -v 1.000000 1.312500 0.937500 -v 0.937500 1.312500 0.937500 -v 0.937500 1.375000 0.937500 -v 0.000000 1.250000 0.062500 -v 0.000000 1.187500 0.062500 -v 0.062500 1.187500 0.062500 -v 0.062500 1.250000 0.062500 -v 0.062500 1.250000 0.000000 -v 0.062500 1.187500 0.000000 -v 0.000000 1.187500 0.000000 -v 0.000000 1.250000 0.000000 -v 0.000000 1.375000 0.062500 -v 0.000000 1.312500 0.062500 -v 0.062500 1.312500 0.062500 -v 0.062500 1.375000 0.062500 -v 0.062500 1.375000 0.000000 -v 0.062500 1.312500 0.000000 -v 0.000000 1.312500 0.000000 -v 0.000000 1.375000 0.000000 -v 0.000000 1.375000 0.062500 -v 0.000000 1.312500 0.062500 -v 0.062500 1.312500 0.062500 -v 0.062500 1.375000 0.062500 -v 0.062500 1.375000 0.000000 -v 0.062500 1.312500 0.000000 -v 0.000000 1.312500 0.000000 -v 0.000000 1.375000 0.000000 -v 0.062500 0.875000 0.812500 -v 0.062500 0.750000 0.812500 -v 0.187500 0.750000 0.812500 -v 0.187500 0.875000 0.812500 -v 0.187500 0.875000 0.187500 -v 0.187500 0.750000 0.187500 -v 0.062500 0.750000 0.187500 -v 0.062500 0.875000 0.187500 -v 0.187500 0.875000 0.187500 -v 0.187500 0.750000 0.187500 -v 0.812500 0.750000 0.187500 -v 0.812500 0.875000 0.187500 -v 0.812500 0.875000 0.062500 -v 0.812500 0.750000 0.062500 -v 0.187500 0.750000 0.062500 -v 0.187500 0.875000 0.062500 -v 0.187500 0.875000 0.937500 -v 0.187500 0.750000 0.937500 -v 0.812500 0.750000 0.937500 -v 0.812500 0.875000 0.937500 -v 0.812500 0.875000 0.812500 -v 0.812500 0.750000 0.812500 -v 0.187500 0.750000 0.812500 -v 0.187500 0.875000 0.812500 -v 0.812500 0.875000 0.812500 -v 0.812500 0.750000 0.812500 -v 0.937500 0.750000 0.812500 -v 0.937500 0.875000 0.812500 -v 0.937500 0.875000 0.187500 -v 0.937500 0.750000 0.187500 -v 0.812500 0.750000 0.187500 -v 0.812500 0.875000 0.187500 -vt 0.437500 0.015625 -vt 0.437500 0.000000 -vt 0.625000 0.000000 -vt 0.625000 0.015625 -vt 0.812500 0.015625 -vt 0.812500 0.000000 -vt 1.000000 0.000000 -vt 1.000000 0.015625 -vt 0.437500 0.203125 -vt 0.625000 0.203125 -vt 0.812500 0.203125 -vt 0.250000 0.015625 -vt 0.250000 0.000000 -vt 0.531250 0.234375 -vt 0.531250 0.218750 -vt 0.687500 0.218750 -vt 0.687500 0.234375 -vt 0.843750 0.234375 -vt 0.843750 0.218750 -vt 1.000000 0.218750 -vt 1.000000 0.234375 -vt 0.531250 0.390625 -vt 0.687500 0.390625 -vt 0.843750 0.390625 -vt 0.375000 0.234375 -vt 0.375000 0.218750 -vt 0.046875 0.171875 -vt 0.046875 0.000000 -vt 0.093750 0.000000 -vt 0.093750 0.171875 -vt 0.140625 0.171875 -vt 0.140625 0.000000 -vt 0.187500 0.000000 -vt 0.187500 0.171875 -vt 0.046875 0.218750 -vt 0.093750 0.218750 -vt 0.140625 0.218750 -vt 0.000000 0.171875 -vt 0.000000 0.000000 -vt 0.609375 0.281250 -vt 0.609375 0.265625 -vt 0.671875 0.265625 -vt 0.671875 0.281250 -vt 0.734375 0.281250 -vt 0.734375 0.265625 -vt 0.796875 0.265625 -vt 0.796875 0.281250 -vt 0.609375 0.343750 -vt 0.671875 0.343750 -vt 0.734375 0.343750 -vt 0.546875 0.281250 -vt 0.546875 0.265625 -vt 0.609375 0.234375 -vt 0.609375 0.218750 -vt 0.671875 0.218750 -vt 0.671875 0.234375 -vt 0.734375 0.234375 -vt 0.734375 0.218750 -vt 0.796875 0.218750 -vt 0.796875 0.234375 -vt 0.609375 0.296875 -vt 0.671875 0.296875 -vt 0.734375 0.296875 -vt 0.546875 0.234375 -vt 0.546875 0.218750 -vt 0.609375 0.250000 -vt 0.671875 0.250000 -vt 0.734375 0.250000 -vt 0.796875 0.250000 -vt 0.609375 0.312500 -vt 0.671875 0.312500 -vt 0.734375 0.312500 -vt 0.546875 0.250000 -vt 0.609375 0.328125 -vt 0.671875 0.328125 -vt 0.734375 0.328125 -vt 0.187500 0.812500 -vt 0.187500 0.781250 -vt 0.375000 0.781250 -vt 0.375000 0.812500 -vt 0.562500 0.812500 -vt 0.562500 0.781250 -vt 0.750000 0.781250 -vt 0.750000 0.812500 -vt 0.187500 1.000000 -vt 0.375000 1.000000 -vt 0.562500 1.000000 -vt 0.000000 0.812500 -vt 0.000000 0.781250 -vt 0.593750 0.640625 -vt 0.593750 0.609375 -vt 0.781250 0.609375 -vt 0.781250 0.640625 -vt 0.812500 0.640625 -vt 0.812500 0.609375 -vt 1.000000 0.609375 -vt 1.000000 0.640625 -vt 0.593750 0.671875 -vt 0.781250 0.671875 -vt 0.968750 0.640625 -vt 0.968750 0.671875 -vt 0.562500 0.640625 -vt 0.562500 0.609375 -vt 0.593750 0.718750 -vt 0.593750 0.687500 -vt 0.781250 0.687500 -vt 0.781250 0.718750 -vt 0.812500 0.718750 -vt 0.812500 0.687500 -vt 1.000000 0.687500 -vt 1.000000 0.718750 -vt 0.593750 0.750000 -vt 0.781250 0.750000 -vt 0.968750 0.718750 -vt 0.968750 0.750000 -vt 0.562500 0.718750 -vt 0.562500 0.687500 -vt 0.187500 0.578125 -vt 0.187500 0.546875 -vt 0.218750 0.546875 -vt 0.218750 0.578125 -vt 0.406250 0.578125 -vt 0.406250 0.546875 -vt 0.437500 0.546875 -vt 0.437500 0.578125 -vt 0.187500 0.765625 -vt 0.218750 0.765625 -vt 0.250000 0.578125 -vt 0.250000 0.765625 -vt 0.000000 0.578125 -vt 0.000000 0.546875 -vt 0.078125 0.453125 -vt 0.078125 0.437500 -vt 0.156250 0.437500 -vt 0.156250 0.453125 -vt 0.234375 0.453125 -vt 0.234375 0.437500 -vt 0.312500 0.437500 -vt 0.312500 0.453125 -vt 0.078125 0.531250 -vt 0.156250 0.531250 -vt 0.234375 0.531250 -vt 0.000000 0.453125 -vt 0.000000 0.437500 -vt 0.312500 0.062500 -vt 0.312500 0.031250 -vt 0.328125 0.031250 -vt 0.328125 0.062500 -vt 0.406250 0.062500 -vt 0.406250 0.031250 -vt 0.421875 0.031250 -vt 0.421875 0.062500 -vt 0.312500 0.140625 -vt 0.328125 0.140625 -vt 0.343750 0.062500 -vt 0.343750 0.140625 -vt 0.234375 0.062500 -vt 0.234375 0.031250 -vt 0.250000 0.187500 -vt 0.250000 0.156250 -vt 0.328125 0.156250 -vt 0.328125 0.187500 -vt 0.343750 0.187500 -vt 0.343750 0.156250 -vt 0.421875 0.156250 -vt 0.421875 0.187500 -vt 0.250000 0.203125 -vt 0.328125 0.203125 -vt 0.406250 0.187500 -vt 0.406250 0.203125 -vt 0.234375 0.187500 -vt 0.234375 0.156250 -vt 0.906250 0.093750 -vt 0.906250 0.031250 -vt 0.937500 0.031250 -vt 0.937500 0.093750 -vt 0.968750 0.093750 -vt 0.968750 0.031250 -vt 1.000000 0.031250 -vt 1.000000 0.093750 -vt 0.906250 0.125000 -vt 0.937500 0.125000 -vt 0.968750 0.125000 -vt 0.875000 0.093750 -vt 0.875000 0.031250 -vt 0.953125 0.156250 -vt 0.953125 0.140625 -vt 0.968750 0.140625 -vt 0.968750 0.156250 -vt 0.984375 0.156250 -vt 0.984375 0.140625 -vt 1.000000 0.140625 -vt 1.000000 0.156250 -vt 0.953125 0.171875 -vt 0.968750 0.171875 -vt 0.984375 0.171875 -vt 0.937500 0.156250 -vt 0.937500 0.140625 -vt 0.656250 0.281250 -vt 0.656250 0.265625 -vt 0.687500 0.281250 -vt 0.687500 0.265625 -vt 0.703125 0.265625 -vt 0.703125 0.281250 -vt 0.656250 0.296875 -vt 0.687500 0.296875 -vt 0.640625 0.281250 -vt 0.640625 0.265625 -vt 0.593750 0.281250 -vt 0.593750 0.265625 -vt 0.625000 0.281250 -vt 0.625000 0.265625 -vt 0.593750 0.296875 -vt 0.625000 0.296875 -vt 0.578125 0.281250 -vt 0.578125 0.265625 -vt 0.750000 0.265625 -vt 0.750000 0.281250 -vt 0.765625 0.281250 -vt 0.765625 0.265625 -vt 0.781250 0.265625 -vt 0.781250 0.281250 -vt 0.750000 0.296875 -vt 0.765625 0.296875 -vt 0.718750 0.281250 -vt 0.718750 0.265625 -vt 0.640625 0.296875 -vt 0.531250 0.437500 -vt 0.531250 0.406250 -vt 0.687500 0.406250 -vt 0.687500 0.437500 -vt 0.843750 0.437500 -vt 0.843750 0.406250 -vt 1.000000 0.406250 -vt 1.000000 0.437500 -vt 0.531250 0.593750 -vt 0.687500 0.593750 -vt 0.843750 0.593750 -vt 0.375000 0.437500 -vt 0.375000 0.406250 -vt 0.156250 0.265625 -vt 0.156250 0.234375 -vt 0.187500 0.234375 -vt 0.187500 0.265625 -vt 0.343750 0.265625 -vt 0.343750 0.234375 -vt 0.375000 0.265625 -vt 0.156250 0.421875 -vt 0.187500 0.421875 -vt 0.218750 0.265625 -vt 0.218750 0.421875 -vt 0.000000 0.265625 -vt 0.000000 0.234375 -vt 0.625000 0.890625 -vt 0.625000 0.859375 -vt 0.781250 0.859375 -vt 0.781250 0.890625 -vt 0.812500 0.890625 -vt 0.812500 0.859375 -vt 0.968750 0.859375 -vt 0.968750 0.890625 -vt 0.625000 0.921875 -vt 0.781250 0.921875 -vt 0.937500 0.890625 -vt 0.937500 0.921875 -vt 0.593750 0.890625 -vt 0.593750 0.859375 -vt 0.625000 0.968750 -vt 0.625000 0.937500 -vt 0.781250 0.937500 -vt 0.781250 0.968750 -vt 0.812500 0.968750 -vt 0.812500 0.937500 -vt 0.968750 0.937500 -vt 0.968750 0.968750 -vt 0.625000 1.000000 -vt 0.781250 1.000000 -vt 0.937500 0.968750 -vt 0.937500 1.000000 -vt 0.593750 0.968750 -vt 0.593750 0.937500 -vn 0.000000 0.000000 1.000000 -vn 0.000000 0.000000 -1.000000 -vn 0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 -0.000000 -vn 1.000000 0.000000 0.000000 -vn -1.000000 0.000000 0.000000 -vn -0.000000 0.109700 0.994000 -vn -0.000000 -0.109600 -0.994000 -vn 0.109700 0.988000 -0.109000 -vn -0.109700 -0.988000 0.109000 -vn 0.994000 -0.109000 0.012000 -vn -0.994000 0.109000 -0.012000 -vn 0.000000 -0.109700 -0.994000 -vn 0.000000 -0.109700 0.994000 -vn 0.000000 0.109700 -0.994000 -vn 0.109700 0.988000 0.109000 -vn -0.109600 -0.988000 -0.109000 -vn 0.994000 -0.109000 -0.012000 -vn -0.994000 0.109000 0.012000 -vn -0.109700 0.988000 0.109000 -vn 0.109700 -0.988000 -0.109000 -vn 0.994000 0.109000 0.012000 -vn -0.994000 -0.109000 -0.012000 -vn -0.109700 0.988000 -0.109000 -vn 0.109700 -0.988000 0.109000 -vn 0.994000 0.109000 -0.012000 -vn -0.994000 -0.109000 0.012000 -vn -0.000000 0.109600 0.994000 -vn 0.707100 0.707100 0.000000 -vn -0.707100 -0.707100 0.000000 -vn 0.707100 -0.707100 0.000000 -vn -0.707100 0.707100 0.000000 -vn 0.000000 0.707100 0.707100 -vn 0.000000 -0.707100 -0.707100 -vn 0.000000 0.707100 -0.707100 -vn 0.000000 -0.707100 0.707100 -usemtl None -#s 1 -f 1/1/1 2/2/1 3/3/1 4/4/1 -f 5/5/2 6/6/2 7/7/2 8/8/2 -f 8/9/3 1/1/3 4/4/3 5/10/3 -f 2/5/4 7/11/4 6/10/4 3/4/4 -f 5/5/5 4/4/5 3/3/5 6/6/5 -f 8/12/6 7/13/6 2/2/6 1/1/6 -f 9/14/1 10/15/1 11/16/1 12/17/1 -f 13/18/2 14/19/2 15/20/2 16/21/2 -f 16/22/3 9/14/3 12/17/3 13/23/3 -f 10/18/4 15/24/4 14/23/4 11/17/4 -f 13/18/5 12/17/5 11/16/5 14/19/5 -f 16/25/6 15/26/6 10/15/6 9/14/6 -f 17/1/1 18/2/1 19/3/1 20/4/1 -f 21/5/2 22/6/2 23/7/2 24/8/2 -f 24/9/3 17/1/3 20/4/3 21/10/3 -f 18/5/4 23/11/4 22/10/4 19/4/4 -f 21/5/5 20/4/5 19/3/5 22/6/5 -f 24/12/6 23/13/6 18/2/6 17/1/6 -f 25/27/7 26/28/7 27/29/7 28/30/7 -f 29/31/8 30/32/8 31/33/8 32/34/8 -f 32/35/9 25/27/9 28/30/9 29/36/9 -f 26/31/10 31/37/10 30/36/10 27/30/10 -f 29/31/11 28/30/11 27/29/11 30/32/11 -f 32/38/12 31/39/12 26/28/12 25/27/12 -f 33/40/7 34/41/7 35/42/7 36/43/7 -f 37/44/13 38/45/13 39/46/13 40/47/13 -f 40/48/9 33/40/9 36/43/9 37/49/9 -f 34/44/10 39/50/10 38/49/10 35/43/10 -f 37/44/11 36/43/11 35/42/11 38/45/11 -f 40/51/12 39/52/12 34/41/12 33/40/12 -f 41/27/14 42/28/14 43/29/14 44/30/14 -f 45/31/15 46/32/15 47/33/15 48/34/15 -f 48/35/16 41/27/16 44/30/16 45/36/16 -f 42/31/17 47/37/17 46/36/17 43/30/17 -f 45/31/18 44/30/18 43/29/18 46/32/18 -f 48/38/19 47/39/19 42/28/19 41/27/19 -f 49/53/14 50/54/14 51/55/14 52/56/14 -f 53/57/15 54/58/15 55/59/15 56/60/15 -f 56/61/16 49/53/16 52/56/16 53/62/16 -f 50/57/17 55/63/17 54/62/17 51/56/17 -f 53/57/18 52/56/18 51/55/18 54/58/18 -f 56/64/19 55/65/19 50/54/19 49/53/19 -f 57/27/14 58/28/14 59/29/14 60/30/14 -f 61/31/15 62/32/15 63/33/15 64/34/15 -f 64/35/20 57/27/20 60/30/20 61/36/20 -f 58/31/21 63/37/21 62/36/21 59/30/21 -f 61/31/22 60/30/22 59/29/22 62/32/22 -f 64/38/23 63/39/23 58/28/23 57/27/23 -f 65/66/14 66/53/14 67/56/14 68/67/14 -f 69/68/15 70/57/15 71/60/15 72/69/15 -f 72/70/20 65/66/20 68/67/20 69/71/20 -f 66/68/21 71/72/21 70/71/21 67/67/21 -f 69/68/22 68/67/22 67/56/22 70/57/22 -f 72/73/23 71/64/23 66/53/23 65/66/23 -f 73/27/7 74/28/7 75/29/7 76/30/7 -f 77/31/13 78/32/13 79/33/13 80/34/13 -f 80/35/24 73/27/24 76/30/24 77/36/24 -f 74/31/25 79/37/25 78/36/25 75/30/25 -f 77/31/26 76/30/26 75/29/26 78/32/26 -f 80/38/27 79/39/27 74/28/27 73/27/27 -f 81/41/28 82/66/28 83/67/28 84/42/28 -f 85/45/13 86/68/13 87/69/13 88/46/13 -f 88/74/24 81/41/24 84/42/24 85/75/24 -f 82/45/25 87/76/25 86/75/25 83/42/25 -f 85/45/26 84/42/26 83/67/26 86/68/26 -f 88/52/27 87/73/27 82/66/27 81/41/27 -f 89/77/1 90/78/1 91/79/1 92/80/1 -f 93/81/2 94/82/2 95/83/2 96/84/2 -f 96/85/3 89/77/3 92/80/3 93/86/3 -f 90/81/4 95/87/4 94/86/4 91/80/4 -f 93/81/5 92/80/5 91/79/5 94/82/5 -f 96/88/6 95/89/6 90/78/6 89/77/6 -f 97/90/1 98/91/1 99/92/1 100/93/1 -f 101/94/2 102/95/2 103/96/2 104/97/2 -f 104/98/3 97/90/3 100/93/3 101/99/3 -f 98/100/4 103/101/4 102/99/4 99/93/4 -f 101/94/5 100/93/5 99/92/5 102/95/5 -f 104/102/6 103/103/6 98/91/6 97/90/6 -f 105/104/1 106/105/1 107/106/1 108/107/1 -f 109/108/2 110/109/2 111/110/2 112/111/2 -f 112/112/3 105/104/3 108/107/3 109/113/3 -f 106/114/4 111/115/4 110/113/4 107/107/4 -f 109/108/5 108/107/5 107/106/5 110/109/5 -f 112/116/6 111/117/6 106/105/6 105/104/6 -f 113/118/1 114/119/1 115/120/1 116/121/1 -f 117/122/2 118/123/2 119/124/2 120/125/2 -f 120/126/3 113/118/3 116/121/3 117/127/3 -f 114/128/4 119/129/4 118/127/4 115/121/4 -f 117/122/5 116/121/5 115/120/5 118/123/5 -f 120/130/6 119/131/6 114/119/6 113/118/6 -f 121/118/1 122/119/1 123/120/1 124/121/1 -f 125/122/2 126/123/2 127/124/2 128/125/2 -f 128/126/3 121/118/3 124/121/3 125/127/3 -f 122/128/4 127/129/4 126/127/4 123/121/4 -f 125/122/5 124/121/5 123/120/5 126/123/5 -f 128/130/6 127/131/6 122/119/6 121/118/6 -f 129/132/1 130/133/1 131/134/1 132/135/1 -f 133/136/2 134/137/2 135/138/2 136/139/2 -f 136/140/3 129/132/3 132/135/3 133/141/3 -f 130/136/4 135/142/4 134/141/4 131/135/4 -f 133/136/5 132/135/5 131/134/5 134/137/5 -f 136/143/6 135/144/6 130/133/6 129/132/6 -f 137/145/1 138/146/1 139/147/1 140/148/1 -f 141/149/2 142/150/2 143/151/2 144/152/2 -f 144/153/29 137/145/29 140/148/29 141/154/29 -f 138/155/30 143/156/30 142/154/30 139/148/30 -f 141/149/31 140/148/31 139/147/31 142/150/31 -f 144/157/32 143/158/32 138/146/32 137/145/32 -f 145/159/33 146/160/33 147/161/33 148/162/33 -f 149/163/34 150/164/34 151/165/34 152/166/34 -f 152/167/35 145/159/35 148/162/35 149/168/35 -f 146/169/36 151/170/36 150/168/36 147/162/36 -f 149/163/5 148/162/5 147/161/5 150/164/5 -f 152/171/6 151/172/6 146/160/6 145/159/6 -f 153/159/36 154/160/36 155/161/36 156/162/36 -f 157/163/35 158/164/35 159/165/35 160/166/35 -f 160/167/33 153/159/33 156/162/33 157/168/33 -f 154/169/34 159/170/34 158/168/34 155/162/34 -f 157/163/5 156/162/5 155/161/5 158/164/5 -f 160/171/6 159/172/6 154/160/6 153/159/6 -f 161/145/1 162/146/1 163/147/1 164/148/1 -f 165/149/2 166/150/2 167/151/2 168/152/2 -f 168/153/32 161/145/32 164/148/32 165/154/32 -f 162/155/31 167/156/31 166/154/31 163/148/31 -f 165/149/29 164/148/29 163/147/29 166/150/29 -f 168/157/30 167/158/30 162/146/30 161/145/30 -f 169/173/1 170/174/1 171/175/1 172/176/1 -f 173/177/2 174/178/2 175/179/2 176/180/2 -f 176/181/3 169/173/3 172/176/3 173/182/3 -f 170/177/4 175/183/4 174/182/4 171/176/4 -f 173/177/5 172/176/5 171/175/5 174/178/5 -f 176/184/6 175/185/6 170/174/6 169/173/6 -f 177/186/1 178/187/1 179/188/1 180/189/1 -f 181/190/2 182/191/2 183/192/2 184/193/2 -f 184/194/3 177/186/3 180/189/3 181/195/3 -f 178/190/4 183/196/4 182/195/4 179/189/4 -f 181/190/5 180/189/5 179/188/5 182/191/5 -f 184/197/6 183/198/6 178/187/6 177/186/6 -f 185/199/1 186/200/1 187/42/1 188/43/1 -f 189/201/2 190/202/2 191/203/2 192/204/2 -f 192/205/3 185/199/3 188/43/3 189/62/3 -f 186/201/4 191/206/4 190/62/4 187/43/4 -f 189/201/5 188/43/5 187/42/5 190/202/5 -f 192/207/6 191/208/6 186/200/6 185/199/6 -f 193/173/1 194/174/1 195/175/1 196/176/1 -f 197/177/2 198/178/2 199/179/2 200/180/2 -f 200/181/3 193/173/3 196/176/3 197/182/3 -f 194/177/4 199/183/4 198/182/4 195/176/4 -f 197/177/5 196/176/5 195/175/5 198/178/5 -f 200/184/6 199/185/6 194/174/6 193/173/6 -f 201/186/1 202/187/1 203/188/1 204/189/1 -f 205/190/2 206/191/2 207/192/2 208/193/2 -f 208/194/3 201/186/3 204/189/3 205/195/3 -f 202/190/4 207/196/4 206/195/4 203/189/4 -f 205/190/5 204/189/5 203/188/5 206/191/5 -f 208/197/6 207/198/6 202/187/6 201/186/6 -f 209/209/1 210/210/1 211/41/1 212/40/1 -f 213/211/2 214/212/2 215/208/2 216/207/2 -f 216/213/3 209/209/3 212/40/3 213/61/3 -f 210/211/4 215/214/4 214/61/4 211/40/4 -f 213/211/5 212/40/5 211/41/5 214/212/5 -f 216/215/6 215/216/6 210/210/6 209/209/6 -f 217/173/1 218/174/1 219/175/1 220/176/1 -f 221/177/2 222/178/2 223/179/2 224/180/2 -f 224/181/3 217/173/3 220/176/3 221/182/3 -f 218/177/4 223/183/4 222/182/4 219/176/4 -f 221/177/5 220/176/5 219/175/5 222/178/5 -f 224/184/6 223/185/6 218/174/6 217/173/6 -f 225/186/1 226/187/1 227/188/1 228/189/1 -f 229/190/2 230/191/2 231/192/2 232/193/2 -f 232/194/3 225/186/3 228/189/3 229/195/3 -f 226/190/4 231/196/4 230/195/4 227/189/4 -f 229/190/5 228/189/5 227/188/5 230/191/5 -f 232/197/6 231/198/6 226/187/6 225/186/6 -f 233/44/1 234/45/1 235/217/1 236/218/1 -f 237/219/2 238/220/2 239/221/2 240/222/2 -f 240/63/3 233/44/3 236/218/3 237/223/3 -f 234/219/4 239/224/4 238/223/4 235/218/4 -f 237/219/5 236/218/5 235/217/5 238/220/5 -f 240/225/6 239/226/6 234/45/6 233/44/6 -f 241/173/1 242/174/1 243/175/1 244/176/1 -f 245/177/2 246/178/2 247/179/2 248/180/2 -f 248/181/3 241/173/3 244/176/3 245/182/3 -f 242/177/4 247/183/4 246/182/4 243/176/4 -f 245/177/5 244/176/5 243/175/5 246/178/5 -f 248/184/6 247/185/6 242/174/6 241/173/6 -f 249/186/1 250/187/1 251/188/1 252/189/1 -f 253/190/2 254/191/2 255/192/2 256/193/2 -f 256/194/3 249/186/3 252/189/3 253/195/3 -f 250/190/4 255/196/4 254/195/4 251/189/4 -f 253/190/5 252/189/5 251/188/5 254/191/5 -f 256/197/6 255/198/6 250/187/6 249/186/6 -f 257/207/1 258/208/1 259/200/1 260/199/1 -f 261/43/2 262/42/2 263/202/2 264/201/2 -f 264/227/3 257/207/3 260/199/3 261/205/3 -f 258/43/4 263/62/4 262/205/4 259/199/4 -f 261/43/5 260/199/5 259/200/5 262/42/5 -f 264/211/6 263/212/6 258/208/6 257/207/6 -f 265/228/1 266/229/1 267/230/1 268/231/1 -f 269/232/2 270/233/2 271/234/2 272/235/2 -f 272/236/3 265/228/3 268/231/3 269/237/3 -f 266/232/4 271/238/4 270/237/4 267/231/4 -f 269/232/5 268/231/5 267/230/5 270/233/5 -f 272/239/6 271/240/6 266/229/6 265/228/6 -f 273/241/1 274/242/1 275/243/1 276/244/1 -f 277/245/2 278/246/2 279/25/2 280/247/2 -f 280/248/3 273/241/3 276/244/3 277/249/3 -f 274/250/4 279/251/4 278/249/4 275/244/4 -f 277/245/5 276/244/5 275/243/5 278/246/5 -f 280/252/6 279/253/6 274/242/6 273/241/6 -f 281/254/1 282/255/1 283/256/1 284/257/1 -f 285/258/2 286/259/2 287/260/2 288/261/2 -f 288/262/3 281/254/3 284/257/3 285/263/3 -f 282/264/4 287/265/4 286/263/4 283/257/4 -f 285/258/5 284/257/5 283/256/5 286/259/5 -f 288/266/6 287/267/6 282/255/6 281/254/6 -f 289/268/1 290/269/1 291/270/1 292/271/1 -f 293/272/2 294/273/2 295/274/2 296/275/2 -f 296/276/3 289/268/3 292/271/3 293/277/3 -f 290/278/4 295/279/4 294/277/4 291/271/4 -f 293/272/5 292/271/5 291/270/5 294/273/5 -f 296/280/6 295/281/6 290/269/6 289/268/6 -f 297/241/1 298/242/1 299/243/1 300/244/1 -f 301/245/2 302/246/2 303/25/2 304/247/2 -f 304/248/3 297/241/3 300/244/3 301/249/3 -f 298/250/4 303/251/4 302/249/4 299/244/4 -f 301/245/5 300/244/5 299/243/5 302/246/5 -f 304/252/6 303/253/6 298/242/6 297/241/6 -f 305/14/1 306/15/1 307/16/1 308/17/1 -f 309/18/2 310/19/2 311/20/2 312/21/2 -f 312/22/3 305/14/3 308/17/3 309/23/3 -f 306/18/4 311/24/4 310/23/4 307/17/4 -f 309/18/5 308/17/5 307/16/5 310/19/5 -f 312/25/6 311/26/6 306/15/6 305/14/6 -f 313/1/1 314/2/1 315/3/1 316/4/1 -f 317/5/2 318/6/2 319/7/2 320/8/2 -f 320/9/3 313/1/3 316/4/3 317/10/3 -f 314/5/4 319/11/4 318/10/4 315/4/4 -f 317/5/5 316/4/5 315/3/5 318/6/5 -f 320/12/6 319/13/6 314/2/6 313/1/6 -f 321/1/1 322/2/1 323/3/1 324/4/1 -f 325/5/2 326/6/2 327/7/2 328/8/2 -f 328/9/3 321/1/3 324/4/3 325/10/3 -f 322/5/4 327/11/4 326/10/4 323/4/4 -f 325/5/5 324/4/5 323/3/5 326/6/5 -f 328/12/6 327/13/6 322/2/6 321/1/6 -f 329/40/7 330/41/7 331/42/7 332/43/7 -f 333/44/13 334/45/13 335/46/13 336/47/13 -f 336/48/9 329/40/9 332/43/9 333/49/9 -f 330/44/10 335/50/10 334/49/10 331/43/10 -f 333/44/11 332/43/11 331/42/11 334/45/11 -f 336/51/12 335/52/12 330/41/12 329/40/12 -f 337/53/14 338/54/14 339/55/14 340/56/14 -f 341/57/15 342/58/15 343/59/15 344/60/15 -f 344/61/16 337/53/16 340/56/16 341/62/16 -f 338/57/17 343/63/17 342/62/17 339/56/17 -f 341/57/18 340/56/18 339/55/18 342/58/18 -f 344/64/19 343/65/19 338/54/19 337/53/19 -f 345/66/14 346/53/14 347/56/14 348/67/14 -f 349/68/15 350/57/15 351/60/15 352/69/15 -f 352/70/20 345/66/20 348/67/20 349/71/20 -f 346/68/21 351/72/21 350/71/21 347/67/21 -f 349/68/22 348/67/22 347/56/22 350/57/22 -f 352/73/23 351/64/23 346/53/23 345/66/23 -f 353/41/28 354/66/28 355/67/28 356/42/28 -f 357/45/13 358/68/13 359/69/13 360/46/13 -f 360/74/24 353/41/24 356/42/24 357/75/24 -f 354/45/25 359/76/25 358/75/25 355/42/25 -f 357/45/26 356/42/26 355/67/26 358/68/26 -f 360/52/27 359/73/27 354/66/27 353/41/27 -f 361/90/1 362/91/1 363/92/1 364/93/1 -f 365/94/2 366/95/2 367/96/2 368/97/2 -f 368/98/3 361/90/3 364/93/3 365/99/3 -f 362/100/4 367/101/4 366/99/4 363/93/4 -f 365/94/5 364/93/5 363/92/5 366/95/5 -f 368/102/6 367/103/6 362/91/6 361/90/6 -f 369/104/1 370/105/1 371/106/1 372/107/1 -f 373/108/2 374/109/2 375/110/2 376/111/2 -f 376/112/3 369/104/3 372/107/3 373/113/3 -f 370/114/4 375/115/4 374/113/4 371/107/4 -f 373/108/5 372/107/5 371/106/5 374/109/5 -f 376/116/6 375/117/6 370/105/6 369/104/6 -f 377/118/1 378/119/1 379/120/1 380/121/1 -f 381/122/2 382/123/2 383/124/2 384/125/2 -f 384/126/3 377/118/3 380/121/3 381/127/3 -f 378/128/4 383/129/4 382/127/4 379/121/4 -f 381/122/5 380/121/5 379/120/5 382/123/5 -f 384/130/6 383/131/6 378/119/6 377/118/6 -f 385/118/1 386/119/1 387/120/1 388/121/1 -f 389/122/2 390/123/2 391/124/2 392/125/2 -f 392/126/3 385/118/3 388/121/3 389/127/3 -f 386/128/4 391/129/4 390/127/4 387/121/4 -f 389/122/5 388/121/5 387/120/5 390/123/5 -f 392/130/6 391/131/6 386/119/6 385/118/6 -f 393/132/1 394/133/1 395/134/1 396/135/1 -f 397/136/2 398/137/2 399/138/2 400/139/2 -f 400/140/3 393/132/3 396/135/3 397/141/3 -f 394/136/4 399/142/4 398/141/4 395/135/4 -f 397/136/5 396/135/5 395/134/5 398/137/5 -f 400/143/6 399/144/6 394/133/6 393/132/6 -f 401/145/1 402/146/1 403/147/1 404/148/1 -f 405/149/2 406/150/2 407/151/2 408/152/2 -f 408/153/29 401/145/29 404/148/29 405/154/29 -f 402/155/30 407/156/30 406/154/30 403/148/30 -f 405/149/31 404/148/31 403/147/31 406/150/31 -f 408/157/32 407/158/32 402/146/32 401/145/32 -f 409/159/33 410/160/33 411/161/33 412/162/33 -f 413/163/34 414/164/34 415/165/34 416/166/34 -f 416/167/35 409/159/35 412/162/35 413/168/35 -f 410/169/36 415/170/36 414/168/36 411/162/36 -f 413/163/5 412/162/5 411/161/5 414/164/5 -f 416/171/6 415/172/6 410/160/6 409/159/6 -f 417/159/36 418/160/36 419/161/36 420/162/36 -f 421/163/35 422/164/35 423/165/35 424/166/35 -f 424/167/33 417/159/33 420/162/33 421/168/33 -f 418/169/34 423/170/34 422/168/34 419/162/34 -f 421/163/5 420/162/5 419/161/5 422/164/5 -f 424/171/6 423/172/6 418/160/6 417/159/6 -f 425/145/1 426/146/1 427/147/1 428/148/1 -f 429/149/2 430/150/2 431/151/2 432/152/2 -f 432/153/32 425/145/32 428/148/32 429/154/32 -f 426/155/31 431/156/31 430/154/31 427/148/31 -f 429/149/29 428/148/29 427/147/29 430/150/29 -f 432/157/30 431/158/30 426/146/30 425/145/30 -f 433/145/1 434/146/1 435/147/1 436/148/1 -f 437/149/2 438/150/2 439/151/2 440/152/2 -f 440/153/29 433/145/29 436/148/29 437/154/29 -f 434/155/30 439/156/30 438/154/30 435/148/30 -f 437/149/31 436/148/31 435/147/31 438/150/31 -f 440/157/32 439/158/32 434/146/32 433/145/32 -f 441/159/33 442/160/33 443/161/33 444/162/33 -f 445/163/34 446/164/34 447/165/34 448/166/34 -f 448/167/35 441/159/35 444/162/35 445/168/35 -f 442/169/36 447/170/36 446/168/36 443/162/36 -f 445/163/5 444/162/5 443/161/5 446/164/5 -f 448/171/6 447/172/6 442/160/6 441/159/6 -f 449/159/36 450/160/36 451/161/36 452/162/36 -f 453/163/35 454/164/35 455/165/35 456/166/35 -f 456/167/33 449/159/33 452/162/33 453/168/33 -f 450/169/34 455/170/34 454/168/34 451/162/34 -f 453/163/5 452/162/5 451/161/5 454/164/5 -f 456/171/6 455/172/6 450/160/6 449/159/6 -f 457/145/1 458/146/1 459/147/1 460/148/1 -f 461/149/2 462/150/2 463/151/2 464/152/2 -f 464/153/32 457/145/32 460/148/32 461/154/32 -f 458/155/31 463/156/31 462/154/31 459/148/31 -f 461/149/29 460/148/29 459/147/29 462/150/29 -f 464/157/30 463/158/30 458/146/30 457/145/30 -f 465/186/1 466/187/1 467/188/1 468/189/1 -f 469/190/2 470/191/2 471/192/2 472/193/2 -f 472/194/3 465/186/3 468/189/3 469/195/3 -f 466/190/4 471/196/4 470/195/4 467/189/4 -f 469/190/5 468/189/5 467/188/5 470/191/5 -f 472/197/6 471/198/6 466/187/6 465/186/6 -f 473/199/1 474/200/1 475/42/1 476/43/1 -f 477/201/2 478/202/2 479/203/2 480/204/2 -f 480/205/3 473/199/3 476/43/3 477/62/3 -f 474/201/4 479/206/4 478/62/4 475/43/4 -f 477/201/5 476/43/5 475/42/5 478/202/5 -f 480/207/6 479/208/6 474/200/6 473/199/6 -f 481/199/1 482/200/1 483/42/1 484/43/1 -f 485/201/2 486/202/2 487/203/2 488/204/2 -f 488/205/3 481/199/3 484/43/3 485/62/3 -f 482/201/4 487/206/4 486/62/4 483/43/4 -f 485/201/5 484/43/5 483/42/5 486/202/5 -f 488/207/6 487/208/6 482/200/6 481/199/6 -f 489/186/1 490/187/1 491/188/1 492/189/1 -f 493/190/2 494/191/2 495/192/2 496/193/2 -f 496/194/3 489/186/3 492/189/3 493/195/3 -f 490/190/4 495/196/4 494/195/4 491/189/4 -f 493/190/5 492/189/5 491/188/5 494/191/5 -f 496/197/6 495/198/6 490/187/6 489/186/6 -f 497/209/1 498/210/1 499/41/1 500/40/1 -f 501/211/2 502/212/2 503/208/2 504/207/2 -f 504/213/3 497/209/3 500/40/3 501/61/3 -f 498/211/4 503/214/4 502/61/4 499/40/4 -f 501/211/5 500/40/5 499/41/5 502/212/5 -f 504/215/6 503/216/6 498/210/6 497/209/6 -f 505/209/1 506/210/1 507/41/1 508/40/1 -f 509/211/2 510/212/2 511/208/2 512/207/2 -f 512/213/3 505/209/3 508/40/3 509/61/3 -f 506/211/4 511/214/4 510/61/4 507/40/4 -f 509/211/5 508/40/5 507/41/5 510/212/5 -f 512/215/6 511/216/6 506/210/6 505/209/6 -f 513/186/1 514/187/1 515/188/1 516/189/1 -f 517/190/2 518/191/2 519/192/2 520/193/2 -f 520/194/3 513/186/3 516/189/3 517/195/3 -f 514/190/4 519/196/4 518/195/4 515/189/4 -f 517/190/5 516/189/5 515/188/5 518/191/5 -f 520/197/6 519/198/6 514/187/6 513/186/6 -f 521/44/1 522/45/1 523/217/1 524/218/1 -f 525/219/2 526/220/2 527/221/2 528/222/2 -f 528/63/3 521/44/3 524/218/3 525/223/3 -f 522/219/4 527/224/4 526/223/4 523/218/4 -f 525/219/5 524/218/5 523/217/5 526/220/5 -f 528/225/6 527/226/6 522/45/6 521/44/6 -f 529/44/1 530/45/1 531/217/1 532/218/1 -f 533/219/2 534/220/2 535/221/2 536/222/2 -f 536/63/3 529/44/3 532/218/3 533/223/3 -f 530/219/4 535/224/4 534/223/4 531/218/4 -f 533/219/5 532/218/5 531/217/5 534/220/5 -f 536/225/6 535/226/6 530/45/6 529/44/6 -f 537/186/1 538/187/1 539/188/1 540/189/1 -f 541/190/2 542/191/2 543/192/2 544/193/2 -f 544/194/3 537/186/3 540/189/3 541/195/3 -f 538/190/4 543/196/4 542/195/4 539/189/4 -f 541/190/5 540/189/5 539/188/5 542/191/5 -f 544/197/6 543/198/6 538/187/6 537/186/6 -f 545/207/1 546/208/1 547/200/1 548/199/1 -f 549/43/2 550/42/2 551/202/2 552/201/2 -f 552/227/3 545/207/3 548/199/3 549/205/3 -f 546/43/4 551/62/4 550/205/4 547/199/4 -f 549/43/5 548/199/5 547/200/5 550/42/5 -f 552/211/6 551/212/6 546/208/6 545/207/6 -f 553/207/1 554/208/1 555/200/1 556/199/1 -f 557/43/2 558/42/2 559/202/2 560/201/2 -f 560/227/3 553/207/3 556/199/3 557/205/3 -f 554/43/4 559/62/4 558/205/4 555/199/4 -f 557/43/5 556/199/5 555/200/5 558/42/5 -f 560/211/6 559/212/6 554/208/6 553/207/6 -f 561/241/1 562/242/1 563/243/1 564/244/1 -f 565/245/2 566/246/2 567/25/2 568/247/2 -f 568/248/3 561/241/3 564/244/3 565/249/3 -f 562/250/4 567/251/4 566/249/4 563/244/4 -f 565/245/5 564/244/5 563/243/5 566/246/5 -f 568/252/6 567/253/6 562/242/6 561/241/6 -f 569/254/1 570/255/1 571/256/1 572/257/1 -f 573/258/2 574/259/2 575/260/2 576/261/2 -f 576/262/3 569/254/3 572/257/3 573/263/3 -f 570/264/4 575/265/4 574/263/4 571/257/4 -f 573/258/5 572/257/5 571/256/5 574/259/5 -f 576/266/6 575/267/6 570/255/6 569/254/6 -f 577/268/1 578/269/1 579/270/1 580/271/1 -f 581/272/2 582/273/2 583/274/2 584/275/2 -f 584/276/3 577/268/3 580/271/3 581/277/3 -f 578/278/4 583/279/4 582/277/4 579/271/4 -f 581/272/5 580/271/5 579/270/5 582/273/5 -f 584/280/6 583/281/6 578/269/6 577/268/6 -f 585/241/1 586/242/1 587/243/1 588/244/1 -f 589/245/2 590/246/2 591/25/2 592/247/2 -f 592/248/3 585/241/3 588/244/3 589/249/3 -f 586/250/4 591/251/4 590/249/4 587/244/4 -f 589/245/5 588/244/5 587/243/5 590/246/5 -f 592/252/6 591/253/6 586/242/6 585/241/6 diff --git a/src/main/resources/assets/bloodmagic/models/block/blockdemonpylon.mtl b/src/main/resources/assets/bloodmagic/models/block/blockdemonpylon.mtl deleted file mode 100644 index b4d18584..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/blockdemonpylon.mtl +++ /dev/null @@ -1,11 +0,0 @@ -# Blender MTL File: 'None' -# Material Count: 1 - -newmtl None -#Ns 0 -Ka 0.000000 0.000000 0.000000 -Kd 0.8 0.8 0.8 -#Ks 0.8 0.8 0.8 -d 1 -#illum 2 -map_Kd bloodmagic:models/demonpylon \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/blockdemonpylon.obj b/src/main/resources/assets/bloodmagic/models/block/blockdemonpylon.obj deleted file mode 100644 index 1e4d31b0..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/blockdemonpylon.obj +++ /dev/null @@ -1,1171 +0,0 @@ -# Blender v2.76 (sub 0) OBJ File: '' -# www.blender.org -mtllib blockdemonpylon.mtl -o BlockDemonPylon -v 0.125000 0.125000 0.875000 -v 0.125000 -0.000000 0.875000 -v 0.375000 -0.000000 0.875000 -v 0.375000 0.125000 0.875000 -v 0.375000 0.125000 0.625000 -v 0.375000 -0.000000 0.625000 -v 0.125000 -0.000000 0.625000 -v 0.125000 0.125000 0.625000 -v 0.193151 0.473851 0.803768 -v 0.151353 0.103509 0.845306 -v 0.337685 0.082741 0.847635 -v 0.379483 0.453082 0.806098 -v 0.379483 0.432183 0.619766 -v 0.337685 0.061842 0.661303 -v 0.151353 0.082610 0.658974 -v 0.193151 0.452952 0.617437 -v 0.625000 0.125000 0.375000 -v 0.625000 0.000000 0.375000 -v 0.875000 0.000000 0.375000 -v 0.875000 0.125000 0.375000 -v 0.875000 0.125000 0.125000 -v 0.875000 0.000000 0.125000 -v 0.625000 0.000000 0.125000 -v 0.625000 0.125000 0.125000 -v 0.620517 0.432206 0.380235 -v 0.662315 0.061873 0.338698 -v 0.848645 0.082641 0.341027 -v 0.806847 0.452974 0.382564 -v 0.806847 0.473873 0.196235 -v 0.848645 0.103540 0.154698 -v 0.662315 0.082772 0.152368 -v 0.620517 0.453105 0.193905 -v 0.125000 0.125000 0.375000 -v 0.125000 0.000000 0.375000 -v 0.375000 0.000000 0.375000 -v 0.375000 0.125000 0.375000 -v 0.375000 0.125000 0.125000 -v 0.375000 0.000000 0.125000 -v 0.125000 0.000000 0.125000 -v 0.125000 0.125000 0.125000 -v 0.193151 0.452963 0.382563 -v 0.151353 0.082626 0.341026 -v 0.337685 0.061857 0.338696 -v 0.379483 0.432194 0.380234 -v 0.379483 0.453093 0.193904 -v 0.337685 0.082756 0.152367 -v 0.151353 0.103525 0.154696 -v 0.193151 0.473862 0.196233 -v 0.625000 0.125000 0.875000 -v 0.625000 -0.000000 0.875000 -v 0.875000 -0.000000 0.875000 -v 0.875000 0.125000 0.875000 -v 0.875000 0.125000 0.625000 -v 0.875000 -0.000000 0.625000 -v 0.625000 -0.000000 0.625000 -v 0.625000 0.125000 0.625000 -v 0.620517 0.453093 0.806096 -v 0.662315 0.082756 0.847633 -v 0.848645 0.103525 0.845304 -v 0.806847 0.473862 0.803767 -v 0.806847 0.452963 0.617435 -v 0.848645 0.082626 0.658972 -v 0.662315 0.061857 0.661302 -v 0.620517 0.432194 0.619765 -v 0.125000 0.500000 0.875000 -v 0.125000 0.437500 0.875000 -v 0.875000 0.437500 0.875000 -v 0.875000 0.500000 0.875000 -v 0.875000 0.500000 0.125000 -v 0.875000 0.437500 0.125000 -v 0.125000 0.437500 0.125000 -v 0.125000 0.500000 0.125000 -v 0.187500 0.562500 0.812500 -v 0.187500 0.500000 0.812500 -v 0.812500 0.500000 0.812500 -v 0.812500 0.562500 0.812500 -v 0.812500 0.562500 0.187500 -v 0.812500 0.500000 0.187500 -v 0.187500 0.500000 0.187500 -v 0.187500 0.562500 0.187500 -v 0.125000 0.625000 0.875000 -v 0.125000 0.562500 0.875000 -v 0.875000 0.562500 0.875000 -v 0.875000 0.625000 0.875000 -v 0.875000 0.625000 0.125000 -v 0.875000 0.562500 0.125000 -v 0.125000 0.562500 0.125000 -v 0.125000 0.625000 0.125000 -v 0.218750 1.062500 0.781250 -v 0.218750 0.625000 0.781250 -v 0.781250 0.625000 0.781250 -v 0.781250 1.062500 0.781250 -v 0.781250 1.062500 0.218750 -v 0.781250 0.625000 0.218750 -v 0.218750 0.625000 0.218750 -v 0.218750 1.062500 0.218750 -v 0.218750 1.093750 0.843750 -v 0.218750 0.718750 0.843750 -v 0.781250 0.718750 0.843750 -v 0.781250 1.093750 0.843750 -v 0.781250 1.093750 0.781250 -v 0.781250 0.718750 0.781250 -v 0.218750 0.718750 0.781250 -v 0.218750 1.093750 0.781250 -v 0.406250 0.968750 0.937500 -v 0.406250 0.843750 0.937500 -v 0.593750 0.843750 0.937500 -v 0.593750 0.968750 0.937500 -v 0.593750 0.968750 0.812500 -v 0.593750 0.843750 0.812500 -v 0.406250 0.843750 0.812500 -v 0.406250 0.968750 0.812500 -v 0.406250 1.156250 1.000000 -v 0.406250 0.906250 1.000000 -v 0.593750 0.906250 1.000000 -v 0.593750 1.156250 1.000000 -v 0.593750 1.156250 0.937500 -v 0.593750 0.906250 0.937500 -v 0.406250 0.906250 0.937500 -v 0.406250 1.156250 0.937500 -v 0.156250 1.093750 0.781250 -v 0.156250 0.718750 0.781250 -v 0.218750 0.718750 0.781250 -v 0.218750 1.093750 0.781250 -v 0.218750 1.093750 0.218750 -v 0.218750 0.718750 0.218750 -v 0.156250 0.718750 0.218750 -v 0.156250 1.093750 0.218750 -v 0.062500 0.968750 0.593750 -v 0.062500 0.843750 0.593750 -v 0.187500 0.843750 0.593750 -v 0.187500 0.968750 0.593750 -v 0.187500 0.968750 0.406250 -v 0.187500 0.843750 0.406250 -v 0.062500 0.843750 0.406250 -v 0.062500 0.968750 0.406250 -v 0.000000 1.156250 0.593750 -v 0.000000 0.906250 0.593750 -v 0.062500 0.906250 0.593750 -v 0.062500 1.156250 0.593750 -v 0.062500 1.156250 0.406250 -v 0.062500 0.906250 0.406250 -v 0.000000 0.906250 0.406250 -v 0.000000 1.156250 0.406250 -v 0.218750 1.093750 0.218750 -v 0.218750 0.718750 0.218750 -v 0.781250 0.718750 0.218750 -v 0.781250 1.093750 0.218750 -v 0.781250 1.093750 0.156250 -v 0.781250 0.718750 0.156250 -v 0.218750 0.718750 0.156250 -v 0.218750 1.093750 0.156250 -v 0.406250 0.968750 0.187500 -v 0.406250 0.843750 0.187500 -v 0.593750 0.843750 0.187500 -v 0.593750 0.968750 0.187500 -v 0.593750 0.968750 0.062500 -v 0.593750 0.843750 0.062500 -v 0.406250 0.843750 0.062500 -v 0.406250 0.968750 0.062500 -v 0.406250 1.156250 0.062500 -v 0.406250 0.906250 0.062500 -v 0.593750 0.906250 0.062500 -v 0.593750 1.156250 0.062500 -v 0.593750 1.156250 0.000000 -v 0.593750 0.906250 0.000000 -v 0.406250 0.906250 0.000000 -v 0.406250 1.156250 0.000000 -v 0.781250 1.093750 0.781250 -v 0.781250 0.718750 0.781250 -v 0.843750 0.718750 0.781250 -v 0.843750 1.093750 0.781250 -v 0.843750 1.093750 0.218750 -v 0.843750 0.718750 0.218750 -v 0.781250 0.718750 0.218750 -v 0.781250 1.093750 0.218750 -v 0.812500 0.968750 0.593750 -v 0.812500 0.843750 0.593750 -v 0.937500 0.843750 0.593750 -v 0.937500 0.968750 0.593750 -v 0.937500 0.968750 0.406250 -v 0.937500 0.843750 0.406250 -v 0.812500 0.843750 0.406250 -v 0.812500 0.968750 0.406250 -v 0.937500 1.156250 0.593750 -v 0.937500 0.906250 0.593750 -v 1.000000 0.906250 0.593750 -v 1.000000 1.156250 0.593750 -v 1.000000 1.156250 0.406250 -v 1.000000 0.906250 0.406250 -v 0.937500 0.906250 0.406250 -v 0.937500 1.156250 0.406250 -v 0.281250 1.250000 0.718750 -v 0.281250 1.062500 0.718750 -v 0.718750 1.062500 0.718750 -v 0.718750 1.250000 0.718750 -v 0.718750 1.250000 0.281250 -v 0.718750 1.062500 0.281250 -v 0.281250 1.062500 0.281250 -v 0.281250 1.250000 0.281250 -v 0.406250 1.375000 0.593750 -v 0.406250 1.250000 0.593750 -v 0.593750 1.250000 0.593750 -v 0.593750 1.375000 0.593750 -v 0.593750 1.375000 0.406250 -v 0.593750 1.250000 0.406250 -v 0.406250 1.250000 0.406250 -v 0.406250 1.375000 0.406250 -v 0.468750 1.500000 0.531250 -v 0.468750 1.375000 0.531250 -v 0.531250 1.375000 0.531250 -v 0.531250 1.500000 0.531250 -v 0.531250 1.500000 0.468750 -v 0.531250 1.375000 0.468750 -v 0.468750 1.375000 0.468750 -v 0.468750 1.500000 0.468750 -v 0.437500 1.750000 0.562500 -v 0.437500 1.500000 0.562500 -v 0.562500 1.500000 0.562500 -v 0.562500 1.750000 0.562500 -v 0.562500 1.750000 0.437500 -v 0.562500 1.500000 0.437500 -v 0.437500 1.500000 0.437500 -v 0.437500 1.750000 0.437500 -v 0.193151 0.473851 0.803768 -v 0.151353 0.103509 0.845306 -v 0.337685 0.082741 0.847635 -v 0.379483 0.453082 0.806098 -v 0.379483 0.432183 0.619766 -v 0.337685 0.061842 0.661303 -v 0.151353 0.082610 0.658974 -v 0.193151 0.452952 0.617437 -v 0.620517 0.432206 0.380235 -v 0.662315 0.061873 0.338698 -v 0.848645 0.082641 0.341027 -v 0.806847 0.452974 0.382564 -v 0.806847 0.473873 0.196235 -v 0.848645 0.103540 0.154698 -v 0.662315 0.082772 0.152368 -v 0.620517 0.453105 0.193905 -v 0.193151 0.452963 0.382563 -v 0.151353 0.082626 0.341026 -v 0.337685 0.061857 0.338696 -v 0.379483 0.432194 0.380234 -v 0.379483 0.453093 0.193904 -v 0.337685 0.082756 0.152367 -v 0.151353 0.103525 0.154696 -v 0.193151 0.473862 0.196233 -v 0.620517 0.453093 0.806096 -v 0.662315 0.082756 0.847633 -v 0.848645 0.103525 0.845304 -v 0.806847 0.473862 0.803767 -v 0.806847 0.452963 0.617435 -v 0.848645 0.082626 0.658972 -v 0.662315 0.061857 0.661302 -v 0.620517 0.432194 0.619765 -v 0.218750 1.093750 0.843750 -v 0.218750 0.718750 0.843750 -v 0.781250 0.718750 0.843750 -v 0.781250 1.093750 0.843750 -v 0.781250 1.093750 0.781250 -v 0.781250 0.718750 0.781250 -v 0.218750 0.718750 0.781250 -v 0.218750 1.093750 0.781250 -v 0.406250 0.968750 0.937500 -v 0.406250 0.843750 0.937500 -v 0.593750 0.843750 0.937500 -v 0.593750 0.968750 0.937500 -v 0.593750 0.968750 0.812500 -v 0.593750 0.843750 0.812500 -v 0.406250 0.843750 0.812500 -v 0.406250 0.968750 0.812500 -v 0.406250 1.156250 1.000000 -v 0.406250 0.906250 1.000000 -v 0.593750 0.906250 1.000000 -v 0.593750 1.156250 1.000000 -v 0.593750 1.156250 0.937500 -v 0.593750 0.906250 0.937500 -v 0.406250 0.906250 0.937500 -v 0.406250 1.156250 0.937500 -v 0.156250 1.093750 0.781250 -v 0.156250 0.718750 0.781250 -v 0.218750 0.718750 0.781250 -v 0.218750 1.093750 0.781250 -v 0.218750 1.093750 0.218750 -v 0.218750 0.718750 0.218750 -v 0.156250 0.718750 0.218750 -v 0.156250 1.093750 0.218750 -v 0.062500 0.968750 0.593750 -v 0.062500 0.843750 0.593750 -v 0.187500 0.843750 0.593750 -v 0.187500 0.968750 0.593750 -v 0.187500 0.968750 0.406250 -v 0.187500 0.843750 0.406250 -v 0.062500 0.843750 0.406250 -v 0.062500 0.968750 0.406250 -v 0.000000 1.156250 0.593750 -v 0.000000 0.906250 0.593750 -v 0.062500 0.906250 0.593750 -v 0.062500 1.156250 0.593750 -v 0.062500 1.156250 0.406250 -v 0.062500 0.906250 0.406250 -v 0.000000 0.906250 0.406250 -v 0.000000 1.156250 0.406250 -v 0.218750 1.093750 0.218750 -v 0.218750 0.718750 0.218750 -v 0.781250 0.718750 0.218750 -v 0.781250 1.093750 0.218750 -v 0.781250 1.093750 0.156250 -v 0.781250 0.718750 0.156250 -v 0.218750 0.718750 0.156250 -v 0.218750 1.093750 0.156250 -v 0.406250 0.968750 0.187500 -v 0.406250 0.843750 0.187500 -v 0.593750 0.843750 0.187500 -v 0.593750 0.968750 0.187500 -v 0.593750 0.968750 0.062500 -v 0.593750 0.843750 0.062500 -v 0.406250 0.843750 0.062500 -v 0.406250 0.968750 0.062500 -v 0.406250 1.156250 0.062500 -v 0.406250 0.906250 0.062500 -v 0.593750 0.906250 0.062500 -v 0.593750 1.156250 0.062500 -v 0.593750 1.156250 0.000000 -v 0.593750 0.906250 0.000000 -v 0.406250 0.906250 0.000000 -v 0.406250 1.156250 0.000000 -v 0.781250 1.093750 0.781250 -v 0.781250 0.718750 0.781250 -v 0.843750 0.718750 0.781250 -v 0.843750 1.093750 0.781250 -v 0.843750 1.093750 0.218750 -v 0.843750 0.718750 0.218750 -v 0.781250 0.718750 0.218750 -v 0.781250 1.093750 0.218750 -v 0.812500 0.968750 0.593750 -v 0.812500 0.843750 0.593750 -v 0.937500 0.843750 0.593750 -v 0.937500 0.968750 0.593750 -v 0.937500 0.968750 0.406250 -v 0.937500 0.843750 0.406250 -v 0.812500 0.843750 0.406250 -v 0.812500 0.968750 0.406250 -v 0.937500 1.156250 0.593750 -v 0.937500 0.906250 0.593750 -v 1.000000 0.906250 0.593750 -v 1.000000 1.156250 0.593750 -v 1.000000 1.156250 0.406250 -v 1.000000 0.906250 0.406250 -v 0.937500 0.906250 0.406250 -v 0.937500 1.156250 0.406250 -v 0.281250 1.250000 0.718750 -v 0.281250 1.062500 0.718750 -v 0.718750 1.062500 0.718750 -v 0.718750 1.250000 0.718750 -v 0.718750 1.250000 0.281250 -v 0.718750 1.062500 0.281250 -v 0.281250 1.062500 0.281250 -v 0.281250 1.250000 0.281250 -v 0.406250 1.375000 0.593750 -v 0.406250 1.250000 0.593750 -v 0.593750 1.250000 0.593750 -v 0.593750 1.375000 0.593750 -v 0.593750 1.375000 0.406250 -v 0.593750 1.250000 0.406250 -v 0.406250 1.250000 0.406250 -v 0.406250 1.375000 0.406250 -v 0.468750 1.500000 0.531250 -v 0.468750 1.375000 0.531250 -v 0.531250 1.375000 0.531250 -v 0.531250 1.500000 0.531250 -v 0.531250 1.500000 0.468750 -v 0.531250 1.375000 0.468750 -v 0.468750 1.375000 0.468750 -v 0.468750 1.500000 0.468750 -v 0.437500 1.750000 0.562500 -v 0.437500 1.500000 0.562500 -v 0.562500 1.500000 0.562500 -v 0.562500 1.750000 0.562500 -v 0.562500 1.750000 0.437500 -v 0.562500 1.500000 0.437500 -v 0.437500 1.500000 0.437500 -v 0.437500 1.750000 0.437500 -v 0.406250 0.968750 0.937500 -v 0.406250 0.843750 0.937500 -v 0.593750 0.843750 0.937500 -v 0.593750 0.968750 0.937500 -v 0.593750 0.968750 0.812500 -v 0.593750 0.843750 0.812500 -v 0.406250 0.843750 0.812500 -v 0.406250 0.968750 0.812500 -v 0.406250 1.156250 1.000000 -v 0.406250 0.906250 1.000000 -v 0.593750 0.906250 1.000000 -v 0.593750 1.156250 1.000000 -v 0.593750 1.156250 0.937500 -v 0.593750 0.906250 0.937500 -v 0.406250 0.906250 0.937500 -v 0.406250 1.156250 0.937500 -v 0.406250 1.156250 1.000000 -v 0.406250 0.906250 1.000000 -v 0.593750 0.906250 1.000000 -v 0.593750 1.156250 1.000000 -v 0.593750 1.156250 0.937500 -v 0.593750 0.906250 0.937500 -v 0.406250 0.906250 0.937500 -v 0.406250 1.156250 0.937500 -v 0.062500 0.968750 0.593750 -v 0.062500 0.843750 0.593750 -v 0.187500 0.843750 0.593750 -v 0.187500 0.968750 0.593750 -v 0.187500 0.968750 0.406250 -v 0.187500 0.843750 0.406250 -v 0.062500 0.843750 0.406250 -v 0.062500 0.968750 0.406250 -v 0.000000 1.156250 0.593750 -v 0.000000 0.906250 0.593750 -v 0.062500 0.906250 0.593750 -v 0.062500 1.156250 0.593750 -v 0.062500 1.156250 0.406250 -v 0.062500 0.906250 0.406250 -v 0.000000 0.906250 0.406250 -v 0.000000 1.156250 0.406250 -v 0.000000 1.156250 0.593750 -v 0.000000 0.906250 0.593750 -v 0.062500 0.906250 0.593750 -v 0.062500 1.156250 0.593750 -v 0.062500 1.156250 0.406250 -v 0.062500 0.906250 0.406250 -v 0.000000 0.906250 0.406250 -v 0.000000 1.156250 0.406250 -v 0.406250 0.968750 0.187500 -v 0.406250 0.843750 0.187500 -v 0.593750 0.843750 0.187500 -v 0.593750 0.968750 0.187500 -v 0.593750 0.968750 0.062500 -v 0.593750 0.843750 0.062500 -v 0.406250 0.843750 0.062500 -v 0.406250 0.968750 0.062500 -v 0.406250 1.156250 0.062500 -v 0.406250 0.906250 0.062500 -v 0.593750 0.906250 0.062500 -v 0.593750 1.156250 0.062500 -v 0.593750 1.156250 0.000000 -v 0.593750 0.906250 0.000000 -v 0.406250 0.906250 0.000000 -v 0.406250 1.156250 0.000000 -v 0.406250 1.156250 0.062500 -v 0.406250 0.906250 0.062500 -v 0.593750 0.906250 0.062500 -v 0.593750 1.156250 0.062500 -v 0.593750 1.156250 0.000000 -v 0.593750 0.906250 0.000000 -v 0.406250 0.906250 0.000000 -v 0.406250 1.156250 0.000000 -v 0.812500 0.968750 0.593750 -v 0.812500 0.843750 0.593750 -v 0.937500 0.843750 0.593750 -v 0.937500 0.968750 0.593750 -v 0.937500 0.968750 0.406250 -v 0.937500 0.843750 0.406250 -v 0.812500 0.843750 0.406250 -v 0.812500 0.968750 0.406250 -v 0.937500 1.156250 0.593750 -v 0.937500 0.906250 0.593750 -v 1.000000 0.906250 0.593750 -v 1.000000 1.156250 0.593750 -v 1.000000 1.156250 0.406250 -v 1.000000 0.906250 0.406250 -v 0.937500 0.906250 0.406250 -v 0.937500 1.156250 0.406250 -v 0.937500 1.156250 0.593750 -v 0.937500 0.906250 0.593750 -v 1.000000 0.906250 0.593750 -v 1.000000 1.156250 0.593750 -v 1.000000 1.156250 0.406250 -v 1.000000 0.906250 0.406250 -v 0.937500 0.906250 0.406250 -v 0.937500 1.156250 0.406250 -v 0.406250 1.375000 0.593750 -v 0.406250 1.250000 0.593750 -v 0.593750 1.250000 0.593750 -v 0.593750 1.375000 0.593750 -v 0.593750 1.375000 0.406250 -v 0.593750 1.250000 0.406250 -v 0.406250 1.250000 0.406250 -v 0.406250 1.375000 0.406250 -v 0.468750 1.500000 0.531250 -v 0.468750 1.375000 0.531250 -v 0.531250 1.375000 0.531250 -v 0.531250 1.500000 0.531250 -v 0.531250 1.500000 0.468750 -v 0.531250 1.375000 0.468750 -v 0.468750 1.375000 0.468750 -v 0.468750 1.500000 0.468750 -v 0.437500 1.750000 0.562500 -v 0.437500 1.500000 0.562500 -v 0.562500 1.500000 0.562500 -v 0.562500 1.750000 0.562500 -v 0.562500 1.750000 0.437500 -v 0.562500 1.500000 0.437500 -v 0.437500 1.500000 0.437500 -v 0.437500 1.750000 0.437500 -v 0.468750 1.500000 0.531250 -v 0.468750 1.375000 0.531250 -v 0.531250 1.375000 0.531250 -v 0.531250 1.500000 0.531250 -v 0.531250 1.500000 0.468750 -v 0.531250 1.375000 0.468750 -v 0.468750 1.375000 0.468750 -v 0.468750 1.500000 0.468750 -v 0.437500 1.750000 0.562500 -v 0.437500 1.500000 0.562500 -v 0.562500 1.500000 0.562500 -v 0.562500 1.750000 0.562500 -v 0.562500 1.750000 0.437500 -v 0.562500 1.500000 0.437500 -v 0.437500 1.500000 0.437500 -v 0.437500 1.750000 0.437500 -v 0.437500 1.750000 0.562500 -v 0.437500 1.500000 0.562500 -v 0.562500 1.500000 0.562500 -v 0.562500 1.750000 0.562500 -v 0.562500 1.750000 0.437500 -v 0.562500 1.500000 0.437500 -v 0.437500 1.500000 0.437500 -v 0.437500 1.750000 0.437500 -vt 0.062500 0.937500 -vt 0.062500 0.906250 -vt 0.125000 0.906250 -vt 0.125000 0.937500 -vt 0.187500 0.937500 -vt 0.187500 0.906250 -vt 0.250000 0.906250 -vt 0.250000 0.937500 -vt 0.062500 1.000000 -vt 0.125000 1.000000 -vt 0.187500 1.000000 -vt 0.000000 0.937500 -vt 0.000000 0.906250 -vt 0.046875 0.843750 -vt 0.046875 0.750000 -vt 0.093750 0.750000 -vt 0.093750 0.843750 -vt 0.140625 0.843750 -vt 0.140625 0.750000 -vt 0.187500 0.750000 -vt 0.187500 0.843750 -vt 0.046875 0.890625 -vt 0.093750 0.890625 -vt 0.140625 0.890625 -vt 0.000000 0.843750 -vt 0.000000 0.750000 -vt 0.437500 0.015625 -vt 0.437500 0.000000 -vt 0.625000 0.000000 -vt 0.625000 0.015625 -vt 0.812500 0.015625 -vt 0.812500 0.000000 -vt 1.000000 0.000000 -vt 1.000000 0.015625 -vt 0.437500 0.203125 -vt 0.625000 0.203125 -vt 0.812500 0.203125 -vt 0.250000 0.015625 -vt 0.250000 0.000000 -vt 0.531250 0.234375 -vt 0.531250 0.218750 -vt 0.687500 0.218750 -vt 0.687500 0.234375 -vt 0.843750 0.234375 -vt 0.843750 0.218750 -vt 1.000000 0.218750 -vt 1.000000 0.234375 -vt 0.531250 0.390625 -vt 0.687500 0.390625 -vt 0.843750 0.390625 -vt 0.375000 0.234375 -vt 0.375000 0.218750 -vt 0.578125 0.531250 -vt 0.578125 0.421875 -vt 0.718750 0.421875 -vt 0.718750 0.531250 -vt 0.859375 0.531250 -vt 0.859375 0.421875 -vt 1.000000 0.421875 -vt 1.000000 0.531250 -vt 0.578125 0.671875 -vt 0.718750 0.671875 -vt 0.859375 0.671875 -vt 0.437500 0.531250 -vt 0.437500 0.421875 -vt 0.703125 0.984375 -vt 0.703125 0.890625 -vt 0.843750 0.890625 -vt 0.843750 0.984375 -vt 0.859375 0.984375 -vt 0.859375 0.890625 -vt 1.000000 0.890625 -vt 1.000000 0.984375 -vt 0.703125 1.000000 -vt 0.843750 1.000000 -vt 0.984375 0.984375 -vt 0.984375 1.000000 -vt 0.687500 0.984375 -vt 0.687500 0.890625 -vt 0.734375 0.843750 -vt 0.734375 0.812500 -vt 0.781250 0.812500 -vt 0.781250 0.843750 -vt 0.812500 0.843750 -vt 0.812500 0.812500 -vt 0.859375 0.812500 -vt 0.859375 0.843750 -vt 0.734375 0.875000 -vt 0.781250 0.875000 -vt 0.828125 0.843750 -vt 0.828125 0.875000 -vt 0.703125 0.843750 -vt 0.703125 0.812500 -vt 0.890625 0.859375 -vt 0.890625 0.796875 -vt 0.937500 0.796875 -vt 0.937500 0.859375 -vt 0.953125 0.859375 -vt 0.953125 0.796875 -vt 1.000000 0.796875 -vt 1.000000 0.859375 -vt 0.890625 0.875000 -vt 0.937500 0.875000 -vt 0.984375 0.859375 -vt 0.984375 0.875000 -vt 0.875000 0.859375 -vt 0.875000 0.796875 -vt 0.140625 0.593750 -vt 0.140625 0.500000 -vt 0.156250 0.500000 -vt 0.156250 0.593750 -vt 0.296875 0.593750 -vt 0.296875 0.500000 -vt 0.312500 0.500000 -vt 0.312500 0.593750 -vt 0.140625 0.734375 -vt 0.156250 0.734375 -vt 0.171875 0.593750 -vt 0.171875 0.734375 -vt 0.000000 0.593750 -vt 0.000000 0.500000 -vt 0.421875 0.828125 -vt 0.421875 0.796875 -vt 0.453125 0.796875 -vt 0.453125 0.828125 -vt 0.500000 0.828125 -vt 0.500000 0.796875 -vt 0.531250 0.796875 -vt 0.531250 0.828125 -vt 0.421875 0.875000 -vt 0.453125 0.875000 -vt 0.484375 0.828125 -vt 0.484375 0.875000 -vt 0.375000 0.828125 -vt 0.375000 0.796875 -vt 0.593750 0.828125 -vt 0.593750 0.765625 -vt 0.609375 0.765625 -vt 0.609375 0.828125 -vt 0.656250 0.828125 -vt 0.656250 0.765625 -vt 0.671875 0.765625 -vt 0.671875 0.828125 -vt 0.593750 0.875000 -vt 0.609375 0.875000 -vt 0.625000 0.828125 -vt 0.625000 0.875000 -vt 0.546875 0.828125 -vt 0.546875 0.765625 -vt 0.375000 0.984375 -vt 0.375000 0.890625 -vt 0.515625 0.890625 -vt 0.515625 0.984375 -vt 0.531250 0.984375 -vt 0.531250 0.890625 -vt 0.671875 0.890625 -vt 0.671875 0.984375 -vt 0.375000 1.000000 -vt 0.515625 1.000000 -vt 0.656250 0.984375 -vt 0.656250 1.000000 -vt 0.359375 0.984375 -vt 0.359375 0.890625 -vt 0.109375 0.375000 -vt 0.109375 0.328125 -vt 0.218750 0.328125 -vt 0.218750 0.375000 -vt 0.328125 0.375000 -vt 0.328125 0.328125 -vt 0.437500 0.328125 -vt 0.437500 0.375000 -vt 0.109375 0.484375 -vt 0.218750 0.484375 -vt 0.328125 0.484375 -vt 0.000000 0.375000 -vt 0.000000 0.328125 -vt 0.046875 0.203125 -vt 0.046875 0.171875 -vt 0.093750 0.171875 -vt 0.093750 0.203125 -vt 0.140625 0.203125 -vt 0.140625 0.171875 -vt 0.187500 0.171875 -vt 0.187500 0.203125 -vt 0.046875 0.250000 -vt 0.093750 0.250000 -vt 0.140625 0.250000 -vt 0.000000 0.203125 -vt 0.000000 0.171875 -vt 0.015625 0.140625 -vt 0.015625 0.109375 -vt 0.031250 0.109375 -vt 0.031250 0.140625 -vt 0.046875 0.140625 -vt 0.046875 0.109375 -vt 0.062500 0.109375 -vt 0.062500 0.140625 -vt 0.015625 0.156250 -vt 0.031250 0.156250 -vt 0.046875 0.156250 -vt 0.000000 0.140625 -vt 0.000000 0.109375 -vt 0.031250 0.062500 -vt 0.031250 0.000000 -vt 0.062500 0.000000 -vt 0.062500 0.062500 -vt 0.093750 0.062500 -vt 0.093750 0.000000 -vt 0.125000 0.000000 -vt 0.125000 0.062500 -vt 0.031250 0.093750 -vt 0.062500 0.093750 -vt 0.093750 0.093750 -vt 0.000000 0.062500 -vt 0.000000 0.000000 -vn 0.000000 0.000000 1.000000 -vn 0.000000 0.000000 -1.000000 -vn 0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 -0.000000 -vn 1.000000 0.000000 0.000000 -vn -1.000000 0.000000 0.000000 -vn -0.000000 0.111500 0.993800 -vn -0.000000 -0.111500 -0.993800 -vn 0.111500 0.987600 -0.110800 -vn -0.111500 -0.987600 0.110800 -vn 0.993800 -0.110800 0.012400 -vn -0.993800 0.110800 -0.012400 -vn 0.000000 -0.111500 0.993800 -vn 0.000000 0.111500 -0.993800 -vn -0.111500 0.987600 0.110800 -vn 0.111500 -0.987600 -0.110800 -vn 0.993800 0.110800 0.012400 -vn -0.993800 -0.110800 -0.012400 -vn 0.111500 0.987600 0.110800 -vn -0.111500 -0.987600 -0.110800 -vn 0.993800 -0.110800 -0.012400 -vn -0.993800 0.110800 0.012400 -vn -0.111500 0.987600 -0.110800 -vn 0.111500 -0.987600 0.110800 -vn 0.993800 0.110800 -0.012400 -vn -0.993800 -0.110800 0.012400 -usemtl None -#s 1 -f 1/1/1 2/2/1 3/3/1 4/4/1 -f 5/5/2 6/6/2 7/7/2 8/8/2 -f 8/9/3 1/1/3 4/4/3 5/10/3 -f 2/5/4 7/11/4 6/10/4 3/4/4 -f 5/5/5 4/4/5 3/3/5 6/6/5 -f 8/12/6 7/13/6 2/2/6 1/1/6 -f 9/14/7 10/15/7 11/16/7 12/17/7 -f 13/18/8 14/19/8 15/20/8 16/21/8 -f 16/22/9 9/14/9 12/17/9 13/23/9 -f 10/18/10 15/24/10 14/23/10 11/17/10 -f 13/18/11 12/17/11 11/16/11 14/19/11 -f 16/25/12 15/26/12 10/15/12 9/14/12 -f 17/1/1 18/2/1 19/3/1 20/4/1 -f 21/5/2 22/6/2 23/7/2 24/8/2 -f 24/9/3 17/1/3 20/4/3 21/10/3 -f 18/5/4 23/11/4 22/10/4 19/4/4 -f 21/5/5 20/4/5 19/3/5 22/6/5 -f 24/12/6 23/13/6 18/2/6 17/1/6 -f 25/14/13 26/15/13 27/16/13 28/17/13 -f 29/18/14 30/19/14 31/20/14 32/21/14 -f 32/22/15 25/14/15 28/17/15 29/23/15 -f 26/18/16 31/24/16 30/23/16 27/17/16 -f 29/18/17 28/17/17 27/16/17 30/19/17 -f 32/25/18 31/26/18 26/15/18 25/14/18 -f 33/1/1 34/2/1 35/3/1 36/4/1 -f 37/5/2 38/6/2 39/7/2 40/8/2 -f 40/9/3 33/1/3 36/4/3 37/10/3 -f 34/5/4 39/11/4 38/10/4 35/4/4 -f 37/5/5 36/4/5 35/3/5 38/6/5 -f 40/12/6 39/13/6 34/2/6 33/1/6 -f 41/14/13 42/15/13 43/16/13 44/17/13 -f 45/18/14 46/19/14 47/20/14 48/21/14 -f 48/22/19 41/14/19 44/17/19 45/23/19 -f 42/18/20 47/24/20 46/23/20 43/17/20 -f 45/18/21 44/17/21 43/16/21 46/19/21 -f 48/25/22 47/26/22 42/15/22 41/14/22 -f 49/1/1 50/2/1 51/3/1 52/4/1 -f 53/5/2 54/6/2 55/7/2 56/8/2 -f 56/9/3 49/1/3 52/4/3 53/10/3 -f 50/5/4 55/11/4 54/10/4 51/4/4 -f 53/5/5 52/4/5 51/3/5 54/6/5 -f 56/12/6 55/13/6 50/2/6 49/1/6 -f 57/14/7 58/15/7 59/16/7 60/17/7 -f 61/18/8 62/19/8 63/20/8 64/21/8 -f 64/22/23 57/14/23 60/17/23 61/23/23 -f 58/18/24 63/24/24 62/23/24 59/17/24 -f 61/18/25 60/17/25 59/16/25 62/19/25 -f 64/25/26 63/26/26 58/15/26 57/14/26 -f 65/27/1 66/28/1 67/29/1 68/30/1 -f 69/31/2 70/32/2 71/33/2 72/34/2 -f 72/35/3 65/27/3 68/30/3 69/36/3 -f 66/31/4 71/37/4 70/36/4 67/30/4 -f 69/31/5 68/30/5 67/29/5 70/32/5 -f 72/38/6 71/39/6 66/28/6 65/27/6 -f 73/40/1 74/41/1 75/42/1 76/43/1 -f 77/44/2 78/45/2 79/46/2 80/47/2 -f 80/48/3 73/40/3 76/43/3 77/49/3 -f 74/44/4 79/50/4 78/49/4 75/43/4 -f 77/44/5 76/43/5 75/42/5 78/45/5 -f 80/51/6 79/52/6 74/41/6 73/40/6 -f 81/27/1 82/28/1 83/29/1 84/30/1 -f 85/31/2 86/32/2 87/33/2 88/34/2 -f 88/35/3 81/27/3 84/30/3 85/36/3 -f 82/31/4 87/37/4 86/36/4 83/30/4 -f 85/31/5 84/30/5 83/29/5 86/32/5 -f 88/38/6 87/39/6 82/28/6 81/27/6 -f 89/53/1 90/54/1 91/55/1 92/56/1 -f 93/57/2 94/58/2 95/59/2 96/60/2 -f 96/61/3 89/53/3 92/56/3 93/62/3 -f 90/57/4 95/63/4 94/62/4 91/56/4 -f 93/57/5 92/56/5 91/55/5 94/58/5 -f 96/64/6 95/65/6 90/54/6 89/53/6 -f 97/66/1 98/67/1 99/68/1 100/69/1 -f 101/70/2 102/71/2 103/72/2 104/73/2 -f 104/74/3 97/66/3 100/69/3 101/75/3 -f 98/76/4 103/77/4 102/75/4 99/69/4 -f 101/70/5 100/69/5 99/68/5 102/71/5 -f 104/78/6 103/79/6 98/67/6 97/66/6 -f 105/80/1 106/81/1 107/82/1 108/83/1 -f 109/84/2 110/85/2 111/86/2 112/87/2 -f 112/88/3 105/80/3 108/83/3 109/89/3 -f 106/90/4 111/91/4 110/89/4 107/83/4 -f 109/84/5 108/83/5 107/82/5 110/85/5 -f 112/92/6 111/93/6 106/81/6 105/80/6 -f 113/94/1 114/95/1 115/96/1 116/97/1 -f 117/98/2 118/99/2 119/100/2 120/101/2 -f 120/102/3 113/94/3 116/97/3 117/103/3 -f 114/104/4 119/105/4 118/103/4 115/97/4 -f 117/98/5 116/97/5 115/96/5 118/99/5 -f 120/106/6 119/107/6 114/95/6 113/94/6 -f 121/108/1 122/109/1 123/110/1 124/111/1 -f 125/112/2 126/113/2 127/114/2 128/115/2 -f 128/116/3 121/108/3 124/111/3 125/117/3 -f 122/118/4 127/119/4 126/117/4 123/111/4 -f 125/112/5 124/111/5 123/110/5 126/113/5 -f 128/120/6 127/121/6 122/109/6 121/108/6 -f 129/122/1 130/123/1 131/124/1 132/125/1 -f 133/126/2 134/127/2 135/128/2 136/129/2 -f 136/130/3 129/122/3 132/125/3 133/131/3 -f 130/132/4 135/133/4 134/131/4 131/125/4 -f 133/126/5 132/125/5 131/124/5 134/127/5 -f 136/134/6 135/135/6 130/123/6 129/122/6 -f 137/136/1 138/137/1 139/138/1 140/139/1 -f 141/140/2 142/141/2 143/142/2 144/143/2 -f 144/144/3 137/136/3 140/139/3 141/145/3 -f 138/146/4 143/147/4 142/145/4 139/139/4 -f 141/140/5 140/139/5 139/138/5 142/141/5 -f 144/148/6 143/149/6 138/137/6 137/136/6 -f 145/150/1 146/151/1 147/152/1 148/153/1 -f 149/154/2 150/155/2 151/156/2 152/157/2 -f 152/158/3 145/150/3 148/153/3 149/159/3 -f 146/160/4 151/161/4 150/159/4 147/153/4 -f 149/154/5 148/153/5 147/152/5 150/155/5 -f 152/162/6 151/163/6 146/151/6 145/150/6 -f 153/80/1 154/81/1 155/82/1 156/83/1 -f 157/84/2 158/85/2 159/86/2 160/87/2 -f 160/88/3 153/80/3 156/83/3 157/89/3 -f 154/90/4 159/91/4 158/89/4 155/83/4 -f 157/84/5 156/83/5 155/82/5 158/85/5 -f 160/92/6 159/93/6 154/81/6 153/80/6 -f 161/94/1 162/95/1 163/96/1 164/97/1 -f 165/98/2 166/99/2 167/100/2 168/101/2 -f 168/102/3 161/94/3 164/97/3 165/103/3 -f 162/104/4 167/105/4 166/103/4 163/97/4 -f 165/98/5 164/97/5 163/96/5 166/99/5 -f 168/106/6 167/107/6 162/95/6 161/94/6 -f 169/108/1 170/109/1 171/110/1 172/111/1 -f 173/112/2 174/113/2 175/114/2 176/115/2 -f 176/116/3 169/108/3 172/111/3 173/117/3 -f 170/118/4 175/119/4 174/117/4 171/111/4 -f 173/112/5 172/111/5 171/110/5 174/113/5 -f 176/120/6 175/121/6 170/109/6 169/108/6 -f 177/122/1 178/123/1 179/124/1 180/125/1 -f 181/126/2 182/127/2 183/128/2 184/129/2 -f 184/130/3 177/122/3 180/125/3 181/131/3 -f 178/132/4 183/133/4 182/131/4 179/125/4 -f 181/126/5 180/125/5 179/124/5 182/127/5 -f 184/134/6 183/135/6 178/123/6 177/122/6 -f 185/136/1 186/137/1 187/138/1 188/139/1 -f 189/140/2 190/141/2 191/142/2 192/143/2 -f 192/144/3 185/136/3 188/139/3 189/145/3 -f 186/146/4 191/147/4 190/145/4 187/139/4 -f 189/140/5 188/139/5 187/138/5 190/141/5 -f 192/148/6 191/149/6 186/137/6 185/136/6 -f 193/164/1 194/165/1 195/166/1 196/167/1 -f 197/168/2 198/169/2 199/170/2 200/171/2 -f 200/172/3 193/164/3 196/167/3 197/173/3 -f 194/168/4 199/174/4 198/173/4 195/167/4 -f 197/168/5 196/167/5 195/166/5 198/169/5 -f 200/175/6 199/176/6 194/165/6 193/164/6 -f 201/177/1 202/178/1 203/179/1 204/180/1 -f 205/181/2 206/182/2 207/183/2 208/184/2 -f 208/185/3 201/177/3 204/180/3 205/186/3 -f 202/181/4 207/187/4 206/186/4 203/180/4 -f 205/181/5 204/180/5 203/179/5 206/182/5 -f 208/188/6 207/189/6 202/178/6 201/177/6 -f 209/190/1 210/191/1 211/192/1 212/193/1 -f 213/194/2 214/195/2 215/196/2 216/197/2 -f 216/198/3 209/190/3 212/193/3 213/199/3 -f 210/194/4 215/200/4 214/199/4 211/193/4 -f 213/194/5 212/193/5 211/192/5 214/195/5 -f 216/201/6 215/202/6 210/191/6 209/190/6 -f 217/203/1 218/204/1 219/205/1 220/206/1 -f 221/207/2 222/208/2 223/209/2 224/210/2 -f 224/211/3 217/203/3 220/206/3 221/212/3 -f 218/207/4 223/213/4 222/212/4 219/206/4 -f 221/207/5 220/206/5 219/205/5 222/208/5 -f 224/214/6 223/215/6 218/204/6 217/203/6 -f 225/14/7 226/15/7 227/16/7 228/17/7 -f 229/18/8 230/19/8 231/20/8 232/21/8 -f 232/22/9 225/14/9 228/17/9 229/23/9 -f 226/18/10 231/24/10 230/23/10 227/17/10 -f 229/18/11 228/17/11 227/16/11 230/19/11 -f 232/25/12 231/26/12 226/15/12 225/14/12 -f 233/14/13 234/15/13 235/16/13 236/17/13 -f 237/18/14 238/19/14 239/20/14 240/21/14 -f 240/22/15 233/14/15 236/17/15 237/23/15 -f 234/18/16 239/24/16 238/23/16 235/17/16 -f 237/18/17 236/17/17 235/16/17 238/19/17 -f 240/25/18 239/26/18 234/15/18 233/14/18 -f 241/14/13 242/15/13 243/16/13 244/17/13 -f 245/18/14 246/19/14 247/20/14 248/21/14 -f 248/22/19 241/14/19 244/17/19 245/23/19 -f 242/18/20 247/24/20 246/23/20 243/17/20 -f 245/18/21 244/17/21 243/16/21 246/19/21 -f 248/25/22 247/26/22 242/15/22 241/14/22 -f 249/14/7 250/15/7 251/16/7 252/17/7 -f 253/18/8 254/19/8 255/20/8 256/21/8 -f 256/22/23 249/14/23 252/17/23 253/23/23 -f 250/18/24 255/24/24 254/23/24 251/17/24 -f 253/18/25 252/17/25 251/16/25 254/19/25 -f 256/25/26 255/26/26 250/15/26 249/14/26 -f 257/66/1 258/67/1 259/68/1 260/69/1 -f 261/70/2 262/71/2 263/72/2 264/73/2 -f 264/74/3 257/66/3 260/69/3 261/75/3 -f 258/76/4 263/77/4 262/75/4 259/69/4 -f 261/70/5 260/69/5 259/68/5 262/71/5 -f 264/78/6 263/79/6 258/67/6 257/66/6 -f 265/80/1 266/81/1 267/82/1 268/83/1 -f 269/84/2 270/85/2 271/86/2 272/87/2 -f 272/88/3 265/80/3 268/83/3 269/89/3 -f 266/90/4 271/91/4 270/89/4 267/83/4 -f 269/84/5 268/83/5 267/82/5 270/85/5 -f 272/92/6 271/93/6 266/81/6 265/80/6 -f 273/94/1 274/95/1 275/96/1 276/97/1 -f 277/98/2 278/99/2 279/100/2 280/101/2 -f 280/102/3 273/94/3 276/97/3 277/103/3 -f 274/104/4 279/105/4 278/103/4 275/97/4 -f 277/98/5 276/97/5 275/96/5 278/99/5 -f 280/106/6 279/107/6 274/95/6 273/94/6 -f 281/108/1 282/109/1 283/110/1 284/111/1 -f 285/112/2 286/113/2 287/114/2 288/115/2 -f 288/116/3 281/108/3 284/111/3 285/117/3 -f 282/118/4 287/119/4 286/117/4 283/111/4 -f 285/112/5 284/111/5 283/110/5 286/113/5 -f 288/120/6 287/121/6 282/109/6 281/108/6 -f 289/122/1 290/123/1 291/124/1 292/125/1 -f 293/126/2 294/127/2 295/128/2 296/129/2 -f 296/130/3 289/122/3 292/125/3 293/131/3 -f 290/132/4 295/133/4 294/131/4 291/125/4 -f 293/126/5 292/125/5 291/124/5 294/127/5 -f 296/134/6 295/135/6 290/123/6 289/122/6 -f 297/136/1 298/137/1 299/138/1 300/139/1 -f 301/140/2 302/141/2 303/142/2 304/143/2 -f 304/144/3 297/136/3 300/139/3 301/145/3 -f 298/146/4 303/147/4 302/145/4 299/139/4 -f 301/140/5 300/139/5 299/138/5 302/141/5 -f 304/148/6 303/149/6 298/137/6 297/136/6 -f 305/150/1 306/151/1 307/152/1 308/153/1 -f 309/154/2 310/155/2 311/156/2 312/157/2 -f 312/158/3 305/150/3 308/153/3 309/159/3 -f 306/160/4 311/161/4 310/159/4 307/153/4 -f 309/154/5 308/153/5 307/152/5 310/155/5 -f 312/162/6 311/163/6 306/151/6 305/150/6 -f 313/80/1 314/81/1 315/82/1 316/83/1 -f 317/84/2 318/85/2 319/86/2 320/87/2 -f 320/88/3 313/80/3 316/83/3 317/89/3 -f 314/90/4 319/91/4 318/89/4 315/83/4 -f 317/84/5 316/83/5 315/82/5 318/85/5 -f 320/92/6 319/93/6 314/81/6 313/80/6 -f 321/94/1 322/95/1 323/96/1 324/97/1 -f 325/98/2 326/99/2 327/100/2 328/101/2 -f 328/102/3 321/94/3 324/97/3 325/103/3 -f 322/104/4 327/105/4 326/103/4 323/97/4 -f 325/98/5 324/97/5 323/96/5 326/99/5 -f 328/106/6 327/107/6 322/95/6 321/94/6 -f 329/108/1 330/109/1 331/110/1 332/111/1 -f 333/112/2 334/113/2 335/114/2 336/115/2 -f 336/116/3 329/108/3 332/111/3 333/117/3 -f 330/118/4 335/119/4 334/117/4 331/111/4 -f 333/112/5 332/111/5 331/110/5 334/113/5 -f 336/120/6 335/121/6 330/109/6 329/108/6 -f 337/122/1 338/123/1 339/124/1 340/125/1 -f 341/126/2 342/127/2 343/128/2 344/129/2 -f 344/130/3 337/122/3 340/125/3 341/131/3 -f 338/132/4 343/133/4 342/131/4 339/125/4 -f 341/126/5 340/125/5 339/124/5 342/127/5 -f 344/134/6 343/135/6 338/123/6 337/122/6 -f 345/136/1 346/137/1 347/138/1 348/139/1 -f 349/140/2 350/141/2 351/142/2 352/143/2 -f 352/144/3 345/136/3 348/139/3 349/145/3 -f 346/146/4 351/147/4 350/145/4 347/139/4 -f 349/140/5 348/139/5 347/138/5 350/141/5 -f 352/148/6 351/149/6 346/137/6 345/136/6 -f 353/164/1 354/165/1 355/166/1 356/167/1 -f 357/168/2 358/169/2 359/170/2 360/171/2 -f 360/172/3 353/164/3 356/167/3 357/173/3 -f 354/168/4 359/174/4 358/173/4 355/167/4 -f 357/168/5 356/167/5 355/166/5 358/169/5 -f 360/175/6 359/176/6 354/165/6 353/164/6 -f 361/177/1 362/178/1 363/179/1 364/180/1 -f 365/181/2 366/182/2 367/183/2 368/184/2 -f 368/185/3 361/177/3 364/180/3 365/186/3 -f 362/181/4 367/187/4 366/186/4 363/180/4 -f 365/181/5 364/180/5 363/179/5 366/182/5 -f 368/188/6 367/189/6 362/178/6 361/177/6 -f 369/190/1 370/191/1 371/192/1 372/193/1 -f 373/194/2 374/195/2 375/196/2 376/197/2 -f 376/198/3 369/190/3 372/193/3 373/199/3 -f 370/194/4 375/200/4 374/199/4 371/193/4 -f 373/194/5 372/193/5 371/192/5 374/195/5 -f 376/201/6 375/202/6 370/191/6 369/190/6 -f 377/203/1 378/204/1 379/205/1 380/206/1 -f 381/207/2 382/208/2 383/209/2 384/210/2 -f 384/211/3 377/203/3 380/206/3 381/212/3 -f 378/207/4 383/213/4 382/212/4 379/206/4 -f 381/207/5 380/206/5 379/205/5 382/208/5 -f 384/214/6 383/215/6 378/204/6 377/203/6 -f 385/80/1 386/81/1 387/82/1 388/83/1 -f 389/84/2 390/85/2 391/86/2 392/87/2 -f 392/88/3 385/80/3 388/83/3 389/89/3 -f 386/90/4 391/91/4 390/89/4 387/83/4 -f 389/84/5 388/83/5 387/82/5 390/85/5 -f 392/92/6 391/93/6 386/81/6 385/80/6 -f 393/94/1 394/95/1 395/96/1 396/97/1 -f 397/98/2 398/99/2 399/100/2 400/101/2 -f 400/102/3 393/94/3 396/97/3 397/103/3 -f 394/104/4 399/105/4 398/103/4 395/97/4 -f 397/98/5 396/97/5 395/96/5 398/99/5 -f 400/106/6 399/107/6 394/95/6 393/94/6 -f 401/94/1 402/95/1 403/96/1 404/97/1 -f 405/98/2 406/99/2 407/100/2 408/101/2 -f 408/102/3 401/94/3 404/97/3 405/103/3 -f 402/104/4 407/105/4 406/103/4 403/97/4 -f 405/98/5 404/97/5 403/96/5 406/99/5 -f 408/106/6 407/107/6 402/95/6 401/94/6 -f 409/122/1 410/123/1 411/124/1 412/125/1 -f 413/126/2 414/127/2 415/128/2 416/129/2 -f 416/130/3 409/122/3 412/125/3 413/131/3 -f 410/132/4 415/133/4 414/131/4 411/125/4 -f 413/126/5 412/125/5 411/124/5 414/127/5 -f 416/134/6 415/135/6 410/123/6 409/122/6 -f 417/136/1 418/137/1 419/138/1 420/139/1 -f 421/140/2 422/141/2 423/142/2 424/143/2 -f 424/144/3 417/136/3 420/139/3 421/145/3 -f 418/146/4 423/147/4 422/145/4 419/139/4 -f 421/140/5 420/139/5 419/138/5 422/141/5 -f 424/148/6 423/149/6 418/137/6 417/136/6 -f 425/136/1 426/137/1 427/138/1 428/139/1 -f 429/140/2 430/141/2 431/142/2 432/143/2 -f 432/144/3 425/136/3 428/139/3 429/145/3 -f 426/146/4 431/147/4 430/145/4 427/139/4 -f 429/140/5 428/139/5 427/138/5 430/141/5 -f 432/148/6 431/149/6 426/137/6 425/136/6 -f 433/80/1 434/81/1 435/82/1 436/83/1 -f 437/84/2 438/85/2 439/86/2 440/87/2 -f 440/88/3 433/80/3 436/83/3 437/89/3 -f 434/90/4 439/91/4 438/89/4 435/83/4 -f 437/84/5 436/83/5 435/82/5 438/85/5 -f 440/92/6 439/93/6 434/81/6 433/80/6 -f 441/94/1 442/95/1 443/96/1 444/97/1 -f 445/98/2 446/99/2 447/100/2 448/101/2 -f 448/102/3 441/94/3 444/97/3 445/103/3 -f 442/104/4 447/105/4 446/103/4 443/97/4 -f 445/98/5 444/97/5 443/96/5 446/99/5 -f 448/106/6 447/107/6 442/95/6 441/94/6 -f 449/94/1 450/95/1 451/96/1 452/97/1 -f 453/98/2 454/99/2 455/100/2 456/101/2 -f 456/102/3 449/94/3 452/97/3 453/103/3 -f 450/104/4 455/105/4 454/103/4 451/97/4 -f 453/98/5 452/97/5 451/96/5 454/99/5 -f 456/106/6 455/107/6 450/95/6 449/94/6 -f 457/122/1 458/123/1 459/124/1 460/125/1 -f 461/126/2 462/127/2 463/128/2 464/129/2 -f 464/130/3 457/122/3 460/125/3 461/131/3 -f 458/132/4 463/133/4 462/131/4 459/125/4 -f 461/126/5 460/125/5 459/124/5 462/127/5 -f 464/134/6 463/135/6 458/123/6 457/122/6 -f 465/136/1 466/137/1 467/138/1 468/139/1 -f 469/140/2 470/141/2 471/142/2 472/143/2 -f 472/144/3 465/136/3 468/139/3 469/145/3 -f 466/146/4 471/147/4 470/145/4 467/139/4 -f 469/140/5 468/139/5 467/138/5 470/141/5 -f 472/148/6 471/149/6 466/137/6 465/136/6 -f 473/136/1 474/137/1 475/138/1 476/139/1 -f 477/140/2 478/141/2 479/142/2 480/143/2 -f 480/144/3 473/136/3 476/139/3 477/145/3 -f 474/146/4 479/147/4 478/145/4 475/139/4 -f 477/140/5 476/139/5 475/138/5 478/141/5 -f 480/148/6 479/149/6 474/137/6 473/136/6 -f 481/177/1 482/178/1 483/179/1 484/180/1 -f 485/181/2 486/182/2 487/183/2 488/184/2 -f 488/185/3 481/177/3 484/180/3 485/186/3 -f 482/181/4 487/187/4 486/186/4 483/180/4 -f 485/181/5 484/180/5 483/179/5 486/182/5 -f 488/188/6 487/189/6 482/178/6 481/177/6 -f 489/190/1 490/191/1 491/192/1 492/193/1 -f 493/194/2 494/195/2 495/196/2 496/197/2 -f 496/198/3 489/190/3 492/193/3 493/199/3 -f 490/194/4 495/200/4 494/199/4 491/193/4 -f 493/194/5 492/193/5 491/192/5 494/195/5 -f 496/201/6 495/202/6 490/191/6 489/190/6 -f 497/203/1 498/204/1 499/205/1 500/206/1 -f 501/207/2 502/208/2 503/209/2 504/210/2 -f 504/211/3 497/203/3 500/206/3 501/212/3 -f 498/207/4 503/213/4 502/212/4 499/206/4 -f 501/207/5 500/206/5 499/205/5 502/208/5 -f 504/214/6 503/215/6 498/204/6 497/203/6 -f 505/190/1 506/191/1 507/192/1 508/193/1 -f 509/194/2 510/195/2 511/196/2 512/197/2 -f 512/198/3 505/190/3 508/193/3 509/199/3 -f 506/194/4 511/200/4 510/199/4 507/193/4 -f 509/194/5 508/193/5 507/192/5 510/195/5 -f 512/201/6 511/202/6 506/191/6 505/190/6 -f 513/203/1 514/204/1 515/205/1 516/206/1 -f 517/207/2 518/208/2 519/209/2 520/210/2 -f 520/211/3 513/203/3 516/206/3 517/212/3 -f 514/207/4 519/213/4 518/212/4 515/206/4 -f 517/207/5 516/206/5 515/205/5 518/208/5 -f 520/214/6 519/215/6 514/204/6 513/203/6 -f 521/203/1 522/204/1 523/205/1 524/206/1 -f 525/207/2 526/208/2 527/209/2 528/210/2 -f 528/211/3 521/203/3 524/206/3 525/212/3 -f 522/207/4 527/213/4 526/212/4 523/206/4 -f 525/207/5 524/206/5 523/205/5 526/208/5 -f 528/214/6 527/215/6 522/204/6 521/203/6 diff --git a/src/main/resources/assets/bloodmagic/models/block/blockdimensionalportal.json b/src/main/resources/assets/bloodmagic/models/block/blockdimensionalportal.json deleted file mode 100644 index 3c45f9df..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/blockdimensionalportal.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "textures": { - "particle": "bloodmagic:blocks/lifeEssenceFlowing", - "portal": "bloodmagic:blocks/lifeEssenceFlowing" - }, - "elements": [ - { "from": [ 6, 0, 0 ], - "to": [ 10, 16, 16 ], - "faces": { - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#portal" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#portal" } - } - } - ] -} diff --git a/src/main/resources/assets/bloodmagic/models/block/blockdimensionalportalew.json b/src/main/resources/assets/bloodmagic/models/block/blockdimensionalportalew.json deleted file mode 100644 index 3c45f9df..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/blockdimensionalportalew.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "textures": { - "particle": "bloodmagic:blocks/lifeEssenceFlowing", - "portal": "bloodmagic:blocks/lifeEssenceFlowing" - }, - "elements": [ - { "from": [ 6, 0, 0 ], - "to": [ 10, 16, 16 ], - "faces": { - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#portal" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#portal" } - } - } - ] -} diff --git a/src/main/resources/assets/bloodmagic/models/block/blockdimensionalportalns.json b/src/main/resources/assets/bloodmagic/models/block/blockdimensionalportalns.json deleted file mode 100644 index 6696313f..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/blockdimensionalportalns.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "textures": { - "particle": "bloodmagic:blocks/lifeEssenceFlowing", - "portal": "bloodmagic:blocks/lifeEssenceFlowing" - }, - "elements": [ - { "from": [ 0, 0, 6 ], - "to": [ 16, 16, 10 ], - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#portal" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#portal" } - } - } - ] -} diff --git a/src/main/resources/assets/bloodmagic/models/block/blockhellfireforge.mtl b/src/main/resources/assets/bloodmagic/models/block/blockhellfireforge.mtl deleted file mode 100644 index c4e8b122..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/blockhellfireforge.mtl +++ /dev/null @@ -1,11 +0,0 @@ -# Blender MTL File: 'None' -# Material Count: 1 - -newmtl None -#Ns 0 -Ka 0.000000 0.000000 0.000000 -Kd 0.8 0.8 0.8 -#Ks 0.8 0.8 0.8 -d 1 -#illum 2 -map_Kd bloodmagic:models/hellfireforge diff --git a/src/main/resources/assets/bloodmagic/models/block/blockhellfireforge.obj b/src/main/resources/assets/bloodmagic/models/block/blockhellfireforge.obj deleted file mode 100644 index 595aa694..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/blockhellfireforge.obj +++ /dev/null @@ -1,899 +0,0 @@ -# Blender v2.76 (sub 0) OBJ File: '' -# www.blender.org -mtllib blockhellfireforge.mtl -o BlockHellfireForge_(5) -v 0.062500 0.125000 0.937500 -v 0.062500 -0.000000 0.937500 -v 0.312500 -0.000000 0.937500 -v 0.312500 0.125000 0.937500 -v 0.312500 0.125000 0.687500 -v 0.312500 -0.000000 0.687500 -v 0.062500 -0.000000 0.687500 -v 0.062500 0.125000 0.687500 -v 0.134319 0.498760 0.861969 -v 0.093200 0.128268 0.902840 -v 0.279569 0.107833 0.905094 -v 0.320688 0.478324 0.864223 -v 0.320688 0.457765 0.677854 -v 0.279569 0.087273 0.718725 -v 0.093200 0.107709 0.716470 -v 0.134319 0.478200 0.675599 -v 0.687500 0.125000 0.312500 -v 0.687500 0.000000 0.312500 -v 0.937500 0.000000 0.312500 -v 0.937500 0.125000 0.312500 -v 0.937500 0.125000 0.062500 -v 0.937500 0.000000 0.062500 -v 0.687500 0.000000 0.062500 -v 0.687500 0.125000 0.062500 -v 0.679311 0.457787 0.322148 -v 0.720430 0.087304 0.281277 -v 0.906798 0.107739 0.283532 -v 0.865679 0.478222 0.324402 -v 0.865679 0.498782 0.138035 -v 0.906798 0.128299 0.097164 -v 0.720430 0.107863 0.094910 -v 0.679311 0.478347 0.135780 -v 0.062500 0.125000 0.312500 -v 0.062500 0.000000 0.312500 -v 0.312500 0.000000 0.312500 -v 0.312500 0.125000 0.312500 -v 0.312500 0.125000 0.062500 -v 0.312500 0.000000 0.062500 -v 0.062500 0.000000 0.062500 -v 0.062500 0.125000 0.062500 -v 0.134319 0.478211 0.324401 -v 0.093200 0.107724 0.283530 -v 0.279569 0.087289 0.281275 -v 0.320688 0.457776 0.322147 -v 0.320688 0.478335 0.135779 -v 0.279569 0.107848 0.094908 -v 0.093200 0.128283 0.097162 -v 0.134319 0.498771 0.138033 -v 0.687500 0.125000 0.937500 -v 0.687500 -0.000000 0.937500 -v 0.937500 -0.000000 0.937500 -v 0.937500 0.125000 0.937500 -v 0.937500 0.125000 0.687500 -v 0.937500 -0.000000 0.687500 -v 0.687500 -0.000000 0.687500 -v 0.687500 0.125000 0.687500 -v 0.679311 0.478335 0.864222 -v 0.720430 0.107848 0.905092 -v 0.906798 0.128284 0.902838 -v 0.865679 0.498771 0.861968 -v 0.865679 0.478212 0.675598 -v 0.906798 0.107724 0.716469 -v 0.720430 0.087289 0.718723 -v 0.679311 0.457776 0.677853 -v 0.125000 0.687500 0.875000 -v 0.125000 0.312500 0.875000 -v 0.875000 0.312500 0.875000 -v 0.875000 0.687500 0.875000 -v 0.875000 0.687500 0.125000 -v 0.875000 0.312500 0.125000 -v 0.125000 0.312500 0.125000 -v 0.125000 0.687500 0.125000 -v 0.406250 0.750000 0.593750 -v 0.406250 0.687500 0.593750 -v 0.593750 0.687500 0.593750 -v 0.593750 0.750000 0.593750 -v 0.593750 0.750000 0.406250 -v 0.593750 0.687500 0.406250 -v 0.406250 0.687500 0.406250 -v 0.406250 0.750000 0.406250 -v 0.406167 0.749949 0.593750 -v 0.317779 0.661561 0.593750 -v 0.361973 0.617367 0.593750 -v 0.450362 0.705755 0.593750 -v 0.450362 0.705755 0.406250 -v 0.361973 0.617367 0.406250 -v 0.317779 0.661561 0.406250 -v 0.406167 0.749949 0.406250 -v 0.549638 0.705755 0.593750 -v 0.638027 0.617367 0.593750 -v 0.682221 0.661561 0.593750 -v 0.593833 0.749949 0.593750 -v 0.593833 0.749949 0.406250 -v 0.682221 0.661561 0.406250 -v 0.638027 0.617367 0.406250 -v 0.549638 0.705755 0.406250 -v 0.406250 0.749949 0.593832 -v 0.406250 0.661561 0.682221 -v 0.593750 0.661561 0.682221 -v 0.593750 0.749949 0.593832 -v 0.593750 0.705755 0.549638 -v 0.593750 0.617367 0.638027 -v 0.406250 0.617367 0.638027 -v 0.406250 0.705755 0.549638 -v 0.406250 0.705755 0.450625 -v 0.406250 0.617367 0.362236 -v 0.593750 0.617367 0.362236 -v 0.593750 0.705755 0.450625 -v 0.593750 0.749949 0.406431 -v 0.593750 0.661561 0.318042 -v 0.406250 0.661561 0.318042 -v 0.406250 0.749949 0.406431 -v 0.750000 0.750000 0.250000 -v 0.750000 0.687500 0.250000 -v 0.875000 0.687500 0.250000 -v 0.875000 0.750000 0.250000 -v 0.875000 0.750000 0.125000 -v 0.875000 0.687500 0.125000 -v 0.750000 0.687500 0.125000 -v 0.750000 0.750000 0.125000 -v 0.750000 0.750000 0.875000 -v 0.750000 0.687500 0.875000 -v 0.875000 0.687500 0.875000 -v 0.875000 0.750000 0.875000 -v 0.875000 0.750000 0.750000 -v 0.875000 0.687500 0.750000 -v 0.750000 0.687500 0.750000 -v 0.750000 0.750000 0.750000 -v 0.125000 0.750000 0.250000 -v 0.125000 0.687500 0.250000 -v 0.250000 0.687500 0.250000 -v 0.250000 0.750000 0.250000 -v 0.250000 0.750000 0.125000 -v 0.250000 0.687500 0.125000 -v 0.125000 0.687500 0.125000 -v 0.125000 0.750000 0.125000 -v 0.125000 0.750000 0.875000 -v 0.125000 0.687500 0.875000 -v 0.250000 0.687500 0.875000 -v 0.250000 0.750000 0.875000 -v 0.250000 0.750000 0.750000 -v 0.250000 0.687500 0.750000 -v 0.125000 0.687500 0.750000 -v 0.125000 0.750000 0.750000 -v 0.125000 0.750000 0.125000 -v 0.125000 0.375000 0.125000 -v 0.875000 0.375000 0.125000 -v 0.875000 0.750000 0.125000 -v 0.875000 0.750000 0.062500 -v 0.875000 0.375000 0.062500 -v 0.125000 0.375000 0.062500 -v 0.125000 0.750000 0.062500 -v 0.125000 0.750000 0.937500 -v 0.125000 0.375000 0.937500 -v 0.875000 0.375000 0.937500 -v 0.875000 0.750000 0.937500 -v 0.875000 0.750000 0.875000 -v 0.875000 0.375000 0.875000 -v 0.125000 0.375000 0.875000 -v 0.125000 0.750000 0.875000 -v 0.062500 0.750000 0.875000 -v 0.062500 0.375000 0.875000 -v 0.125000 0.375000 0.875000 -v 0.125000 0.750000 0.875000 -v 0.125000 0.750000 0.125000 -v 0.125000 0.375000 0.125000 -v 0.062500 0.375000 0.125000 -v 0.062500 0.750000 0.125000 -v 0.875000 0.750000 0.875000 -v 0.875000 0.375000 0.875000 -v 0.937500 0.375000 0.875000 -v 0.937500 0.750000 0.875000 -v 0.937500 0.750000 0.125000 -v 0.937500 0.375000 0.125000 -v 0.875000 0.375000 0.125000 -v 0.875000 0.750000 0.125000 -v 0.875000 0.875000 1.000000 -v 0.875000 0.687500 1.000000 -v 1.000000 0.687500 1.000000 -v 1.000000 0.875000 1.000000 -v 1.000000 0.875000 0.875000 -v 1.000000 0.687500 0.875000 -v 0.875000 0.687500 0.875000 -v 0.875000 0.875000 0.875000 -v 0.937500 0.968750 1.000000 -v 0.937500 0.906250 1.000000 -v 1.000000 0.906250 1.000000 -v 1.000000 0.968750 1.000000 -v 1.000000 0.968750 0.937500 -v 1.000000 0.906250 0.937500 -v 0.937500 0.906250 0.937500 -v 0.937500 0.968750 0.937500 -v 0.875000 0.875000 0.125000 -v 0.875000 0.687500 0.125000 -v 1.000000 0.687500 0.125000 -v 1.000000 0.875000 0.125000 -v 1.000000 0.875000 0.000000 -v 1.000000 0.687500 0.000000 -v 0.875000 0.687500 0.000000 -v 0.875000 0.875000 0.000000 -v 0.937500 0.968750 0.062500 -v 0.937500 0.906250 0.062500 -v 1.000000 0.906250 0.062500 -v 1.000000 0.968750 0.062500 -v 1.000000 0.968750 0.000000 -v 1.000000 0.906250 0.000000 -v 0.937500 0.906250 0.000000 -v 0.937500 0.968750 0.000000 -v 0.000000 0.875000 1.000000 -v 0.000000 0.687500 1.000000 -v 0.125000 0.687500 1.000000 -v 0.125000 0.875000 1.000000 -v 0.125000 0.875000 0.875000 -v 0.125000 0.687500 0.875000 -v 0.000000 0.687500 0.875000 -v 0.000000 0.875000 0.875000 -v 0.000000 0.968750 1.000000 -v 0.000000 0.906250 1.000000 -v 0.062500 0.906250 1.000000 -v 0.062500 0.968750 1.000000 -v 0.062500 0.968750 0.937500 -v 0.062500 0.906250 0.937500 -v 0.000000 0.906250 0.937500 -v 0.000000 0.968750 0.937500 -v 0.000000 0.875000 0.125000 -v 0.000000 0.687500 0.125000 -v 0.125000 0.687500 0.125000 -v 0.125000 0.875000 0.125000 -v 0.125000 0.875000 0.000000 -v 0.125000 0.687500 0.000000 -v 0.000000 0.687500 0.000000 -v 0.000000 0.875000 0.000000 -v 0.000000 0.968750 0.062500 -v 0.000000 0.906250 0.062500 -v 0.062500 0.906250 0.062500 -v 0.062500 0.968750 0.062500 -v 0.062500 0.968750 0.000000 -v 0.062500 0.906250 0.000000 -v 0.000000 0.906250 0.000000 -v 0.000000 0.968750 0.000000 -v 0.134319 0.498760 0.861969 -v 0.093200 0.128268 0.902840 -v 0.279569 0.107833 0.905094 -v 0.320688 0.478324 0.864223 -v 0.320688 0.457765 0.677854 -v 0.279569 0.087273 0.718725 -v 0.093200 0.107709 0.716470 -v 0.134319 0.478200 0.675599 -v 0.679311 0.457787 0.322148 -v 0.720430 0.087304 0.281277 -v 0.906798 0.107739 0.283532 -v 0.865679 0.478222 0.324402 -v 0.865679 0.498782 0.138035 -v 0.906798 0.128299 0.097164 -v 0.720430 0.107863 0.094910 -v 0.679311 0.478347 0.135780 -v 0.134319 0.478211 0.324401 -v 0.093200 0.107724 0.283530 -v 0.279569 0.087289 0.281275 -v 0.320688 0.457776 0.322147 -v 0.320688 0.478335 0.135779 -v 0.279569 0.107848 0.094908 -v 0.093200 0.128283 0.097162 -v 0.134319 0.498771 0.138033 -v 0.679311 0.478335 0.864222 -v 0.720430 0.107848 0.905092 -v 0.906798 0.128284 0.902838 -v 0.865679 0.498771 0.861968 -v 0.865679 0.478212 0.675598 -v 0.906798 0.107724 0.716469 -v 0.720430 0.087289 0.718723 -v 0.679311 0.457776 0.677853 -v 0.406250 0.750000 0.593750 -v 0.406250 0.687500 0.593750 -v 0.593750 0.687500 0.593750 -v 0.593750 0.750000 0.593750 -v 0.593750 0.750000 0.406250 -v 0.593750 0.687500 0.406250 -v 0.406250 0.687500 0.406250 -v 0.406250 0.750000 0.406250 -v 0.406167 0.749949 0.593750 -v 0.317779 0.661561 0.593750 -v 0.361973 0.617367 0.593750 -v 0.450362 0.705755 0.593750 -v 0.450362 0.705755 0.406250 -v 0.361973 0.617367 0.406250 -v 0.317779 0.661561 0.406250 -v 0.406167 0.749949 0.406250 -v 0.549638 0.705755 0.593750 -v 0.638027 0.617367 0.593750 -v 0.682221 0.661561 0.593750 -v 0.593833 0.749949 0.593750 -v 0.593833 0.749949 0.406250 -v 0.682221 0.661561 0.406250 -v 0.638027 0.617367 0.406250 -v 0.549638 0.705755 0.406250 -v 0.406250 0.749949 0.593832 -v 0.406250 0.661561 0.682221 -v 0.593750 0.661561 0.682221 -v 0.593750 0.749949 0.593832 -v 0.593750 0.705755 0.549638 -v 0.593750 0.617367 0.638027 -v 0.406250 0.617367 0.638027 -v 0.406250 0.705755 0.549638 -v 0.406250 0.705755 0.450625 -v 0.406250 0.617367 0.362236 -v 0.593750 0.617367 0.362236 -v 0.593750 0.705755 0.450625 -v 0.593750 0.749949 0.406431 -v 0.593750 0.661561 0.318042 -v 0.406250 0.661561 0.318042 -v 0.406250 0.749949 0.406431 -v 0.750000 0.750000 0.250000 -v 0.750000 0.687500 0.250000 -v 0.875000 0.687500 0.250000 -v 0.875000 0.750000 0.250000 -v 0.875000 0.750000 0.125000 -v 0.875000 0.687500 0.125000 -v 0.750000 0.687500 0.125000 -v 0.750000 0.750000 0.125000 -v 0.750000 0.750000 0.875000 -v 0.750000 0.687500 0.875000 -v 0.875000 0.687500 0.875000 -v 0.875000 0.750000 0.875000 -v 0.875000 0.750000 0.750000 -v 0.875000 0.687500 0.750000 -v 0.750000 0.687500 0.750000 -v 0.750000 0.750000 0.750000 -v 0.125000 0.750000 0.250000 -v 0.125000 0.687500 0.250000 -v 0.250000 0.687500 0.250000 -v 0.250000 0.750000 0.250000 -v 0.250000 0.750000 0.125000 -v 0.250000 0.687500 0.125000 -v 0.125000 0.687500 0.125000 -v 0.125000 0.750000 0.125000 -v 0.125000 0.750000 0.875000 -v 0.125000 0.687500 0.875000 -v 0.250000 0.687500 0.875000 -v 0.250000 0.750000 0.875000 -v 0.250000 0.750000 0.750000 -v 0.250000 0.687500 0.750000 -v 0.125000 0.687500 0.750000 -v 0.125000 0.750000 0.750000 -v 0.406167 0.749949 0.593750 -v 0.317779 0.661561 0.593750 -v 0.361973 0.617367 0.593750 -v 0.450362 0.705755 0.593750 -v 0.450362 0.705755 0.406250 -v 0.361973 0.617367 0.406250 -v 0.317779 0.661561 0.406250 -v 0.406167 0.749949 0.406250 -v 0.549638 0.705755 0.593750 -v 0.638027 0.617367 0.593750 -v 0.682221 0.661561 0.593750 -v 0.593833 0.749949 0.593750 -v 0.593833 0.749949 0.406250 -v 0.682221 0.661561 0.406250 -v 0.638027 0.617367 0.406250 -v 0.549638 0.705755 0.406250 -v 0.406250 0.749949 0.593832 -v 0.406250 0.661561 0.682221 -v 0.593750 0.661561 0.682221 -v 0.593750 0.749949 0.593832 -v 0.593750 0.705755 0.549638 -v 0.593750 0.617367 0.638027 -v 0.406250 0.617367 0.638027 -v 0.406250 0.705755 0.549638 -v 0.406250 0.705755 0.450625 -v 0.406250 0.617367 0.362236 -v 0.593750 0.617367 0.362236 -v 0.593750 0.705755 0.450625 -v 0.593750 0.749949 0.406431 -v 0.593750 0.661561 0.318042 -v 0.406250 0.661561 0.318042 -v 0.406250 0.749949 0.406431 -v 0.937500 0.968750 1.000000 -v 0.937500 0.906250 1.000000 -v 1.000000 0.906250 1.000000 -v 1.000000 0.968750 1.000000 -v 1.000000 0.968750 0.937500 -v 1.000000 0.906250 0.937500 -v 0.937500 0.906250 0.937500 -v 0.937500 0.968750 0.937500 -v 0.937500 0.968750 0.062500 -v 0.937500 0.906250 0.062500 -v 1.000000 0.906250 0.062500 -v 1.000000 0.968750 0.062500 -v 1.000000 0.968750 0.000000 -v 1.000000 0.906250 0.000000 -v 0.937500 0.906250 0.000000 -v 0.937500 0.968750 0.000000 -v 0.000000 0.968750 1.000000 -v 0.000000 0.906250 1.000000 -v 0.062500 0.906250 1.000000 -v 0.062500 0.968750 1.000000 -v 0.062500 0.968750 0.937500 -v 0.062500 0.906250 0.937500 -v 0.000000 0.906250 0.937500 -v 0.000000 0.968750 0.937500 -v 0.000000 0.968750 0.062500 -v 0.000000 0.906250 0.062500 -v 0.062500 0.906250 0.062500 -v 0.062500 0.968750 0.062500 -v 0.062500 0.968750 0.000000 -v 0.062500 0.906250 0.000000 -v 0.000000 0.906250 0.000000 -v 0.000000 0.968750 0.000000 -vt 0.062500 0.937500 -vt 0.062500 0.906250 -vt 0.125000 0.906250 -vt 0.125000 0.937500 -vt 0.187500 0.937500 -vt 0.187500 0.906250 -vt 0.250000 0.906250 -vt 0.250000 0.937500 -vt 0.062500 1.000000 -vt 0.125000 1.000000 -vt 0.187500 1.000000 -vt 0.000000 0.937500 -vt 0.000000 0.906250 -vt 0.046875 0.843750 -vt 0.046875 0.750000 -vt 0.093750 0.750000 -vt 0.093750 0.843750 -vt 0.140625 0.843750 -vt 0.140625 0.750000 -vt 0.187500 0.750000 -vt 0.187500 0.843750 -vt 0.046875 0.890625 -vt 0.093750 0.890625 -vt 0.140625 0.890625 -vt 0.000000 0.843750 -vt 0.000000 0.750000 -vt 0.437500 0.093750 -vt 0.437500 0.000000 -vt 0.625000 0.000000 -vt 0.625000 0.093750 -vt 0.812500 0.093750 -vt 0.812500 0.000000 -vt 1.000000 0.000000 -vt 1.000000 0.093750 -vt 0.437500 0.281250 -vt 0.625000 0.281250 -vt 0.812500 0.281250 -vt 0.250000 0.093750 -vt 0.250000 0.000000 -vt 0.046875 0.593750 -vt 0.046875 0.578125 -vt 0.093750 0.578125 -vt 0.093750 0.593750 -vt 0.140625 0.593750 -vt 0.140625 0.578125 -vt 0.187500 0.578125 -vt 0.187500 0.593750 -vt 0.046875 0.640625 -vt 0.093750 0.640625 -vt 0.140625 0.640625 -vt 0.000000 0.593750 -vt 0.000000 0.578125 -vt 0.250000 0.812500 -vt 0.250000 0.781250 -vt 0.265625 0.781250 -vt 0.265625 0.812500 -vt 0.312500 0.812500 -vt 0.312500 0.781250 -vt 0.328125 0.781250 -vt 0.328125 0.812500 -vt 0.250000 0.859375 -vt 0.265625 0.859375 -vt 0.281250 0.812500 -vt 0.281250 0.859375 -vt 0.203125 0.812500 -vt 0.203125 0.781250 -vt 0.218750 0.750000 -vt 0.218750 0.718750 -vt 0.265625 0.718750 -vt 0.265625 0.750000 -vt 0.281250 0.750000 -vt 0.281250 0.718750 -vt 0.328125 0.718750 -vt 0.328125 0.750000 -vt 0.218750 0.765625 -vt 0.265625 0.765625 -vt 0.312500 0.750000 -vt 0.312500 0.765625 -vt 0.203125 0.750000 -vt 0.203125 0.718750 -vt 0.031250 0.531250 -vt 0.031250 0.515625 -vt 0.062500 0.515625 -vt 0.062500 0.531250 -vt 0.093750 0.531250 -vt 0.093750 0.515625 -vt 0.125000 0.515625 -vt 0.125000 0.531250 -vt 0.031250 0.562500 -vt 0.062500 0.562500 -vt 0.093750 0.562500 -vt 0.000000 0.531250 -vt 0.000000 0.515625 -vt 0.281250 0.984375 -vt 0.281250 0.890625 -vt 0.468750 0.890625 -vt 0.468750 0.984375 -vt 0.484375 0.984375 -vt 0.484375 0.890625 -vt 0.671875 0.890625 -vt 0.671875 0.984375 -vt 0.281250 1.000000 -vt 0.468750 1.000000 -vt 0.656250 0.984375 -vt 0.656250 1.000000 -vt 0.265625 0.984375 -vt 0.265625 0.890625 -vt 0.781250 0.812500 -vt 0.781250 0.718750 -vt 0.796875 0.718750 -vt 0.796875 0.812500 -vt 0.984375 0.812500 -vt 0.984375 0.718750 -vt 1.000000 0.718750 -vt 1.000000 0.812500 -vt 0.781250 1.000000 -vt 0.796875 1.000000 -vt 0.812500 0.812500 -vt 0.812500 1.000000 -vt 0.593750 0.812500 -vt 0.593750 0.718750 -vt 0.031250 0.703125 -vt 0.031250 0.656250 -vt 0.062500 0.656250 -vt 0.062500 0.703125 -vt 0.093750 0.703125 -vt 0.093750 0.656250 -vt 0.125000 0.656250 -vt 0.125000 0.703125 -vt 0.031250 0.734375 -vt 0.062500 0.734375 -vt 0.093750 0.734375 -vt 0.000000 0.703125 -vt 0.000000 0.656250 -vt 0.031250 0.687500 -vt 0.046875 0.687500 -vt 0.046875 0.703125 -vt 0.062500 0.687500 -vt 0.078125 0.687500 -vt 0.078125 0.703125 -vt 0.031250 0.718750 -vt 0.046875 0.718750 -vt 0.062500 0.718750 -vt 0.015625 0.703125 -vt 0.015625 0.687500 -vn 0.000000 0.000000 1.000000 -vn 0.000000 0.000000 -1.000000 -vn 0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 -0.000000 -vn 1.000000 0.000000 0.000000 -vn -1.000000 0.000000 0.000000 -vn 0.000000 0.109600 0.994000 -vn 0.000000 -0.109700 -0.994000 -vn 0.109700 0.988000 -0.109000 -vn -0.109700 -0.988000 0.109000 -vn 0.994000 -0.109000 0.012000 -vn -0.994000 0.109000 -0.012000 -vn -0.000000 -0.109700 0.994000 -vn 0.000000 0.109700 -0.994000 -vn -0.109600 0.988000 0.109000 -vn 0.109700 -0.988000 -0.109000 -vn 0.994000 0.109000 0.012000 -vn -0.994000 -0.109000 -0.012000 -vn 0.109700 0.988000 0.109000 -vn -0.109600 -0.988000 -0.109000 -vn 0.994000 -0.109000 -0.012000 -vn -0.994000 0.109000 0.012000 -vn -0.109700 0.988000 -0.109000 -vn 0.109700 -0.988000 0.109000 -vn 0.994000 0.109000 -0.012000 -vn -0.994000 -0.109000 0.012000 -vn 0.707100 0.707100 0.000000 -vn -0.707100 -0.707100 0.000000 -vn 0.707100 -0.707100 0.000000 -vn -0.707100 0.707100 0.000000 -vn 0.000000 0.707100 0.707100 -vn 0.000000 -0.707100 -0.707100 -vn 0.000000 0.707100 -0.707100 -vn 0.000000 -0.707100 0.707100 -usemtl None -#s 1 -f 1/1/1 2/2/1 3/3/1 4/4/1 -f 5/5/2 6/6/2 7/7/2 8/8/2 -f 8/9/3 1/1/3 4/4/3 5/10/3 -f 2/5/4 7/11/4 6/10/4 3/4/4 -f 5/5/5 4/4/5 3/3/5 6/6/5 -f 8/12/6 7/13/6 2/2/6 1/1/6 -f 9/14/7 10/15/7 11/16/7 12/17/7 -f 13/18/8 14/19/8 15/20/8 16/21/8 -f 16/22/9 9/14/9 12/17/9 13/23/9 -f 10/18/10 15/24/10 14/23/10 11/17/10 -f 13/18/11 12/17/11 11/16/11 14/19/11 -f 16/25/12 15/26/12 10/15/12 9/14/12 -f 17/1/1 18/2/1 19/3/1 20/4/1 -f 21/5/2 22/6/2 23/7/2 24/8/2 -f 24/9/3 17/1/3 20/4/3 21/10/3 -f 18/5/4 23/11/4 22/10/4 19/4/4 -f 21/5/5 20/4/5 19/3/5 22/6/5 -f 24/12/6 23/13/6 18/2/6 17/1/6 -f 25/14/13 26/15/13 27/16/13 28/17/13 -f 29/18/14 30/19/14 31/20/14 32/21/14 -f 32/22/15 25/14/15 28/17/15 29/23/15 -f 26/18/16 31/24/16 30/23/16 27/17/16 -f 29/18/17 28/17/17 27/16/17 30/19/17 -f 32/25/18 31/26/18 26/15/18 25/14/18 -f 33/1/1 34/2/1 35/3/1 36/4/1 -f 37/5/2 38/6/2 39/7/2 40/8/2 -f 40/9/3 33/1/3 36/4/3 37/10/3 -f 34/5/4 39/11/4 38/10/4 35/4/4 -f 37/5/5 36/4/5 35/3/5 38/6/5 -f 40/12/6 39/13/6 34/2/6 33/1/6 -f 41/14/13 42/15/13 43/16/13 44/17/13 -f 45/18/14 46/19/14 47/20/14 48/21/14 -f 48/22/19 41/14/19 44/17/19 45/23/19 -f 42/18/20 47/24/20 46/23/20 43/17/20 -f 45/18/21 44/17/21 43/16/21 46/19/21 -f 48/25/22 47/26/22 42/15/22 41/14/22 -f 49/1/1 50/2/1 51/3/1 52/4/1 -f 53/5/2 54/6/2 55/7/2 56/8/2 -f 56/9/3 49/1/3 52/4/3 53/10/3 -f 50/5/4 55/11/4 54/10/4 51/4/4 -f 53/5/5 52/4/5 51/3/5 54/6/5 -f 56/12/6 55/13/6 50/2/6 49/1/6 -f 57/14/7 58/15/7 59/16/7 60/17/7 -f 61/18/8 62/19/8 63/20/8 64/21/8 -f 64/22/23 57/14/23 60/17/23 61/23/23 -f 58/18/24 63/24/24 62/23/24 59/17/24 -f 61/18/25 60/17/25 59/16/25 62/19/25 -f 64/25/26 63/26/26 58/15/26 57/14/26 -f 65/27/1 66/28/1 67/29/1 68/30/1 -f 69/31/2 70/32/2 71/33/2 72/34/2 -f 72/35/3 65/27/3 68/30/3 69/36/3 -f 66/31/4 71/37/4 70/36/4 67/30/4 -f 69/31/5 68/30/5 67/29/5 70/32/5 -f 72/38/6 71/39/6 66/28/6 65/27/6 -f 73/40/1 74/41/1 75/42/1 76/43/1 -f 77/44/2 78/45/2 79/46/2 80/47/2 -f 80/48/3 73/40/3 76/43/3 77/49/3 -f 74/44/4 79/50/4 78/49/4 75/43/4 -f 77/44/5 76/43/5 75/42/5 78/45/5 -f 80/51/6 79/52/6 74/41/6 73/40/6 -f 81/53/1 82/54/1 83/55/1 84/56/1 -f 85/57/2 86/58/2 87/59/2 88/60/2 -f 88/61/27 81/53/27 84/56/27 85/62/27 -f 82/63/28 87/64/28 86/62/28 83/56/28 -f 85/57/29 84/56/29 83/55/29 86/58/29 -f 88/65/30 87/66/30 82/54/30 81/53/30 -f 89/53/1 90/54/1 91/55/1 92/56/1 -f 93/57/2 94/58/2 95/59/2 96/60/2 -f 96/61/30 89/53/30 92/56/30 93/62/30 -f 90/63/29 95/64/29 94/62/29 91/56/29 -f 93/57/27 92/56/27 91/55/27 94/58/27 -f 96/65/28 95/66/28 90/54/28 89/53/28 -f 97/67/31 98/68/31 99/69/31 100/70/31 -f 101/71/32 102/72/32 103/73/32 104/74/32 -f 104/75/33 97/67/33 100/70/33 101/76/33 -f 98/77/34 103/78/34 102/76/34 99/70/34 -f 101/71/5 100/70/5 99/69/5 102/72/5 -f 104/79/6 103/80/6 98/68/6 97/67/6 -f 105/67/34 106/68/34 107/69/34 108/70/34 -f 109/71/33 110/72/33 111/73/33 112/74/33 -f 112/75/31 105/67/31 108/70/31 109/76/31 -f 106/77/32 111/78/32 110/76/32 107/70/32 -f 109/71/5 108/70/5 107/69/5 110/72/5 -f 112/79/6 111/80/6 106/68/6 105/67/6 -f 113/81/1 114/82/1 115/83/1 116/84/1 -f 117/85/2 118/86/2 119/87/2 120/88/2 -f 120/89/3 113/81/3 116/84/3 117/90/3 -f 114/85/4 119/91/4 118/90/4 115/84/4 -f 117/85/5 116/84/5 115/83/5 118/86/5 -f 120/92/6 119/93/6 114/82/6 113/81/6 -f 121/81/1 122/82/1 123/83/1 124/84/1 -f 125/85/2 126/86/2 127/87/2 128/88/2 -f 128/89/3 121/81/3 124/84/3 125/90/3 -f 122/85/4 127/91/4 126/90/4 123/84/4 -f 125/85/5 124/84/5 123/83/5 126/86/5 -f 128/92/6 127/93/6 122/82/6 121/81/6 -f 129/81/1 130/82/1 131/83/1 132/84/1 -f 133/85/2 134/86/2 135/87/2 136/88/2 -f 136/89/3 129/81/3 132/84/3 133/90/3 -f 130/85/4 135/91/4 134/90/4 131/84/4 -f 133/85/5 132/84/5 131/83/5 134/86/5 -f 136/92/6 135/93/6 130/82/6 129/81/6 -f 137/81/1 138/82/1 139/83/1 140/84/1 -f 141/85/2 142/86/2 143/87/2 144/88/2 -f 144/89/3 137/81/3 140/84/3 141/90/3 -f 138/85/4 143/91/4 142/90/4 139/84/4 -f 141/85/5 140/84/5 139/83/5 142/86/5 -f 144/92/6 143/93/6 138/82/6 137/81/6 -f 145/94/1 146/95/1 147/96/1 148/97/1 -f 149/98/2 150/99/2 151/100/2 152/101/2 -f 152/102/3 145/94/3 148/97/3 149/103/3 -f 146/104/4 151/105/4 150/103/4 147/97/4 -f 149/98/5 148/97/5 147/96/5 150/99/5 -f 152/106/6 151/107/6 146/95/6 145/94/6 -f 153/94/1 154/95/1 155/96/1 156/97/1 -f 157/98/2 158/99/2 159/100/2 160/101/2 -f 160/102/3 153/94/3 156/97/3 157/103/3 -f 154/104/4 159/105/4 158/103/4 155/97/4 -f 157/98/5 156/97/5 155/96/5 158/99/5 -f 160/106/6 159/107/6 154/95/6 153/94/6 -f 161/108/1 162/109/1 163/110/1 164/111/1 -f 165/112/2 166/113/2 167/114/2 168/115/2 -f 168/116/3 161/108/3 164/111/3 165/117/3 -f 162/118/4 167/119/4 166/117/4 163/111/4 -f 165/112/5 164/111/5 163/110/5 166/113/5 -f 168/120/6 167/121/6 162/109/6 161/108/6 -f 169/108/1 170/109/1 171/110/1 172/111/1 -f 173/112/2 174/113/2 175/114/2 176/115/2 -f 176/116/3 169/108/3 172/111/3 173/117/3 -f 170/118/4 175/119/4 174/117/4 171/111/4 -f 173/112/5 172/111/5 171/110/5 174/113/5 -f 176/120/6 175/121/6 170/109/6 169/108/6 -f 177/122/1 178/123/1 179/124/1 180/125/1 -f 181/126/2 182/127/2 183/128/2 184/129/2 -f 184/130/3 177/122/3 180/125/3 181/131/3 -f 178/126/4 183/132/4 182/131/4 179/125/4 -f 181/126/5 180/125/5 179/124/5 182/127/5 -f 184/133/6 183/134/6 178/123/6 177/122/6 -f 185/122/1 186/135/1 187/136/1 188/137/1 -f 189/125/2 190/138/2 191/139/2 192/140/2 -f 192/141/3 185/122/3 188/137/3 189/142/3 -f 186/125/4 191/143/4 190/142/4 187/137/4 -f 189/125/5 188/137/5 187/136/5 190/138/5 -f 192/144/6 191/145/6 186/135/6 185/122/6 -f 193/122/1 194/123/1 195/124/1 196/125/1 -f 197/126/2 198/127/2 199/128/2 200/129/2 -f 200/130/3 193/122/3 196/125/3 197/131/3 -f 194/126/4 199/132/4 198/131/4 195/125/4 -f 197/126/5 196/125/5 195/124/5 198/127/5 -f 200/133/6 199/134/6 194/123/6 193/122/6 -f 201/122/1 202/135/1 203/136/1 204/137/1 -f 205/125/2 206/138/2 207/139/2 208/140/2 -f 208/141/3 201/122/3 204/137/3 205/142/3 -f 202/125/4 207/143/4 206/142/4 203/137/4 -f 205/125/5 204/137/5 203/136/5 206/138/5 -f 208/144/6 207/145/6 202/135/6 201/122/6 -f 209/122/1 210/123/1 211/124/1 212/125/1 -f 213/126/2 214/127/2 215/128/2 216/129/2 -f 216/130/3 209/122/3 212/125/3 213/131/3 -f 210/126/4 215/132/4 214/131/4 211/125/4 -f 213/126/5 212/125/5 211/124/5 214/127/5 -f 216/133/6 215/134/6 210/123/6 209/122/6 -f 217/122/1 218/135/1 219/136/1 220/137/1 -f 221/125/2 222/138/2 223/139/2 224/140/2 -f 224/141/3 217/122/3 220/137/3 221/142/3 -f 218/125/4 223/143/4 222/142/4 219/137/4 -f 221/125/5 220/137/5 219/136/5 222/138/5 -f 224/144/6 223/145/6 218/135/6 217/122/6 -f 225/122/1 226/123/1 227/124/1 228/125/1 -f 229/126/2 230/127/2 231/128/2 232/129/2 -f 232/130/3 225/122/3 228/125/3 229/131/3 -f 226/126/4 231/132/4 230/131/4 227/125/4 -f 229/126/5 228/125/5 227/124/5 230/127/5 -f 232/133/6 231/134/6 226/123/6 225/122/6 -f 233/122/1 234/135/1 235/136/1 236/137/1 -f 237/125/2 238/138/2 239/139/2 240/140/2 -f 240/141/3 233/122/3 236/137/3 237/142/3 -f 234/125/4 239/143/4 238/142/4 235/137/4 -f 237/125/5 236/137/5 235/136/5 238/138/5 -f 240/144/6 239/145/6 234/135/6 233/122/6 -f 241/14/7 242/15/7 243/16/7 244/17/7 -f 245/18/8 246/19/8 247/20/8 248/21/8 -f 248/22/9 241/14/9 244/17/9 245/23/9 -f 242/18/10 247/24/10 246/23/10 243/17/10 -f 245/18/11 244/17/11 243/16/11 246/19/11 -f 248/25/12 247/26/12 242/15/12 241/14/12 -f 249/14/13 250/15/13 251/16/13 252/17/13 -f 253/18/14 254/19/14 255/20/14 256/21/14 -f 256/22/15 249/14/15 252/17/15 253/23/15 -f 250/18/16 255/24/16 254/23/16 251/17/16 -f 253/18/17 252/17/17 251/16/17 254/19/17 -f 256/25/18 255/26/18 250/15/18 249/14/18 -f 257/14/13 258/15/13 259/16/13 260/17/13 -f 261/18/14 262/19/14 263/20/14 264/21/14 -f 264/22/19 257/14/19 260/17/19 261/23/19 -f 258/18/20 263/24/20 262/23/20 259/17/20 -f 261/18/21 260/17/21 259/16/21 262/19/21 -f 264/25/22 263/26/22 258/15/22 257/14/22 -f 265/14/7 266/15/7 267/16/7 268/17/7 -f 269/18/8 270/19/8 271/20/8 272/21/8 -f 272/22/23 265/14/23 268/17/23 269/23/23 -f 266/18/24 271/24/24 270/23/24 267/17/24 -f 269/18/25 268/17/25 267/16/25 270/19/25 -f 272/25/26 271/26/26 266/15/26 265/14/26 -f 273/40/1 274/41/1 275/42/1 276/43/1 -f 277/44/2 278/45/2 279/46/2 280/47/2 -f 280/48/3 273/40/3 276/43/3 277/49/3 -f 274/44/4 279/50/4 278/49/4 275/43/4 -f 277/44/5 276/43/5 275/42/5 278/45/5 -f 280/51/6 279/52/6 274/41/6 273/40/6 -f 281/53/1 282/54/1 283/55/1 284/56/1 -f 285/57/2 286/58/2 287/59/2 288/60/2 -f 288/61/27 281/53/27 284/56/27 285/62/27 -f 282/63/28 287/64/28 286/62/28 283/56/28 -f 285/57/29 284/56/29 283/55/29 286/58/29 -f 288/65/30 287/66/30 282/54/30 281/53/30 -f 289/53/1 290/54/1 291/55/1 292/56/1 -f 293/57/2 294/58/2 295/59/2 296/60/2 -f 296/61/30 289/53/30 292/56/30 293/62/30 -f 290/63/29 295/64/29 294/62/29 291/56/29 -f 293/57/27 292/56/27 291/55/27 294/58/27 -f 296/65/28 295/66/28 290/54/28 289/53/28 -f 297/67/31 298/68/31 299/69/31 300/70/31 -f 301/71/32 302/72/32 303/73/32 304/74/32 -f 304/75/33 297/67/33 300/70/33 301/76/33 -f 298/77/34 303/78/34 302/76/34 299/70/34 -f 301/71/5 300/70/5 299/69/5 302/72/5 -f 304/79/6 303/80/6 298/68/6 297/67/6 -f 305/67/34 306/68/34 307/69/34 308/70/34 -f 309/71/33 310/72/33 311/73/33 312/74/33 -f 312/75/31 305/67/31 308/70/31 309/76/31 -f 306/77/32 311/78/32 310/76/32 307/70/32 -f 309/71/5 308/70/5 307/69/5 310/72/5 -f 312/79/6 311/80/6 306/68/6 305/67/6 -f 313/81/1 314/82/1 315/83/1 316/84/1 -f 317/85/2 318/86/2 319/87/2 320/88/2 -f 320/89/3 313/81/3 316/84/3 317/90/3 -f 314/85/4 319/91/4 318/90/4 315/84/4 -f 317/85/5 316/84/5 315/83/5 318/86/5 -f 320/92/6 319/93/6 314/82/6 313/81/6 -f 321/81/1 322/82/1 323/83/1 324/84/1 -f 325/85/2 326/86/2 327/87/2 328/88/2 -f 328/89/3 321/81/3 324/84/3 325/90/3 -f 322/85/4 327/91/4 326/90/4 323/84/4 -f 325/85/5 324/84/5 323/83/5 326/86/5 -f 328/92/6 327/93/6 322/82/6 321/81/6 -f 329/81/1 330/82/1 331/83/1 332/84/1 -f 333/85/2 334/86/2 335/87/2 336/88/2 -f 336/89/3 329/81/3 332/84/3 333/90/3 -f 330/85/4 335/91/4 334/90/4 331/84/4 -f 333/85/5 332/84/5 331/83/5 334/86/5 -f 336/92/6 335/93/6 330/82/6 329/81/6 -f 337/81/1 338/82/1 339/83/1 340/84/1 -f 341/85/2 342/86/2 343/87/2 344/88/2 -f 344/89/3 337/81/3 340/84/3 341/90/3 -f 338/85/4 343/91/4 342/90/4 339/84/4 -f 341/85/5 340/84/5 339/83/5 342/86/5 -f 344/92/6 343/93/6 338/82/6 337/81/6 -f 345/53/1 346/54/1 347/55/1 348/56/1 -f 349/57/2 350/58/2 351/59/2 352/60/2 -f 352/61/27 345/53/27 348/56/27 349/62/27 -f 346/63/28 351/64/28 350/62/28 347/56/28 -f 349/57/29 348/56/29 347/55/29 350/58/29 -f 352/65/30 351/66/30 346/54/30 345/53/30 -f 353/53/1 354/54/1 355/55/1 356/56/1 -f 357/57/2 358/58/2 359/59/2 360/60/2 -f 360/61/30 353/53/30 356/56/30 357/62/30 -f 354/63/29 359/64/29 358/62/29 355/56/29 -f 357/57/27 356/56/27 355/55/27 358/58/27 -f 360/65/28 359/66/28 354/54/28 353/53/28 -f 361/67/31 362/68/31 363/69/31 364/70/31 -f 365/71/32 366/72/32 367/73/32 368/74/32 -f 368/75/33 361/67/33 364/70/33 365/76/33 -f 362/77/34 367/78/34 366/76/34 363/70/34 -f 365/71/5 364/70/5 363/69/5 366/72/5 -f 368/79/6 367/80/6 362/68/6 361/67/6 -f 369/67/34 370/68/34 371/69/34 372/70/34 -f 373/71/33 374/72/33 375/73/33 376/74/33 -f 376/75/31 369/67/31 372/70/31 373/76/31 -f 370/77/32 375/78/32 374/76/32 371/70/32 -f 373/71/5 372/70/5 371/69/5 374/72/5 -f 376/79/6 375/80/6 370/68/6 369/67/6 -f 377/122/1 378/135/1 379/136/1 380/137/1 -f 381/125/2 382/138/2 383/139/2 384/140/2 -f 384/141/3 377/122/3 380/137/3 381/142/3 -f 378/125/4 383/143/4 382/142/4 379/137/4 -f 381/125/5 380/137/5 379/136/5 382/138/5 -f 384/144/6 383/145/6 378/135/6 377/122/6 -f 385/122/1 386/135/1 387/136/1 388/137/1 -f 389/125/2 390/138/2 391/139/2 392/140/2 -f 392/141/3 385/122/3 388/137/3 389/142/3 -f 386/125/4 391/143/4 390/142/4 387/137/4 -f 389/125/5 388/137/5 387/136/5 390/138/5 -f 392/144/6 391/145/6 386/135/6 385/122/6 -f 393/122/1 394/135/1 395/136/1 396/137/1 -f 397/125/2 398/138/2 399/139/2 400/140/2 -f 400/141/3 393/122/3 396/137/3 397/142/3 -f 394/125/4 399/143/4 398/142/4 395/137/4 -f 397/125/5 396/137/5 395/136/5 398/138/5 -f 400/144/6 399/145/6 394/135/6 393/122/6 -f 401/122/1 402/135/1 403/136/1 404/137/1 -f 405/125/2 406/138/2 407/139/2 408/140/2 -f 408/141/3 401/122/3 404/137/3 405/142/3 -f 402/125/4 407/143/4 406/142/4 403/137/4 -f 405/125/5 404/137/5 403/136/5 406/138/5 -f 408/144/6 407/145/6 402/135/6 401/122/6 diff --git a/src/main/resources/assets/bloodmagic/models/block/blockincensealtar.mtl b/src/main/resources/assets/bloodmagic/models/block/blockincensealtar.mtl deleted file mode 100644 index 754b7d64..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/blockincensealtar.mtl +++ /dev/null @@ -1,11 +0,0 @@ -# Blender MTL File: 'None' -# Material Count: 1 - -newmtl None -#Ns 0 -Ka 0.000000 0.000000 0.000000 -Kd 0.8 0.8 0.8 -#Ks 0.8 0.8 0.8 -d 1 -#illum 2 -map_Kd bloodmagic:models/incensealtar diff --git a/src/main/resources/assets/bloodmagic/models/block/blockincensealtar.obj b/src/main/resources/assets/bloodmagic/models/block/blockincensealtar.obj deleted file mode 100644 index 3c6790d1..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/blockincensealtar.obj +++ /dev/null @@ -1,650 +0,0 @@ -# Blender v2.76 (sub 0) OBJ File: '' -# www.blender.org -mtllib blockincensealtar.mtl -o BlockIncenseAltar_(1) -v 0.659375 0.159375 0.871875 -v 0.659375 -0.000000 0.871875 -v 0.871875 -0.000000 0.871875 -v 0.871875 0.159375 0.871875 -v 0.871875 0.159375 0.659375 -v 0.871875 -0.000000 0.659375 -v 0.659375 -0.000000 0.659375 -v 0.659375 0.159375 0.659375 -v 0.659375 0.159375 0.340625 -v 0.659375 0.000000 0.340625 -v 0.871875 0.000000 0.340625 -v 0.871875 0.159375 0.340625 -v 0.871875 0.159375 0.128125 -v 0.871875 0.000000 0.128125 -v 0.659375 0.000000 0.128125 -v 0.659375 0.159375 0.128125 -v 0.128125 0.159375 0.871875 -v 0.128125 -0.000000 0.871875 -v 0.340625 -0.000000 0.871875 -v 0.340625 0.159375 0.871875 -v 0.340625 0.159375 0.659375 -v 0.340625 -0.000000 0.659375 -v 0.128125 -0.000000 0.659375 -v 0.128125 0.159375 0.659375 -v 0.128125 0.159375 0.340625 -v 0.128125 0.000000 0.340625 -v 0.340625 0.000000 0.340625 -v 0.340625 0.159375 0.340625 -v 0.340625 0.159375 0.128125 -v 0.340625 0.000000 0.128125 -v 0.128125 0.000000 0.128125 -v 0.128125 0.159375 0.128125 -v 0.128125 0.212500 0.871875 -v 0.128125 0.159375 0.871875 -v 0.871875 0.159375 0.871875 -v 0.871875 0.212500 0.871875 -v 0.871875 0.212500 0.128125 -v 0.871875 0.159375 0.128125 -v 0.128125 0.159375 0.128125 -v 0.128125 0.212500 0.128125 -v 0.314062 0.984629 0.371221 -v 0.314062 0.195516 0.260344 -v 0.685938 0.195516 0.260344 -v 0.685938 0.984629 0.371221 -v 0.685938 0.992021 0.318614 -v 0.685938 0.202908 0.207737 -v 0.314062 0.202908 0.207737 -v 0.314062 0.992021 0.318614 -v 0.628779 0.984629 0.685938 -v 0.739656 0.195516 0.685938 -v 0.792263 0.202908 0.685938 -v 0.681387 0.992021 0.685938 -v 0.681387 0.992021 0.314063 -v 0.792263 0.202908 0.314063 -v 0.739656 0.195516 0.314063 -v 0.628779 0.984629 0.314063 -v 0.318612 0.992017 0.685938 -v 0.207735 0.202893 0.685938 -v 0.260343 0.195502 0.685938 -v 0.371220 0.984625 0.685938 -v 0.371220 0.984626 0.314063 -v 0.260343 0.195502 0.314063 -v 0.207735 0.202893 0.314063 -v 0.318612 0.992017 0.314063 -v 0.314062 0.992017 0.681388 -v 0.314062 0.202893 0.792265 -v 0.685938 0.202893 0.792265 -v 0.685938 0.992017 0.681388 -v 0.685938 0.984625 0.628780 -v 0.685938 0.195502 0.739657 -v 0.314062 0.195502 0.739657 -v 0.314062 0.984625 0.628780 -v 0.576198 0.952884 0.733023 -v 0.687075 0.171447 0.842819 -v 0.844898 0.193406 0.839734 -v 0.734021 0.974844 0.729938 -v 0.734021 0.952669 0.572113 -v 0.844898 0.171232 0.681909 -v 0.687075 0.149272 0.684995 -v 0.576198 0.930709 0.575199 -v 0.576198 0.930713 0.424802 -v 0.687075 0.149287 0.315005 -v 0.844898 0.171246 0.318091 -v 0.734021 0.952673 0.427888 -v 0.734021 0.974849 0.270065 -v 0.844898 0.193422 0.160268 -v 0.687075 0.171463 0.157182 -v 0.576198 0.952889 0.266979 -v 0.265976 0.952668 0.427887 -v 0.155100 0.171231 0.318088 -v 0.312924 0.149272 0.315003 -v 0.423802 0.930709 0.424801 -v 0.423802 0.952884 0.266979 -v 0.312924 0.171448 0.157181 -v 0.155100 0.193407 0.160266 -v 0.265976 0.974844 0.270064 -v 0.265976 0.974840 0.729939 -v 0.155100 0.193391 0.839737 -v 0.312924 0.171432 0.842822 -v 0.423802 0.952880 0.733024 -v 0.423802 0.930704 0.575199 -v 0.312924 0.149257 0.684997 -v 0.155100 0.171216 0.681912 -v 0.265976 0.952664 0.572113 -v 0.181250 1.009375 0.818750 -v 0.181250 0.956250 0.818750 -v 0.340625 0.956250 0.818750 -v 0.340625 1.009375 0.818750 -v 0.340625 1.009375 0.181250 -v 0.340625 0.956250 0.181250 -v 0.181250 0.956250 0.181250 -v 0.181250 1.009375 0.181250 -v 0.659375 1.009375 0.818750 -v 0.659375 0.956250 0.818750 -v 0.659375 0.956250 0.659375 -v 0.659375 1.009375 0.659375 -v 0.340625 1.009375 0.659375 -v 0.340625 0.956250 0.659375 -v 0.340625 0.956250 0.818750 -v 0.340625 1.009375 0.818750 -v 0.659375 1.009375 0.818750 -v 0.659375 0.956250 0.818750 -v 0.818750 0.956250 0.818750 -v 0.818750 1.009375 0.818750 -v 0.818750 1.009375 0.181250 -v 0.818750 0.956250 0.181250 -v 0.659375 0.956250 0.181250 -v 0.659375 1.009375 0.181250 -v 0.659375 1.009375 0.340625 -v 0.659375 0.956250 0.340625 -v 0.659375 0.956250 0.181250 -v 0.659375 1.009375 0.181250 -v 0.340625 1.009375 0.181250 -v 0.340625 0.956250 0.181250 -v 0.340625 0.956250 0.340625 -v 0.340625 1.009375 0.340625 -v 0.739062 1.062500 0.845313 -v 0.739062 1.009375 0.845313 -v 0.845312 1.009375 0.845313 -v 0.845312 1.062500 0.845313 -v 0.845312 1.062500 0.739063 -v 0.845312 1.009375 0.739063 -v 0.739062 1.009375 0.739063 -v 0.739062 1.062500 0.739063 -v 0.792188 1.115625 0.845313 -v 0.792188 1.062500 0.845313 -v 0.845312 1.062500 0.845313 -v 0.845312 1.115625 0.845313 -v 0.845312 1.115625 0.792188 -v 0.845312 1.062500 0.792188 -v 0.792188 1.062500 0.792188 -v 0.792188 1.115625 0.792188 -v 0.154687 1.062500 0.845313 -v 0.154687 1.009375 0.845313 -v 0.260938 1.009375 0.845313 -v 0.260938 1.062500 0.845313 -v 0.260938 1.062500 0.739063 -v 0.260938 1.009375 0.739063 -v 0.154687 1.009375 0.739063 -v 0.154687 1.062500 0.739063 -v 0.154687 1.115625 0.845313 -v 0.154687 1.062500 0.845313 -v 0.207812 1.062500 0.845313 -v 0.207812 1.115625 0.845313 -v 0.207812 1.115625 0.792188 -v 0.207812 1.062500 0.792188 -v 0.154687 1.062500 0.792188 -v 0.154687 1.115625 0.792188 -v 0.739062 1.062500 0.260938 -v 0.739062 1.009375 0.260938 -v 0.845312 1.009375 0.260938 -v 0.845312 1.062500 0.260938 -v 0.845312 1.062500 0.154688 -v 0.845312 1.009375 0.154688 -v 0.739062 1.009375 0.154688 -v 0.739062 1.062500 0.154688 -v 0.792188 1.115625 0.207813 -v 0.792188 1.062500 0.207813 -v 0.845312 1.062500 0.207813 -v 0.845312 1.115625 0.207813 -v 0.845312 1.115625 0.154688 -v 0.845312 1.062500 0.154688 -v 0.792188 1.062500 0.154688 -v 0.792188 1.115625 0.154688 -v 0.154687 1.062500 0.260938 -v 0.154687 1.009375 0.260938 -v 0.260938 1.009375 0.260938 -v 0.260938 1.062500 0.260938 -v 0.260938 1.062500 0.154688 -v 0.260938 1.009375 0.154688 -v 0.154687 1.009375 0.154688 -v 0.154687 1.062500 0.154688 -v 0.154687 1.115625 0.207813 -v 0.154687 1.062500 0.207813 -v 0.207812 1.062500 0.207813 -v 0.207812 1.115625 0.207813 -v 0.207812 1.115625 0.154688 -v 0.207812 1.062500 0.154688 -v 0.154687 1.062500 0.154688 -v 0.154687 1.115625 0.154688 -v 0.367188 0.956250 0.632813 -v 0.367188 0.903125 0.632813 -v 0.632812 0.903125 0.632813 -v 0.632812 0.956250 0.632813 -v 0.632812 0.956250 0.367188 -v 0.632812 0.903125 0.367188 -v 0.367188 0.903125 0.367188 -v 0.367188 0.956250 0.367188 -v 0.314062 0.984629 0.371221 -v 0.314062 0.195516 0.260344 -v 0.685938 0.195516 0.260344 -v 0.685938 0.984629 0.371221 -v 0.685938 0.992021 0.318614 -v 0.685938 0.202908 0.207737 -v 0.314062 0.202908 0.207737 -v 0.314062 0.992021 0.318614 -v 0.628779 0.984629 0.685938 -v 0.739656 0.195516 0.685938 -v 0.792263 0.202908 0.685938 -v 0.681387 0.992021 0.685938 -v 0.681387 0.992021 0.314063 -v 0.792263 0.202908 0.314063 -v 0.739656 0.195516 0.314063 -v 0.628779 0.984629 0.314063 -v 0.318612 0.992017 0.685938 -v 0.207735 0.202893 0.685938 -v 0.260343 0.195502 0.685938 -v 0.371220 0.984625 0.685938 -v 0.371220 0.984626 0.314063 -v 0.260343 0.195502 0.314063 -v 0.207735 0.202893 0.314063 -v 0.318612 0.992017 0.314063 -v 0.314062 0.992017 0.681388 -v 0.314062 0.202893 0.792265 -v 0.685938 0.202893 0.792265 -v 0.685938 0.992017 0.681388 -v 0.685938 0.984625 0.628780 -v 0.685938 0.195502 0.739657 -v 0.314062 0.195502 0.739657 -v 0.314062 0.984625 0.628780 -v 0.792188 1.115625 0.845313 -v 0.792188 1.062500 0.845313 -v 0.845312 1.062500 0.845313 -v 0.845312 1.115625 0.845313 -v 0.845312 1.115625 0.792188 -v 0.845312 1.062500 0.792188 -v 0.792188 1.062500 0.792188 -v 0.792188 1.115625 0.792188 -v 0.154687 1.115625 0.845313 -v 0.154687 1.062500 0.845313 -v 0.207812 1.062500 0.845313 -v 0.207812 1.115625 0.845313 -v 0.207812 1.115625 0.792188 -v 0.207812 1.062500 0.792188 -v 0.154687 1.062500 0.792188 -v 0.154687 1.115625 0.792188 -v 0.792188 1.115625 0.207813 -v 0.792188 1.062500 0.207813 -v 0.845312 1.062500 0.207813 -v 0.845312 1.115625 0.207813 -v 0.845312 1.115625 0.154688 -v 0.845312 1.062500 0.154688 -v 0.792188 1.062500 0.154688 -v 0.792188 1.115625 0.154688 -v 0.154687 1.115625 0.207813 -v 0.154687 1.062500 0.207813 -v 0.207812 1.062500 0.207813 -v 0.207812 1.115625 0.207813 -v 0.207812 1.115625 0.154688 -v 0.207812 1.062500 0.154688 -v 0.154687 1.062500 0.154688 -v 0.154687 1.115625 0.154688 -vt 0.062500 0.937500 -vt 0.062500 0.890625 -vt 0.125000 0.890625 -vt 0.125000 0.937500 -vt 0.187500 0.937500 -vt 0.187500 0.890625 -vt 0.250000 0.890625 -vt 0.250000 0.937500 -vt 0.062500 1.000000 -vt 0.125000 1.000000 -vt 0.187500 1.000000 -vt 0.000000 0.937500 -vt 0.000000 0.890625 -vt 0.265625 0.781250 -vt 0.265625 0.765625 -vt 0.484375 0.765625 -vt 0.484375 0.781250 -vt 0.703125 0.781250 -vt 0.703125 0.765625 -vt 0.921875 0.765625 -vt 0.921875 0.781250 -vt 0.265625 1.000000 -vt 0.484375 1.000000 -vt 0.703125 1.000000 -vt 0.046875 0.781250 -vt 0.046875 0.765625 -vt 0.015625 0.734375 -vt 0.015625 0.500000 -vt 0.125000 0.500000 -vt 0.125000 0.734375 -vt 0.140625 0.734375 -vt 0.140625 0.500000 -vt 0.250000 0.500000 -vt 0.250000 0.734375 -vt 0.015625 0.750000 -vt 0.125000 0.750000 -vt 0.234375 0.734375 -vt 0.234375 0.750000 -vt 0.000000 0.734375 -vt 0.000000 0.500000 -vt 0.375000 0.640625 -vt 0.375000 0.406250 -vt 0.390625 0.406250 -vt 0.390625 0.640625 -vt 0.500000 0.640625 -vt 0.500000 0.406250 -vt 0.515625 0.406250 -vt 0.515625 0.640625 -vt 0.375000 0.750000 -vt 0.390625 0.750000 -vt 0.406250 0.640625 -vt 0.406250 0.750000 -vt 0.265625 0.640625 -vt 0.265625 0.406250 -vt 0.046875 0.437500 -vt 0.046875 0.203125 -vt 0.093750 0.203125 -vt 0.093750 0.437500 -vt 0.140625 0.437500 -vt 0.140625 0.203125 -vt 0.187500 0.203125 -vt 0.187500 0.437500 -vt 0.046875 0.484375 -vt 0.093750 0.484375 -vt 0.140625 0.484375 -vt 0.000000 0.437500 -vt 0.000000 0.203125 -vt 0.203125 0.015625 -vt 0.203125 0.000000 -vt 0.250000 0.000000 -vt 0.250000 0.015625 -vt 0.437500 0.015625 -vt 0.437500 0.000000 -vt 0.484375 0.000000 -vt 0.484375 0.015625 -vt 0.203125 0.203125 -vt 0.250000 0.203125 -vt 0.296875 0.015625 -vt 0.296875 0.203125 -vt 0.015625 0.015625 -vt 0.015625 0.000000 -vt 0.593750 0.015625 -vt 0.593750 0.000000 -vt 0.640625 0.000000 -vt 0.640625 0.015625 -vt 0.734375 0.015625 -vt 0.734375 0.000000 -vt 0.781250 0.000000 -vt 0.781250 0.015625 -vt 0.593750 0.109375 -vt 0.640625 0.109375 -vt 0.687500 0.015625 -vt 0.687500 0.109375 -vt 0.500000 0.015625 -vt 0.500000 0.000000 -vt 0.234375 0.234375 -vt 0.234375 0.218750 -vt 0.265625 0.218750 -vt 0.265625 0.234375 -vt 0.296875 0.234375 -vt 0.296875 0.218750 -vt 0.328125 0.218750 -vt 0.328125 0.234375 -vt 0.234375 0.265625 -vt 0.265625 0.265625 -vt 0.296875 0.265625 -vt 0.203125 0.234375 -vt 0.203125 0.218750 -vt 0.218750 0.250000 -vt 0.218750 0.234375 -vt 0.234375 0.250000 -vt 0.250000 0.250000 -vt 0.250000 0.234375 -vt 0.265625 0.250000 -vt 0.218750 0.265625 -vt 0.250000 0.265625 -vt 0.203125 0.250000 -vt 0.281250 0.312500 -vt 0.281250 0.296875 -vt 0.359375 0.296875 -vt 0.359375 0.312500 -vt 0.437500 0.312500 -vt 0.437500 0.296875 -vt 0.515625 0.296875 -vt 0.515625 0.312500 -vt 0.281250 0.390625 -vt 0.359375 0.390625 -vt 0.437500 0.390625 -vt 0.203125 0.312500 -vt 0.203125 0.296875 -vn 0.000000 0.000000 1.000000 -vn 0.000000 0.000000 -1.000000 -vn 0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 -0.000000 -vn 1.000000 0.000000 0.000000 -vn -1.000000 0.000000 0.000000 -vn 0.000000 -0.139100 0.990300 -vn 0.000000 0.139100 -0.990300 -vn 0.000000 0.990300 0.139200 -vn 0.000000 -0.990300 -0.139100 -vn -0.139200 0.990300 0.000000 -vn 0.139100 -0.990300 -0.000000 -vn 0.990300 0.139100 0.000000 -vn -0.990300 -0.139100 -0.000000 -vn 0.139100 0.990300 0.000000 -vn -0.139100 -0.990300 -0.000000 -vn 0.990300 -0.139100 -0.000000 -vn -0.990300 0.139100 0.000000 -vn 0.000000 0.139100 0.990300 -vn 0.000000 -0.139100 -0.990300 -vn 0.000000 0.990300 -0.139200 -vn 0.000000 -0.990300 0.139100 -vn -0.139100 0.980600 -0.137800 -vn 0.139100 -0.980600 0.137800 -vn 0.990300 0.137800 -0.019400 -vn -0.990300 -0.137800 0.019400 -vn -0.139100 0.980600 0.137800 -vn 0.139100 -0.980600 -0.137800 -vn 0.990300 0.137800 0.019400 -vn -0.990300 -0.137800 -0.019400 -vn 0.139100 0.980600 0.137800 -vn -0.139100 -0.980600 -0.137800 -vn 0.990300 -0.137800 -0.019400 -vn -0.990300 0.137800 0.019400 -vn 0.139100 0.980600 -0.137800 -vn -0.139100 -0.980600 0.137800 -vn 0.990300 -0.137800 0.019400 -vn -0.990300 0.137800 -0.019400 -usemtl None -#s 1 -f 1/1/1 2/2/1 3/3/1 4/4/1 -f 5/5/2 6/6/2 7/7/2 8/8/2 -f 8/9/3 1/1/3 4/4/3 5/10/3 -f 2/5/4 7/11/4 6/10/4 3/4/4 -f 5/5/5 4/4/5 3/3/5 6/6/5 -f 8/12/6 7/13/6 2/2/6 1/1/6 -f 9/1/1 10/2/1 11/3/1 12/4/1 -f 13/5/2 14/6/2 15/7/2 16/8/2 -f 16/9/3 9/1/3 12/4/3 13/10/3 -f 10/5/4 15/11/4 14/10/4 11/4/4 -f 13/5/5 12/4/5 11/3/5 14/6/5 -f 16/12/6 15/13/6 10/2/6 9/1/6 -f 17/1/1 18/2/1 19/3/1 20/4/1 -f 21/5/2 22/6/2 23/7/2 24/8/2 -f 24/9/3 17/1/3 20/4/3 21/10/3 -f 18/5/4 23/11/4 22/10/4 19/4/4 -f 21/5/5 20/4/5 19/3/5 22/6/5 -f 24/12/6 23/13/6 18/2/6 17/1/6 -f 25/1/1 26/2/1 27/3/1 28/4/1 -f 29/5/2 30/6/2 31/7/2 32/8/2 -f 32/9/3 25/1/3 28/4/3 29/10/3 -f 26/5/4 31/11/4 30/10/4 27/4/4 -f 29/5/5 28/4/5 27/3/5 30/6/5 -f 32/12/6 31/13/6 26/2/6 25/1/6 -f 33/14/1 34/15/1 35/16/1 36/17/1 -f 37/18/2 38/19/2 39/20/2 40/21/2 -f 40/22/3 33/14/3 36/17/3 37/23/3 -f 34/18/4 39/24/4 38/23/4 35/17/4 -f 37/18/5 36/17/5 35/16/5 38/19/5 -f 40/25/6 39/26/6 34/15/6 33/14/6 -f 41/27/7 42/28/7 43/29/7 44/30/7 -f 45/31/8 46/32/8 47/33/8 48/34/8 -f 48/35/9 41/27/9 44/30/9 45/36/9 -f 42/37/10 47/38/10 46/36/10 43/30/10 -f 45/31/5 44/30/5 43/29/5 46/32/5 -f 48/39/6 47/40/6 42/28/6 41/27/6 -f 49/41/1 50/42/1 51/43/1 52/44/1 -f 53/45/2 54/46/2 55/47/2 56/48/2 -f 56/49/11 49/41/11 52/44/11 53/50/11 -f 50/51/12 55/52/12 54/50/12 51/44/12 -f 53/45/13 52/44/13 51/43/13 54/46/13 -f 56/53/14 55/54/14 50/42/14 49/41/14 -f 57/41/1 58/42/1 59/43/1 60/44/1 -f 61/45/2 62/46/2 63/47/2 64/48/2 -f 64/49/15 57/41/15 60/44/15 61/50/15 -f 58/51/16 63/52/16 62/50/16 59/44/16 -f 61/45/17 60/44/17 59/43/17 62/46/17 -f 64/53/18 63/54/18 58/42/18 57/41/18 -f 65/27/19 66/28/19 67/29/19 68/30/19 -f 69/31/20 70/32/20 71/33/20 72/34/20 -f 72/35/21 65/27/21 68/30/21 69/36/21 -f 66/37/22 71/38/22 70/36/22 67/30/22 -f 69/31/5 68/30/5 67/29/5 70/32/5 -f 72/39/6 71/40/6 66/28/6 65/27/6 -f 73/55/19 74/56/19 75/57/19 76/58/19 -f 77/59/20 78/60/20 79/61/20 80/62/20 -f 80/63/23 73/55/23 76/58/23 77/64/23 -f 74/59/24 79/65/24 78/64/24 75/58/24 -f 77/59/25 76/58/25 75/57/25 78/60/25 -f 80/66/26 79/67/26 74/56/26 73/55/26 -f 81/55/7 82/56/7 83/57/7 84/58/7 -f 85/59/8 86/60/8 87/61/8 88/62/8 -f 88/63/27 81/55/27 84/58/27 85/64/27 -f 82/59/28 87/65/28 86/64/28 83/58/28 -f 85/59/29 84/58/29 83/57/29 86/60/29 -f 88/66/30 87/67/30 82/56/30 81/55/30 -f 89/55/7 90/56/7 91/57/7 92/58/7 -f 93/59/8 94/60/8 95/61/8 96/62/8 -f 96/63/31 89/55/31 92/58/31 93/64/31 -f 90/59/32 95/65/32 94/64/32 91/58/32 -f 93/59/33 92/58/33 91/57/33 94/60/33 -f 96/66/34 95/67/34 90/56/34 89/55/34 -f 97/55/19 98/56/19 99/57/19 100/58/19 -f 101/59/20 102/60/20 103/61/20 104/62/20 -f 104/63/35 97/55/35 100/58/35 101/64/35 -f 98/59/36 103/65/36 102/64/36 99/58/36 -f 101/59/37 100/58/37 99/57/37 102/60/37 -f 104/66/38 103/67/38 98/56/38 97/55/38 -f 105/68/1 106/69/1 107/70/1 108/71/1 -f 109/72/2 110/73/2 111/74/2 112/75/2 -f 112/76/3 105/68/3 108/71/3 109/77/3 -f 106/78/4 111/79/4 110/77/4 107/71/4 -f 109/72/5 108/71/5 107/70/5 110/73/5 -f 112/80/6 111/81/6 106/69/6 105/68/6 -f 113/82/5 114/83/5 115/84/5 116/85/5 -f 117/86/6 118/87/6 119/88/6 120/89/6 -f 120/90/3 113/82/3 116/85/3 117/91/3 -f 114/92/4 119/93/4 118/91/4 115/85/4 -f 117/86/2 116/85/2 115/84/2 118/87/2 -f 120/94/1 119/95/1 114/83/1 113/82/1 -f 121/68/1 122/69/1 123/70/1 124/71/1 -f 125/72/2 126/73/2 127/74/2 128/75/2 -f 128/76/3 121/68/3 124/71/3 125/77/3 -f 122/78/4 127/79/4 126/77/4 123/71/4 -f 125/72/5 124/71/5 123/70/5 126/73/5 -f 128/80/6 127/81/6 122/69/6 121/68/6 -f 129/82/5 130/83/5 131/84/5 132/85/5 -f 133/86/6 134/87/6 135/88/6 136/89/6 -f 136/90/3 129/82/3 132/85/3 133/91/3 -f 130/92/4 135/93/4 134/91/4 131/85/4 -f 133/86/2 132/85/2 131/84/2 134/87/2 -f 136/94/1 135/95/1 130/83/1 129/82/1 -f 137/96/1 138/97/1 139/98/1 140/99/1 -f 141/100/2 142/101/2 143/102/2 144/103/2 -f 144/104/3 137/96/3 140/99/3 141/105/3 -f 138/100/4 143/106/4 142/105/4 139/99/4 -f 141/100/5 140/99/5 139/98/5 142/101/5 -f 144/107/6 143/108/6 138/97/6 137/96/6 -f 145/109/1 146/110/1 147/96/1 148/111/1 -f 149/112/2 150/113/2 151/99/2 152/114/2 -f 152/115/3 145/109/3 148/111/3 149/104/3 -f 146/112/4 151/116/4 150/104/4 147/111/4 -f 149/112/5 148/111/5 147/96/5 150/113/5 -f 152/117/6 151/107/6 146/110/6 145/109/6 -f 153/96/1 154/97/1 155/98/1 156/99/1 -f 157/100/2 158/101/2 159/102/2 160/103/2 -f 160/104/3 153/96/3 156/99/3 157/105/3 -f 154/100/4 159/106/4 158/105/4 155/99/4 -f 157/100/5 156/99/5 155/98/5 158/101/5 -f 160/107/6 159/108/6 154/97/6 153/96/6 -f 161/109/1 162/110/1 163/96/1 164/111/1 -f 165/112/2 166/113/2 167/99/2 168/114/2 -f 168/115/3 161/109/3 164/111/3 165/104/3 -f 162/112/4 167/116/4 166/104/4 163/111/4 -f 165/112/5 164/111/5 163/96/5 166/113/5 -f 168/117/6 167/107/6 162/110/6 161/109/6 -f 169/96/1 170/97/1 171/98/1 172/99/1 -f 173/100/2 174/101/2 175/102/2 176/103/2 -f 176/104/3 169/96/3 172/99/3 173/105/3 -f 170/100/4 175/106/4 174/105/4 171/99/4 -f 173/100/5 172/99/5 171/98/5 174/101/5 -f 176/107/6 175/108/6 170/97/6 169/96/6 -f 177/109/1 178/110/1 179/96/1 180/111/1 -f 181/112/2 182/113/2 183/99/2 184/114/2 -f 184/115/3 177/109/3 180/111/3 181/104/3 -f 178/112/4 183/116/4 182/104/4 179/111/4 -f 181/112/5 180/111/5 179/96/5 182/113/5 -f 184/117/6 183/107/6 178/110/6 177/109/6 -f 185/96/1 186/97/1 187/98/1 188/99/1 -f 189/100/2 190/101/2 191/102/2 192/103/2 -f 192/104/3 185/96/3 188/99/3 189/105/3 -f 186/100/4 191/106/4 190/105/4 187/99/4 -f 189/100/5 188/99/5 187/98/5 190/101/5 -f 192/107/6 191/108/6 186/97/6 185/96/6 -f 193/109/1 194/110/1 195/96/1 196/111/1 -f 197/112/2 198/113/2 199/99/2 200/114/2 -f 200/115/3 193/109/3 196/111/3 197/104/3 -f 194/112/4 199/116/4 198/104/4 195/111/4 -f 197/112/5 196/111/5 195/96/5 198/113/5 -f 200/117/6 199/107/6 194/110/6 193/109/6 -f 201/118/1 202/119/1 203/120/1 204/121/1 -f 205/122/2 206/123/2 207/124/2 208/125/2 -f 208/126/3 201/118/3 204/121/3 205/127/3 -f 202/122/4 207/128/4 206/127/4 203/121/4 -f 205/122/5 204/121/5 203/120/5 206/123/5 -f 208/129/6 207/130/6 202/119/6 201/118/6 -f 209/27/7 210/28/7 211/29/7 212/30/7 -f 213/31/8 214/32/8 215/33/8 216/34/8 -f 216/35/9 209/27/9 212/30/9 213/36/9 -f 210/37/10 215/38/10 214/36/10 211/30/10 -f 213/31/5 212/30/5 211/29/5 214/32/5 -f 216/39/6 215/40/6 210/28/6 209/27/6 -f 217/41/1 218/42/1 219/43/1 220/44/1 -f 221/45/2 222/46/2 223/47/2 224/48/2 -f 224/49/11 217/41/11 220/44/11 221/50/11 -f 218/51/12 223/52/12 222/50/12 219/44/12 -f 221/45/13 220/44/13 219/43/13 222/46/13 -f 224/53/14 223/54/14 218/42/14 217/41/14 -f 225/41/1 226/42/1 227/43/1 228/44/1 -f 229/45/2 230/46/2 231/47/2 232/48/2 -f 232/49/15 225/41/15 228/44/15 229/50/15 -f 226/51/16 231/52/16 230/50/16 227/44/16 -f 229/45/17 228/44/17 227/43/17 230/46/17 -f 232/53/18 231/54/18 226/42/18 225/41/18 -f 233/27/19 234/28/19 235/29/19 236/30/19 -f 237/31/20 238/32/20 239/33/20 240/34/20 -f 240/35/21 233/27/21 236/30/21 237/36/21 -f 234/37/22 239/38/22 238/36/22 235/30/22 -f 237/31/5 236/30/5 235/29/5 238/32/5 -f 240/39/6 239/40/6 234/28/6 233/27/6 -f 241/109/1 242/110/1 243/96/1 244/111/1 -f 245/112/2 246/113/2 247/99/2 248/114/2 -f 248/115/3 241/109/3 244/111/3 245/104/3 -f 242/112/4 247/116/4 246/104/4 243/111/4 -f 245/112/5 244/111/5 243/96/5 246/113/5 -f 248/117/6 247/107/6 242/110/6 241/109/6 -f 249/109/1 250/110/1 251/96/1 252/111/1 -f 253/112/2 254/113/2 255/99/2 256/114/2 -f 256/115/3 249/109/3 252/111/3 253/104/3 -f 250/112/4 255/116/4 254/104/4 251/111/4 -f 253/112/5 252/111/5 251/96/5 254/113/5 -f 256/117/6 255/107/6 250/110/6 249/109/6 -f 257/109/1 258/110/1 259/96/1 260/111/1 -f 261/112/2 262/113/2 263/99/2 264/114/2 -f 264/115/3 257/109/3 260/111/3 261/104/3 -f 258/112/4 263/116/4 262/104/4 259/111/4 -f 261/112/5 260/111/5 259/96/5 262/113/5 -f 264/117/6 263/107/6 258/110/6 257/109/6 -f 265/109/1 266/110/1 267/96/1 268/111/1 -f 269/112/2 270/113/2 271/99/2 272/114/2 -f 272/115/3 265/109/3 268/111/3 269/104/3 -f 266/112/4 271/116/4 270/104/4 267/111/4 -f 269/112/5 268/111/5 267/96/5 270/113/5 -f 272/117/6 271/107/6 266/110/6 265/109/6 diff --git a/src/main/resources/assets/bloodmagic/models/block/blockinputroutingnode.json b/src/main/resources/assets/bloodmagic/models/block/blockinputroutingnode.json deleted file mode 100644 index 18ceed9e..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/blockinputroutingnode.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:blocks/InputRoutingNode" - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/block/blockmasterroutingnode.json b/src/main/resources/assets/bloodmagic/models/block/blockmasterroutingnode.json deleted file mode 100644 index 947efbf5..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/blockmasterroutingnode.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:blocks/MasterRoutingNode" - } -} - - diff --git a/src/main/resources/assets/bloodmagic/models/block/blockoutputroutingnode.json b/src/main/resources/assets/bloodmagic/models/block/blockoutputroutingnode.json deleted file mode 100644 index 96f86dbf..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/blockoutputroutingnode.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:blocks/OutputRoutingNode" - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/block/blockphantom.json b/src/main/resources/assets/bloodmagic/models/block/blockphantom.json deleted file mode 100644 index 1a2e871a..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/blockphantom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:blocks/PhantomBlock" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/block/blockpillarcapeast.json b/src/main/resources/assets/bloodmagic/models/block/blockpillarcapeast.json deleted file mode 100644 index babad7d1..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/blockpillarcapeast.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#sideBottom", "rotation": 270 }, - "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#sideBottom", "rotation": 270 }, - "north": { "uv": [ 16, 0, 0, 16 ], "texture": "#sideTop", "rotation": 270 }, - "south": { "uv": [ 16, 0, 0, 16 ], "texture": "#sideBottom", "rotation": 270 }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#end" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#end" } - } - } - ] -} - diff --git a/src/main/resources/assets/bloodmagic/models/block/blockpillarcapnorth.json b/src/main/resources/assets/bloodmagic/models/block/blockpillarcapnorth.json deleted file mode 100644 index 6e32e554..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/blockpillarcapnorth.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#sideTop" }, - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#sideBottom" }, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#end" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#end" }, - "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#sideTop", "rotation": 270 }, - "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#sideBottom", "rotation": 270 } - } - } - ] -} - diff --git a/src/main/resources/assets/bloodmagic/models/block/blockpillarcapsouth.json b/src/main/resources/assets/bloodmagic/models/block/blockpillarcapsouth.json deleted file mode 100644 index 073431bb..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/blockpillarcapsouth.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#sideBottom" }, - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#sideTop" }, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#end" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#end" }, - "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#sideBottom", "rotation": 270 }, - "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#sideTop", "rotation": 270 } - } - } - ] -} - diff --git a/src/main/resources/assets/bloodmagic/models/block/blockpillarcapwest.json b/src/main/resources/assets/bloodmagic/models/block/blockpillarcapwest.json deleted file mode 100644 index 32007d6c..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/blockpillarcapwest.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#sideTop", "rotation": 270 }, - "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#sideTop", "rotation": 270 }, - "north": { "uv": [ 16, 0, 0, 16 ], "texture": "#sideBottom", "rotation": 270 }, - "south": { "uv": [ 16, 0, 0, 16 ], "texture": "#sideTop", "rotation": 270 }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#end" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#end" } - } - } - ] -} - diff --git a/src/main/resources/assets/bloodmagic/models/block/blockpillarx.json b/src/main/resources/assets/bloodmagic/models/block/blockpillarx.json deleted file mode 100644 index 3ad3a948..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/blockpillarx.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#side", "rotation": 270 }, - "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#side", "rotation": 270 }, - "north": { "uv": [ 16, 0, 0, 16 ], "texture": "#side", "rotation": 270 }, - "south": { "uv": [ 16, 0, 0, 16 ], "texture": "#side", "rotation": 270 }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#end" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#end" } - } - } - ] -} - diff --git a/src/main/resources/assets/bloodmagic/models/block/blockpillarz.json b/src/main/resources/assets/bloodmagic/models/block/blockpillarz.json deleted file mode 100644 index a240f4d2..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/blockpillarz.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" }, - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" }, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#end" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#end" }, - "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#side", "rotation": 270 }, - "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#side", "rotation": 270 } - } - } - ] -} - diff --git a/src/main/resources/assets/bloodmagic/models/block/blocksoulforge.json b/src/main/resources/assets/bloodmagic/models/block/blocksoulforge.json deleted file mode 100644 index cd179dad..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/blocksoulforge.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "bloodmagic:block/sub/BlockSoulForge", - "textures": { - "base": "minecraft:blocks/iron_block", - "base_bottom": "minecraft:blocks/gold_block", - "glass": "minecraft:blocks/glass", - "attachment": "minecraft:blocks/stone" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/block/blockspectral.json b/src/main/resources/assets/bloodmagic/models/block/blockspectral.json deleted file mode 100644 index 5f0a77ba..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/blockspectral.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "bloodmagic:blocks/SpectralBlock" - } -} diff --git a/src/main/resources/assets/bloodmagic/models/block/blockaltar.mtl b/src/main/resources/assets/bloodmagic/models/block/blood_altar.mtl similarity index 79% rename from src/main/resources/assets/bloodmagic/models/block/blockaltar.mtl rename to src/main/resources/assets/bloodmagic/models/block/blood_altar.mtl index 983345f9..428a77af 100644 --- a/src/main/resources/assets/bloodmagic/models/block/blockaltar.mtl +++ b/src/main/resources/assets/bloodmagic/models/block/blood_altar.mtl @@ -8,4 +8,4 @@ Kd 0.8 0.8 0.8 #Ks 0.8 0.8 0.8 d 1 #illum 2 -map_Kd bloodmagic:models/altar \ No newline at end of file +map_Kd bloodmagic:blocks/blood_altar \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/blockaltar.obj b/src/main/resources/assets/bloodmagic/models/block/blood_altar.obj similarity index 99% rename from src/main/resources/assets/bloodmagic/models/block/blockaltar.obj rename to src/main/resources/assets/bloodmagic/models/block/blood_altar.obj index 0d33a216..8052c334 100644 --- a/src/main/resources/assets/bloodmagic/models/block/blockaltar.obj +++ b/src/main/resources/assets/bloodmagic/models/block/blood_altar.obj @@ -1,6 +1,6 @@ # Blender v2.76 (sub 0) OBJ File: '' # www.blender.org -mtllib blockaltar.mtl +mtllib blood_altar.mtl o Shape1 v 0.000000 0.500000 1.000000 v 0.000000 -0.000000 1.000000 diff --git a/src/main/resources/assets/bloodmagic/models/block/bloodaltar.json b/src/main/resources/assets/bloodmagic/models/block/bloodaltar.json deleted file mode 100644 index 8f1f343e..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/bloodaltar.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "block/block", - "loader": "forge:obj", - "flip-v": true, - "model": "bloodmagic:models/block/blockaltar.obj", - "textures": { - "default": "bloodmagic:models/altar", - "particle": "#default" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/crystal/crystal1.mtl b/src/main/resources/assets/bloodmagic/models/block/crystal/crystal1.mtl deleted file mode 100644 index 8312afd8..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/crystal/crystal1.mtl +++ /dev/null @@ -1,11 +0,0 @@ -# Blender MTL File: 'CrystalEdited.blend' -# Material Count: 1 - -newmtl Material.001 -#Ns 0 -Ka 0.000000 0.000000 0.000000 -Kd 0.8 0.8 0.8 -#Ks 0.8 0.8 0.8 -d 1 -#illum 2 -map_Kd #crystal \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/crystal/crystal1.obj b/src/main/resources/assets/bloodmagic/models/block/crystal/crystal1.obj deleted file mode 100644 index 820c4245..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/crystal/crystal1.obj +++ /dev/null @@ -1,30 +0,0 @@ -# Blender v2.76 (sub 0) OBJ File: '' -# www.blender.org -mtllib crystal1.mtl -o Crystal1_Cube.002 -v 0.541309 0.522193 0.565775 -v 0.475462 0.818325 0.429288 -v 0.364893 0.461758 0.462174 -v 0.390526 0.258066 0.560703 -v 0.523738 0.510684 0.334361 -v 0.467179 0.253186 0.344289 -v 0.625975 0.304529 0.481768 -v 0.494567 -0.066932 0.498392 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.000000 1.000000 -vn -0.554600 0.268800 0.787500 -vn -0.644800 0.122900 -0.754400 -vn 0.678500 -0.232200 -0.697000 -vn 0.338600 -0.133400 0.931400 -vn -0.915300 -0.246300 -0.318600 -vn 0.958400 0.272000 -0.086300 -usemtl Material.001 -#s 1 -f 1/1/1 2/2/1 3/3/1 4/4/1 -f 2/1/2 5/2/2 6/3/2 3/4/2 -f 5/1/3 7/2/3 8/3/3 6/4/3 -f 7/1/4 1/2/4 4/3/4 8/4/4 -f 4/1/5 3/2/5 6/3/5 8/4/5 -f 7/1/6 5/2/6 2/3/6 1/4/6 diff --git a/src/main/resources/assets/bloodmagic/models/block/crystal/crystal2.mtl b/src/main/resources/assets/bloodmagic/models/block/crystal/crystal2.mtl deleted file mode 100644 index 8312afd8..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/crystal/crystal2.mtl +++ /dev/null @@ -1,11 +0,0 @@ -# Blender MTL File: 'CrystalEdited.blend' -# Material Count: 1 - -newmtl Material.001 -#Ns 0 -Ka 0.000000 0.000000 0.000000 -Kd 0.8 0.8 0.8 -#Ks 0.8 0.8 0.8 -d 1 -#illum 2 -map_Kd #crystal \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/crystal/crystal2.obj b/src/main/resources/assets/bloodmagic/models/block/crystal/crystal2.obj deleted file mode 100644 index ef42163c..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/crystal/crystal2.obj +++ /dev/null @@ -1,30 +0,0 @@ -# Blender v2.76 (sub 0) OBJ File: '' -# www.blender.org -mtllib crystal2.mtl -o Crystal2_Cube.003 -v 0.583418 0.194815 0.355811 -v 0.590795 0.338364 0.208300 -v 0.443486 0.156662 0.275360 -v 0.491321 -0.033342 0.518335 -v 0.739315 0.387694 -0.018903 -v 0.565149 0.127821 0.081910 -v 0.781085 0.191352 0.180536 -v 0.652954 0.018450 0.289613 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.000000 1.000000 -vn -0.509600 0.627400 0.588800 -vn -0.784400 0.386700 -0.485000 -vn 0.468500 -0.628400 -0.621000 -vn 0.744000 0.043000 0.666800 -vn -0.493000 -0.785700 -0.373600 -vn 0.558900 0.619400 0.551300 -usemtl Material.001 -#s 1 -f 1/1/1 2/2/1 3/3/1 4/4/1 -f 2/1/2 5/2/2 6/3/2 3/4/2 -f 5/1/3 7/2/3 8/3/3 6/4/3 -f 7/1/4 1/2/4 4/3/4 8/4/4 -f 4/1/5 3/2/5 6/3/5 8/4/5 -f 7/1/6 5/2/6 2/3/6 1/4/6 diff --git a/src/main/resources/assets/bloodmagic/models/block/crystal/crystal3.mtl b/src/main/resources/assets/bloodmagic/models/block/crystal/crystal3.mtl deleted file mode 100644 index 8312afd8..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/crystal/crystal3.mtl +++ /dev/null @@ -1,11 +0,0 @@ -# Blender MTL File: 'CrystalEdited.blend' -# Material Count: 1 - -newmtl Material.001 -#Ns 0 -Ka 0.000000 0.000000 0.000000 -Kd 0.8 0.8 0.8 -#Ks 0.8 0.8 0.8 -d 1 -#illum 2 -map_Kd #crystal \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/crystal/crystal3.obj b/src/main/resources/assets/bloodmagic/models/block/crystal/crystal3.obj deleted file mode 100644 index 346e90fb..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/crystal/crystal3.obj +++ /dev/null @@ -1,30 +0,0 @@ -# Blender v2.76 (sub 0) OBJ File: '' -# www.blender.org -mtllib crystal3.mtl -o Crystal3_Cube.004 -v 0.599699 0.234431 0.715050 -v 0.561549 0.133651 0.487765 -v 0.490610 -0.051382 0.494637 -v 0.573184 0.095593 0.709620 -v 0.705541 0.197807 0.627045 -v 0.617341 0.039525 0.599787 -v 0.814451 0.310805 0.883878 -v 0.698243 0.101404 0.775472 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.000000 1.000000 -vn -0.952700 0.287100 0.099200 -vn 0.728300 -0.301000 -0.615600 -vn 0.884700 -0.409700 -0.222600 -vn -0.561200 -0.040200 0.826700 -vn 0.026100 -0.886100 0.462800 -vn -0.015500 0.916400 -0.400000 -usemtl Material.001 -#s 1 -f 1/1/1 2/2/1 3/3/1 4/4/1 -f 2/1/2 5/2/2 6/3/2 3/4/2 -f 5/1/3 7/2/3 8/3/3 6/4/3 -f 7/1/4 1/2/4 4/3/4 8/4/4 -f 4/1/5 3/2/5 6/3/5 8/4/5 -f 7/1/6 5/2/6 2/3/6 1/4/6 diff --git a/src/main/resources/assets/bloodmagic/models/block/crystal/crystal4.mtl b/src/main/resources/assets/bloodmagic/models/block/crystal/crystal4.mtl deleted file mode 100644 index 8312afd8..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/crystal/crystal4.mtl +++ /dev/null @@ -1,11 +0,0 @@ -# Blender MTL File: 'CrystalEdited.blend' -# Material Count: 1 - -newmtl Material.001 -#Ns 0 -Ka 0.000000 0.000000 0.000000 -Kd 0.8 0.8 0.8 -#Ks 0.8 0.8 0.8 -d 1 -#illum 2 -map_Kd #crystal \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/crystal/crystal4.obj b/src/main/resources/assets/bloodmagic/models/block/crystal/crystal4.obj deleted file mode 100644 index a1733ba6..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/crystal/crystal4.obj +++ /dev/null @@ -1,30 +0,0 @@ -# Blender v2.76 (sub 0) OBJ File: '' -# www.blender.org -mtllib crystal4.mtl -o Crystal4_Cube.005 -v 0.231425 0.272568 0.295285 -v 0.148716 0.421674 0.074512 -v 0.229979 0.123255 0.182833 -v 0.279143 0.056276 0.408796 -v 0.403338 0.307055 0.170708 -v 0.450289 0.076509 0.254075 -v 0.408191 0.195351 0.365302 -v 0.484596 -0.035550 0.505028 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.000000 1.000000 -vn -0.965600 -0.150500 0.212200 -vn 0.232800 -0.281000 -0.931100 -vn 0.957000 0.284200 0.058600 -vn -0.184300 0.445100 0.876300 -vn -0.177800 -0.931100 -0.318400 -vn 0.187400 0.849200 0.493700 -usemtl Material.001 -#s 1 -f 1/1/1 2/2/1 3/3/1 4/4/1 -f 2/1/2 5/2/2 6/3/2 3/4/2 -f 5/1/3 7/2/3 8/3/3 6/4/3 -f 7/1/4 1/2/4 4/3/4 8/4/4 -f 4/1/5 3/2/5 6/3/5 8/4/5 -f 7/1/6 5/2/6 2/3/6 1/4/6 diff --git a/src/main/resources/assets/bloodmagic/models/block/crystal/crystal5.mtl b/src/main/resources/assets/bloodmagic/models/block/crystal/crystal5.mtl deleted file mode 100644 index 8312afd8..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/crystal/crystal5.mtl +++ /dev/null @@ -1,11 +0,0 @@ -# Blender MTL File: 'CrystalEdited.blend' -# Material Count: 1 - -newmtl Material.001 -#Ns 0 -Ka 0.000000 0.000000 0.000000 -Kd 0.8 0.8 0.8 -#Ks 0.8 0.8 0.8 -d 1 -#illum 2 -map_Kd #crystal \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/crystal/crystal5.obj b/src/main/resources/assets/bloodmagic/models/block/crystal/crystal5.obj deleted file mode 100644 index cc75d4b8..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/crystal/crystal5.obj +++ /dev/null @@ -1,30 +0,0 @@ -# Blender v2.76 (sub 0) OBJ File: '' -# www.blender.org -mtllib crystal5.mtl -o Crystal5_Cube.006 -v 0.349231 0.423691 0.937667 -v 0.305391 0.245339 0.724533 -v 0.367605 0.076317 0.717276 -v 0.460587 0.191248 0.826603 -v 0.391454 0.159733 0.568418 -v 0.492172 -0.045920 0.485475 -v 0.470717 0.292579 0.676822 -v 0.542313 0.166856 0.649094 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.000000 1.000000 -vn -0.594700 -0.452900 0.664200 -vn -0.894900 -0.312500 -0.318500 -vn 0.398800 0.470300 -0.787300 -vn 0.892800 0.342800 0.292300 -vn 0.544200 -0.664400 0.512300 -vn -0.373400 0.733900 -0.567400 -usemtl Material.001 -#s 1 -f 1/1/1 2/2/1 3/3/1 4/4/1 -f 2/1/2 5/2/2 6/3/2 3/4/2 -f 5/1/3 7/2/3 8/3/3 6/4/3 -f 7/1/4 1/2/4 4/3/4 8/4/4 -f 4/1/5 3/2/5 6/3/5 8/4/5 -f 7/1/6 5/2/6 2/3/6 1/4/6 diff --git a/src/main/resources/assets/bloodmagic/models/block/crystal/crystal6.mtl b/src/main/resources/assets/bloodmagic/models/block/crystal/crystal6.mtl deleted file mode 100644 index 8312afd8..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/crystal/crystal6.mtl +++ /dev/null @@ -1,11 +0,0 @@ -# Blender MTL File: 'CrystalEdited.blend' -# Material Count: 1 - -newmtl Material.001 -#Ns 0 -Ka 0.000000 0.000000 0.000000 -Kd 0.8 0.8 0.8 -#Ks 0.8 0.8 0.8 -d 1 -#illum 2 -map_Kd #crystal \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/crystal/crystal6.obj b/src/main/resources/assets/bloodmagic/models/block/crystal/crystal6.obj deleted file mode 100644 index 9206e935..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/crystal/crystal6.obj +++ /dev/null @@ -1,30 +0,0 @@ -# Blender v2.76 (sub 0) OBJ File: '' -# www.blender.org -mtllib crystal6.mtl -o Crystal6_Cube.007 -v 0.239487 0.278413 0.616538 -v 0.028163 0.346273 0.526362 -v 0.189094 0.113959 0.535716 -v 0.335860 0.041917 0.579906 -v 0.235427 0.257442 0.421622 -v 0.320816 0.037582 0.451232 -v 0.393389 0.239035 0.522345 -v 0.490528 -0.046537 0.496835 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.000000 1.000000 -vn -0.432900 -0.287300 0.854500 -vn -0.585200 -0.380500 -0.716100 -vn 0.442400 0.152600 -0.883700 -vn 0.524900 0.093900 0.846000 -vn -0.459900 -0.884000 0.083600 -vn 0.279000 0.954200 -0.108500 -usemtl Material.001 -#s 1 -f 1/1/1 2/2/1 3/3/1 4/4/1 -f 2/1/2 5/2/2 6/3/2 3/4/2 -f 5/1/3 7/2/3 8/3/3 6/4/3 -f 7/1/4 1/2/4 4/3/4 8/4/4 -f 4/1/5 3/2/5 6/3/5 8/4/5 -f 7/1/6 5/2/6 2/3/6 1/4/6 diff --git a/src/main/resources/assets/bloodmagic/models/block/crystal/crystal7.mtl b/src/main/resources/assets/bloodmagic/models/block/crystal/crystal7.mtl deleted file mode 100644 index 8312afd8..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/crystal/crystal7.mtl +++ /dev/null @@ -1,11 +0,0 @@ -# Blender MTL File: 'CrystalEdited.blend' -# Material Count: 1 - -newmtl Material.001 -#Ns 0 -Ka 0.000000 0.000000 0.000000 -Kd 0.8 0.8 0.8 -#Ks 0.8 0.8 0.8 -d 1 -#illum 2 -map_Kd #crystal \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/crystal/crystal7.obj b/src/main/resources/assets/bloodmagic/models/block/crystal/crystal7.obj deleted file mode 100644 index 0a2094b6..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/crystal/crystal7.obj +++ /dev/null @@ -1,30 +0,0 @@ -# Blender v2.76 (sub 0) OBJ File: '' -# www.blender.org -mtllib crystal7.mtl -o Crystal7_Cube.008 -v 0.679569 0.173016 0.537214 -v 0.753542 0.268537 0.442736 -v 0.647951 0.146157 0.391809 -v 0.483178 -0.044230 0.496270 -v 0.932224 0.344260 0.450676 -v 0.777536 0.161952 0.399277 -v 0.798431 0.176811 0.535512 -v 0.709441 0.067096 0.475384 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.000000 1.000000 -vn -0.752300 0.657500 0.042100 -vn -0.061900 0.364900 -0.929000 -vn 0.776200 -0.628400 -0.050500 -vn 0.206700 -0.449100 0.869200 -vn 0.198600 -0.634800 -0.746700 -vn -0.189400 0.650900 0.735200 -usemtl Material.001 -#s 1 -f 1/1/1 2/2/1 3/3/1 4/4/1 -f 2/1/2 5/2/2 6/3/2 3/4/2 -f 5/1/3 7/2/3 8/3/3 6/4/3 -f 7/1/4 1/2/4 4/3/4 8/4/4 -f 4/1/5 3/2/5 6/3/5 8/4/5 -f 7/1/6 5/2/6 2/3/6 1/4/6 diff --git a/src/main/resources/assets/bloodmagic/models/block/crystal1.json b/src/main/resources/assets/bloodmagic/models/block/crystal1.json deleted file mode 100644 index 41a7581c..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/crystal1.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "block/block", - "loader": "forge:obj", - "flip-v": true, - "model": "bloodmagic:models/block/crystal/crystal1.obj", - "textures": { - "crystal": "bloodmagic:models/defaultcrystal", - "particle": "#crystal" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/crystal2.json b/src/main/resources/assets/bloodmagic/models/block/crystal2.json deleted file mode 100644 index 5e50ae32..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/crystal2.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "block/block", - "loader": "forge:obj", - "flip-v": true, - "model": "bloodmagic:models/block/crystal/crystal2.obj", - "textures": { - "crystal": "bloodmagic:models/defaultcrystal", - "particle": "#crystal" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/crystal3.json b/src/main/resources/assets/bloodmagic/models/block/crystal3.json deleted file mode 100644 index 592f0dca..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/crystal3.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "block/block", - "loader": "forge:obj", - "flip-v": true, - "model": "bloodmagic:models/block/crystal/crystal3.obj", - "textures": { - "crystal": "bloodmagic:models/defaultcrystal", - "particle": "#crystal" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/crystal4.json b/src/main/resources/assets/bloodmagic/models/block/crystal4.json deleted file mode 100644 index 2fa0a75e..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/crystal4.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "block/block", - "loader": "forge:obj", - "flip-v": true, - "model": "bloodmagic:models/block/crystal/crystal4.obj", - "textures": { - "crystal": "bloodmagic:models/defaultcrystal", - "particle": "#crystal" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/crystal5.json b/src/main/resources/assets/bloodmagic/models/block/crystal5.json deleted file mode 100644 index eab5ad29..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/crystal5.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "block/block", - "loader": "forge:obj", - "flip-v": true, - "model": "bloodmagic:models/block/crystal/crystal5.obj", - "textures": { - "crystal": "bloodmagic:models/defaultcrystal", - "particle": "#crystal" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/crystal6.json b/src/main/resources/assets/bloodmagic/models/block/crystal6.json deleted file mode 100644 index f82b438e..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/crystal6.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "block/block", - "loader": "forge:obj", - "flip-v": true, - "model": "bloodmagic:models/block/crystal/crystal6.obj", - "textures": { - "crystal": "bloodmagic:models/defaultcrystal", - "particle": "#crystal" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/crystal7.json b/src/main/resources/assets/bloodmagic/models/block/crystal7.json deleted file mode 100644 index 345d1916..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/crystal7.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "block/block", - "loader": "forge:obj", - "flip-v": true, - "model": "bloodmagic:models/block/crystal/crystal7.obj", - "textures": { - "crystal": "bloodmagic:models/defaultcrystal", - "particle": "#crystal" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/demoncrucible.json b/src/main/resources/assets/bloodmagic/models/block/demoncrucible.json deleted file mode 100644 index ca99080f..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/demoncrucible.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "block/block", - "loader": "forge:obj", - "flip-v": true, - "model": "bloodmagic:models/block/blockdemoncrucible.obj", - "textures": { - "default": "bloodmagic:models/demoncrucible", - "particle": "#default" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/demoncrystallizer.json b/src/main/resources/assets/bloodmagic/models/block/demoncrystallizer.json deleted file mode 100644 index 0bd7c2bb..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/demoncrystallizer.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "block/block", - "loader": "forge:obj", - "flip-v": true, - "model": "bloodmagic:models/block/blockdemoncrystallizer.obj", - "textures": { - "default": "bloodmagic:models/demoncrystallizer", - "particle": "#default" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/demonpylon.json b/src/main/resources/assets/bloodmagic/models/block/demonpylon.json deleted file mode 100644 index de39d9ab..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/demonpylon.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "block/block", - "loader": "forge:obj", - "flip-v": true, - "model": "bloodmagic:models/block/blockdemonpylon.obj", - "textures": { - "default": "bloodmagic:models/demonpylon", - "particle": "#default" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/ethereal_mimic.json b/src/main/resources/assets/bloodmagic/models/block/ethereal_mimic.json deleted file mode 100644 index 3245d768..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/ethereal_mimic.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "bloodmagic:mimicloader_ethereal" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/incensealtar.json b/src/main/resources/assets/bloodmagic/models/block/incensealtar.json deleted file mode 100644 index 4f824ef3..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/incensealtar.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "block/block", - "loader": "forge:obj", - "flip-v": true, - "model": "bloodmagic:models/block/blockincensealtar.obj", - "textures": { - "default": "bloodmagic:models/incensealtar", - "particle": "#default" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/modelalchemytable.mtl b/src/main/resources/assets/bloodmagic/models/block/modelalchemytable.mtl deleted file mode 100644 index efa6ee21..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/modelalchemytable.mtl +++ /dev/null @@ -1,11 +0,0 @@ -# Blender MTL File: 'None' -# Material Count: 1 - -newmtl None -#Ns 0 -Ka 0.000000 0.000000 0.000000 -Kd 0.8 0.8 0.8 -#Ks 0.8 0.8 0.8 -d 1 -#illum 2 -map_Kd bloodmagic:models/alchemytable \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/modelalchemytable.obj b/src/main/resources/assets/bloodmagic/models/block/modelalchemytable.obj deleted file mode 100644 index 188da6f7..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/modelalchemytable.obj +++ /dev/null @@ -1,1257 +0,0 @@ -# Blender v2.76 (sub 0) OBJ File: '' -# www.blender.org -mtllib modelalchemytable.mtl -o Decanter1 -v -0.125000 0.837500 0.718750 -v -0.306111 0.837500 0.767279 -v -0.306111 1.025000 0.767279 -v -0.125000 1.025000 0.718750 -v -0.257582 0.837500 0.948390 -v -0.076471 0.837500 0.899861 -v -0.076471 1.025000 0.899861 -v -0.257582 1.025000 0.948390 -vt 0.023438 0.000000 -vt 0.046875 0.000000 -vt 0.046875 0.023438 -vt 0.023438 0.023438 -vt 0.070313 0.000000 -vt 0.093750 0.000000 -vt 0.093750 0.023438 -vt 0.070313 0.023438 -vt 0.046875 0.046875 -vt 0.023438 0.046875 -vt 0.070313 0.046875 -vt 0.000000 0.000000 -vt 0.000000 0.023438 -vn -0.258800 0.000000 -0.965900 -vn 0.258800 -0.000000 0.965900 -vn 0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 0.000000 -vn 0.965900 0.000000 -0.258800 -vn -0.965900 -0.000000 0.258800 -usemtl None -#s off -f 1/1/1 2/2/1 3/3/1 4/4/1 -f 5/5/2 6/6/2 7/7/2 8/8/2 -f 4/4/3 3/3/3 8/9/3 7/10/3 -f 6/3/4 5/8/4 2/11/4 1/9/4 -f 6/12/5 1/1/5 4/4/5 7/13/5 -f 2/2/6 5/5/6 8/8/6 3/3/6 -o CarpetLow1 -v 1.054228 0.423099 0.250000 -v 0.992678 0.412246 0.250000 -v 0.970972 0.535347 0.250000 -v 1.032522 0.546200 0.250000 -v 0.992678 0.412246 0.750000 -v 1.054228 0.423099 0.750000 -v 1.032522 0.546200 0.750000 -v 0.970972 0.535347 0.750000 -vt 0.843750 0.757813 -vt 0.851563 0.757813 -vt 0.851563 0.773438 -vt 0.843750 0.773438 -vt 0.914063 0.757813 -vt 0.921875 0.757813 -vt 0.921875 0.773438 -vt 0.914063 0.773438 -vt 0.851563 0.835938 -vt 0.843750 0.835938 -vt 0.859375 0.773438 -vt 0.859375 0.835938 -vt 0.781250 0.757813 -vt 0.781250 0.773438 -vn -0.000000 0.000000 -1.000000 -vn 0.000000 -0.000000 1.000000 -vn -0.173600 0.984800 0.000000 -vn 0.173600 -0.984800 -0.000000 -vn 0.984800 0.173600 0.000000 -vn -0.984800 -0.173600 -0.000000 -usemtl None -#s off -f 9/14/7 10/15/7 11/16/7 12/17/7 -f 13/18/8 14/19/8 15/20/8 16/21/8 -f 12/17/9 11/16/9 16/22/9 15/23/9 -f 14/16/10 13/24/10 10/25/10 9/22/10 -f 14/26/11 9/14/11 12/17/11 15/27/11 -f 10/15/12 13/18/12 16/21/12 11/16/12 -o CarpetLowest2 -v -1.057387 0.301657 0.250000 -v -1.113075 0.330031 0.250000 -v -1.056326 0.441407 0.250000 -v -1.000638 0.413033 0.250000 -v -1.113075 0.330031 0.750000 -v -1.057387 0.301657 0.750000 -v -1.000638 0.413033 0.750000 -v -1.056326 0.441407 0.750000 -vt 0.843750 0.664063 -vt 0.851563 0.664063 -vt 0.851563 0.679688 -vt 0.843750 0.679688 -vt 0.914063 0.664063 -vt 0.921875 0.664063 -vt 0.921875 0.679688 -vt 0.914063 0.679688 -vt 0.851563 0.742188 -vt 0.843750 0.742188 -vt 0.859375 0.679688 -vt 0.859375 0.742188 -vt 0.781250 0.664063 -vt 0.781250 0.679688 -vn 0.000000 0.000000 -1.000000 -vn -0.000000 0.000000 1.000000 -vn 0.454000 0.891000 0.000000 -vn -0.454000 -0.891000 -0.000000 -vn 0.891000 -0.454000 -0.000000 -vn -0.891000 0.454000 0.000000 -usemtl None -#s off -f 17/28/13 18/29/13 19/30/13 20/31/13 -f 21/32/14 22/33/14 23/34/14 24/35/14 -f 20/31/15 19/30/15 24/36/15 23/37/15 -f 22/30/16 21/38/16 18/39/16 17/36/16 -f 22/40/17 17/28/17 20/31/17 23/41/17 -f 18/29/18 21/32/18 24/35/18 19/30/18 -o Decanter2 -v -0.185370 1.025000 0.734926 -v -0.366481 1.025000 0.783455 -v -0.366481 1.087500 0.783455 -v -0.185370 1.087500 0.734926 -v -0.317953 1.025000 0.964566 -v -0.136842 1.025000 0.916037 -v -0.136842 1.087500 0.916037 -v -0.317953 1.087500 0.964566 -vt 0.023438 0.062500 -vt 0.046875 0.062500 -vt 0.046875 0.070313 -vt 0.023438 0.070313 -vt 0.070313 0.062500 -vt 0.093750 0.062500 -vt 0.093750 0.070313 -vt 0.070313 0.070313 -vt 0.046875 0.093750 -vt 0.023438 0.093750 -vt 0.070313 0.093750 -vt 0.000000 0.062500 -vt 0.000000 0.070313 -vn -0.258800 0.000000 -0.965900 -vn 0.258800 0.000000 0.965900 -vn 0.000000 1.000000 0.000000 -vn -0.000000 -1.000000 -0.000000 -vn 0.965900 0.000000 -0.258800 -vn -0.965900 0.000000 0.258800 -usemtl None -#s off -f 25/42/19 26/43/19 27/44/19 28/45/19 -f 29/46/20 30/47/20 31/48/20 32/49/20 -f 28/45/21 27/44/21 32/50/21 31/51/21 -f 30/44/22 29/49/22 26/52/22 25/50/22 -f 30/53/23 25/42/23 28/45/23 31/54/23 -f 26/43/24 29/46/24 32/49/24 27/44/24 -o Pipe1 -v -0.373208 1.087147 0.866346 -v -0.548929 1.122100 0.811057 -v -0.536736 1.183399 0.811057 -v -0.361015 1.148446 0.866346 -v -0.567004 1.125696 0.870778 -v -0.391284 1.090743 0.926067 -v -0.379091 1.152042 0.926067 -v -0.554811 1.186995 0.870778 -vt 0.007813 0.132813 -vt 0.031250 0.132813 -vt 0.031250 0.140625 -vt 0.007813 0.140625 -vt 0.039063 0.132813 -vt 0.062500 0.132813 -vt 0.062500 0.140625 -vt 0.039063 0.140625 -vt 0.031250 0.148438 -vt 0.007813 0.148438 -vt 0.054688 0.140625 -vt 0.054688 0.148438 -vt 0.000000 0.132813 -vt 0.000000 0.140625 -vn 0.289200 -0.057500 -0.955500 -vn -0.289200 0.057500 0.955500 -vn 0.195100 0.980800 -0.000000 -vn -0.195100 -0.980800 0.000000 -vn 0.937200 -0.186400 0.294900 -vn -0.937200 0.186400 -0.294900 -usemtl None -#s off -f 33/55/25 34/56/25 35/57/25 36/58/25 -f 37/59/26 38/60/26 39/61/26 40/62/26 -f 36/58/27 35/57/27 40/63/27 39/64/27 -f 38/57/28 37/65/28 34/66/28 33/63/28 -f 38/67/29 33/55/29 36/58/29 39/68/29 -f 34/56/30 37/59/30 40/62/30 35/57/30 -o Base -v 1.000000 0.002500 0.000000 -v -1.000000 0.002500 0.000000 -v -1.000000 0.127500 0.000000 -v 1.000000 0.127500 0.000000 -v -1.000000 0.002500 1.000000 -v 1.000000 0.002500 1.000000 -v 1.000000 0.127500 1.000000 -v -1.000000 0.127500 1.000000 -vt 0.125000 0.859375 -vt 0.375000 0.859375 -vt 0.375000 0.875000 -vt 0.125000 0.875000 -vt 0.500000 0.859375 -vt 0.750000 0.859375 -vt 0.750000 0.875000 -vt 0.500000 0.875000 -vt 0.375000 1.000000 -vt 0.125000 1.000000 -vt 0.625000 0.875000 -vt 0.625000 1.000000 -vt 0.000000 0.859375 -vt 0.000000 0.875000 -vn 0.000000 0.000000 -1.000000 -vn 0.000000 0.000000 1.000000 -vn 0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 -0.000000 -vn 1.000000 0.000000 0.000000 -vn -1.000000 0.000000 0.000000 -usemtl None -#s off -f 41/69/31 42/70/31 43/71/31 44/72/31 -f 45/73/32 46/74/32 47/75/32 48/76/32 -f 44/72/33 43/71/33 48/77/33 47/78/33 -f 46/71/34 45/79/34 42/80/34 41/77/34 -f 46/81/35 41/69/35 44/72/35 47/82/35 -f 42/70/36 45/73/36 48/76/36 43/71/36 -o Pipe2 -v -0.538497 1.119845 0.809794 -v -0.705303 1.166575 0.738041 -v -0.688443 1.226758 0.738041 -v -0.521637 1.180028 0.809794 -v -0.728334 1.173027 0.795784 -v -0.561528 1.126297 0.867537 -v -0.544668 1.186480 0.867537 -v -0.711474 1.233210 0.795784 -vt 0.007813 0.156250 -vt 0.031250 0.156250 -vt 0.031250 0.164063 -vt 0.007813 0.164063 -vt 0.039063 0.156250 -vt 0.062500 0.156250 -vt 0.062500 0.164063 -vt 0.039063 0.164063 -vt 0.031250 0.171875 -vt 0.007813 0.171875 -vt 0.054688 0.164063 -vt 0.054688 0.171875 -vt 0.000000 0.156250 -vt 0.000000 0.164063 -vn 0.368500 -0.103200 -0.923900 -vn -0.368500 0.103200 0.923900 -vn 0.269800 0.962900 0.000000 -vn -0.269800 -0.962900 0.000000 -vn 0.889600 -0.249200 0.382700 -vn -0.889600 0.249200 -0.382700 -usemtl None -#s off -f 49/83/37 50/84/37 51/85/37 52/86/37 -f 53/87/38 54/88/38 55/89/38 56/90/38 -f 52/86/39 51/85/39 56/91/39 55/92/39 -f 54/85/40 53/93/40 50/94/40 49/91/40 -f 54/95/41 49/83/41 52/86/41 55/96/41 -f 50/84/42 53/87/42 56/90/42 51/85/42 -o JarContent1 -v 0.897244 0.868750 0.414703 -v 0.775448 0.868750 0.442822 -v 0.775448 1.056250 0.442822 -v 0.897244 1.056250 0.414703 -v 0.803567 0.868750 0.564619 -v 0.925363 0.868750 0.536500 -v 0.925363 1.056250 0.536500 -v 0.803567 1.056250 0.564619 -vt 0.117188 0.406250 -vt 0.132813 0.406250 -vt 0.132813 0.429688 -vt 0.117188 0.429688 -vt 0.148438 0.406250 -vt 0.164063 0.406250 -vt 0.164063 0.429688 -vt 0.148438 0.429688 -vt 0.132813 0.445313 -vt 0.117188 0.445313 -vt 0.148438 0.445313 -vt 0.101563 0.406250 -vt 0.101563 0.429688 -vn -0.225000 0.000000 -0.974400 -vn 0.225000 -0.000000 0.974400 -vn 0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 0.000000 -vn 0.974400 -0.000000 -0.225000 -vn -0.974400 0.000000 0.225000 -usemtl None -#s off -f 57/97/43 58/98/43 59/99/43 60/100/43 -f 61/101/44 62/102/44 63/103/44 64/104/44 -f 60/100/45 59/99/45 64/105/45 63/106/45 -f 62/99/46 61/104/46 58/107/46 57/105/46 -f 62/108/47 57/97/47 60/100/47 63/109/47 -f 58/98/48 61/101/48 64/104/48 59/99/48 -o BeamCasing -v 0.875000 0.275000 0.437500 -v -0.875000 0.275000 0.437500 -v -0.875000 0.400000 0.437500 -v 0.875000 0.400000 0.437500 -v -0.875000 0.275000 0.562500 -v 0.875000 0.275000 0.562500 -v 0.875000 0.400000 0.562500 -v -0.875000 0.400000 0.562500 -vt 0.015625 0.500000 -vt 0.234375 0.500000 -vt 0.234375 0.515625 -vt 0.015625 0.515625 -vt 0.250000 0.500000 -vt 0.468750 0.500000 -vt 0.468750 0.515625 -vt 0.250000 0.515625 -vt 0.234375 0.531250 -vt 0.015625 0.531250 -vt 0.453125 0.515625 -vt 0.453125 0.531250 -vt 0.000000 0.500000 -vt 0.000000 0.515625 -vn 0.000000 0.000000 -1.000000 -vn 0.000000 0.000000 1.000000 -vn 0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 0.000000 -vn 1.000000 0.000000 0.000000 -vn -1.000000 0.000000 0.000000 -usemtl None -#s off -f 65/110/49 66/111/49 67/112/49 68/113/49 -f 69/114/50 70/115/50 71/116/50 72/117/50 -f 68/113/51 67/112/51 72/118/51 71/119/51 -f 70/112/52 69/120/52 66/121/52 65/118/52 -f 70/122/53 65/110/53 68/113/53 71/123/53 -f 66/111/54 69/114/54 72/117/54 67/112/54 -o CrucibleLeg2 -v -0.682350 0.837500 0.913320 -v -0.740093 0.837500 0.889403 -v -0.740093 0.962500 0.889403 -v -0.682350 0.962500 0.913320 -v -0.764011 0.837500 0.947145 -v -0.706268 0.837500 0.971063 -v -0.706268 0.962500 0.971063 -v -0.764011 0.962500 0.947145 -vt 0.007813 0.828125 -vt 0.015625 0.828125 -vt 0.015625 0.843750 -vt 0.007813 0.843750 -vt 0.023438 0.828125 -vt 0.031250 0.828125 -vt 0.031250 0.843750 -vt 0.023438 0.843750 -vt 0.015625 0.851563 -vt 0.007813 0.851563 -vt 0.023438 0.851563 -vt 0.000000 0.828125 -vt 0.000000 0.843750 -vn 0.382700 0.000000 -0.923900 -vn -0.382700 0.000000 0.923900 -vn 0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 0.000000 -vn 0.923900 0.000000 0.382700 -vn -0.923900 0.000000 -0.382700 -usemtl None -#s off -f 73/124/55 74/125/55 75/126/55 76/127/55 -f 77/128/56 78/129/56 79/130/56 80/131/56 -f 76/127/57 75/126/57 80/132/57 79/133/57 -f 78/126/58 77/131/58 74/134/58 73/132/58 -f 78/135/59 73/124/59 76/127/59 79/136/59 -f 74/125/60 77/128/60 80/131/60 75/126/60 -o Jar2 -v 0.897748 0.837500 0.809359 -v 0.765165 0.837500 0.676777 -v 0.765165 1.150000 0.676777 -v 0.897748 1.150000 0.809359 -v 0.632583 0.837500 0.809359 -v 0.765165 0.837500 0.941942 -v 0.765165 1.150000 0.941942 -v 0.632583 1.150000 0.809359 -vt 0.023438 0.312500 -vt 0.046875 0.312500 -vt 0.046875 0.351563 -vt 0.023438 0.351563 -vt 0.070313 0.312500 -vt 0.093750 0.312500 -vt 0.093750 0.351563 -vt 0.070313 0.351563 -vt 0.046875 0.375000 -vt 0.023438 0.375000 -vt 0.070313 0.375000 -vt 0.000000 0.312500 -vt 0.000000 0.351563 -vn 0.707100 0.000000 -0.707100 -vn -0.707100 -0.000000 0.707100 -vn 0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 -0.000000 -vn 0.707100 0.000000 0.707100 -vn -0.707100 0.000000 -0.707100 -usemtl None -#s off -f 81/137/61 82/138/61 83/139/61 84/140/61 -f 85/141/62 86/142/62 87/143/62 88/144/62 -f 84/140/63 83/139/63 88/145/63 87/146/63 -f 86/139/64 85/144/64 82/147/64 81/145/64 -f 86/148/65 81/137/65 84/140/65 87/149/65 -f 82/138/66 85/141/66 88/144/66 83/139/66 -o Jar3 -v 0.546330 0.837500 0.810056 -v 0.365219 0.837500 0.761527 -v 0.365219 1.212500 0.761527 -v 0.546330 1.212500 0.810056 -v 0.316691 0.837500 0.942639 -v 0.497802 0.837500 0.991167 -v 0.497802 1.212500 0.991167 -v 0.316691 1.212500 0.942639 -vt 0.023438 0.179688 -vt 0.046875 0.179688 -vt 0.046875 0.226563 -vt 0.023438 0.226563 -vt 0.070313 0.179688 -vt 0.093750 0.179688 -vt 0.093750 0.226563 -vt 0.070313 0.226563 -vt 0.046875 0.250000 -vt 0.023438 0.250000 -vt 0.070313 0.250000 -vt 0.000000 0.179688 -vt 0.000000 0.226563 -vn 0.258800 0.000000 -0.965900 -vn -0.258800 -0.000000 0.965900 -vn -0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 0.000000 -vn 0.965900 0.000000 0.258800 -vn -0.965900 0.000000 -0.258800 -usemtl None -#s off -f 89/150/67 90/151/67 91/152/67 92/153/67 -f 93/154/68 94/155/68 95/156/68 96/157/68 -f 92/153/69 91/152/69 96/158/69 95/159/69 -f 94/152/70 93/157/70 90/160/70 89/158/70 -f 94/161/71 89/150/71 92/153/71 95/162/71 -f 90/151/72 93/154/72 96/157/72 91/152/72 -o BeamCore -v 0.843750 0.306250 0.468750 -v -0.843750 0.306250 0.468750 -v -0.843750 0.368750 0.468750 -v 0.843750 0.368750 0.468750 -v -0.843750 0.306250 0.531250 -v 0.843750 0.306250 0.531250 -v 0.843750 0.368750 0.531250 -v -0.843750 0.368750 0.531250 -vt 0.007813 0.476563 -vt 0.218750 0.476563 -vt 0.218750 0.484375 -vt 0.007813 0.484375 -vt 0.226563 0.476563 -vt 0.437500 0.476563 -vt 0.437500 0.484375 -vt 0.226563 0.484375 -vt 0.218750 0.492188 -vt 0.007813 0.492188 -vt 0.429688 0.484375 -vt 0.429688 0.492188 -vt 0.000000 0.476563 -vt 0.000000 0.484375 -vn 0.000000 0.000000 -1.000000 -vn 0.000000 0.000000 1.000000 -vn 0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 0.000000 -vn 1.000000 0.000000 0.000000 -vn -1.000000 0.000000 0.000000 -usemtl None -#s off -f 97/163/73 98/164/73 99/165/73 100/166/73 -f 101/167/74 102/168/74 103/169/74 104/170/74 -f 100/166/75 99/165/75 104/171/75 103/172/75 -f 102/165/76 101/173/76 98/174/76 97/171/76 -f 102/175/77 97/163/77 100/166/77 103/176/77 -f 98/164/78 101/167/78 104/170/78 99/165/78 -o CrucibleSide1 -v -0.682350 0.962500 0.913320 -v -0.971063 0.962500 0.793732 -v -0.971063 1.025000 0.793732 -v -0.682350 1.025000 0.913320 -v -0.994980 0.962500 0.851474 -v -0.706268 0.962500 0.971063 -v -0.706268 1.025000 0.971063 -v -0.994980 1.025000 0.851474 -vt 0.007813 0.765625 -vt 0.046875 0.765625 -vt 0.046875 0.773438 -vt 0.007813 0.773438 -vt 0.054688 0.765625 -vt 0.093750 0.765625 -vt 0.093750 0.773438 -vt 0.054688 0.773438 -vt 0.046875 0.781250 -vt 0.007813 0.781250 -vt 0.085938 0.773438 -vt 0.085938 0.781250 -vt 0.000000 0.765625 -vt 0.000000 0.773438 -vn 0.382700 0.000000 -0.923900 -vn -0.382700 0.000000 0.923900 -vn 0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 0.000000 -vn 0.923900 0.000000 0.382700 -vn -0.923900 0.000000 -0.382700 -usemtl None -#s off -f 105/177/79 106/178/79 107/179/79 108/180/79 -f 109/181/80 110/182/80 111/183/80 112/184/80 -f 108/180/81 107/179/81 112/185/81 111/186/81 -f 110/179/82 109/187/82 106/188/82 105/185/82 -f 110/189/83 105/177/83 108/180/83 111/190/83 -f 106/178/84 109/181/84 112/184/84 107/179/84 -o JarContent3 -v 0.508057 0.868750 0.832153 -v 0.387316 0.868750 0.799801 -v 0.387316 1.181250 0.799801 -v 0.508057 1.181250 0.832153 -v 0.354964 0.868750 0.920541 -v 0.475705 0.868750 0.952894 -v 0.475705 1.181250 0.952894 -v 0.354964 1.181250 0.920541 -vt 0.117188 0.179688 -vt 0.132813 0.179688 -vt 0.132813 0.218750 -vt 0.117188 0.218750 -vt 0.148438 0.179688 -vt 0.164063 0.179688 -vt 0.164063 0.218750 -vt 0.148438 0.218750 -vt 0.132813 0.234375 -vt 0.117188 0.234375 -vt 0.148438 0.234375 -vt 0.101563 0.179688 -vt 0.101563 0.218750 -vn 0.258800 0.000000 -0.965900 -vn -0.258800 -0.000000 0.965900 -vn -0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 -0.000000 -vn 0.965900 0.000000 0.258800 -vn -0.965900 0.000000 -0.258800 -usemtl None -#s off -f 113/191/85 114/192/85 115/193/85 116/194/85 -f 117/195/86 118/196/86 119/197/86 120/198/86 -f 116/194/87 115/193/87 120/199/87 119/200/87 -f 118/193/88 117/198/88 114/201/88 113/199/88 -f 118/202/89 113/191/89 116/194/89 119/203/89 -f 114/192/90 117/195/90 120/198/90 115/193/90 -o CrucibleLeg4 -v -0.817649 0.837500 0.586680 -v -0.875392 0.837500 0.562762 -v -0.875392 0.962500 0.562762 -v -0.817649 0.962500 0.586680 -v -0.899310 0.837500 0.620504 -v -0.841567 0.837500 0.644422 -v -0.841567 0.962500 0.644422 -v -0.899310 0.962500 0.620504 -vt 0.007813 0.828125 -vt 0.015625 0.828125 -vt 0.015625 0.843750 -vt 0.007813 0.843750 -vt 0.023438 0.828125 -vt 0.031250 0.828125 -vt 0.031250 0.843750 -vt 0.023438 0.843750 -vt 0.015625 0.851563 -vt 0.007813 0.851563 -vt 0.023438 0.851563 -vt 0.000000 0.828125 -vt 0.000000 0.843750 -vn 0.382700 0.000000 -0.923900 -vn -0.382700 0.000000 0.923900 -vn 0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 -0.000000 -vn 0.923900 0.000000 0.382700 -vn -0.923900 0.000000 -0.382700 -usemtl None -#s off -f 121/204/91 122/205/91 123/206/91 124/207/91 -f 125/208/92 126/209/92 127/210/92 128/211/92 -f 124/207/93 123/206/93 128/212/93 127/213/93 -f 126/206/94 125/211/94 122/214/94 121/212/94 -f 126/215/95 121/204/95 124/207/95 127/216/95 -f 122/205/96 125/208/96 128/211/96 123/206/96 -o Carpet2 -v -0.968750 0.524375 0.250000 -v -1.031250 0.524375 0.250000 -v -1.031250 0.836875 0.250000 -v -0.968750 0.836875 0.250000 -v -1.031250 0.524375 0.750000 -v -0.968750 0.524375 0.750000 -v -0.968750 0.836875 0.750000 -v -1.031250 0.836875 0.750000 -vt 0.695313 0.750000 -vt 0.703125 0.750000 -vt 0.703125 0.789063 -vt 0.695313 0.789063 -vt 0.765625 0.750000 -vt 0.773438 0.750000 -vt 0.773438 0.789063 -vt 0.765625 0.789063 -vt 0.703125 0.851563 -vt 0.695313 0.851563 -vt 0.710938 0.789063 -vt 0.710938 0.851563 -vt 0.632813 0.750000 -vt 0.632813 0.789063 -vn 0.000000 0.000000 -1.000000 -vn 0.000000 0.000000 1.000000 -vn 0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 -0.000000 -vn 1.000000 0.000000 0.000000 -vn -1.000000 -0.000000 0.000000 -usemtl None -#s off -f 129/217/97 130/218/97 131/219/97 132/220/97 -f 133/221/98 134/222/98 135/223/98 136/224/98 -f 132/220/99 131/219/99 136/225/99 135/226/99 -f 134/219/100 133/227/100 130/228/100 129/225/100 -f 134/229/101 129/217/101 132/220/101 135/230/101 -f 130/218/102 133/221/102 136/224/102 131/219/102 -o CrucibleLeg1 -v -0.913320 0.837500 0.817650 -v -0.971063 0.837500 0.793732 -v -0.971063 0.962500 0.793732 -v -0.913320 0.962500 0.817650 -v -0.994980 0.837500 0.851474 -v -0.937238 0.837500 0.875392 -v -0.937238 0.962500 0.875392 -v -0.994980 0.962500 0.851474 -vt 0.007813 0.828125 -vt 0.015625 0.828125 -vt 0.015625 0.843750 -vt 0.007813 0.843750 -vt 0.023438 0.828125 -vt 0.031250 0.828125 -vt 0.031250 0.843750 -vt 0.023438 0.843750 -vt 0.015625 0.851563 -vt 0.007813 0.851563 -vt 0.023438 0.851563 -vt 0.000000 0.828125 -vt 0.000000 0.843750 -vn 0.382700 0.000000 -0.923900 -vn -0.382700 0.000000 0.923900 -vn 0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 0.000000 -vn 0.923900 0.000000 0.382700 -vn -0.923900 0.000000 -0.382700 -usemtl None -#s off -f 137/231/103 138/232/103 139/233/103 140/234/103 -f 141/235/104 142/236/104 143/237/104 144/238/104 -f 140/234/105 139/233/105 144/239/105 143/240/105 -f 142/233/106 141/238/106 138/241/106 137/239/106 -f 142/242/107 137/231/107 140/234/107 143/243/107 -f 138/232/108 141/235/108 144/238/108 139/233/108 -o Top -v 1.000000 0.587500 0.000000 -v -1.000000 0.587500 0.000000 -v -1.000000 0.837500 0.000000 -v 1.000000 0.837500 0.000000 -v -1.000000 0.587500 1.000000 -v 1.000000 0.587500 1.000000 -v 1.000000 0.837500 1.000000 -v -1.000000 0.837500 1.000000 -vt 0.125000 0.695313 -vt 0.375000 0.695313 -vt 0.375000 0.726563 -vt 0.125000 0.726563 -vt 0.500000 0.695313 -vt 0.750000 0.695313 -vt 0.750000 0.726563 -vt 0.500000 0.726563 -vt 0.375000 0.851563 -vt 0.125000 0.851563 -vt 0.625000 0.726563 -vt 0.625000 0.851563 -vt 0.000000 0.695313 -vt 0.000000 0.726563 -vn 0.000000 0.000000 -1.000000 -vn 0.000000 0.000000 1.000000 -vn 0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 -0.000000 -vn 1.000000 -0.000000 0.000000 -vn -1.000000 -0.000000 0.000000 -usemtl None -#s off -f 145/244/109 146/245/109 147/246/109 148/247/109 -f 149/248/110 150/249/110 151/250/110 152/251/110 -f 148/247/111 147/246/111 152/252/111 151/253/111 -f 150/246/112 149/254/112 146/255/112 145/252/112 -f 150/256/113 145/244/113 148/247/113 151/257/113 -f 146/245/114 149/248/114 152/251/114 147/246/114 -o Pillar2 -v -0.309500 -0.007739 0.312500 -v -0.674888 0.076617 0.312500 -v -0.534294 0.685599 0.312500 -v -0.168905 0.601242 0.312500 -v -0.674888 0.076617 0.687500 -v -0.309500 -0.007739 0.687500 -v -0.168905 0.601242 0.687500 -v -0.534294 0.685599 0.687500 -vt 0.046875 0.562500 -vt 0.093750 0.562500 -vt 0.093750 0.640625 -vt 0.046875 0.640625 -vt 0.140625 0.562500 -vt 0.187500 0.562500 -vt 0.187500 0.640625 -vt 0.140625 0.640625 -vt 0.093750 0.687500 -vt 0.046875 0.687500 -vt 0.140625 0.687500 -vt 0.000000 0.562500 -vt 0.000000 0.640625 -vn -0.000000 0.000000 -1.000000 -vn -0.000000 -0.000000 1.000000 -vn 0.225000 0.974400 0.000000 -vn -0.224900 -0.974400 -0.000000 -vn 0.974400 -0.225000 -0.000000 -vn -0.974400 0.225000 0.000000 -usemtl None -#s off -f 153/258/115 154/259/115 155/260/115 156/261/115 -f 157/262/116 158/263/116 159/264/116 160/265/116 -f 156/261/117 155/260/117 160/266/117 159/267/117 -f 158/260/118 157/265/118 154/268/118 153/266/118 -f 158/269/119 153/258/119 156/261/119 159/270/119 -f 154/259/120 157/262/120 160/265/120 155/260/120 -o Jar1 -v 0.920663 0.837500 0.377225 -v 0.737969 0.837500 0.419403 -v 0.737969 1.087500 0.419403 -v 0.920663 1.087500 0.377225 -v 0.780147 0.837500 0.602097 -v 0.962842 0.837500 0.559919 -v 0.962842 1.087500 0.559919 -v 0.780147 1.087500 0.602097 -vt 0.023438 0.406250 -vt 0.046875 0.406250 -vt 0.046875 0.437500 -vt 0.023438 0.437500 -vt 0.070313 0.406250 -vt 0.093750 0.406250 -vt 0.093750 0.437500 -vt 0.070313 0.437500 -vt 0.046875 0.460938 -vt 0.023438 0.460938 -vt 0.070313 0.460938 -vt 0.000000 0.406250 -vt 0.000000 0.437500 -vn -0.224900 0.000000 -0.974400 -vn 0.224900 -0.000000 0.974400 -vn 0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 0.000000 -vn 0.974400 0.000000 -0.225000 -vn -0.974400 0.000000 0.224900 -usemtl None -#s off -f 161/271/121 162/272/121 163/273/121 164/274/121 -f 165/275/122 166/276/122 167/277/122 168/278/122 -f 164/274/123 163/273/123 168/279/123 167/280/123 -f 166/273/124 165/278/124 162/281/124 161/279/124 -f 166/282/125 161/271/125 164/274/125 167/283/125 -f 162/272/126 165/275/126 168/278/126 163/273/126 -o Carpet1 -v 1.031250 0.524375 0.250000 -v 0.968750 0.524375 0.250000 -v 0.968750 0.836875 0.250000 -v 1.031250 0.836875 0.250000 -v 0.968750 0.524375 0.750000 -v 1.031250 0.524375 0.750000 -v 1.031250 0.836875 0.750000 -v 0.968750 0.836875 0.750000 -vt 0.695313 0.750000 -vt 0.703125 0.750000 -vt 0.703125 0.789063 -vt 0.695313 0.789063 -vt 0.765625 0.750000 -vt 0.773438 0.750000 -vt 0.773438 0.789063 -vt 0.765625 0.789063 -vt 0.703125 0.851563 -vt 0.695313 0.851563 -vt 0.710938 0.789063 -vt 0.710938 0.851563 -vt 0.632813 0.750000 -vt 0.632813 0.789063 -vn 0.000000 0.000000 -1.000000 -vn 0.000000 0.000000 1.000000 -vn 0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 -0.000000 -vn 1.000000 -0.000000 0.000000 -vn -1.000000 0.000000 0.000000 -usemtl None -#s off -f 169/284/127 170/285/127 171/286/127 172/287/127 -f 173/288/128 174/289/128 175/290/128 176/291/128 -f 172/287/129 171/286/129 176/292/129 175/293/129 -f 174/286/130 173/294/130 170/295/130 169/292/130 -f 174/296/131 169/284/131 172/287/131 175/297/131 -f 170/285/132 173/288/132 176/291/132 171/286/132 -o CrucibleJarContent -v -0.709170 0.962500 0.733088 -v -0.824655 0.962500 0.685252 -v -0.824655 1.275000 0.685252 -v -0.709170 1.275000 0.733088 -v -0.872490 0.962500 0.800737 -v -0.757005 0.962500 0.848573 -v -0.757005 1.275000 0.848573 -v -0.872490 1.275000 0.800737 -vt 0.304688 0.179688 -vt 0.320313 0.179688 -vt 0.320313 0.218750 -vt 0.304688 0.218750 -vt 0.335938 0.179688 -vt 0.351563 0.179688 -vt 0.351563 0.218750 -vt 0.335938 0.218750 -vt 0.320313 0.234375 -vt 0.304688 0.234375 -vt 0.335938 0.234375 -vt 0.289063 0.179688 -vt 0.289063 0.218750 -vn 0.382700 0.000000 -0.923900 -vn -0.382700 -0.000000 0.923900 -vn 0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 -0.000000 -vn 0.923900 0.000000 0.382700 -vn -0.923900 0.000000 -0.382700 -usemtl None -#s off -f 177/298/133 178/299/133 179/300/133 180/301/133 -f 181/302/134 182/303/134 183/304/134 184/305/134 -f 180/301/135 179/300/135 184/306/135 183/307/135 -f 182/300/136 181/305/136 178/308/136 177/306/136 -f 182/309/137 177/298/137 180/301/137 183/310/137 -f 178/299/138 181/302/138 184/305/138 179/300/138 -o CarpetLow2 -v -0.992678 0.412246 0.250000 -v -1.054228 0.423099 0.250000 -v -1.032522 0.546200 0.250000 -v -0.970972 0.535347 0.250000 -v -1.054228 0.423099 0.750000 -v -0.992678 0.412246 0.750000 -v -0.970972 0.535347 0.750000 -v -1.032522 0.546200 0.750000 -vt 0.843750 0.757813 -vt 0.851563 0.757813 -vt 0.851563 0.773438 -vt 0.843750 0.773438 -vt 0.914063 0.757813 -vt 0.921875 0.757813 -vt 0.921875 0.773438 -vt 0.914063 0.773438 -vt 0.851563 0.835938 -vt 0.843750 0.835938 -vt 0.859375 0.773438 -vt 0.859375 0.835938 -vt 0.781250 0.757813 -vt 0.781250 0.773438 -vn 0.000000 0.000000 -1.000000 -vn -0.000000 -0.000000 1.000000 -vn 0.173600 0.984800 0.000000 -vn -0.173600 -0.984800 -0.000000 -vn 0.984800 -0.173600 -0.000000 -vn -0.984800 0.173600 0.000000 -usemtl None -#s off -f 185/311/139 186/312/139 187/313/139 188/314/139 -f 189/315/140 190/316/140 191/317/140 192/318/140 -f 188/314/141 187/313/141 192/319/141 191/320/141 -f 190/313/142 189/321/142 186/322/142 185/319/142 -f 190/323/143 185/311/143 188/314/143 191/324/143 -f 186/312/144 189/315/144 192/318/144 187/313/144 -o CrucibleJar -v -0.668340 0.925000 0.716175 -v -0.841567 0.925000 0.644422 -v -0.841567 1.300000 0.644422 -v -0.668340 1.300000 0.716175 -v -0.913320 0.925000 0.817650 -v -0.740093 0.925000 0.889403 -v -0.740093 1.300000 0.889403 -v -0.913320 1.300000 0.817650 -vt 0.203125 0.179688 -vt 0.226563 0.179688 -vt 0.226563 0.226563 -vt 0.203125 0.226563 -vt 0.250000 0.179688 -vt 0.273438 0.179688 -vt 0.273438 0.226563 -vt 0.250000 0.226563 -vt 0.226563 0.250000 -vt 0.203125 0.250000 -vt 0.250000 0.250000 -vt 0.179688 0.179688 -vt 0.179688 0.226563 -vn 0.382700 0.000000 -0.923900 -vn -0.382700 -0.000000 0.923900 -vn 0.000000 1.000000 -0.000000 -vn -0.000000 -1.000000 0.000000 -vn 0.923900 -0.000000 0.382700 -vn -0.923900 0.000000 -0.382700 -usemtl None -#s off -f 193/325/145 194/326/145 195/327/145 196/328/145 -f 197/329/146 198/330/146 199/331/146 200/332/146 -f 196/328/147 195/327/147 200/333/147 199/334/147 -f 198/327/148 197/332/148 194/335/148 193/333/148 -f 198/336/149 193/325/149 196/328/149 199/337/149 -f 194/326/150 197/329/150 200/332/150 195/327/150 -o DecanterContent -v -0.147097 0.868750 0.757023 -v -0.267838 0.868750 0.789376 -v -0.267838 0.993750 0.789376 -v -0.147097 0.993750 0.757023 -v -0.235485 0.868750 0.910116 -v -0.114745 0.868750 0.877764 -v -0.114745 0.993750 0.877764 -v -0.235485 0.993750 0.910116 -vt 0.117188 0.015625 -vt 0.132813 0.015625 -vt 0.132813 0.031250 -vt 0.117188 0.031250 -vt 0.148438 0.015625 -vt 0.164063 0.015625 -vt 0.164063 0.031250 -vt 0.148438 0.031250 -vt 0.132813 0.046875 -vt 0.117188 0.046875 -vt 0.148438 0.046875 -vt 0.101563 0.015625 -vt 0.101563 0.031250 -vn -0.258800 0.000000 -0.965900 -vn 0.258800 0.000000 0.965900 -vn 0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 0.000000 -vn 0.965900 0.000000 -0.258800 -vn -0.965900 0.000000 0.258800 -usemtl None -#s off -f 201/338/151 202/339/151 203/340/151 204/341/151 -f 205/342/152 206/343/152 207/344/152 208/345/152 -f 204/341/153 203/340/153 208/346/153 207/347/153 -f 206/340/154 205/345/154 202/348/154 201/346/154 -f 206/349/155 201/338/155 204/341/155 207/350/155 -f 202/339/156 205/342/156 208/345/156 203/340/156 -o Pillar1 -v 0.674888 0.076617 0.312500 -v 0.309499 -0.007739 0.312500 -v 0.168905 0.601242 0.312500 -v 0.534294 0.685598 0.312500 -v 0.309499 -0.007739 0.687500 -v 0.674888 0.076617 0.687500 -v 0.534294 0.685598 0.687500 -v 0.168905 0.601242 0.687500 -vt 0.046875 0.562500 -vt 0.093750 0.562500 -vt 0.093750 0.640625 -vt 0.046875 0.640625 -vt 0.140625 0.562500 -vt 0.187500 0.562500 -vt 0.187500 0.640625 -vt 0.140625 0.640625 -vt 0.093750 0.687500 -vt 0.046875 0.687500 -vt 0.140625 0.687500 -vt 0.000000 0.562500 -vt 0.000000 0.640625 -vn -0.000000 0.000000 -1.000000 -vn -0.000000 -0.000000 1.000000 -vn -0.224900 0.974400 0.000000 -vn 0.224900 -0.974400 -0.000000 -vn 0.974400 0.225000 0.000000 -vn -0.974400 -0.225000 -0.000000 -usemtl None -#s off -f 209/351/157 210/352/157 211/353/157 212/354/157 -f 213/355/158 214/356/158 215/357/158 216/358/158 -f 212/354/159 211/353/159 216/359/159 215/360/159 -f 214/353/160 213/358/160 210/361/160 209/359/160 -f 214/362/161 209/351/161 212/354/161 215/363/161 -f 210/352/162 213/355/162 216/358/162 211/353/162 -o CrucibleSide4 -v -0.841567 0.962500 0.644422 -v -0.899310 0.962500 0.620504 -v -0.899310 1.025000 0.620504 -v -0.841567 1.025000 0.644422 -v -0.971063 0.962500 0.793732 -v -0.913320 0.962500 0.817650 -v -0.913320 1.025000 0.817650 -v -0.971063 1.025000 0.793732 -vt 0.078125 0.796875 -vt 0.085938 0.796875 -vt 0.085938 0.804688 -vt 0.078125 0.804688 -vt 0.109375 0.796875 -vt 0.117188 0.796875 -vt 0.117188 0.804688 -vt 0.109375 0.804688 -vt 0.085938 0.828125 -vt 0.078125 0.828125 -vt 0.093750 0.804688 -vt 0.093750 0.828125 -vt 0.054688 0.796875 -vt 0.054688 0.804688 -vn 0.382700 0.000000 -0.923900 -vn -0.382700 -0.000000 0.923900 -vn 0.000000 1.000000 -0.000000 -vn 0.000000 -1.000000 0.000000 -vn 0.923900 0.000000 0.382700 -vn -0.923900 0.000000 -0.382700 -usemtl None -#s off -f 217/364/163 218/365/163 219/366/163 220/367/163 -f 221/368/164 222/369/164 223/370/164 224/371/164 -f 220/367/165 219/366/165 224/372/165 223/373/165 -f 222/366/166 221/374/166 218/375/166 217/372/166 -f 222/376/167 217/364/167 220/367/167 223/377/167 -f 218/365/168 221/368/168 224/371/168 219/366/168 -o JarContent2 -v 0.853553 0.868750 0.809359 -v 0.765165 0.868750 0.720971 -v 0.765165 1.118750 0.720971 -v 0.853553 1.118750 0.809359 -v 0.676777 0.868750 0.809359 -v 0.765165 0.868750 0.897748 -v 0.765165 1.118750 0.897748 -v 0.676777 1.118750 0.809359 -vt 0.117188 0.312500 -vt 0.132813 0.312500 -vt 0.132813 0.343750 -vt 0.117188 0.343750 -vt 0.148438 0.312500 -vt 0.164063 0.312500 -vt 0.164063 0.343750 -vt 0.148438 0.343750 -vt 0.132813 0.359375 -vt 0.117188 0.359375 -vt 0.148438 0.359375 -vt 0.101563 0.312500 -vt 0.101563 0.343750 -vn 0.707100 0.000000 -0.707100 -vn -0.707100 0.000000 0.707100 -vn 0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 0.000000 -vn 0.707100 0.000000 0.707100 -vn -0.707100 0.000000 -0.707100 -usemtl None -#s off -f 225/378/169 226/379/169 227/380/169 228/381/169 -f 229/382/170 230/383/170 231/384/170 232/385/170 -f 228/381/171 227/380/171 232/386/171 231/387/171 -f 230/380/172 229/385/172 226/388/172 225/386/172 -f 230/389/173 225/378/173 228/381/173 231/390/173 -f 226/379/174 229/382/174 232/385/174 227/380/174 -o CarpetLowest1 -v 1.113075 0.330031 0.250000 -v 1.057387 0.301657 0.250000 -v 1.000638 0.413033 0.250000 -v 1.056326 0.441407 0.250000 -v 1.057387 0.301657 0.750000 -v 1.113075 0.330031 0.750000 -v 1.056326 0.441407 0.750000 -v 1.000638 0.413033 0.750000 -vt 0.843750 0.664063 -vt 0.851563 0.664063 -vt 0.851563 0.679688 -vt 0.843750 0.679688 -vt 0.914063 0.664063 -vt 0.921875 0.664063 -vt 0.921875 0.679688 -vt 0.914063 0.679688 -vt 0.851563 0.742188 -vt 0.843750 0.742188 -vt 0.859375 0.679688 -vt 0.859375 0.742188 -vt 0.781250 0.664063 -vt 0.781250 0.679688 -vn -0.000000 0.000000 -1.000000 -vn 0.000000 0.000000 1.000000 -vn -0.454000 0.891000 0.000000 -vn 0.454000 -0.891000 -0.000000 -vn 0.891000 0.454000 0.000000 -vn -0.891000 -0.454000 -0.000000 -usemtl None -#s off -f 233/391/175 234/392/175 235/393/175 236/394/175 -f 237/395/176 238/396/176 239/397/176 240/398/176 -f 236/394/177 235/393/177 240/399/177 239/400/177 -f 238/393/178 237/401/178 234/402/178 233/399/178 -f 238/403/179 233/391/179 236/394/179 239/404/179 -f 234/392/180 237/395/180 240/398/180 235/393/180 -o Decanter3 -v -0.220741 1.087500 0.813602 -v -0.401852 1.087500 0.862131 -v -0.401852 1.150000 0.862131 -v -0.220741 1.150000 0.813602 -v -0.385676 1.087500 0.922501 -v -0.204564 1.087500 0.873973 -v -0.204564 1.150000 0.873973 -v -0.385676 1.150000 0.922501 -vt 0.007813 0.109375 -vt 0.031250 0.109375 -vt 0.031250 0.117188 -vt 0.007813 0.117188 -vt 0.039063 0.109375 -vt 0.062500 0.109375 -vt 0.062500 0.117188 -vt 0.039063 0.117188 -vt 0.031250 0.125000 -vt 0.007813 0.125000 -vt 0.054688 0.117188 -vt 0.054688 0.125000 -vt 0.000000 0.109375 -vt 0.000000 0.117188 -vn -0.258800 0.000000 -0.965900 -vn 0.258800 0.000000 0.965900 -vn 0.000000 1.000000 0.000000 -vn -0.000000 -1.000000 -0.000000 -vn 0.965900 0.000000 -0.258800 -vn -0.965900 0.000000 0.258800 -usemtl None -#s off -f 241/405/181 242/406/181 243/407/181 244/408/181 -f 245/409/182 246/410/182 247/411/182 248/412/182 -f 244/408/183 243/407/183 248/413/183 247/414/183 -f 246/407/184 245/415/184 242/416/184 241/413/184 -f 246/417/185 241/405/185 244/408/185 247/418/185 -f 242/406/186 245/409/186 248/412/186 243/407/186 -o CrucibleSide3 -v -0.610597 0.962500 0.740093 -v -0.668340 0.962500 0.716175 -v -0.668340 1.025000 0.716175 -v -0.610597 1.025000 0.740093 -v -0.740093 0.962500 0.889403 -v -0.682350 0.962500 0.913320 -v -0.682350 1.025000 0.913320 -v -0.740093 1.025000 0.889403 -vt 0.078125 0.796875 -vt 0.085938 0.796875 -vt 0.085938 0.804688 -vt 0.078125 0.804688 -vt 0.109375 0.796875 -vt 0.117188 0.796875 -vt 0.117188 0.804688 -vt 0.109375 0.804688 -vt 0.085938 0.828125 -vt 0.078125 0.828125 -vt 0.093750 0.804688 -vt 0.093750 0.828125 -vt 0.054688 0.796875 -vt 0.054688 0.804688 -vn 0.382700 0.000000 -0.923900 -vn -0.382700 -0.000000 0.923900 -vn -0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 0.000000 -vn 0.923900 0.000000 0.382700 -vn -0.923900 0.000000 -0.382700 -usemtl None -#s off -f 249/419/187 250/420/187 251/421/187 252/422/187 -f 253/423/188 254/424/188 255/425/188 256/426/188 -f 252/422/189 251/421/189 256/427/189 255/428/189 -f 254/421/190 253/429/190 250/430/190 249/427/190 -f 254/431/191 249/419/191 252/422/191 255/432/191 -f 250/420/192 253/423/192 256/426/192 251/421/192 -o Recipe -v 0.746155 0.846250 0.501083 -v 0.490214 0.846250 0.775162 -v 0.216135 0.846250 0.519221 -v 0.472076 0.846250 0.245142 -vt 0.046875 0.953125 -vt 0.093750 0.953125 -vt 0.093750 1.000000 -vt 0.046875 1.000000 -vn 0.000000 1.000000 -0.000000 -usemtl None -#s off -f 260/433/193 259/434/193 258/435/193 257/436/193 -o CrucibleSide2 -v -0.586680 0.962500 0.682350 -v -0.875392 0.962500 0.562762 -v -0.875392 1.025000 0.562762 -v -0.586680 1.025000 0.682350 -v -0.899310 0.962500 0.620504 -v -0.610597 0.962500 0.740093 -v -0.610597 1.025000 0.740093 -v -0.899310 1.025000 0.620504 -vt 0.007813 0.765625 -vt 0.046875 0.765625 -vt 0.046875 0.773438 -vt 0.007813 0.773438 -vt 0.054688 0.765625 -vt 0.093750 0.765625 -vt 0.093750 0.773438 -vt 0.054688 0.773438 -vt 0.046875 0.781250 -vt 0.007813 0.781250 -vt 0.085938 0.773438 -vt 0.085938 0.781250 -vt 0.000000 0.765625 -vt 0.000000 0.773438 -vn 0.382700 0.000000 -0.923900 -vn -0.382700 0.000000 0.923900 -vn 0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 0.000000 -vn 0.923900 0.000000 0.382700 -vn -0.923900 0.000000 -0.382700 -usemtl None -#s off -f 261/437/194 262/438/194 263/439/194 264/440/194 -f 265/441/195 266/442/195 267/443/195 268/444/195 -f 264/440/196 263/439/196 268/445/196 267/446/196 -f 266/439/197 265/447/197 262/448/197 261/445/197 -f 266/449/198 261/437/198 264/440/198 267/450/198 -f 262/438/199 265/441/199 268/444/199 263/439/199 -o CrucibleLeg3 -v -0.586680 0.837500 0.682350 -v -0.644422 0.837500 0.658433 -v -0.644422 0.962500 0.658433 -v -0.586680 0.962500 0.682350 -v -0.668340 0.837500 0.716175 -v -0.610597 0.837500 0.740093 -v -0.610597 0.962500 0.740093 -v -0.668340 0.962500 0.716175 -vt 0.007813 0.828125 -vt 0.015625 0.828125 -vt 0.015625 0.843750 -vt 0.007813 0.843750 -vt 0.023438 0.828125 -vt 0.031250 0.828125 -vt 0.031250 0.843750 -vt 0.023438 0.843750 -vt 0.015625 0.851563 -vt 0.007813 0.851563 -vt 0.023438 0.851563 -vt 0.000000 0.828125 -vt 0.000000 0.843750 -vn 0.382700 0.000000 -0.923900 -vn -0.382700 -0.000000 0.923900 -vn -0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 0.000000 -vn 0.923900 -0.000000 0.382700 -vn -0.923900 0.000000 -0.382700 -usemtl None -#s off -f 269/451/200 270/452/200 271/453/200 272/454/200 -f 273/455/201 274/456/201 275/457/201 276/458/201 -f 272/454/202 271/453/202 276/459/202 275/460/202 -f 274/453/203 273/458/203 270/461/203 269/459/203 -f 274/462/204 269/451/204 272/454/204 275/463/204 -f 270/452/205 273/455/205 276/458/205 271/453/205 diff --git a/src/main/resources/assets/bloodmagic/models/block/nothing.json b/src/main/resources/assets/bloodmagic/models/block/nothing.json deleted file mode 100644 index 0e0dcd23..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/nothing.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/opaquemimic.json b/src/main/resources/assets/bloodmagic/models/block/opaquemimic.json deleted file mode 100644 index 2b819ba0..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/opaquemimic.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "bloodmagic:mimicloader" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/pillar_bottom.json b/src/main/resources/assets/bloodmagic/models/block/pillar_bottom.json deleted file mode 100644 index ffe9b20e..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/pillar_bottom.json +++ /dev/null @@ -1,184 +0,0 @@ -{ -"textures": { - "texture": "models/pillar_base_d" -}, -"elements": [ -{ - "__comment": "Base1", - "from": [ 0, 0, 0 ], - "to": [ 16, 2, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 8, 8 ], "texture": "#texture", "cullface": "down" }, - "up": { "uv": [ 0, 0, 8, 8 ], "texture": "#texture" }, - "north": { "uv": [ 0, 7, 8, 8 ], "texture": "#texture", "cullface": "north" }, - "south": { "uv": [ 0, 7, 8, 8 ], "texture": "#texture", "cullface": "south" }, - "west": { "uv": [ 0, 7, 8, 8 ], "texture": "#texture", "cullface": "west" }, - "east": { "uv": [ 0, 7, 8, 8 ], "texture": "#texture", "cullface": "east" } - } -}, -{ - "__comment": "Base2", - "from": [ 1, 2, 1 ], - "to": [ 15, 3, 15 ], - "faces": { - "north": { "uv": [ 0, 8.5, 7.5, 9 ], "texture": "#texture" }, - "south": { "uv": [ 0, 8.5, 7.5, 9 ], "texture": "#texture" }, - "west": { "uv": [ 0, 8.5, 7.5, 9 ], "texture": "#texture" }, - "east": { "uv": [ 0, 8.5, 7.5, 9 ], "texture": "#texture" } - } -}, -{ - "__comment": "Base3", - "from": [ 0, 3, 0 ], - "to": [ 16, 5, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 8, 8 ], "texture": "#texture" }, - "up": { "uv": [ 8, 8, 16, 16 ], "texture": "#texture" }, - "north": { "uv": [ 0, 0, 8, 1 ], "texture": "#texture", "cullface": "north" }, - "south": { "uv": [ 0, 0, 8, 1 ], "texture": "#texture", "cullface": "south" }, - "west": { "uv": [ 0, 0, 8, 1 ], "texture": "#texture", "cullface": "west" }, - "east": { "uv": [ 0, 0, 8, 1 ], "texture": "#texture", "cullface": "east" } - } -}, -{ - "__comment": "Rim1", - "from": [ 3, 5, 13 ], - "to": [ 13, 6, 15 ], - "faces": { - "up": { "uv": [ 1.5, 7, 6.5, 8 ], "texture": "#texture" }, - "north": { "uv": [ 1.5, 7, 6.5, 7.5 ], "texture": "#texture" }, - "south": { "uv": [ 1.5, 7.5, 6.5, 8 ], "texture": "#texture" } - } -}, -{ - "__comment": "Rim2", - "from": [ 1, 5, 3 ], - "to": [ 3, 6, 13 ], - "faces": { - "up": { "uv": [ 0, 1.5, 1, 6.5 ], "texture": "#texture" }, - "west": { "uv": [ 1.5, 7.5, 6.5, 8 ], "texture": "#texture" }, - "east": { "uv": [ 1.5, 7, 6.5, 7.5 ], "texture": "#texture" } - } -}, -{ - "__comment": "Nook1", - "from": [ -1, -0.5, -1 ], - "to": [ 1, 2.5, 1 ], - "faces": { - "down": { "uv": [ 11.5, 0, 12.5, 1 ], "texture": "#texture", "cullface": "west" }, - "up": { "uv": [ 10, 0, 11, 1 ], "texture": "#texture", "cullface": "west" }, - "north": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture", "cullface": "west" }, - "south": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture", "cullface": "west" }, - "west": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture", "cullface": "west" }, - "east": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture", "cullface": "west" } - } -}, -{ - "__comment": "Rim4", - "from": [ 3, 5, 1 ], - "to": [ 13, 6, 3 ], - "faces": { - "up": { "uv": [ 1.5, 0, 6.5, 1 ], "texture": "#texture" }, - "north": { "uv": [ 1.5, 7.5, 6.5, 8 ], "texture": "#texture" }, - "south": { "uv": [ 1.5, 7, 6.5, 7.5 ], "texture": "#texture" } - } -}, -{ - "__comment": "Rim4", - "from": [ 13, 5, 3 ], - "to": [ 15, 6, 13 ], - "faces": { - "up": { "uv": [ 7, 1.5, 8, 6.5 ], "texture": "#texture" }, - "west": { "uv": [ 1.5, 7, 6.5, 7.5 ], "texture": "#texture" }, - "east": { "uv": [ 1.5, 7.5, 6.5, 8 ], "texture": "#texture" } - } -}, -{ - "__comment": "Nook5", - "from": [ 1, 5, 13 ], - "to": [ 3, 8, 15 ], - "faces": { - "up": { "uv": [ 10, 0, 11, 1 ], "texture": "#texture" }, - "north": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture" }, - "south": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture" }, - "west": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture" }, - "east": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture" } - } -}, -{ - "__comment": "Nook6", - "from": [ 13, 5, 13 ], - "to": [ 15, 8, 15 ], - "faces": { - "up": { "uv": [ 10, 0, 11, 1 ], "texture": "#texture" }, - "north": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture" }, - "south": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture" }, - "west": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture" }, - "east": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture" } - } -}, -{ - "__comment": "Nook7", - "from": [ 13, 5, 1 ], - "to": [ 15, 8, 3 ], - "faces": { - "up": { "uv": [ 10, 0, 11, 1 ], "texture": "#texture" }, - "north": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture" }, - "south": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture" }, - "west": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture" }, - "east": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture" } - } -}, -{ - "__comment": "Nook8", - "from": [ 1, 5, 1 ], - "to": [ 3, 8, 3 ], - "faces": { - "up": { "uv": [ 10, 0, 11, 1 ], "texture": "#texture" }, - "north": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture" }, - "south": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture" }, - "west": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture" }, - "east": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture" } - } -}, -{ - "__comment": "Nook2", - "from": [ 15, -0.5, -1 ], - "to": [ 17, 2.5, 1 ], - "faces": { - "down": { "uv": [ 11.5, 0, 12.5, 1 ], "texture": "#texture", "cullface": "east" }, - "up": { "uv": [ 10, 0, 11, 1 ], "texture": "#texture", "cullface": "east" }, - "north": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture", "cullface": "east" }, - "south": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture", "cullface": "east" }, - "west": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture", "cullface": "east" }, - "east": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture", "cullface": "east" } - } -}, -{ - "__comment": "Nook3", - "from": [ 15, -0.5, 15 ], - "to": [ 17, 2.5, 17 ], - "faces": { - "down": { "uv": [ 11.5, 0, 12.5, 1 ], "texture": "#texture", "cullface": "east" }, - "up": { "uv": [ 10, 0, 11, 1 ], "texture": "#texture", "cullface": "east" }, - "north": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture", "cullface": "east" }, - "south": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture", "cullface": "east" }, - "west": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture", "cullface": "east" }, - "east": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture", "cullface": "east" } - } -}, -{ - "__comment": "Nook4", - "from": [ -1, -0.5, 15 ], - "to": [ 1, 2.5, 17 ], - "faces": { - "down": { "uv": [ 11.5, 0, 12.5, 1 ], "texture": "#texture", "cullface": "west" }, - "up": { "uv": [ 10, 0, 11, 1 ], "texture": "#texture", "cullface": "west" }, - "north": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture", "cullface": "west" }, - "south": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture", "cullface": "west" }, - "west": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture", "cullface": "west" }, - "east": { "uv": [ 8.5, 0, 9.5, 1.5 ], "texture": "#texture", "cullface": "west" } - } -} -] -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/pillar_mid.json b/src/main/resources/assets/bloodmagic/models/block/pillar_mid.json deleted file mode 100644 index 98c53eac..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/pillar_mid.json +++ /dev/null @@ -1,294 +0,0 @@ -{ -"textures": { - "texture": "models/pillar_mid_d" -}, -"elements": [ -{ - "__comment": "Base1", - "from": [ 2, -7, 2 ], - "to": [ 14, -3, 14 ], - "faces": { - "down": { "uv": [ 8, 8, 16, 16 ], "texture": "#texture", "cullface": "down" }, - "up": { "uv": [ 8, 8, 16, 16 ], "texture": "#texture" }, - "north": { "uv": [ 0, 6.5, 6, 8.5 ], "texture": "#texture" }, - "south": { "uv": [ 0, 6.5, 6, 8.5 ], "texture": "#texture" }, - "west": { "uv": [ 0, 6.5, 6, 8.5 ], "texture": "#texture" }, - "east": { "uv": [ 0, 6.5, 6, 8.5 ], "texture": "#texture" } - } -}, -{ - "__comment": "Rim1", - "from": [ 5, -3, 11 ], - "to": [ 11, 1, 14 ], - "faces": { - "up": { "uv": [ 5, 2.5, 8, 4 ], "texture": "#texture" }, - "north": { "uv": [ 1.5, 4.5, 4.5, 6.5 ], "texture": "#texture" }, - "south": { "uv": [ 1.5, 4.5, 4.5, 6.5 ], "texture": "#texture" }, - "west": { "uv": [ 6.5, 0, 8, 2 ], "texture": "#texture" }, - "east": { "uv": [ 6.5, 0, 8, 2 ], "texture": "#texture" } - } -}, -{ - "__comment": "Rim2", - "from": [ 2, -3, 5 ], - "to": [ 5, 1, 11 ], - "faces": { - "up": { "uv": [ 5, 2.5, 8, 4 ], "rotation": 90, "texture": "#texture" }, - "north": { "uv": [ 6.5, 0, 8, 2 ], "texture": "#texture" }, - "south": { "uv": [ 6.5, 0, 8, 2 ], "texture": "#texture" }, - "west": { "uv": [ 1.5, 4.5, 4.5, 6.5 ], "texture": "#texture" }, - "east": { "uv": [ 1.5, 4.5, 4.5, 6.5 ], "texture": "#texture" } - } -}, -{ - "__comment": "Rim3", - "from": [ 5, -3, 2 ], - "to": [ 11, 1, 5 ], - "faces": { - "up": { "uv": [ 5, 2.5, 8, 4 ], "rotation": 180, "texture": "#texture" }, - "north": { "uv": [ 1.5, 4.5, 4.5, 6.5 ], "texture": "#texture" }, - "south": { "uv": [ 1.5, 4.5, 4.5, 6.5 ], "texture": "#texture" }, - "west": { "uv": [ 6.5, 0, 8, 2 ], "texture": "#texture" }, - "east": { "uv": [ 6.5, 0, 8, 2 ], "texture": "#texture" } - } -}, -{ - "__comment": "Rim4", - "from": [ 11, -3, 5 ], - "to": [ 14, 1, 11 ], - "faces": { - "up": { "uv": [ 5, 2.5, 8, 4 ], "rotation": 270, "texture": "#texture" }, - "north": { "uv": [ 6.5, 0, 8, 2 ], "texture": "#texture" }, - "south": { "uv": [ 6.5, 0, 8, 2 ], "texture": "#texture" }, - "west": { "uv": [ 1.5, 4.5, 4.5, 6.5 ], "texture": "#texture" }, - "east": { "uv": [ 1.5, 4.5, 4.5, 6.5 ], "texture": "#texture" } - } -}, -{ - "__comment": "Mid1", - "from": [ 5, 1, 5 ], - "to": [ 11, 5, 11 ], - "faces": { - "down": { "uv": [ 10.5, 10.5, 13.5, 13.5 ], "texture": "#texture" }, - "up": { "uv": [ 10.5, 10.5, 13.5, 13.5 ], "texture": "#texture" }, - "north": { "uv": [ 8.5, 5, 11.5, 7 ], "texture": "#texture" }, - "south": { "uv": [ 8.5, 5, 11.5, 7 ], "texture": "#texture" }, - "west": { "uv": [ 8.5, 5, 11.5, 7 ], "texture": "#texture" }, - "east": { "uv": [ 8.5, 5, 11.5, 7 ], "texture": "#texture" } - } -}, -{ - "__comment": "Nook", - "from": [ 11, -4, 11 ], - "to": [ 13, -1, 13 ], - "faces": { - "down": { "uv": [ 3, 9, 4, 10 ], "texture": "#texture" }, - "up": { "uv": [ 1.5, 9, 2.5, 10 ], "texture": "#texture" }, - "north": { "uv": [ 0, 9, 1, 10.5 ], "texture": "#texture" }, - "south": { "uv": [ 0, 9, 1, 10.5 ], "texture": "#texture" }, - "west": { "uv": [ 0, 9, 1, 10.5 ], "texture": "#texture" }, - "east": { "uv": [ 0, 9, 1, 10.5 ], "texture": "#texture" } - } -}, -{ - "__comment": "Nook2", - "from": [ 3, -4, 11 ], - "to": [ 5, -1, 13 ], - "faces": { - "down": { "uv": [ 3, 9, 4, 10 ], "texture": "#texture" }, - "up": { "uv": [ 1.5, 9, 2.5, 10 ], "texture": "#texture" }, - "north": { "uv": [ 0, 9, 1, 10.5 ], "texture": "#texture" }, - "south": { "uv": [ 0, 9, 1, 10.5 ], "texture": "#texture" }, - "west": { "uv": [ 0, 9, 1, 10.5 ], "texture": "#texture" }, - "east": { "uv": [ 0, 9, 1, 10.5 ], "texture": "#texture" } - } -}, -{ - "__comment": "Nook3", - "from": [ 3, -4, 3 ], - "to": [ 5, -1, 5 ], - "faces": { - "down": { "uv": [ 3, 9, 4, 10 ], "texture": "#texture" }, - "up": { "uv": [ 1.5, 9, 2.5, 10 ], "texture": "#texture" }, - "north": { "uv": [ 0, 9, 1, 10.5 ], "texture": "#texture" }, - "south": { "uv": [ 0, 9, 1, 10.5 ], "texture": "#texture" }, - "west": { "uv": [ 0, 9, 1, 10.5 ], "texture": "#texture" }, - "east": { "uv": [ 0, 9, 1, 10.5 ], "texture": "#texture" } - } -}, -{ - "__comment": "Nook4", - "from": [ 11, -4, 3 ], - "to": [ 13, -1, 5 ], - "faces": { - "down": { "uv": [ 3, 9, 4, 10 ], "texture": "#texture" }, - "up": { "uv": [ 1.5, 9, 2.5, 10 ], "texture": "#texture" }, - "north": { "uv": [ 0, 9, 1, 10.5 ], "texture": "#texture" }, - "south": { "uv": [ 0, 9, 1, 10.5 ], "texture": "#texture" }, - "west": { "uv": [ 0, 9, 1, 10.5 ], "texture": "#texture" }, - "east": { "uv": [ 0, 9, 1, 10.5 ], "texture": "#texture" } - } -}, -{ - "__comment": "Mid3", - "from": [ 5, 6, 5 ], - "to": [ 11, 10, 11 ], - "faces": { - "down": { "uv": [ 10.5, 10.5, 13.5, 13.5 ], "texture": "#texture", "cullface": "up" }, - "up": { "uv": [ 10.5, 10.5, 13.5, 13.5 ], "texture": "#texture", "cullface": "up" }, - "north": { "uv": [ 8.5, 2.5, 11.5, 4.5 ], "texture": "#texture", "cullface": "up" }, - "south": { "uv": [ 8.5, 2.5, 11.5, 4.5 ], "texture": "#texture", "cullface": "up" }, - "west": { "uv": [ 8.5, 2.5, 11.5, 4.5 ], "texture": "#texture", "cullface": "up" }, - "east": { "uv": [ 8.5, 2.5, 11.5, 4.5 ], "texture": "#texture", "cullface": "up" } - } -}, -{ - "__comment": "Mid5", - "from": [ 5, 11, 5 ], - "to": [ 11, 15, 11 ], - "faces": { - "down": { "uv": [ 10.5, 10.5, 13.5, 13.5 ], "texture": "#texture", "cullface": "up" }, - "up": { "uv": [ 10.5, 10.5, 13.5, 13.5 ], "texture": "#texture", "cullface": "up" }, - "north": { "uv": [ 8.5, 0, 11.5, 2 ], "texture": "#texture", "cullface": "up" }, - "south": { "uv": [ 8.5, 0, 11.5, 2 ], "texture": "#texture", "cullface": "up" }, - "west": { "uv": [ 8.5, 0, 11.5, 2 ], "texture": "#texture", "cullface": "up" }, - "east": { "uv": [ 8.5, 0, 11.5, 2 ], "texture": "#texture", "cullface": "up" } - } -}, -{ - "__comment": "Mid2", - "from": [ 5.5, 5, 5.5 ], - "to": [ 10.5, 6, 10.5 ], - "faces": { - "north": { "uv": [ 12, 2, 14.5, 2.5 ], "texture": "#texture" }, - "south": { "uv": [ 12, 2, 14.5, 2.5 ], "texture": "#texture" }, - "west": { "uv": [ 12, 2, 14.5, 2.5 ], "texture": "#texture" }, - "east": { "uv": [ 12, 2, 14.5, 2.5 ], "texture": "#texture" } - } -}, -{ - "__comment": "Mid4", - "from": [ 5.5, 10, 5.5 ], - "to": [ 10.5, 11, 10.5 ], - "faces": { - "north": { "uv": [ 12, 2, 14.5, 2.5 ], "texture": "#texture", "cullface": "up" }, - "south": { "uv": [ 12, 2, 14.5, 2.5 ], "texture": "#texture", "cullface": "up" }, - "west": { "uv": [ 12, 2, 14.5, 2.5 ], "texture": "#texture", "cullface": "up" }, - "east": { "uv": [ 12, 2, 14.5, 2.5 ], "texture": "#texture", "cullface": "up" } - } -}, -{ - "__comment": "Rim5", - "from": [ 5, 15, 11 ], - "to": [ 11, 19, 14 ], - "faces": { - "down": { "uv": [ 5, 2.5, 8, 4 ], "rotation": 180, "texture": "#texture", "cullface": "up" }, - "north": { "uv": [ 1.5, 2, 4.5, 4 ], "texture": "#texture", "cullface": "up" }, - "south": { "uv": [ 1.5, 2, 4.5, 4 ], "texture": "#texture", "cullface": "up" }, - "west": { "uv": [ 6.5, 0, 8, 2 ], "texture": "#texture", "cullface": "up" }, - "east": { "uv": [ 6.5, 0, 8, 2 ], "texture": "#texture", "cullface": "up" } - } -}, -{ - "__comment": "Rim6", - "from": [ 11, 15, 5 ], - "to": [ 14, 19, 11 ], - "faces": { - "down": { "uv": [ 5, 2.5, 8, 4 ], "rotation": 270, "texture": "#texture", "cullface": "up" }, - "north": { "uv": [ 6.5, 0, 8, 2 ], "texture": "#texture", "cullface": "up" }, - "south": { "uv": [ 6.5, 0, 8, 2 ], "texture": "#texture", "cullface": "up" }, - "west": { "uv": [ 1.5, 2, 4.5, 4 ], "texture": "#texture", "cullface": "up" }, - "east": { "uv": [ 1.5, 2, 4.5, 4 ], "texture": "#texture", "cullface": "up" } - } -}, -{ - "__comment": "Rim7", - "from": [ 2, 15, 5 ], - "to": [ 5, 19, 11 ], - "faces": { - "down": { "uv": [ 5, 2.5, 8, 4 ], "rotation": 90, "texture": "#texture", "cullface": "up" }, - "north": { "uv": [ 6.5, 0, 8, 2 ], "texture": "#texture", "cullface": "up" }, - "south": { "uv": [ 6.5, 0, 8, 2 ], "texture": "#texture", "cullface": "up" }, - "west": { "uv": [ 1.5, 2, 4.5, 4 ], "texture": "#texture", "cullface": "up" }, - "east": { "uv": [ 1.5, 2, 4.5, 4 ], "texture": "#texture", "cullface": "up" } - } -}, -{ - "__comment": "Rim8", - "from": [ 5, 15, 2 ], - "to": [ 11, 19, 5 ], - "faces": { - "down": { "uv": [ 5, 2.5, 8, 4 ], "texture": "#texture", "cullface": "up" }, - "north": { "uv": [ 1.5, 2, 4.5, 4 ], "texture": "#texture", "cullface": "up" }, - "south": { "uv": [ 1.5, 2, 4.5, 4 ], "texture": "#texture", "cullface": "up" }, - "west": { "uv": [ 6.5, 0, 8, 2 ], "texture": "#texture", "cullface": "up" }, - "east": { "uv": [ 6.5, 0, 8, 2 ], "texture": "#texture", "cullface": "up" } - } -}, -{ - "__comment": "Base2", - "from": [ 2, 19, 2 ], - "to": [ 14, 23, 14 ], - "faces": { - "down": { "uv": [ 8, 8, 16, 16 ], "texture": "#texture", "cullface": "up" }, - "up": { "uv": [ 8, 8, 16, 16 ], "texture": "#texture", "cullface": "up" }, - "north": { "uv": [ 0, 0, 6, 2 ], "texture": "#texture", "cullface": "up" }, - "south": { "uv": [ 0, 0, 6, 2 ], "texture": "#texture", "cullface": "up" }, - "west": { "uv": [ 0, 0, 6, 2 ], "texture": "#texture", "cullface": "up" }, - "east": { "uv": [ 0, 0, 6, 2 ], "texture": "#texture", "cullface": "up" } - } -}, -{ - "__comment": "Nook5", - "from": [ 11, 17, 11 ], - "to": [ 13, 20, 13 ], - "faces": { - "down": { "uv": [ 1.5, 9, 2.5, 10 ], "texture": "#texture", "cullface": "up" }, - "up": { "uv": [ 3, 9, 4, 10 ], "texture": "#texture", "cullface": "up" }, - "north": { "uv": [ 0, 10.5, 1, 9 ], "texture": "#texture", "cullface": "up" }, - "south": { "uv": [ 0, 10.5, 1, 9 ], "texture": "#texture", "cullface": "up" }, - "west": { "uv": [ 0, 10.5, 1, 9 ], "texture": "#texture", "cullface": "up" }, - "east": { "uv": [ 0, 10.5, 1, 9 ], "texture": "#texture", "cullface": "up" } - } -}, -{ - "__comment": "Nook7", - "from": [ 3, 17, 11.5 ], - "to": [ 5, 20, 13.5 ], - "faces": { - "down": { "uv": [ 1.5, 9, 2.5, 10 ], "texture": "#texture", "cullface": "up" }, - "up": { "uv": [ 3, 9, 4, 10 ], "texture": "#texture", "cullface": "up" }, - "north": { "uv": [ 0, 10.5, 1, 9 ], "texture": "#texture", "cullface": "up" }, - "south": { "uv": [ 0, 10.5, 1, 9 ], "texture": "#texture", "cullface": "up" }, - "west": { "uv": [ 0, 10.5, 1, 9 ], "texture": "#texture", "cullface": "up" }, - "east": { "uv": [ 0, 10.5, 1, 9 ], "texture": "#texture", "cullface": "up" } - } -}, -{ - "__comment": "Nook8", - "from": [ 3, 17, 3 ], - "to": [ 5, 20, 5 ], - "faces": { - "down": { "uv": [ 1.5, 9, 2.5, 10 ], "texture": "#texture", "cullface": "up" }, - "up": { "uv": [ 3, 9, 4, 10 ], "texture": "#texture", "cullface": "up" }, - "north": { "uv": [ 0, 10.5, 1, 9 ], "texture": "#texture", "cullface": "up" }, - "south": { "uv": [ 0, 10.5, 1, 9 ], "texture": "#texture", "cullface": "up" }, - "west": { "uv": [ 0, 10.5, 1, 9 ], "texture": "#texture", "cullface": "up" }, - "east": { "uv": [ 0, 10.5, 1, 9 ], "texture": "#texture", "cullface": "up" } - } -}, -{ - "__comment": "Nook6", - "from": [ 11, 17, 3 ], - "to": [ 13, 20, 5 ], - "faces": { - "down": { "uv": [ 1.5, 9, 2.5, 10 ], "texture": "#texture", "cullface": "up" }, - "up": { "uv": [ 3, 9, 4, 10 ], "texture": "#texture", "cullface": "up" }, - "north": { "uv": [ 0, 10.5, 1, 9 ], "texture": "#texture", "cullface": "up" }, - "south": { "uv": [ 0, 10.5, 1, 9 ], "texture": "#texture", "cullface": "up" }, - "west": { "uv": [ 0, 10.5, 1, 9 ], "texture": "#texture", "cullface": "up" }, - "east": { "uv": [ 0, 10.5, 1, 9 ], "texture": "#texture", "cullface": "up" } - } -} -] -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/pillar_top.json b/src/main/resources/assets/bloodmagic/models/block/pillar_top.json deleted file mode 100644 index a18f8199..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/pillar_top.json +++ /dev/null @@ -1,184 +0,0 @@ -{ -"textures": { - "texture": "models/pillar_base_d" -}, -"elements": [ -{ - "__comment": "Base1", - "from": [ 0, 14, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 8, 8 ], "texture": "#texture", "cullface": "down" }, - "up": { "uv": [ 0, 0, 8, 8 ], "texture": "#texture" }, - "north": { "uv": [ 0, 7, 8, 8 ], "rotation": 180, "texture": "#texture", "cullface": "north" }, - "south": { "uv": [ 0, 7, 8, 8 ], "rotation": 180, "texture": "#texture", "cullface": "south" }, - "west": { "uv": [ 0, 7, 8, 8 ], "rotation": 180, "texture": "#texture", "cullface": "west" }, - "east": { "uv": [ 0, 7, 8, 8 ], "rotation": 180, "texture": "#texture", "cullface": "east" } - } -}, -{ - "__comment": "Base2", - "from": [ 1, 13, 1 ], - "to": [ 15, 14, 15 ], - "faces": { - "north": { "uv": [ 0, 8.5, 7.5, 9 ], "rotation": 180, "texture": "#texture" }, - "south": { "uv": [ 0, 8.5, 7.5, 9 ], "rotation": 180, "texture": "#texture" }, - "west": { "uv": [ 0, 8.5, 7.5, 9 ], "rotation": 180, "texture": "#texture" }, - "east": { "uv": [ 0, 8.5, 7.5, 9 ], "rotation": 180, "texture": "#texture" } - } -}, -{ - "__comment": "Base3", - "from": [ 0, 11, 0 ], - "to": [ 16, 13, 16 ], - "faces": { - "down": { "uv": [ 8, 8, 16, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 8, 8 ], "texture": "#texture" }, - "north": { "uv": [ 0, 0, 8, 1 ], "rotation": 180, "texture": "#texture", "cullface": "north" }, - "south": { "uv": [ 0, 0, 8, 1 ], "rotation": 180, "texture": "#texture", "cullface": "south" }, - "west": { "uv": [ 0, 0, 8, 1 ], "rotation": 180, "texture": "#texture", "cullface": "west" }, - "east": { "uv": [ 0, 0, 8, 1 ], "rotation": 180, "texture": "#texture", "cullface": "east" } - } -}, -{ - "__comment": "Rim1", - "from": [ 3, 10, 1 ], - "to": [ 13, 11, 3 ], - "faces": { - "down": { "uv": [ 1.5, 7, 6.5, 8 ], "texture": "#texture" }, - "north": { "uv": [ 1.5, 7.5, 6.5, 8 ], "rotation": 180, "texture": "#texture" }, - "south": { "uv": [ 1.5, 7, 6.5, 7.5 ], "rotation": 180, "texture": "#texture" } - } -}, -{ - "__comment": "Rim2", - "from": [ 1, 10, 3 ], - "to": [ 3, 11, 13 ], - "faces": { - "down": { "uv": [ 0, 1.5, 1, 6.5 ], "texture": "#texture" }, - "west": { "uv": [ 1.5, 7.5, 6.5, 8 ], "rotation": 180, "texture": "#texture" }, - "east": { "uv": [ 1.5, 7, 6.5, 7.5 ], "rotation": 180, "texture": "#texture" } - } -}, -{ - "__comment": "Nook1", - "from": [ -1, 13.5, 15 ], - "to": [ 1, 16.5, 17 ], - "faces": { - "down": { "uv": [ 10, 0, 11, 1 ], "texture": "#texture", "cullface": "west" }, - "up": { "uv": [ 11.5, 0, 12.5, 1 ], "texture": "#texture", "cullface": "west" }, - "north": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture", "cullface": "west" }, - "south": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture", "cullface": "west" }, - "west": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture", "cullface": "west" }, - "east": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture", "cullface": "west" } - } -}, -{ - "__comment": "Rim4", - "from": [ 3, 10, 13 ], - "to": [ 13, 11, 15 ], - "faces": { - "down": { "uv": [ 1.5, 0, 6.5, 1 ], "texture": "#texture" }, - "north": { "uv": [ 1.5, 7, 6.5, 7.5 ], "rotation": 180, "texture": "#texture" }, - "south": { "uv": [ 1.5, 7.5, 6.5, 8 ], "rotation": 180, "texture": "#texture" } - } -}, -{ - "__comment": "Rim4", - "from": [ 13, 10, 3 ], - "to": [ 15, 11, 13 ], - "faces": { - "down": { "uv": [ 7, 1.5, 8, 6.5 ], "texture": "#texture" }, - "west": { "uv": [ 1.5, 7, 6.5, 7.5 ], "rotation": 180, "texture": "#texture" }, - "east": { "uv": [ 1.5, 7.5, 6.5, 8 ], "rotation": 180, "texture": "#texture" } - } -}, -{ - "__comment": "Nook5", - "from": [ 1, 8, 1 ], - "to": [ 3, 11, 3 ], - "faces": { - "down": { "uv": [ 10, 0, 11, 1 ], "texture": "#texture" }, - "north": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture" }, - "south": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture" }, - "west": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture" }, - "east": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture" } - } -}, -{ - "__comment": "Nook6", - "from": [ 13, 8, 1 ], - "to": [ 15, 11, 3 ], - "faces": { - "down": { "uv": [ 10, 0, 11, 1 ], "texture": "#texture" }, - "north": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture" }, - "south": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture" }, - "west": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture" }, - "east": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture" } - } -}, -{ - "__comment": "Nook7", - "from": [ 13, 8, 13 ], - "to": [ 15, 11, 15 ], - "faces": { - "down": { "uv": [ 10, 0, 11, 1 ], "texture": "#texture" }, - "north": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture" }, - "south": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture" }, - "west": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture" }, - "east": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture" } - } -}, -{ - "__comment": "Nook8", - "from": [ 1, 8, 13 ], - "to": [ 3, 11, 15 ], - "faces": { - "down": { "uv": [ 10, 0, 11, 1 ], "texture": "#texture" }, - "north": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture" }, - "south": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture" }, - "west": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture" }, - "east": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture" } - } -}, -{ - "__comment": "Nook2", - "from": [ 15, 13.5, 15 ], - "to": [ 17, 16.5, 17 ], - "faces": { - "down": { "uv": [ 10, 0, 11, 1 ], "texture": "#texture", "cullface": "east" }, - "up": { "uv": [ 11.5, 0, 12.5, 1 ], "texture": "#texture", "cullface": "east" }, - "north": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture", "cullface": "east" }, - "south": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture", "cullface": "east" }, - "west": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture", "cullface": "east" }, - "east": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture", "cullface": "east" } - } -}, -{ - "__comment": "Nook3", - "from": [ 15, 13.5, -1 ], - "to": [ 17, 16.5, 1 ], - "faces": { - "down": { "uv": [ 10, 0, 11, 1 ], "texture": "#texture", "cullface": "east" }, - "up": { "uv": [ 11.5, 0, 12.5, 1 ], "texture": "#texture", "cullface": "east" }, - "north": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture", "cullface": "east" }, - "south": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture", "cullface": "east" }, - "west": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture", "cullface": "east" }, - "east": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture", "cullface": "east" } - } -}, -{ - "__comment": "Nook4", - "from": [ -1, 13.5, -1 ], - "to": [ 1, 16.5, 1 ], - "faces": { - "down": { "uv": [ 10, 0, 11, 1 ], "texture": "#texture", "cullface": "west" }, - "up": { "uv": [ 11.5, 0, 12.5, 1 ], "texture": "#texture", "cullface": "west" }, - "north": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture", "cullface": "west" }, - "south": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture", "cullface": "west" }, - "west": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture", "cullface": "west" }, - "east": { "uv": [ 8.5, 0, 9.5, 1.5 ], "rotation": 180, "texture": "#texture", "cullface": "west" } - } -} -] -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/routing/modelmasterroutingnodebase.mtl b/src/main/resources/assets/bloodmagic/models/block/routing/modelmasterroutingnodebase.mtl deleted file mode 100644 index d58e8ad1..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/routing/modelmasterroutingnodebase.mtl +++ /dev/null @@ -1,11 +0,0 @@ -# Blender MTL File: 'None' -# Material Count: 1 - -newmtl None -#Ns 0 -Ka 0.000000 0.000000 0.000000 -Kd 0.8 0.8 0.8 -#Ks 0.8 0.8 0.8 -d 1 -#illum 2 -map_Kd bloodmagic:models/ModelMasterRoutingNode \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/routing/modelmasterroutingnodebase.obj b/src/main/resources/assets/bloodmagic/models/block/routing/modelmasterroutingnodebase.obj deleted file mode 100644 index 14d04104..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/routing/modelmasterroutingnodebase.obj +++ /dev/null @@ -1,360 +0,0 @@ -# Blender v2.76 (sub 0) OBJ File: '' -# www.blender.org -mtllib ModelMasterRoutingNodeBase.mtl -o ModelMasterRoutingNodeBase -v 0.250000 0.062500 0.750000 -v 0.250000 -0.000000 0.750000 -v 0.750000 -0.000000 0.750000 -v 0.750000 0.062500 0.750000 -v 0.750000 0.062500 0.250000 -v 0.750000 0.000000 0.250000 -v 0.250000 0.000000 0.250000 -v 0.250000 0.062500 0.250000 -v 0.362465 0.389996 0.531250 -v 0.278129 0.024602 0.531250 -v 0.339027 0.010546 0.531250 -v 0.423364 0.375940 0.531250 -v 0.423364 0.375940 0.468750 -v 0.339027 0.010546 0.468750 -v 0.278129 0.024602 0.468750 -v 0.362465 0.389996 0.468750 -v 0.468750 0.375964 0.423360 -v 0.468750 0.010578 0.339023 -v 0.531250 0.010578 0.339023 -v 0.531250 0.375964 0.423360 -v 0.531250 0.390020 0.362462 -v 0.531250 0.024634 0.278126 -v 0.468750 0.024634 0.278126 -v 0.468750 0.390020 0.362462 -v 0.468750 0.389996 0.637535 -v 0.468750 0.024602 0.721871 -v 0.531250 0.024602 0.721871 -v 0.531250 0.389996 0.637535 -v 0.531250 0.375940 0.576636 -v 0.531250 0.010546 0.660972 -v 0.468750 0.010546 0.660972 -v 0.468750 0.375940 0.576636 -v 0.576640 0.375964 0.531250 -v 0.660976 0.010578 0.531250 -v 0.721874 0.024634 0.531250 -v 0.637538 0.390020 0.531250 -v 0.637538 0.390020 0.468750 -v 0.721874 0.024634 0.468750 -v 0.660976 0.010578 0.468750 -v 0.576640 0.375964 0.468750 -v 0.375000 0.156250 0.625000 -v 0.375000 0.031250 0.625000 -v 0.625000 0.031250 0.625000 -v 0.625000 0.156250 0.625000 -v 0.625000 0.156250 0.375000 -v 0.625000 0.031250 0.375000 -v 0.375000 0.031250 0.375000 -v 0.375000 0.156250 0.375000 -v 0.437500 0.250000 0.562500 -v 0.437500 0.125000 0.562500 -v 0.562500 0.125000 0.562500 -v 0.562500 0.250000 0.562500 -v 0.562500 0.250000 0.437500 -v 0.562500 0.125000 0.437500 -v 0.437500 0.125000 0.437500 -v 0.437500 0.250000 0.437500 -v 0.468750 0.343750 0.531250 -v 0.468750 0.218750 0.531250 -v 0.531250 0.218750 0.531250 -v 0.531250 0.343750 0.531250 -v 0.531250 0.343750 0.468750 -v 0.531250 0.218750 0.468750 -v 0.468750 0.218750 0.468750 -v 0.468750 0.343750 0.468750 -v 0.362465 0.389996 0.531250 -v 0.278129 0.024602 0.531250 -v 0.339027 0.010546 0.531250 -v 0.423364 0.375940 0.531250 -v 0.423364 0.375940 0.468750 -v 0.339027 0.010546 0.468750 -v 0.278129 0.024602 0.468750 -v 0.362465 0.389996 0.468750 -v 0.468750 0.375964 0.423360 -v 0.468750 0.010578 0.339023 -v 0.531250 0.010578 0.339023 -v 0.531250 0.375964 0.423360 -v 0.531250 0.390020 0.362462 -v 0.531250 0.024634 0.278126 -v 0.468750 0.024634 0.278126 -v 0.468750 0.390020 0.362462 -v 0.468750 0.389996 0.637535 -v 0.468750 0.024602 0.721871 -v 0.531250 0.024602 0.721871 -v 0.531250 0.389996 0.637535 -v 0.531250 0.375940 0.576636 -v 0.531250 0.010546 0.660972 -v 0.468750 0.010546 0.660972 -v 0.468750 0.375940 0.576636 -v 0.576640 0.375964 0.531250 -v 0.660976 0.010578 0.531250 -v 0.721874 0.024634 0.531250 -v 0.637538 0.390020 0.531250 -v 0.637538 0.390020 0.468750 -v 0.721874 0.024634 0.468750 -v 0.660976 0.010578 0.468750 -v 0.576640 0.375964 0.468750 -v 0.375000 0.156250 0.625000 -v 0.375000 0.031250 0.625000 -v 0.625000 0.031250 0.625000 -v 0.625000 0.156250 0.625000 -v 0.625000 0.156250 0.375000 -v 0.625000 0.031250 0.375000 -v 0.375000 0.031250 0.375000 -v 0.375000 0.156250 0.375000 -v 0.437500 0.250000 0.562500 -v 0.437500 0.125000 0.562500 -v 0.562500 0.125000 0.562500 -v 0.562500 0.250000 0.562500 -v 0.562500 0.250000 0.437500 -v 0.562500 0.125000 0.437500 -v 0.437500 0.125000 0.437500 -v 0.437500 0.250000 0.437500 -v 0.468750 0.343750 0.531250 -v 0.468750 0.218750 0.531250 -v 0.531250 0.218750 0.531250 -v 0.531250 0.343750 0.531250 -v 0.531250 0.343750 0.468750 -v 0.531250 0.218750 0.468750 -v 0.468750 0.218750 0.468750 -v 0.468750 0.343750 0.468750 -v 0.437500 0.250000 0.562500 -v 0.437500 0.125000 0.562500 -v 0.562500 0.125000 0.562500 -v 0.562500 0.250000 0.562500 -v 0.562500 0.250000 0.437500 -v 0.562500 0.125000 0.437500 -v 0.437500 0.125000 0.437500 -v 0.437500 0.250000 0.437500 -v 0.468750 0.343750 0.531250 -v 0.468750 0.218750 0.531250 -v 0.531250 0.218750 0.531250 -v 0.531250 0.343750 0.531250 -v 0.531250 0.343750 0.468750 -v 0.531250 0.218750 0.468750 -v 0.468750 0.218750 0.468750 -v 0.468750 0.343750 0.468750 -v 0.468750 0.343750 0.531250 -v 0.468750 0.218750 0.531250 -v 0.531250 0.218750 0.531250 -v 0.531250 0.343750 0.531250 -v 0.531250 0.343750 0.468750 -v 0.531250 0.218750 0.468750 -v 0.468750 0.218750 0.468750 -v 0.468750 0.343750 0.468750 -vt 0.140625 0.515625 -vt 0.140625 0.500000 -vt 0.265625 0.500000 -vt 0.265625 0.515625 -vt 0.390625 0.515625 -vt 0.390625 0.500000 -vt 0.515625 0.500000 -vt 0.515625 0.515625 -vt 0.140625 0.640625 -vt 0.265625 0.640625 -vt 0.390625 0.640625 -vt 0.015625 0.515625 -vt 0.015625 0.500000 -vt 0.093750 0.625000 -vt 0.093750 0.531250 -vt 0.109375 0.531250 -vt 0.109375 0.625000 -vt 0.125000 0.625000 -vt 0.125000 0.531250 -vt 0.140625 0.531250 -vt 0.140625 0.625000 -vt 0.093750 0.640625 -vt 0.109375 0.640625 -vt 0.125000 0.640625 -vt 0.078125 0.625000 -vt 0.078125 0.531250 -vt 0.046875 0.625000 -vt 0.046875 0.531250 -vt 0.062500 0.531250 -vt 0.062500 0.625000 -vt 0.046875 0.640625 -vt 0.062500 0.640625 -vt 0.078125 0.640625 -vt 0.031250 0.625000 -vt 0.031250 0.531250 -vt 0.015625 0.625000 -vt 0.015625 0.531250 -vt 0.015625 0.640625 -vt 0.031250 0.640625 -vt 0.000000 0.625000 -vt 0.000000 0.531250 -vt 0.593750 0.531250 -vt 0.593750 0.500000 -vt 0.656250 0.500000 -vt 0.656250 0.531250 -vt 0.718750 0.531250 -vt 0.718750 0.500000 -vt 0.781250 0.500000 -vt 0.781250 0.531250 -vt 0.593750 0.593750 -vt 0.656250 0.593750 -vt 0.718750 0.593750 -vt 0.531250 0.531250 -vt 0.531250 0.500000 -vt 0.828125 0.531250 -vt 0.828125 0.500000 -vt 0.859375 0.500000 -vt 0.859375 0.531250 -vt 0.890625 0.531250 -vt 0.890625 0.500000 -vt 0.921875 0.500000 -vt 0.921875 0.531250 -vt 0.828125 0.562500 -vt 0.859375 0.562500 -vt 0.890625 0.562500 -vt 0.796875 0.531250 -vt 0.796875 0.500000 -vt 0.953125 0.531250 -vt 0.953125 0.500000 -vt 0.968750 0.500000 -vt 0.968750 0.531250 -vt 0.984375 0.531250 -vt 0.984375 0.500000 -vt 1.000000 0.500000 -vt 1.000000 0.531250 -vt 0.953125 0.546875 -vt 0.968750 0.546875 -vt 0.984375 0.546875 -vt 0.937500 0.531250 -vt 0.937500 0.500000 -vn 0.000000 0.000000 1.000000 -vn 0.000000 0.000000 -1.000000 -vn 0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 -0.000000 -vn 1.000000 0.000000 0.000000 -vn -1.000000 0.000000 0.000000 -vn 0.224900 0.974400 0.000000 -vn -0.224900 -0.974400 -0.000000 -vn 0.974400 -0.224900 0.000000 -vn -0.974400 0.224900 0.000000 -vn 0.000000 -0.224900 0.974400 -vn 0.000000 0.224900 -0.974400 -vn 0.000000 0.974400 0.224900 -vn 0.000000 -0.974400 -0.224900 -vn 0.000000 0.224900 0.974400 -vn 0.000000 -0.224900 -0.974400 -vn 0.000000 0.974400 -0.224900 -vn 0.000000 -0.974400 0.224900 -vn -0.224900 0.974400 0.000000 -vn 0.224900 -0.974400 -0.000000 -vn 0.974400 0.224900 0.000000 -vn -0.974400 -0.224900 0.000000 -usemtl None -#s 1 -f 1/1/1 2/2/1 3/3/1 4/4/1 -f 5/5/2 6/6/2 7/7/2 8/8/2 -f 8/9/3 1/1/3 4/4/3 5/10/3 -f 2/5/4 7/11/4 6/10/4 3/4/4 -f 5/5/5 4/4/5 3/3/5 6/6/5 -f 8/12/6 7/13/6 2/2/6 1/1/6 -f 9/14/1 10/15/1 11/16/1 12/17/1 -f 13/18/2 14/19/2 15/20/2 16/21/2 -f 16/22/7 9/14/7 12/17/7 13/23/7 -f 10/18/8 15/24/8 14/23/8 11/17/8 -f 13/18/9 12/17/9 11/16/9 14/19/9 -f 16/25/10 15/26/10 10/15/10 9/14/10 -f 17/27/11 18/28/11 19/29/11 20/30/11 -f 21/25/12 22/26/12 23/15/12 24/14/12 -f 24/31/13 17/27/13 20/30/13 21/32/13 -f 18/25/14 23/33/14 22/32/14 19/30/14 -f 21/25/5 20/30/5 19/29/5 22/26/5 -f 24/34/6 23/35/6 18/28/6 17/27/6 -f 25/36/15 26/37/15 27/35/15 28/34/15 -f 29/27/16 30/28/16 31/29/16 32/30/16 -f 32/38/17 25/36/17 28/34/17 29/39/17 -f 26/27/18 31/31/18 30/39/18 27/34/18 -f 29/27/5 28/34/5 27/35/5 30/28/5 -f 32/40/6 31/41/6 26/37/6 25/36/6 -f 33/30/1 34/29/1 35/26/1 36/25/1 -f 37/14/2 38/15/2 39/16/2 40/17/2 -f 40/32/19 33/30/19 36/25/19 37/33/19 -f 34/14/20 39/22/20 38/33/20 35/25/20 -f 37/14/21 36/25/21 35/26/21 38/15/21 -f 40/27/22 39/28/22 34/29/22 33/30/22 -f 41/42/1 42/43/1 43/44/1 44/45/1 -f 45/46/2 46/47/2 47/48/2 48/49/2 -f 48/50/3 41/42/3 44/45/3 45/51/3 -f 42/46/4 47/52/4 46/51/4 43/45/4 -f 45/46/5 44/45/5 43/44/5 46/47/5 -f 48/53/6 47/54/6 42/43/6 41/42/6 -f 49/55/1 50/56/1 51/57/1 52/58/1 -f 53/59/2 54/60/2 55/61/2 56/62/2 -f 56/63/3 49/55/3 52/58/3 53/64/3 -f 50/59/4 55/65/4 54/64/4 51/58/4 -f 53/59/5 52/58/5 51/57/5 54/60/5 -f 56/66/6 55/67/6 50/56/6 49/55/6 -f 57/68/1 58/69/1 59/70/1 60/71/1 -f 61/72/2 62/73/2 63/74/2 64/75/2 -f 64/76/3 57/68/3 60/71/3 61/77/3 -f 58/72/4 63/78/4 62/77/4 59/71/4 -f 61/72/5 60/71/5 59/70/5 62/73/5 -f 64/79/6 63/80/6 58/69/6 57/68/6 -f 65/14/1 66/15/1 67/16/1 68/17/1 -f 69/18/2 70/19/2 71/20/2 72/21/2 -f 72/22/7 65/14/7 68/17/7 69/23/7 -f 66/18/8 71/24/8 70/23/8 67/17/8 -f 69/18/9 68/17/9 67/16/9 70/19/9 -f 72/25/10 71/26/10 66/15/10 65/14/10 -f 73/27/11 74/28/11 75/29/11 76/30/11 -f 77/25/12 78/26/12 79/15/12 80/14/12 -f 80/31/13 73/27/13 76/30/13 77/32/13 -f 74/25/14 79/33/14 78/32/14 75/30/14 -f 77/25/5 76/30/5 75/29/5 78/26/5 -f 80/34/6 79/35/6 74/28/6 73/27/6 -f 81/36/15 82/37/15 83/35/15 84/34/15 -f 85/27/16 86/28/16 87/29/16 88/30/16 -f 88/38/17 81/36/17 84/34/17 85/39/17 -f 82/27/18 87/31/18 86/39/18 83/34/18 -f 85/27/5 84/34/5 83/35/5 86/28/5 -f 88/40/6 87/41/6 82/37/6 81/36/6 -f 89/30/1 90/29/1 91/26/1 92/25/1 -f 93/14/2 94/15/2 95/16/2 96/17/2 -f 96/32/19 89/30/19 92/25/19 93/33/19 -f 90/14/20 95/22/20 94/33/20 91/25/20 -f 93/14/21 92/25/21 91/26/21 94/15/21 -f 96/27/22 95/28/22 90/29/22 89/30/22 -f 97/42/1 98/43/1 99/44/1 100/45/1 -f 101/46/2 102/47/2 103/48/2 104/49/2 -f 104/50/3 97/42/3 100/45/3 101/51/3 -f 98/46/4 103/52/4 102/51/4 99/45/4 -f 101/46/5 100/45/5 99/44/5 102/47/5 -f 104/53/6 103/54/6 98/43/6 97/42/6 -f 105/55/1 106/56/1 107/57/1 108/58/1 -f 109/59/2 110/60/2 111/61/2 112/62/2 -f 112/63/3 105/55/3 108/58/3 109/64/3 -f 106/59/4 111/65/4 110/64/4 107/58/4 -f 109/59/5 108/58/5 107/57/5 110/60/5 -f 112/66/6 111/67/6 106/56/6 105/55/6 -f 113/68/1 114/69/1 115/70/1 116/71/1 -f 117/72/2 118/73/2 119/74/2 120/75/2 -f 120/76/3 113/68/3 116/71/3 117/77/3 -f 114/72/4 119/78/4 118/77/4 115/71/4 -f 117/72/5 116/71/5 115/70/5 118/73/5 -f 120/79/6 119/80/6 114/69/6 113/68/6 -f 121/55/1 122/56/1 123/57/1 124/58/1 -f 125/59/2 126/60/2 127/61/2 128/62/2 -f 128/63/3 121/55/3 124/58/3 125/64/3 -f 122/59/4 127/65/4 126/64/4 123/58/4 -f 125/59/5 124/58/5 123/57/5 126/60/5 -f 128/66/6 127/67/6 122/56/6 121/55/6 -f 129/68/1 130/69/1 131/70/1 132/71/1 -f 133/72/2 134/73/2 135/74/2 136/75/2 -f 136/76/3 129/68/3 132/71/3 133/77/3 -f 130/72/4 135/78/4 134/77/4 131/71/4 -f 133/72/5 132/71/5 131/70/5 134/73/5 -f 136/79/6 135/80/6 130/69/6 129/68/6 -f 137/68/1 138/69/1 139/70/1 140/71/1 -f 141/72/2 142/73/2 143/74/2 144/75/2 -f 144/76/3 137/68/3 140/71/3 141/77/3 -f 138/72/4 143/78/4 142/77/4 139/71/4 -f 141/72/5 140/71/5 139/70/5 142/73/5 -f 144/79/6 143/80/6 138/69/6 137/68/6 diff --git a/src/main/resources/assets/bloodmagic/models/block/routing/modelmasterroutingnodecore.mtl b/src/main/resources/assets/bloodmagic/models/block/routing/modelmasterroutingnodecore.mtl deleted file mode 100644 index d58e8ad1..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/routing/modelmasterroutingnodecore.mtl +++ /dev/null @@ -1,11 +0,0 @@ -# Blender MTL File: 'None' -# Material Count: 1 - -newmtl None -#Ns 0 -Ka 0.000000 0.000000 0.000000 -Kd 0.8 0.8 0.8 -#Ks 0.8 0.8 0.8 -d 1 -#illum 2 -map_Kd bloodmagic:models/ModelMasterRoutingNode \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/routing/modelmasterroutingnodecore.obj b/src/main/resources/assets/bloodmagic/models/block/routing/modelmasterroutingnodecore.obj deleted file mode 100644 index 3a13a61e..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/routing/modelmasterroutingnodecore.obj +++ /dev/null @@ -1,66 +0,0 @@ -# Blender v2.76 (sub 0) OBJ File: '' -# www.blender.org -mtllib ModelMasterRoutingNodeCore.mtl -o ModelMasterRoutingNodeCore -v 0.343750 0.656250 0.656250 -v 0.343750 0.343750 0.656250 -v 0.656250 0.343750 0.656250 -v 0.656250 0.656250 0.656250 -v 0.656250 0.656250 0.343750 -v 0.656250 0.343750 0.343750 -v 0.343750 0.343750 0.343750 -v 0.343750 0.656250 0.343750 -v 0.406250 0.593750 0.593750 -v 0.406250 0.406250 0.593750 -v 0.593750 0.406250 0.593750 -v 0.593750 0.593750 0.593750 -v 0.593750 0.593750 0.406250 -v 0.593750 0.406250 0.406250 -v 0.406250 0.406250 0.406250 -v 0.406250 0.593750 0.406250 -vt 0.078125 0.921875 -vt 0.078125 0.843750 -vt 0.156250 0.843750 -vt 0.156250 0.921875 -vt 0.234375 0.921875 -vt 0.234375 0.843750 -vt 0.312500 0.843750 -vt 0.312500 0.921875 -vt 0.078125 1.000000 -vt 0.156250 1.000000 -vt 0.234375 1.000000 -vt 0.000000 0.921875 -vt 0.000000 0.843750 -vt 0.046875 0.781250 -vt 0.046875 0.734375 -vt 0.093750 0.734375 -vt 0.093750 0.781250 -vt 0.140625 0.781250 -vt 0.140625 0.734375 -vt 0.187500 0.734375 -vt 0.187500 0.781250 -vt 0.046875 0.828125 -vt 0.093750 0.828125 -vt 0.140625 0.828125 -vt 0.000000 0.781250 -vt 0.000000 0.734375 -vn 0.000000 -0.000000 1.000000 -vn 0.000000 0.000000 -1.000000 -vn 0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 -0.000000 -vn 1.000000 0.000000 0.000000 -vn -1.000000 0.000000 0.000000 -usemtl None -#s 1 -f 1/1/1 2/2/1 3/3/1 4/4/1 -f 5/5/2 6/6/2 7/7/2 8/8/2 -f 8/9/3 1/1/3 4/4/3 5/10/3 -f 2/5/4 7/11/4 6/10/4 3/4/4 -f 5/5/5 4/4/5 3/3/5 6/6/5 -f 8/12/6 7/13/6 2/2/6 1/1/6 -f 9/14/1 10/15/1 11/16/1 12/17/1 -f 13/18/2 14/19/2 15/20/2 16/21/2 -f 16/22/3 9/14/3 12/17/3 13/23/3 -f 10/18/4 15/24/4 14/23/4 11/17/4 -f 13/18/5 12/17/5 11/16/5 14/19/5 -f 16/25/6 15/26/6 10/15/6 9/14/6 diff --git a/src/main/resources/assets/bloodmagic/models/block/routing/modelroutingnodebase.mtl b/src/main/resources/assets/bloodmagic/models/block/routing/modelroutingnodebase.mtl deleted file mode 100644 index 70541b14..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/routing/modelroutingnodebase.mtl +++ /dev/null @@ -1,11 +0,0 @@ -# Blender MTL File: 'None' -# Material Count: 1 - -newmtl None -#Ns 0 -Ka 0.000000 0.000000 0.000000 -Kd 0.8 0.8 0.8 -#Ks 0.8 0.8 0.8 -d 1 -#illum 2 -map_Kd node \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/routing/modelroutingnodebase.obj b/src/main/resources/assets/bloodmagic/models/block/routing/modelroutingnodebase.obj deleted file mode 100644 index ff7b3e20..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/routing/modelroutingnodebase.obj +++ /dev/null @@ -1,444 +0,0 @@ -# Blender v2.76 (sub 0) OBJ File: '' -# www.blender.org -mtllib ModelRoutingNodeBase.mtl -o ModelRoutingNode -v 0.312500 0.062500 0.687500 -v 0.312500 -0.000000 0.687500 -v 0.687500 -0.000000 0.687500 -v 0.687500 0.062500 0.687500 -v 0.687500 0.062500 0.312500 -v 0.687500 0.000000 0.312500 -v 0.312500 0.000000 0.312500 -v 0.312500 0.062500 0.312500 -v 0.389168 0.422318 0.531250 -v 0.304832 0.056925 0.531250 -v 0.365731 0.042869 0.531250 -v 0.450067 0.408262 0.531250 -v 0.450067 0.408262 0.468750 -v 0.365731 0.042869 0.468750 -v 0.304832 0.056925 0.468750 -v 0.389168 0.422318 0.468750 -v 0.468750 0.408285 0.450063 -v 0.468750 0.042900 0.365726 -v 0.531250 0.042900 0.365726 -v 0.531250 0.408285 0.450063 -v 0.531250 0.422341 0.389165 -v 0.531250 0.056956 0.304829 -v 0.468750 0.056956 0.304829 -v 0.468750 0.422341 0.389165 -v 0.468750 0.422318 0.610832 -v 0.468750 0.056925 0.695168 -v 0.531250 0.056925 0.695168 -v 0.531250 0.422318 0.610832 -v 0.531250 0.408262 0.549933 -v 0.531250 0.042869 0.634269 -v 0.468750 0.042869 0.634269 -v 0.468750 0.408262 0.549933 -v 0.549937 0.408285 0.531250 -v 0.634273 0.042900 0.531250 -v 0.695171 0.056956 0.531250 -v 0.610835 0.422341 0.531250 -v 0.610835 0.422341 0.468750 -v 0.695171 0.056956 0.468750 -v 0.634273 0.042900 0.468750 -v 0.549937 0.408285 0.468750 -v 0.437500 0.125000 0.562500 -v 0.437500 0.062500 0.562500 -v 0.562500 0.062500 0.562500 -v 0.562500 0.125000 0.562500 -v 0.562500 0.125000 0.437500 -v 0.562500 0.062500 0.437500 -v 0.437500 0.062500 0.437500 -v 0.437500 0.125000 0.437500 -v 0.468750 0.187500 0.531250 -v 0.468750 0.125000 0.531250 -v 0.531250 0.125000 0.531250 -v 0.531250 0.187500 0.531250 -v 0.531250 0.187500 0.468750 -v 0.531250 0.125000 0.468750 -v 0.468750 0.125000 0.468750 -v 0.468750 0.187500 0.468750 -v 0.437500 0.062500 0.312500 -v 0.437500 0.000000 0.312500 -v 0.562500 0.000000 0.312500 -v 0.562500 0.062500 0.312500 -v 0.562500 0.062500 0.250000 -v 0.562500 0.000000 0.250000 -v 0.437500 0.000000 0.250000 -v 0.437500 0.062500 0.250000 -v 0.687500 0.062500 0.562500 -v 0.687500 -0.000000 0.562500 -v 0.750000 -0.000000 0.562500 -v 0.750000 0.062500 0.562500 -v 0.750000 0.062500 0.437500 -v 0.750000 0.000000 0.437500 -v 0.687500 0.000000 0.437500 -v 0.687500 0.062500 0.437500 -v 0.437500 0.062500 0.750000 -v 0.437500 -0.000000 0.750000 -v 0.562500 -0.000000 0.750000 -v 0.562500 0.062500 0.750000 -v 0.562500 0.062500 0.687500 -v 0.562500 -0.000000 0.687500 -v 0.437500 -0.000000 0.687500 -v 0.437500 0.062500 0.687500 -v 0.250000 0.062500 0.562500 -v 0.250000 -0.000000 0.562500 -v 0.312500 -0.000000 0.562500 -v 0.312500 0.062500 0.562500 -v 0.312500 0.062500 0.437500 -v 0.312500 0.000000 0.437500 -v 0.250000 0.000000 0.437500 -v 0.250000 0.062500 0.437500 -v 0.389168 0.422318 0.531250 -v 0.304832 0.056925 0.531250 -v 0.365731 0.042869 0.531250 -v 0.450067 0.408262 0.531250 -v 0.450067 0.408262 0.468750 -v 0.365731 0.042869 0.468750 -v 0.304832 0.056925 0.468750 -v 0.389168 0.422318 0.468750 -v 0.468750 0.408285 0.450063 -v 0.468750 0.042900 0.365726 -v 0.531250 0.042900 0.365726 -v 0.531250 0.408285 0.450063 -v 0.531250 0.422341 0.389165 -v 0.531250 0.056956 0.304829 -v 0.468750 0.056956 0.304829 -v 0.468750 0.422341 0.389165 -v 0.468750 0.422318 0.610832 -v 0.468750 0.056925 0.695168 -v 0.531250 0.056925 0.695168 -v 0.531250 0.422318 0.610832 -v 0.531250 0.408262 0.549933 -v 0.531250 0.042869 0.634269 -v 0.468750 0.042869 0.634269 -v 0.468750 0.408262 0.549933 -v 0.549937 0.408285 0.531250 -v 0.634273 0.042900 0.531250 -v 0.695171 0.056956 0.531250 -v 0.610835 0.422341 0.531250 -v 0.610835 0.422341 0.468750 -v 0.695171 0.056956 0.468750 -v 0.634273 0.042900 0.468750 -v 0.549937 0.408285 0.468750 -v 0.437500 0.125000 0.562500 -v 0.437500 0.062500 0.562500 -v 0.562500 0.062500 0.562500 -v 0.562500 0.125000 0.562500 -v 0.562500 0.125000 0.437500 -v 0.562500 0.062500 0.437500 -v 0.437500 0.062500 0.437500 -v 0.437500 0.125000 0.437500 -v 0.468750 0.187500 0.531250 -v 0.468750 0.125000 0.531250 -v 0.531250 0.125000 0.531250 -v 0.531250 0.187500 0.531250 -v 0.531250 0.187500 0.468750 -v 0.531250 0.125000 0.468750 -v 0.468750 0.125000 0.468750 -v 0.468750 0.187500 0.468750 -v 0.437500 0.062500 0.312500 -v 0.437500 0.000000 0.312500 -v 0.562500 0.000000 0.312500 -v 0.562500 0.062500 0.312500 -v 0.562500 0.062500 0.250000 -v 0.562500 0.000000 0.250000 -v 0.437500 0.000000 0.250000 -v 0.437500 0.062500 0.250000 -v 0.687500 0.062500 0.562500 -v 0.687500 -0.000000 0.562500 -v 0.750000 -0.000000 0.562500 -v 0.750000 0.062500 0.562500 -v 0.750000 0.062500 0.437500 -v 0.750000 0.000000 0.437500 -v 0.687500 0.000000 0.437500 -v 0.687500 0.062500 0.437500 -v 0.437500 0.062500 0.750000 -v 0.437500 -0.000000 0.750000 -v 0.562500 -0.000000 0.750000 -v 0.562500 0.062500 0.750000 -v 0.562500 0.062500 0.687500 -v 0.562500 -0.000000 0.687500 -v 0.437500 -0.000000 0.687500 -v 0.437500 0.062500 0.687500 -v 0.250000 0.062500 0.562500 -v 0.250000 -0.000000 0.562500 -v 0.312500 -0.000000 0.562500 -v 0.312500 0.062500 0.562500 -v 0.312500 0.062500 0.437500 -v 0.312500 0.000000 0.437500 -v 0.250000 0.000000 0.437500 -v 0.250000 0.062500 0.437500 -v 0.468750 0.187500 0.531250 -v 0.468750 0.125000 0.531250 -v 0.531250 0.125000 0.531250 -v 0.531250 0.187500 0.531250 -v 0.531250 0.187500 0.468750 -v 0.531250 0.125000 0.468750 -v 0.468750 0.125000 0.468750 -v 0.468750 0.187500 0.468750 -vt 0.093750 0.515625 -vt 0.093750 0.500000 -vt 0.187500 0.500000 -vt 0.187500 0.515625 -vt 0.281250 0.515625 -vt 0.281250 0.500000 -vt 0.375000 0.500000 -vt 0.375000 0.515625 -vt 0.093750 0.609375 -vt 0.187500 0.609375 -vt 0.281250 0.609375 -vt 0.000000 0.515625 -vt 0.000000 0.500000 -vt 0.015625 0.625000 -vt 0.015625 0.531250 -vt 0.031250 0.531250 -vt 0.031250 0.625000 -vt 0.046875 0.625000 -vt 0.046875 0.531250 -vt 0.062500 0.531250 -vt 0.062500 0.625000 -vt 0.015625 0.640625 -vt 0.031250 0.640625 -vt 0.046875 0.640625 -vt 0.000000 0.625000 -vt 0.000000 0.531250 -vt 0.421875 0.515625 -vt 0.421875 0.500000 -vt 0.453125 0.500000 -vt 0.453125 0.515625 -vt 0.484375 0.515625 -vt 0.484375 0.500000 -vt 0.515625 0.500000 -vt 0.515625 0.515625 -vt 0.421875 0.546875 -vt 0.453125 0.546875 -vt 0.484375 0.546875 -vt 0.390625 0.515625 -vt 0.390625 0.500000 -vt 0.546875 0.515625 -vt 0.546875 0.500000 -vt 0.562500 0.500000 -vt 0.562500 0.515625 -vt 0.578125 0.515625 -vt 0.578125 0.500000 -vt 0.593750 0.500000 -vt 0.593750 0.515625 -vt 0.546875 0.531250 -vt 0.562500 0.531250 -vt 0.578125 0.531250 -vt 0.531250 0.515625 -vt 0.531250 0.500000 -vt 0.625000 0.515625 -vt 0.625000 0.500000 -vt 0.656250 0.500000 -vt 0.656250 0.515625 -vt 0.671875 0.515625 -vt 0.671875 0.500000 -vt 0.703125 0.500000 -vt 0.703125 0.515625 -vt 0.625000 0.531250 -vt 0.656250 0.531250 -vt 0.687500 0.515625 -vt 0.687500 0.531250 -vt 0.609375 0.515625 -vt 0.609375 0.500000 -vt 0.750000 0.515625 -vt 0.750000 0.500000 -vt 0.765625 0.500000 -vt 0.765625 0.515625 -vt 0.796875 0.515625 -vt 0.796875 0.500000 -vt 0.812500 0.500000 -vt 0.812500 0.515625 -vt 0.750000 0.546875 -vt 0.765625 0.546875 -vt 0.781250 0.515625 -vt 0.781250 0.546875 -vt 0.718750 0.515625 -vt 0.718750 0.500000 -vt 0.625000 0.562500 -vt 0.625000 0.546875 -vt 0.656250 0.546875 -vt 0.656250 0.562500 -vt 0.671875 0.562500 -vt 0.671875 0.546875 -vt 0.703125 0.546875 -vt 0.703125 0.562500 -vt 0.625000 0.578125 -vt 0.656250 0.578125 -vt 0.687500 0.562500 -vt 0.687500 0.578125 -vt 0.609375 0.562500 -vt 0.609375 0.546875 -vt 0.750000 0.578125 -vt 0.750000 0.562500 -vt 0.765625 0.562500 -vt 0.765625 0.578125 -vt 0.796875 0.578125 -vt 0.796875 0.562500 -vt 0.812500 0.562500 -vt 0.812500 0.578125 -vt 0.750000 0.609375 -vt 0.765625 0.609375 -vt 0.781250 0.578125 -vt 0.781250 0.609375 -vt 0.718750 0.578125 -vt 0.718750 0.562500 -vn 0.000000 0.000000 1.000000 -vn 0.000000 0.000000 -1.000000 -vn 0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 -0.000000 -vn 1.000000 0.000000 0.000000 -vn -1.000000 0.000000 0.000000 -vn 0.224900 0.974400 0.000000 -vn -0.224900 -0.974400 -0.000000 -vn 0.974400 -0.224900 0.000000 -vn -0.974400 0.224900 0.000000 -vn 0.000000 -0.224900 0.974400 -vn 0.000000 0.224900 -0.974400 -vn 0.000000 0.974400 0.224900 -vn 0.000000 -0.974400 -0.224900 -vn 0.000000 0.224900 0.974400 -vn 0.000000 -0.224900 -0.974400 -vn 0.000000 0.974400 -0.224900 -vn 0.000000 -0.974400 0.224900 -vn -0.224900 0.974400 0.000000 -vn 0.224900 -0.974400 -0.000000 -vn 0.974400 0.224900 0.000000 -vn -0.974400 -0.224900 0.000000 -usemtl None -#s 1 -f 1/1/1 2/2/1 3/3/1 4/4/1 -f 5/5/2 6/6/2 7/7/2 8/8/2 -f 8/9/3 1/1/3 4/4/3 5/10/3 -f 2/5/4 7/11/4 6/10/4 3/4/4 -f 5/5/5 4/4/5 3/3/5 6/6/5 -f 8/12/6 7/13/6 2/2/6 1/1/6 -f 9/14/1 10/15/1 11/16/1 12/17/1 -f 13/18/2 14/19/2 15/20/2 16/21/2 -f 16/22/7 9/14/7 12/17/7 13/23/7 -f 10/18/8 15/24/8 14/23/8 11/17/8 -f 13/18/9 12/17/9 11/16/9 14/19/9 -f 16/25/10 15/26/10 10/15/10 9/14/10 -f 17/14/11 18/15/11 19/16/11 20/17/11 -f 21/18/12 22/19/12 23/20/12 24/21/12 -f 24/22/13 17/14/13 20/17/13 21/23/13 -f 18/18/14 23/24/14 22/23/14 19/17/14 -f 21/18/5 20/17/5 19/16/5 22/19/5 -f 24/25/6 23/26/6 18/15/6 17/14/6 -f 25/14/15 26/15/15 27/16/15 28/17/15 -f 29/18/16 30/19/16 31/20/16 32/21/16 -f 32/22/17 25/14/17 28/17/17 29/23/17 -f 26/18/18 31/24/18 30/23/18 27/17/18 -f 29/18/5 28/17/5 27/16/5 30/19/5 -f 32/25/6 31/26/6 26/15/6 25/14/6 -f 33/14/1 34/15/1 35/16/1 36/17/1 -f 37/18/2 38/19/2 39/20/2 40/21/2 -f 40/22/19 33/14/19 36/17/19 37/23/19 -f 34/18/20 39/24/20 38/23/20 35/17/20 -f 37/18/21 36/17/21 35/16/21 38/19/21 -f 40/25/22 39/26/22 34/15/22 33/14/22 -f 41/27/1 42/28/1 43/29/1 44/30/1 -f 45/31/2 46/32/2 47/33/2 48/34/2 -f 48/35/3 41/27/3 44/30/3 45/36/3 -f 42/31/4 47/37/4 46/36/4 43/30/4 -f 45/31/5 44/30/5 43/29/5 46/32/5 -f 48/38/6 47/39/6 42/28/6 41/27/6 -f 49/40/1 50/41/1 51/42/1 52/43/1 -f 53/44/2 54/45/2 55/46/2 56/47/2 -f 56/48/3 49/40/3 52/43/3 53/49/3 -f 50/44/4 55/50/4 54/49/4 51/43/4 -f 53/44/5 52/43/5 51/42/5 54/45/5 -f 56/51/6 55/52/6 50/41/6 49/40/6 -f 57/53/1 58/54/1 59/55/1 60/56/1 -f 61/57/2 62/58/2 63/59/2 64/60/2 -f 64/61/3 57/53/3 60/56/3 61/62/3 -f 58/63/4 63/64/4 62/62/4 59/56/4 -f 61/57/5 60/56/5 59/55/5 62/58/5 -f 64/65/6 63/66/6 58/54/6 57/53/6 -f 65/67/1 66/68/1 67/69/1 68/70/1 -f 69/71/2 70/72/2 71/73/2 72/74/2 -f 72/75/3 65/67/3 68/70/3 69/76/3 -f 66/77/4 71/78/4 70/76/4 67/70/4 -f 69/71/5 68/70/5 67/69/5 70/72/5 -f 72/79/6 71/80/6 66/68/6 65/67/6 -f 73/81/1 74/82/1 75/83/1 76/84/1 -f 77/85/2 78/86/2 79/87/2 80/88/2 -f 80/89/3 73/81/3 76/84/3 77/90/3 -f 74/91/4 79/92/4 78/90/4 75/84/4 -f 77/85/5 76/84/5 75/83/5 78/86/5 -f 80/93/6 79/94/6 74/82/6 73/81/6 -f 81/95/1 82/96/1 83/97/1 84/98/1 -f 85/99/2 86/100/2 87/101/2 88/102/2 -f 88/103/3 81/95/3 84/98/3 85/104/3 -f 82/105/4 87/106/4 86/104/4 83/98/4 -f 85/99/5 84/98/5 83/97/5 86/100/5 -f 88/107/6 87/108/6 82/96/6 81/95/6 -f 89/14/1 90/15/1 91/16/1 92/17/1 -f 93/18/2 94/19/2 95/20/2 96/21/2 -f 96/22/7 89/14/7 92/17/7 93/23/7 -f 90/18/8 95/24/8 94/23/8 91/17/8 -f 93/18/9 92/17/9 91/16/9 94/19/9 -f 96/25/10 95/26/10 90/15/10 89/14/10 -f 97/14/11 98/15/11 99/16/11 100/17/11 -f 101/18/12 102/19/12 103/20/12 104/21/12 -f 104/22/13 97/14/13 100/17/13 101/23/13 -f 98/18/14 103/24/14 102/23/14 99/17/14 -f 101/18/5 100/17/5 99/16/5 102/19/5 -f 104/25/6 103/26/6 98/15/6 97/14/6 -f 105/14/15 106/15/15 107/16/15 108/17/15 -f 109/18/16 110/19/16 111/20/16 112/21/16 -f 112/22/17 105/14/17 108/17/17 109/23/17 -f 106/18/18 111/24/18 110/23/18 107/17/18 -f 109/18/5 108/17/5 107/16/5 110/19/5 -f 112/25/6 111/26/6 106/15/6 105/14/6 -f 113/14/1 114/15/1 115/16/1 116/17/1 -f 117/18/2 118/19/2 119/20/2 120/21/2 -f 120/22/19 113/14/19 116/17/19 117/23/19 -f 114/18/20 119/24/20 118/23/20 115/17/20 -f 117/18/21 116/17/21 115/16/21 118/19/21 -f 120/25/22 119/26/22 114/15/22 113/14/22 -f 121/27/1 122/28/1 123/29/1 124/30/1 -f 125/31/2 126/32/2 127/33/2 128/34/2 -f 128/35/3 121/27/3 124/30/3 125/36/3 -f 122/31/4 127/37/4 126/36/4 123/30/4 -f 125/31/5 124/30/5 123/29/5 126/32/5 -f 128/38/6 127/39/6 122/28/6 121/27/6 -f 129/40/1 130/41/1 131/42/1 132/43/1 -f 133/44/2 134/45/2 135/46/2 136/47/2 -f 136/48/3 129/40/3 132/43/3 133/49/3 -f 130/44/4 135/50/4 134/49/4 131/43/4 -f 133/44/5 132/43/5 131/42/5 134/45/5 -f 136/51/6 135/52/6 130/41/6 129/40/6 -f 137/53/1 138/54/1 139/55/1 140/56/1 -f 141/57/2 142/58/2 143/59/2 144/60/2 -f 144/61/3 137/53/3 140/56/3 141/62/3 -f 138/63/4 143/64/4 142/62/4 139/56/4 -f 141/57/5 140/56/5 139/55/5 142/58/5 -f 144/65/6 143/66/6 138/54/6 137/53/6 -f 145/67/1 146/68/1 147/69/1 148/70/1 -f 149/71/2 150/72/2 151/73/2 152/74/2 -f 152/75/3 145/67/3 148/70/3 149/76/3 -f 146/77/4 151/78/4 150/76/4 147/70/4 -f 149/71/5 148/70/5 147/69/5 150/72/5 -f 152/79/6 151/80/6 146/68/6 145/67/6 -f 153/81/1 154/82/1 155/83/1 156/84/1 -f 157/85/2 158/86/2 159/87/2 160/88/2 -f 160/89/3 153/81/3 156/84/3 157/90/3 -f 154/91/4 159/92/4 158/90/4 155/84/4 -f 157/85/5 156/84/5 155/83/5 158/86/5 -f 160/93/6 159/94/6 154/82/6 153/81/6 -f 161/95/1 162/96/1 163/97/1 164/98/1 -f 165/99/2 166/100/2 167/101/2 168/102/2 -f 168/103/3 161/95/3 164/98/3 165/104/3 -f 162/105/4 167/106/4 166/104/4 163/98/4 -f 165/99/5 164/98/5 163/97/5 166/100/5 -f 168/107/6 167/108/6 162/96/6 161/95/6 -f 169/40/1 170/41/1 171/42/1 172/43/1 -f 173/44/2 174/45/2 175/46/2 176/47/2 -f 176/48/3 169/40/3 172/43/3 173/49/3 -f 170/44/4 175/50/4 174/49/4 171/43/4 -f 173/44/5 172/43/5 171/42/5 174/45/5 -f 176/51/6 175/52/6 170/41/6 169/40/6 diff --git a/src/main/resources/assets/bloodmagic/models/block/routing/modelroutingnodecore.mtl b/src/main/resources/assets/bloodmagic/models/block/routing/modelroutingnodecore.mtl deleted file mode 100644 index 70541b14..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/routing/modelroutingnodecore.mtl +++ /dev/null @@ -1,11 +0,0 @@ -# Blender MTL File: 'None' -# Material Count: 1 - -newmtl None -#Ns 0 -Ka 0.000000 0.000000 0.000000 -Kd 0.8 0.8 0.8 -#Ks 0.8 0.8 0.8 -d 1 -#illum 2 -map_Kd node \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/routing/modelroutingnodecore.obj b/src/main/resources/assets/bloodmagic/models/block/routing/modelroutingnodecore.obj deleted file mode 100644 index 36886c98..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/routing/modelroutingnodecore.obj +++ /dev/null @@ -1,66 +0,0 @@ -# Blender v2.76 (sub 0) OBJ File: '' -# www.blender.org -mtllib ModelRoutingNodeCore.mtl -o ModelRoutingNodeCore -v 0.375000 0.625000 0.625000 -v 0.375000 0.375000 0.625000 -v 0.625000 0.375000 0.625000 -v 0.625000 0.625000 0.625000 -v 0.625000 0.625000 0.375000 -v 0.625000 0.375000 0.375000 -v 0.375000 0.375000 0.375000 -v 0.375000 0.625000 0.375000 -v 0.437500 0.562500 0.562500 -v 0.437500 0.437500 0.562500 -v 0.562500 0.437500 0.562500 -v 0.562500 0.562500 0.562500 -v 0.562500 0.562500 0.437500 -v 0.562500 0.437500 0.437500 -v 0.437500 0.437500 0.437500 -v 0.437500 0.562500 0.437500 -vt 0.062500 0.937500 -vt 0.062500 0.875000 -vt 0.125000 0.875000 -vt 0.125000 0.937500 -vt 0.187500 0.937500 -vt 0.187500 0.875000 -vt 0.250000 0.875000 -vt 0.250000 0.937500 -vt 0.062500 1.000000 -vt 0.125000 1.000000 -vt 0.187500 1.000000 -vt 0.000000 0.937500 -vt 0.000000 0.875000 -vt 0.031250 0.796875 -vt 0.031250 0.765625 -vt 0.062500 0.765625 -vt 0.062500 0.796875 -vt 0.093750 0.796875 -vt 0.093750 0.765625 -vt 0.125000 0.765625 -vt 0.125000 0.796875 -vt 0.031250 0.828125 -vt 0.062500 0.828125 -vt 0.093750 0.828125 -vt 0.000000 0.796875 -vt 0.000000 0.765625 -vn 0.000000 -0.000000 1.000000 -vn 0.000000 0.000000 -1.000000 -vn 0.000000 1.000000 0.000000 -vn 0.000000 -1.000000 -0.000000 -vn 1.000000 0.000000 0.000000 -vn -1.000000 0.000000 0.000000 -usemtl None -#s 1 -f 1/1/1 2/2/1 3/3/1 4/4/1 -f 5/5/2 6/6/2 7/7/2 8/8/2 -f 8/9/3 1/1/3 4/4/3 5/10/3 -f 2/5/4 7/11/4 6/10/4 3/4/4 -f 5/5/5 4/4/5 3/3/5 6/6/5 -f 8/12/6 7/13/6 2/2/6 1/1/6 -f 9/14/1 10/15/1 11/16/1 12/17/1 -f 13/18/2 14/19/2 15/20/2 16/21/2 -f 16/22/3 9/14/3 12/17/3 13/23/3 -f 10/18/4 15/24/4 14/23/4 11/17/4 -f 13/18/5 12/17/5 11/16/5 14/19/5 -f 16/25/6 15/26/6 10/15/6 9/14/6 diff --git a/src/main/resources/assets/bloodmagic/models/block/routing/outputroutingnodecore.json b/src/main/resources/assets/bloodmagic/models/block/routing/outputroutingnodecore.json deleted file mode 100644 index d14b3c32..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/routing/outputroutingnodecore.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "textures": { - "particle": "#core" - }, - "elements": [ - { - "from": [ 6, 6, 6 ], - "to": [ 10, 10, 10 ], - "faces": { - "down": { "uv": [ 6, 6, 10, 10 ], "texture": "#core" }, - "up": { "uv": [ 6, 6, 10, 10 ], "texture": "#core" }, - "north": { "uv": [ 6, 6, 10, 10 ], "texture": "#core" }, - "west": { "uv": [ 6, 6, 10, 10 ], "texture": "#core" }, - "east": { "uv": [ 6, 6, 10, 10 ], "texture": "#core" }, - "south": { "uv": [ 6, 6, 10, 10 ], "texture": "#core" } - }, - "__comment": "core" - } - ] -} diff --git a/src/main/resources/assets/bloodmagic/models/block/routing/routingnodebase.json b/src/main/resources/assets/bloodmagic/models/block/routing/routingnodebase.json deleted file mode 100644 index ccae6aa6..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/routing/routingnodebase.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "textures": { - "particle": "#core" - }, - "elements": [ - { - "from": [ 4, 4, 0 ], - "to": [ 12, 12, 2 ], - "faces": { - "down": { "uv": [ 4, 11, 5, 16 ], "texture": "#attachment" }, - "up": { "uv": [ 4, 0, 5, 5 ], "texture": "#attachment" }, - "north": { "uv": [ 11, 6, 12, 12 ], "texture": "#attachment" }, - "west": { "uv": [ 0, 6, 5, 12 ], "texture": "#attachment" }, - "east": { "uv": [ 11, 6, 16, 12 ], "texture": "#attachment" }, - "south": { "uv": [ 4, 6, 5, 12 ], "texture": "#attachment" } - }, - "__comment": "part 1" - }, - { - "from": [ 6, 6, 2 ], - "to": [ 10, 10, 4 ], - "faces": { - "down": { "uv": [ 4, 11, 5, 16 ], "texture": "#attachment" }, - "up": { "uv": [ 4, 0, 5, 5 ], "texture": "#attachment" }, - "north": { "uv": [ 11, 6, 12, 12 ], "texture": "#attachment" }, - "west": { "uv": [ 0, 6, 5, 12 ], "texture": "#attachment" }, - "east": { "uv": [ 11, 6, 16, 12 ], "texture": "#attachment" }, - "south": { "uv": [ 4, 6, 5, 12 ], "texture": "#attachment" } - }, - "__comment": "part 2" - } - ] -} diff --git a/src/main/resources/assets/bloodmagic/models/block/soulforge.json b/src/main/resources/assets/bloodmagic/models/block/soulforge.json deleted file mode 100644 index 6aa32fd9..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/soulforge.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "block/block", - "loader": "forge:obj", - "flip-v": true, - "model": "bloodmagic:models/block/blockhellfireforge.obj", - "textures": { - "default": "bloodmagic:models/hellfireforge", - "particle": "#default" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/block/sub/blockaltar.mtl b/src/main/resources/assets/bloodmagic/models/block/sub/blockaltar.mtl deleted file mode 100644 index 4eeb1eac..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/sub/blockaltar.mtl +++ /dev/null @@ -1,12 +0,0 @@ -# Blender MTL File: 'None' -# Material Count: 1 - -newmtl Material__46 -Ns 96.078431 -Ka 1.000000 1.000000 1.000000 -Kd 0.640000 0.640000 0.640000 -Ks 0.500000 0.500000 0.500000 -Ke 0.000000 0.000000 0.000000 -Ni 1.000000 -d 1.000000 -illum 2 diff --git a/src/main/resources/assets/bloodmagic/models/block/sub/blockaltar.obj b/src/main/resources/assets/bloodmagic/models/block/sub/blockaltar.obj deleted file mode 100644 index c782d043..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/sub/blockaltar.obj +++ /dev/null @@ -1,238 +0,0 @@ -# Blender v2.76 (sub 0) OBJ File: '' -# www.blender.org -mtllib BlockAltar.mtl -o headusOBJexport002 -v 0.050000 -0.000030 1.200000 -v 0.950000 -0.000030 1.200000 -v 0.901720 0.800000 1.124830 -v 0.098280 0.800000 1.124830 -v 1.193790 -0.000030 0.949940 -v 1.201990 -0.000030 0.050020 -v 1.126000 0.800000 0.098230 -v 1.118680 0.800000 0.901590 -v 0.098280 0.800000 -0.124960 -v 0.901720 0.800000 -0.124960 -v 0.950000 -0.000030 -0.200000 -v 0.050000 -0.000030 -0.200000 -v -0.124890 0.800000 0.901650 -v -0.124890 0.800000 0.093780 -v -0.200000 -0.000030 0.045030 -v -0.200000 -0.000030 0.950000 -v -0.064370 -0.000030 -0.272190 -v -0.269830 -0.000030 -0.070820 -v -0.199670 0.800000 -0.025280 -v -0.019270 0.800000 -0.202100 -v -0.020020 0.800000 1.200790 -v -0.200860 0.800000 1.019960 -v -0.271020 -0.000030 1.065120 -v -0.065130 -0.000030 1.271010 -v 1.065130 -0.000030 1.271010 -v 1.271020 -0.000030 1.065120 -v 1.200860 0.800000 1.019960 -v 1.020020 0.800000 1.200790 -v 1.271020 -0.000030 -0.065130 -v 1.065130 -0.000030 -0.271020 -v 1.020030 0.800000 -0.200920 -v 1.200860 0.800000 -0.020090 -v 0.679120 0.800000 0.828170 -v 0.320900 0.800000 0.828170 -v 0.828570 0.800000 0.320500 -v 0.828570 0.800000 0.678720 -v 0.320940 0.800000 0.171030 -v 0.679120 0.800000 0.171050 -v 0.171450 0.800000 0.678720 -v 0.171470 0.800000 0.318530 -v 0.371550 0.650000 0.705900 -v 0.371110 0.650000 0.293320 -v 0.293740 0.650000 0.369670 -v 0.293730 0.650000 0.628080 -v 0.628460 0.650000 0.705900 -v 0.706290 0.650000 0.628080 -v 0.706290 0.650000 0.371150 -v 0.628470 0.650000 0.293330 -vt -0.000000 0.265600 -vt 0.203100 0.265600 -vt 0.203100 0.500000 -vt 0.000000 0.500000 -vt 0.390600 0.265600 -vt 0.593800 0.265600 -vt 0.593800 0.500000 -vt 0.390600 0.500000 -vt 0.203100 0.234400 -vt -0.000000 0.234400 -vt -0.000000 0.000000 -vt 0.203100 0.000000 -vt 0.593800 0.234400 -vt 0.390600 0.234400 -vt 0.390600 -0.000000 -vt 0.593800 0.000000 -vt 0.250000 0.000000 -vt 0.343800 0.000000 -vt 0.343800 0.234400 -vt 0.250000 0.234400 -vt 0.734400 0.234400 -vt 0.640600 0.234400 -vt 0.640600 0.000000 -vt 0.734400 -0.000000 -vt 0.250000 0.265600 -vt 0.343800 0.265600 -vt 0.343800 0.500000 -vt 0.265600 0.500000 -vt 0.640600 0.265600 -vt 0.734400 0.265600 -vt 0.734400 0.500000 -vt 0.640600 0.500000 -vt 0.093800 0.578100 -vt 0.031300 0.640600 -vt 0.000000 0.609400 -vt 0.062500 0.546900 -vt 0.031300 0.906300 -vt 0.093800 0.968800 -vt 0.062500 1.000000 -vt 0.000000 0.937500 -vt 0.375000 0.968800 -vt 0.437500 0.906300 -vt 0.468800 0.937500 -vt 0.406300 1.000000 -vt 0.437500 0.640600 -vt 0.375000 0.578100 -vt 0.406300 0.546900 -vt 0.468800 0.609400 -vt 0.909700 0.627000 -vt 0.852200 0.704200 -vt 0.759300 0.704500 -vt 0.701200 0.627800 -vt 0.968900 0.893100 -vt 0.891500 0.835700 -vt 0.891100 0.742800 -vt 0.966200 0.684700 -vt 0.702500 0.952000 -vt 0.760000 0.875000 -vt 0.852900 0.874700 -vt 0.910900 0.951200 -vt 0.643600 0.685900 -vt 0.720700 0.743500 -vt 0.721000 0.836900 -vt 0.644400 0.895500 -vt 0.988400 0.923700 -vt 0.941700 0.970800 -vt 0.781300 0.265600 -vt 0.781300 0.500000 -vt 0.672100 0.972200 -vt 0.625100 0.926500 -vt 0.623700 0.655300 -vt 0.670500 0.608200 -vt 0.781300 -0.000000 -vt 0.781300 0.234400 -vt 0.940300 0.607200 -vt 0.987400 0.653900 -vt 0.772500 0.736200 -vt 0.772800 0.843200 -vt 0.752700 0.823500 -vt 0.752400 0.756500 -vt 0.839200 0.736000 -vt 0.859500 0.756100 -vt 0.859700 0.822700 -vt 0.839600 0.843000 -vn 0.000000 0.093500 0.995600 -vn 0.995500 0.094000 0.009100 -vn 0.000000 0.093400 -0.995600 -vn -0.995600 0.093500 0.000000 -vn -0.101800 -0.554900 -0.825700 -vn -0.823200 -0.555100 -0.118900 -vn -0.990700 0.094300 -0.098300 -vn -0.076900 0.091300 -0.992800 -vn -0.088200 0.093800 0.991700 -vn -0.991900 0.091900 0.087200 -vn -0.824800 -0.554700 0.109900 -vn -0.110600 -0.555300 0.824300 -vn 0.109900 -0.554700 0.824800 -vn 0.827400 -0.553300 0.096000 -vn 0.993300 0.092700 0.069000 -vn 0.087200 0.092000 0.991900 -vn 0.823800 -0.555200 -0.114500 -vn 0.110600 -0.555300 -0.824300 -vn 0.088200 0.093700 -0.991700 -vn 0.991600 0.092100 -0.090800 -vn 0.223200 -0.908300 -0.353700 -vn -0.359200 -0.907600 0.217500 -vn -0.356900 -0.907800 -0.220200 -vn 0.220600 -0.908000 0.356100 -vn -0.220100 -0.907800 0.356900 -vn 0.343700 -0.910100 -0.231300 -vn 0.361700 -0.906700 0.216800 -vn -0.220600 -0.908000 -0.356100 -vn -0.000000 1.000000 0.000000 -vn -0.538100 0.043900 0.841700 -vn 0.546500 0.042800 -0.836400 -vn -0.841700 0.043800 -0.538100 -vn -0.539700 0.046300 -0.840600 -vn 0.845600 0.044700 0.531900 -vn -0.845900 0.047000 0.531300 -vn 0.539700 0.046400 0.840600 -vn 0.187200 0.872200 -0.452000 -vn 0.185600 0.872300 0.452300 -vn 0.451600 0.872000 0.188800 -vn 0.452000 0.872200 -0.187200 -vn -0.187200 0.872200 -0.452000 -vn 0.287000 0.661600 -0.692800 -vn -0.287000 0.661600 -0.692800 -vn -0.451900 0.872200 -0.187200 -vn -0.692800 0.661600 -0.286900 -vn -0.451900 0.872200 0.187200 -vn -0.692800 0.661600 0.286900 -vn -0.187200 0.872200 0.451900 -vn -0.287000 0.661600 0.692700 -vn 0.284800 0.661100 0.694100 -vn 0.691400 0.662100 0.289100 -vn 0.692800 0.661600 -0.286900 -vn 0.820700 0.042600 -0.569800 -usemtl Material__46 -#s off -f 1/1/1 2/2/1 3/3/1 4/4/1 -f 5/5/2 6/6/2 7/7/2 8/8/2 -f 9/9/3 10/10/3 11/11/3 12/12/3 -f 13/13/4 14/14/4 15/15/4 16/16/4 -#s 1 -f 17/17/5 18/18/6 19/19/7 20/20/8 -f 21/21/9 22/22/10 23/23/11 24/24/12 -f 25/25/13 26/26/14 27/27/15 28/28/16 -f 29/29/17 30/30/18 31/31/19 32/32/20 -f 12/33/21 15/34/22 18/35/6 17/36/5 -f 16/37/23 1/38/24 24/39/12 23/40/11 -f 2/41/25 5/42/26 26/43/14 25/44/13 -f 6/45/27 11/46/28 30/47/18 29/48/17 -f 3/49/29 33/50/29 34/51/29 4/52/29 -f 7/53/29 35/54/29 36/55/29 8/56/29 -f 9/57/29 37/58/29 38/59/29 10/60/29 -f 13/61/29 39/62/29 40/63/29 14/64/29 -f 9/57/29 14/64/29 40/63/29 37/58/29 -f 4/52/29 34/51/29 39/62/29 13/61/29 -f 8/56/29 36/55/29 33/50/29 3/49/29 -f 10/60/29 38/59/29 35/54/29 7/53/29 -f 25/25/13 28/28/16 3/3/30 2/2/25 -f 10/60/29 7/53/29 32/65/29 31/66/29 -f 17/17/5 20/20/8 9/9/31 12/12/21 -f 23/23/11 22/22/10 13/13/32 16/16/23 -f 11/67/28 10/68/33 31/31/19 30/30/18 -f 29/29/17 32/32/20 7/7/34 6/6/27 -f 14/64/29 9/57/29 20/69/29 19/70/29 -f 15/15/22 14/14/35 19/19/7 18/18/6 -f 4/52/29 13/61/29 22/71/29 21/72/29 -f 1/73/24 4/74/36 21/21/9 24/24/12 -f 8/56/29 3/49/29 28/75/29 27/76/29 -f 41/77/37 42/78/38 43/79/39 44/80/40 -f 45/81/41 41/77/37 34/51/42 33/50/43 -f 46/82/44 45/81/41 33/50/43 36/55/45 -f 47/83/46 46/82/44 36/55/45 35/54/47 -f 48/84/48 47/83/46 35/54/47 38/59/49 -f 42/78/38 48/84/48 38/59/49 37/58/50 -f 43/79/39 42/78/38 37/58/50 40/63/51 -f 44/80/40 43/79/39 40/63/51 39/62/52 -f 41/77/37 44/80/40 39/62/52 34/51/42 -f 48/84/48 45/81/41 46/82/44 47/83/46 -f 45/81/41 48/84/48 42/78/38 41/77/37 -f 16/37/23 15/34/22 12/33/21 1/38/24 -f 2/41/25 11/46/28 6/45/27 5/42/26 -f 11/46/28 2/41/25 1/38/24 12/33/21 -f 5/5/26 8/8/53 27/27/15 26/26/14 diff --git a/src/main/resources/assets/bloodmagic/models/block/sub/blocksoulforge.json b/src/main/resources/assets/bloodmagic/models/block/sub/blocksoulforge.json deleted file mode 100644 index 6d674e78..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/sub/blocksoulforge.json +++ /dev/null @@ -1,160 +0,0 @@ -{ - "textures": { - "particle": "#base" - }, - "elements": [ - { - "from": [ 2, 0, 2 ], - "to": [ 6, 3, 6 ], - "faces": { - "down": { "uv": [ 3, 0, 4.5, 1.5 ], "texture": "#base" }, - "up": { "uv": [ 1.5, 0, 3, 1.5 ], "texture": "#base" }, - "north": { "uv": [ 1.5, 1.5, 3, 3 ], "texture": "#base" }, - "south": { "uv": [ 4.5, 1.5, 6, 3 ], "texture": "#base" }, - "west": { "uv": [ 3, 1.5, 4.5, 3 ], "texture": "#base" }, - "east": { "uv": [ 0, 1.5, 1.5, 3 ], "texture": "#base" } - }, - "__comment": "These are the feet of the model" - }, - { - "from": [ 10, 0, 10 ], - "to": [ 14, 3, 14 ], - "faces": { - "down": { "uv": [ 3, 0, 4.5, 1.5 ], "texture": "#base" }, - "up": { "uv": [ 1.5, 0, 3, 1.5 ], "texture": "#base" }, - "north": { "uv": [ 1.5, 1.5, 3, 3 ], "texture": "#base" }, - "south": { "uv": [ 4.5, 1.5, 6, 3 ], "texture": "#base" }, - "west": { "uv": [ 3, 1.5, 4.5, 3 ], "texture": "#base" }, - "east": { "uv": [ 0, 1.5, 1.5, 3 ], "texture": "#base" } - } - }, - { - "from": [ 2, 0, 10 ], - "to": [ 6, 3, 14 ], - "faces": { - "down": { "uv": [ 3, 0, 4.5, 1.5 ], "texture": "#base" }, - "up": { "uv": [ 1.5, 0, 3, 1.5 ], "texture": "#base" }, - "north": { "uv": [ 1.5, 1.5, 3, 3 ], "texture": "#base" }, - "south": { "uv": [ 4.5, 1.5, 6, 3 ], "texture": "#base" }, - "west": { "uv": [ 3, 1.5, 4.5, 3 ], "texture": "#base" }, - "east": { "uv": [ 0, 1.5, 1.5, 3 ], "texture": "#base" } - } - }, - { - "from": [ 10, 0, 2 ], - "to": [ 14, 3, 6 ], - "faces": { - "down": { "uv": [ 3, 0, 4.5, 1.5 ], "texture": "#base" }, - "up": { "uv": [ 1.5, 0, 3, 1.5 ], "texture": "#base" }, - "north": { "uv": [ 1.5, 1.5, 3, 3 ], "texture": "#base" }, - "south": { "uv": [ 4.5, 1.5, 6, 3 ], "texture": "#base" }, - "west": { "uv": [ 3, 1.5, 4.5, 3 ], "texture": "#base" }, - "east": { "uv": [ 0, 1.5, 1.5, 3 ], "texture": "#base" } - } - }, - { - "from": [ 3, 3, 3 ], - "to": [ 13, 5, 13 ], - "faces": { - "down": { "uv": [ 3, 0, 4.5, 1.5 ], "texture": "#base" }, - "up": { "uv": [ 1.5, 0, 3, 1.5 ], "texture": "#base" }, - "north": { "uv": [ 1.5, 1.5, 3, 3 ], "texture": "#base" }, - "south": { "uv": [ 4.5, 1.5, 6, 3 ], "texture": "#base" }, - "west": { "uv": [ 3, 1.5, 4.5, 3 ], "texture": "#base" }, - "east": { "uv": [ 0, 1.5, 1.5, 3 ], "texture": "#base" } - }, - "__comment": "Base of the model" - }, - { - "from": [ 1, 5, 1 ], - "to": [ 15, 8, 15 ], - "faces": { - "down": { "uv": [ 3, 0, 4.5, 1.5 ], "texture": "#base" }, - "up": { "uv": [ 1.5, 0, 3, 1.5 ], "texture": "#base" }, - "north": { "uv": [ 1.5, 1.5, 3, 3 ], "texture": "#base" }, - "south": { "uv": [ 4.5, 1.5, 6, 3 ], "texture": "#base" }, - "west": { "uv": [ 3, 1.5, 4.5, 3 ], "texture": "#base" }, - "east": { "uv": [ 0, 1.5, 1.5, 3 ], "texture": "#base" } - }, - "__comment": "Base of the model" - }, - { - "from": [ 0, 8, 0 ], - "to": [ 16, 10, 16 ], - "faces": { - "down": { "uv": [ 3, 0, 4.5, 1.5 ], "texture": "#base" }, - "up": { "uv": [ 1.5, 0, 3, 1.5 ], "texture": "#base" }, - "north": { "uv": [ 1.5, 1.5, 3, 3 ], "texture": "#base" }, - "south": { "uv": [ 4.5, 1.5, 6, 3 ], "texture": "#base" }, - "west": { "uv": [ 3, 1.5, 4.5, 3 ], "texture": "#base" }, - "east": { "uv": [ 0, 1.5, 1.5, 3 ], "texture": "#base" } - }, - "__comment": "Base of the model" - }, - { - "from": [ 0, 10, 0 ], - "to": [ 4, 12, 4 ], - "faces": { - "down": { "uv": [ 3, 0, 4.5, 1.5 ], "texture": "#base" }, - "up": { "uv": [ 1.5, 0, 3, 1.5 ], "texture": "#base" }, - "north": { "uv": [ 1.5, 1.5, 3, 3 ], "texture": "#base" }, - "south": { "uv": [ 4.5, 1.5, 6, 3 ], "texture": "#base" }, - "west": { "uv": [ 3, 1.5, 4.5, 3 ], "texture": "#base" }, - "east": { "uv": [ 0, 1.5, 1.5, 3 ], "texture": "#base" } - }, - "__comment": "Space for the item" - }, - { - "from": [ 12, 10, 12 ], - "to": [ 16, 12, 16 ], - "faces": { - "down": { "uv": [ 3, 0, 4.5, 1.5 ], "texture": "#base" }, - "up": { "uv": [ 1.5, 0, 3, 1.5 ], "texture": "#base" }, - "north": { "uv": [ 1.5, 1.5, 3, 3 ], "texture": "#base" }, - "south": { "uv": [ 4.5, 1.5, 6, 3 ], "texture": "#base" }, - "west": { "uv": [ 3, 1.5, 4.5, 3 ], "texture": "#base" }, - "east": { "uv": [ 0, 1.5, 1.5, 3 ], "texture": "#base" } - }, - "__comment": "Space for the item" - }, - { - "from": [ 0, 10, 12 ], - "to": [ 4, 12, 16 ], - "faces": { - "down": { "uv": [ 3, 0, 4.5, 1.5 ], "texture": "#base" }, - "up": { "uv": [ 1.5, 0, 3, 1.5 ], "texture": "#base" }, - "north": { "uv": [ 1.5, 1.5, 3, 3 ], "texture": "#base" }, - "south": { "uv": [ 4.5, 1.5, 6, 3 ], "texture": "#base" }, - "west": { "uv": [ 3, 1.5, 4.5, 3 ], "texture": "#base" }, - "east": { "uv": [ 0, 1.5, 1.5, 3 ], "texture": "#base" } - }, - "__comment": "Space for the item" - }, - { - "from": [ 12, 10, 0 ], - "to": [ 16, 12, 4 ], - "faces": { - "down": { "uv": [ 3, 0, 4.5, 1.5 ], "texture": "#base" }, - "up": { "uv": [ 1.5, 0, 3, 1.5 ], "texture": "#base" }, - "north": { "uv": [ 1.5, 1.5, 3, 3 ], "texture": "#base" }, - "south": { "uv": [ 4.5, 1.5, 6, 3 ], "texture": "#base" }, - "west": { "uv": [ 3, 1.5, 4.5, 3 ], "texture": "#base" }, - "east": { "uv": [ 0, 1.5, 1.5, 3 ], "texture": "#base" } - }, - "__comment": "Space for the item" - }, - { - "from": [ 4, 10, 4 ], - "to": [ 12, 11, 12 ], - "faces": { - "down": { "uv": [ 3, 0, 4.5, 1.5 ], "texture": "#base_bottom" }, - "up": { "uv": [ 1.5, 0, 3, 1.5 ], "texture": "#base_bottom" }, - "north": { "uv": [ 1.5, 1.5, 3, 3 ], "texture": "#base_bottom" }, - "south": { "uv": [ 4.5, 1.5, 6, 3 ], "texture": "#base_bottom" }, - "west": { "uv": [ 3, 1.5, 4.5, 3 ], "texture": "#base_bottom" }, - "east": { "uv": [ 0, 1.5, 1.5, 3 ], "texture": "#base_bottom" } - }, - "__comment": "Space for the item" - } - ] -} diff --git a/src/main/resources/assets/bloodmagic/models/block/sub/blockspellmodifiercore.json b/src/main/resources/assets/bloodmagic/models/block/sub/blockspellmodifiercore.json deleted file mode 100644 index 53852b6a..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/sub/blockspellmodifiercore.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "textures": { - "particle": "#model" - }, - "elements": [ - { "from": [ 5, 5, 5 ], - "to": [ 11, 11, 11 ], - "faces": { - "down": { "uv": [ 3, 0, 4.5, 1.5 ], "texture": "#model" }, - "up": { "uv": [ 1.5, 0, 3, 1.5 ], "texture": "#model" }, - "north": { "uv": [ 1.5, 1.5, 3, 3 ], "texture": "#model" }, - "south": { "uv": [ 4.5, 1.5, 6, 3 ], "texture": "#model" }, - "west": { "uv": [ 3, 1.5, 4.5, 3 ], "texture": "#model" }, - "east": { "uv": [ 0, 1.5, 1.5, 3 ], "texture": "#model" } - }, - "__comment": "This is the core of the model" - } - ] -} diff --git a/src/main/resources/assets/bloodmagic/models/block/sub/blockspellmodifierinput.json b/src/main/resources/assets/bloodmagic/models/block/sub/blockspellmodifierinput.json deleted file mode 100644 index c632c397..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/sub/blockspellmodifierinput.json +++ /dev/null @@ -1,176 +0,0 @@ -{ - "textures": { - "particle": "#model" - }, - "elements": [ - { - "from": [ 6, 13, 6 ], - "to": [ 10, 14, 10 ], - "faces": { - "down": { "uv": [ 5.75, 9, 6.75, 8 ], "texture": "#model" }, - "up": { "uv": [ 4.75, 8, 5.75, 9 ], "texture": "#model" }, - "north": { "uv": [ 6.75, 9, 7.75, 9.25 ], "texture": "#model" }, - "south": { "uv": [ 4.75, 9, 5.75, 9.25 ], "texture": "#model" }, - "west": { "uv": [ 3.75, 9, 4.75, 9.25 ], "texture": "#model" }, - "east": { "uv": [ 5.75, 9, 6.75, 9.25 ], "texture": "#model" } - }, - "__comment": "Top symbol" - }, - { - "from": [ 6, 2, 6 ], - "to": [ 10, 3, 10 ], - "faces": { - "down": { "uv": [ 5.75, 10.75, 6.75, 9.75 ], "texture": "#model" }, - "up": { "uv": [ 4.75, 9.75, 5.75, 10.75 ], "texture": "#model" }, - "north": { "uv": [ 6.75, 10.75, 7.75, 11 ], "texture": "#model" }, - "south": { "uv": [ 4.75, 10.75, 5.75, 11 ], "texture": "#model" }, - "west": { "uv": [ 3.75, 10.75, 4.75, 11 ], "texture": "#model" }, - "east": { "uv": [ 5.75, 10.75, 6.75, 11 ], "texture": "#model" } - }, - "__comment": "Bottom symbol" - }, - { - "from": [ 2, 6, 6 ], - "to": [ 3, 10, 10 ], - "faces": { - "down": { "uv": [ 4.5, 12.5, 4.75, 11.5 ], "texture": "#model" }, - "up": { "uv": [ 4.25, 11.5, 4.5, 12.5 ], "texture": "#model" }, - "north": { "uv": [ 5.5, 12.5, 5.75, 13.5 ], "texture": "#model" }, - "south": { "uv": [ 4.25, 12.5, 4.5, 13.5 ], "texture": "#model" }, - "west": { "uv": [ 3.25, 12.5, 4.25, 13.5 ], "texture": "#model" }, - "east": { "uv": [ 4.5, 12.5, 5.5, 13.5 ], "texture": "#model" } - }, - "__comment": "Left symbol" - }, - { - "from": [ 13, 6, 6 ], - "to": [ 14, 10, 10 ], - "faces": { - "down": { "uv": [ 4.5, 15, 4.75, 14 ], "texture": "#model" }, - "up": { "uv": [ 4.25, 14, 4.5, 15 ], "texture": "#model" }, - "north": { "uv": [ 5.5, 15, 5.75, 16 ], "texture": "#model" }, - "south": { "uv": [ 4.25, 15, 4.5, 16 ], "texture": "#model" }, - "west": { "uv": [ 3.25, 15, 4.25, 16 ], "texture": "#model" }, - "east": { "uv": [ 4.5, 15, 5.5, 16 ], "texture": "#model" } - }, - "__comment": "Right symbol" - }, - { - "from": [ 7, 13, 10 ], - "to": [ 9, 14, 15 ], - "faces": { - "down": { "uv": [ 1.75, 9.25, 2.25, 8 ], "texture": "#model" }, - "up": { "uv": [ 1.25, 8, 1.75, 9.25 ], "texture": "#model" }, - "north": { "uv": [ 3, 9.25, 3.5, 9.5 ], "texture": "#model" }, - "south": { "uv": [ 1.25, 9.25, 1.75, 9.5 ], "texture": "#model" }, - "west": { "uv": [ 0, 9.25, 1.25, 9.5 ], "texture": "#model" }, - "east": { "uv": [ 1.75, 9.25, 3, 9.5 ], "texture": "#model" } - }, - "__comment": "Top holding bar" - }, - { - "from": [ 7, 2, 10 ], - "to": [ 9, 3, 15 ], - "faces": { - "down": { "uv": [ 1.75, 11, 2.25, 9.75 ], "texture": "#model" }, - "up": { "uv": [ 1.25, 9.75, 1.75, 11 ], "texture": "#model" }, - "north": { "uv": [ 3, 11, 3.5, 11.25 ], "texture": "#model" }, - "south": { "uv": [ 1.25, 11, 1.75, 11.25 ], "texture": "#model" }, - "west": { "uv": [ 0, 11, 1.25, 11.25 ], "texture": "#model" }, - "east": { "uv": [ 1.75, 11, 3, 11.25 ], "texture": "#model" } - }, - "__comment": "Bottom holding bar" - }, - { - "from": [ 2, 7, 10 ], - "to": [ 3, 9, 15 ], - "faces": { - "down": { "uv": [ 1.5, 15.25, 1.75, 14 ], "texture": "#model" }, - "up": { "uv": [ 1.25, 14, 1.5, 15.25 ], "texture": "#model" }, - "north": { "uv": [ 2.75, 15.25, 3, 15.75 ], "texture": "#model" }, - "south": { "uv": [ 1.25, 15.25, 1.5, 15.75 ], "texture": "#model" }, - "west": { "uv": [ 0, 15.25, 1.25, 15.75 ], "texture": "#model" }, - "east": { "uv": [ 1.5, 15.25, 2.75, 15.75 ], "texture": "#model" } - }, - "__comment": "Left holding bar" - }, - { - "from": [ 13, 7, 10 ], - "to": [ 14, 9, 15 ], - "faces": { - "down": { "uv": [ 1.5, 12.75, 1.75, 11.5 ], "texture": "#model" }, - "up": { "uv": [ 1.25, 11.5, 1.5, 12.75 ], "texture": "#model" }, - "north": { "uv": [ 2.75, 12.75, 3, 13.25 ], "texture": "#model" }, - "south": { "uv": [ 1.25, 12.75, 1.5, 13.25 ], "texture": "#model" }, - "west": { "uv": [ 0, 12.75, 1.25, 13.25 ], "texture": "#model" }, - "east": { "uv": [ 1.5, 12.75, 2.75, 13.25 ], "texture": "#model" } - }, - "__comment": "Right holding bar" - }, - { - "from": [ 6, 6, 15 ], - "to": [ 10, 10, 16 ], - "faces": { - "down": { "uv": [ 7.5, 4.75, 8.5, 4.5 ], "texture": "#model" }, - "up": { "uv": [ 6.5, 4.5, 7.5, 4.75 ], "texture": "#model" }, - "north": { "uv": [ 7.75, 4.75, 8.75, 5.75 ], "texture": "#model" }, - "south": { "uv": [ 6.5, 4.75, 7.5, 5.75 ], "texture": "#model" }, - "west": { "uv": [ 6.25, 4.75, 6.5, 5.75 ], "texture": "#model" }, - "east": { "uv": [ 7.5, 4.75, 7.75, 5.75 ], "texture": "#model" } - }, - "__comment": "Central point" - }, - { - "from": [ 3, 11, 14 ], - "to": [ 13, 13, 16 ], - "faces": { - "down": { "uv": [ 3, 3.75, 5.5, 3.25 ], "texture": "#model" }, - "up": { "uv": [ 0.5, 3.25, 3, 3.75 ], "texture": "#model" }, - "north": { "uv": [ 3.5, 3.75, 6, 4.25 ], "texture": "#model" }, - "south": { "uv": [ 0.5, 3.75, 3, 4.25 ], "texture": "#model" }, - "west": { "uv": [ 0, 3.75, 0.5, 4.25 ], "texture": "#model" }, - "east": { "uv": [ 3, 3.75, 3.5, 4.25 ], "texture": "#model" } - }, - "__comment": "Top main brace" - }, - { - "from": [ 3, 3, 14 ], - "to": [ 13, 5, 16 ], - "faces": { - "down": { "uv": [ 3, 7.25, 5.5, 6.75 ], "texture": "#model" }, - "up": { "uv": [ 0.5, 6.75, 3, 7.25 ], "texture": "#model" }, - "north": { "uv": [ 3.5, 7.25, 6, 7.75 ], "texture": "#model" }, - "south": { "uv": [ 0.5, 7.25, 3, 7.75 ], "texture": "#model" }, - "west": { "uv": [ 0, 7.25, 0.5, 7.75 ], "texture": "#model" }, - "east": { "uv": [ 3, 7.25, 3.5, 7.75 ], "texture": "#model" } - }, - "__comment": "Bottom main brace" - }, - { - "from": [ 3, 5, 14 ], - "to": [ 5, 11, 16 ], - "faces": { - "down": { "uv": [ 1, 5, 1.5, 4.5 ], "texture": "#model" }, - "up": { "uv": [ 0.5, 4.5, 1, 5 ], "texture": "#model" }, - "north": { "uv": [ 1.5, 5, 2, 6.5 ], "texture": "#model" }, - "south": { "uv": [ 0.5, 5, 1, 6.5 ], "texture": "#model" }, - "west": { "uv": [ 0, 5, 0.5, 6.5 ], "texture": "#model" }, - "east": { "uv": [ 1, 5, 1.5, 6.5 ], "texture": "#model" } - }, - "__comment": "Left main brace" - }, - { - "from": [ 11, 5, 14 ], - "to": [ 13, 11, 16 ], - "faces": { - "down": { "uv": [ 5, 5, 5.5, 4.5 ], "texture": "#model" }, - "up": { "uv": [ 4.5, 4.5, 5, 5 ], "texture": "#model" }, - "north": { "uv": [ 5.5, 5, 6, 6.5 ], "texture": "#model" }, - "south": { "uv": [ 4.5, 5, 5, 6.5 ], "texture": "#model" }, - "west": { "uv": [ 4, 5, 4.5, 6.5 ], "texture": "#model" }, - "east": { "uv": [ 5, 5, 5.5, 6.5 ], "texture": "#model" } - }, - "__comment": "Right main brace" - } - ] -} diff --git a/src/main/resources/assets/bloodmagic/models/block/sub/blockspellmodifieroutput.json b/src/main/resources/assets/bloodmagic/models/block/sub/blockspellmodifieroutput.json deleted file mode 100644 index b08bbd47..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/sub/blockspellmodifieroutput.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "textures": { - "particle": "#model" - }, - "elements": [ - { - "from": [ 15, 6, 6 ], - "to": [ 16, 10, 10 ], - "faces": { - "down": { "uv": [ 14, 5.75, 14.25, 6.75 ], "texture": "#model" }, - "up": { "uv": [ 13.75, 5.75, 14, 6.75 ], "texture": "#model" }, - "north": { "uv": [ 15, 6.75, 15.25, 7.75 ], "texture": "#model" }, - "south": { "uv": [ 13.75, 6.75, 14, 7.75 ], "texture": "#model" }, - "west": { "uv": [ 12.75, 6.75, 13.75, 7.75 ], "texture": "#model" }, - "east": { "uv": [ 14, 6.75, 15, 7.75 ], "texture": "#model" } - } - }, - { - "from": [ 13, 3, 3 ], - "to": [ 16, 5, 5 ], - "faces": { - "down": { "uv": [ 14, 4.5, 14.75, 5 ], "texture": "#model" }, - "up": { "uv": [ 13.25, 4.5, 14, 5 ], "texture": "#model" }, - "north": { "uv": [ 14.5, 5, 15.25, 5.5 ], "texture": "#model" }, - "south": { "uv": [ 13.25, 5, 14, 5.5 ], "texture": "#model" }, - "west": { "uv": [ 12.75, 5, 13.25, 5.5 ], "texture": "#model" }, - "east": { "uv": [ 14, 5, 14.5, 5.5 ], "texture": "#model" } - } - }, - { - "from": [ 13, 11, 3 ], - "to": [ 16, 13, 5 ], - "faces": { - "down": { "uv": [ 14, 4.5, 14.75, 5 ], "texture": "#model" }, - "up": { "uv": [ 13.25, 4.5, 14, 5 ], "texture": "#model" }, - "north": { "uv": [ 14.5, 5, 15.25, 5.5 ], "texture": "#model" }, - "south": { "uv": [ 13.25, 5, 14, 5.5 ], "texture": "#model" }, - "west": { "uv": [ 12.75, 5, 13.25, 5.5 ], "texture": "#model" }, - "east": { "uv": [ 14, 5, 14.5, 5.5 ], "texture": "#model" } - } - }, - { - "from": [ 13, 3, 11 ], - "to": [ 16, 5, 13 ], - "faces": { - "down": { "uv": [ 14, 4.5, 14.75, 5 ], "texture": "#model" }, - "up": { "uv": [ 13.25, 4.5, 14, 5 ], "texture": "#model" }, - "north": { "uv": [ 14.5, 5, 15.25, 5.5 ], "texture": "#model" }, - "south": { "uv": [ 13.25, 5, 14, 5.5 ], "texture": "#model" }, - "west": { "uv": [ 12.75, 5, 13.25, 5.5 ], "texture": "#model" }, - "east": { "uv": [ 14, 5, 14.5, 5.5 ], "texture": "#model" } - } - }, - { - "from": [ 13, 11, 11 ], - "to": [ 16, 13, 13 ], - "faces": { - "down": { "uv": [ 14, 4.5, 14.75, 5 ], "texture": "#model" }, - "up": { "uv": [ 13.25, 4.5, 14, 5 ], "texture": "#model" }, - "north": { "uv": [ 14.5, 5, 15.25, 5.5 ], "texture": "#model" }, - "south": { "uv": [ 13.25, 5, 14, 5.5 ], "texture": "#model" }, - "west": { "uv": [ 12.75, 5, 13.25, 5.5 ], "texture": "#model" }, - "east": { "uv": [ 14, 5, 14.5, 5.5 ], "texture": "#model" } - } - } - ] -} diff --git a/src/main/resources/assets/bloodmagic/models/block/sub/shaped_charge.json b/src/main/resources/assets/bloodmagic/models/block/sub/shaped_charge.json deleted file mode 100644 index 28ae6a06..00000000 --- a/src/main/resources/assets/bloodmagic/models/block/sub/shaped_charge.json +++ /dev/null @@ -1,136 +0,0 @@ -{ - "parent": "block/block", - "credit": "Made with Blockbench", - "textures": { - "1": "dungeon_tile", - "3": "dungeon_stone", - "4": "blankrune", - "5": "largebloodstonebrick", - "6": "defaultcrystal", - "particle": "dungeon_stone" - }, - "elements": [ - { - "name": "base", - "from": [2, 0, 2], - "to": [14, 2, 14], - "faces": { - "north": {"uv": [0, 6, 10, 8], "texture": "#3"}, - "east": {"uv": [0, 6, 10, 8], "texture": "#3"}, - "south": {"uv": [0, 6, 10, 8], "texture": "#3"}, - "west": {"uv": [6, 14, 16, 16], "texture": "#3"}, - "up": {"uv": [10, 10, 0, 0], "texture": "#3"}, - "down": {"uv": [10, 0, 0, 10], "texture": "#3"} - } - }, - { - "name": "core", - "from": [4, 2, 4], - "to": [12, 5, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 9, 13]}, - "faces": { - "north": {"uv": [4, 5, 12, 8], "texture": "#6"}, - "east": {"uv": [4, 5, 12, 8], "texture": "#6"}, - "south": {"uv": [4, 5, 12, 8], "texture": "#6"}, - "west": {"uv": [4, 5, 12, 8], "texture": "#6"}, - "up": {"uv": [4, 4, 12, 12], "texture": "#6"}, - "down": {"uv": [0, 0, 8, 8], "texture": "#6"} - } - }, - { - "name": "casing1", - "from": [7, 2, 3], - "to": [9, 6, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 10, 11]}, - "faces": { - "north": {"uv": [0, 0, 2, 4], "texture": "#5"}, - "east": {"uv": [0, 0, 10, 4], "texture": "#5"}, - "south": {"uv": [0, 0, 2, 4], "texture": "#5"}, - "west": {"uv": [0, 0, 10, 4], "texture": "#5"}, - "up": {"uv": [0, 0, 2, 10], "texture": "#5"}, - "down": {"uv": [0, 0, 2, 10], "texture": "#5"} - } - }, - { - "name": "casing2", - "from": [3, 2, 7], - "to": [13, 6, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 10, 15]}, - "faces": { - "north": {"uv": [0, 0, 10, 4], "texture": "#5"}, - "east": {"uv": [0, 0, 2, 4], "texture": "#5"}, - "south": {"uv": [0, 0, 10, 4], "texture": "#5"}, - "west": {"uv": [0, 0, 2, 4], "texture": "#5"}, - "up": {"uv": [0, 0, 10, 2], "texture": "#5"}, - "down": {"uv": [0, 0, 10, 2], "texture": "#5"} - } - }, - { - "from": [6, 5, 6], - "to": [10, 7, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 13, 14]}, - "faces": { - "north": {"uv": [0, 0, 4, 2], "texture": "#4"}, - "east": {"uv": [0, 0, 4, 2], "texture": "#4"}, - "south": {"uv": [0, 0, 4, 2], "texture": "#4"}, - "west": {"uv": [0, 0, 4, 2], "texture": "#4"}, - "up": {"uv": [0, 0, 4, 4], "texture": "#4"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#4"} - } - }, - { - "name": "edge1", - "from": [3, 2, 3], - "to": [6, 3, 6], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 9]}, - "faces": { - "north": {"uv": [5, 7, 8, 8], "texture": "#1"}, - "east": {"uv": [5, 7, 8, 8], "texture": "#1"}, - "south": {"uv": [5, 7, 8, 8], "texture": "#1"}, - "west": {"uv": [5, 7, 8, 8], "texture": "#1"}, - "up": {"uv": [5, 5, 8, 8], "rotation": 180, "texture": "#1"}, - "down": {"uv": [5, 5, 8, 8], "rotation": 180, "texture": "#1"} - } - }, - { - "name": "edge2", - "from": [3, 2, 10], - "to": [6, 3, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 8, 16]}, - "faces": { - "north": {"uv": [5, 7, 8, 8], "texture": "#1"}, - "east": {"uv": [5, 7, 8, 8], "texture": "#1"}, - "south": {"uv": [5, 7, 8, 8], "texture": "#1"}, - "west": {"uv": [5, 7, 8, 8], "texture": "#1"}, - "up": {"uv": [5, 5, 8, 8], "rotation": 90, "texture": "#1"}, - "down": {"uv": [5, 5, 8, 8], "rotation": 90, "texture": "#1"} - } - }, - { - "name": "edge3", - "from": [10, 2, 3], - "to": [13, 3, 6], - "faces": { - "north": {"uv": [5, 7, 8, 8], "texture": "#1"}, - "east": {"uv": [5, 7, 8, 8], "texture": "#1"}, - "south": {"uv": [5, 7, 8, 8], "texture": "#1"}, - "west": {"uv": [5, 7, 8, 8], "texture": "#1"}, - "up": {"uv": [5, 5, 8, 8], "rotation": 270, "texture": "#1"}, - "down": {"uv": [5, 5, 8, 8], "rotation": 270, "texture": "#1"} - } - }, - { - "name": "edge4", - "from": [10, 2, 10], - "to": [13, 3, 13], - "faces": { - "north": {"uv": [5, 7, 8, 8], "texture": "#1"}, - "east": {"uv": [5, 7, 8, 8], "texture": "#1"}, - "south": {"uv": [5, 7, 8, 8], "texture": "#1"}, - "west": {"uv": [5, 7, 8, 8], "texture": "#1"}, - "up": {"uv": [5, 5, 8, 8], "texture": "#1"}, - "down": {"uv": [5, 6, 8, 9], "texture": "#1"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/bloodaltar-fixeuv.obj b/src/main/resources/assets/bloodmagic/models/bloodaltar-fixeuv.obj deleted file mode 100644 index 83d13903..00000000 --- a/src/main/resources/assets/bloodmagic/models/bloodaltar-fixeuv.obj +++ /dev/null @@ -1,262 +0,0 @@ -# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware -# File Created: 15.08.2013 16:23:16 - -mtllib bloodaltar-fixeUV.mtl - -# -# object headusOBJexport002 -# - -v -4.5000 -0.0003 7.0000 -v 4.5000 -0.0003 7.0000 -v 4.0172 8.0000 6.2483 -v -4.0172 8.0000 6.2483 -v 6.9379 -0.0003 4.4994 -v 7.0199 -0.0003 -4.4998 -v 6.2600 8.0000 -4.0177 -v 6.1868 8.0000 4.0159 -v -4.0172 8.0000 -6.2496 -v 4.0172 8.0000 -6.2496 -v 4.5000 -0.0003 -7.0000 -v -4.5000 -0.0003 -7.0000 -v -6.2489 8.0000 4.0165 -v -6.2489 8.0000 -4.0622 -v -7.0000 -0.0003 -4.5497 -v -7.0000 -0.0003 4.5000 -v -5.6437 -0.0003 -7.7219 -v -7.6983 -0.0003 -5.7082 -v -6.9967 8.0000 -5.2528 -v -5.1927 8.0000 -7.0210 -v -5.2002 8.0000 7.0079 -v -7.0086 8.0000 5.1996 -v -7.7102 -0.0003 5.6512 -v -5.6513 -0.0003 7.7101 -v 5.6513 -0.0003 7.7101 -v 7.7102 -0.0003 5.6512 -v 7.0086 8.0000 5.1996 -v 5.2002 8.0000 7.0079 -v 7.7102 -0.0003 -5.6513 -v 5.6513 -0.0003 -7.7102 -v 5.2003 8.0000 -7.0092 -v 7.0086 8.0000 -5.2009 -v 1.7912 8.0000 3.2817 -v -1.7910 8.0000 3.2817 -v 3.2857 8.0000 -1.7950 -v 3.2857 8.0000 1.7872 -v -1.7906 8.0000 -3.2897 -v 1.7912 8.0000 -3.2895 -v -3.2855 8.0000 1.7872 -v -3.2853 8.0000 -1.8147 -v -1.2845 6.5000 2.0590 -v -1.2889 6.5000 -2.0668 -v -2.0626 6.5000 -1.3033 -v -2.0627 6.5000 1.2808 -v 1.2846 6.5000 2.0590 -v 2.0629 6.5000 1.2808 -v 2.0629 6.5000 -1.2885 -v 1.2847 6.5000 -2.0667 -# 48 vertices - -vn 0.0000 0.0935 0.9956 -vn 0.9955 0.0940 0.0091 -vn 0.0000 0.0934 -0.9956 -vn -0.9956 0.0935 -0.0000 -vn -0.1018 -0.5549 -0.8257 -vn -0.8232 -0.5551 -0.1189 -vn -0.9907 0.0943 -0.0983 -vn -0.0769 0.0913 -0.9928 -vn -0.0882 0.0938 0.9917 -vn -0.9919 0.0919 0.0872 -vn -0.8248 -0.5547 0.1099 -vn -0.1106 -0.5553 0.8243 -vn 0.1099 -0.5547 0.8248 -vn 0.8274 -0.5533 0.0960 -vn 0.9933 0.0927 0.0690 -vn 0.0872 0.0920 0.9919 -vn 0.8238 -0.5552 -0.1145 -vn 0.1106 -0.5553 -0.8243 -vn 0.0882 0.0937 -0.9917 -vn 0.9916 0.0921 -0.0908 -vn 0.2232 -0.9083 -0.3537 -vn -0.3592 -0.9076 0.2175 -vn -0.3569 -0.9078 -0.2202 -vn 0.2206 -0.9080 0.3561 -vn -0.2201 -0.9078 0.3569 -vn 0.3437 -0.9101 -0.2313 -vn 0.3617 -0.9067 0.2168 -vn -0.2206 -0.9081 -0.3561 -vn 0.0000 1.0000 -0.0000 -vn -0.5381 0.0439 0.8417 -vn 0.5465 0.0428 -0.8364 -vn -0.8417 0.0438 -0.5381 -vn -0.5397 0.0463 -0.8406 -vn 0.8456 0.0447 0.5319 -vn -0.8459 0.0470 0.5313 -vn 0.5397 0.0464 0.8406 -vn 0.1872 0.8722 -0.4520 -vn 0.1856 0.8723 0.4523 -vn 0.4516 0.8720 0.1888 -vn 0.4520 0.8722 -0.1872 -vn -0.1872 0.8722 -0.4520 -vn 0.2870 0.6616 -0.6928 -vn -0.2870 0.6616 -0.6928 -vn -0.4519 0.8722 -0.1872 -vn -0.6928 0.6616 -0.2869 -vn -0.4519 0.8722 0.1872 -vn -0.6928 0.6616 0.2869 -vn -0.1872 0.8722 0.4519 -vn -0.2870 0.6616 0.6927 -vn 0.2848 0.6611 0.6941 -vn 0.6914 0.6621 0.2891 -vn 0.6928 0.6616 -0.2869 -vn 0.8207 0.0426 -0.5698 -# 53 vertex normals - -vt -0.0000 0.2656 0.0000 -vt 0.2031 0.2656 0.0000 -vt 0.2031 0.5000 0.0000 -vt 0.0000 0.5000 0.0000 -vt 0.3906 0.2656 0.0000 -vt 0.5938 0.2656 0.0000 -vt 0.5938 0.5000 0.0000 -vt 0.3906 0.5000 0.0000 -vt 0.2031 0.2344 0.0000 -vt -0.0000 0.2344 0.0000 -vt -0.0000 0.0000 0.0000 -vt 0.2031 0.0000 0.0000 -vt 0.5938 0.2344 0.0000 -vt 0.3906 0.2344 0.0000 -vt 0.3906 -0.0000 0.0000 -vt 0.5938 0.0000 0.0000 -vt 0.2500 0.0000 0.0000 -vt 0.3438 0.0000 0.0000 -vt 0.3438 0.2344 0.0000 -vt 0.2500 0.2344 0.0000 -vt 0.7344 0.2344 0.0000 -vt 0.6406 0.2344 0.0000 -vt 0.6406 0.0000 0.0000 -vt 0.7344 -0.0000 0.0000 -vt 0.2500 0.2656 0.0000 -vt 0.3438 0.2656 0.0000 -vt 0.3438 0.5000 0.0000 -vt 0.2500 0.5000 0.0000 -vt 0.6406 0.2656 0.0000 -vt 0.7344 0.2656 0.0000 -vt 0.7344 0.5000 0.0000 -vt 0.6406 0.5000 0.0000 -vt 0.0938 0.5781 0.0000 -vt 0.0313 0.6406 0.0000 -vt 0.0000 0.6094 0.0000 -vt 0.0625 0.5469 0.0000 -vt 0.0313 0.9063 0.0000 -vt 0.0938 0.9688 0.0000 -vt 0.0625 1.0000 0.0000 -vt 0.0000 0.9375 0.0000 -vt 0.3750 0.9688 0.0000 -vt 0.4375 0.9063 0.0000 -vt 0.4688 0.9375 0.0000 -vt 0.4063 1.0000 0.0000 -vt 0.4375 0.6406 0.0000 -vt 0.3750 0.5781 0.0000 -vt 0.4063 0.5469 0.0000 -vt 0.4688 0.6094 0.0000 -vt 0.9097 0.6270 0.0000 -vt 0.8522 0.7042 0.0000 -vt 0.7593 0.7045 0.0000 -vt 0.7012 0.6278 0.0000 -vt 0.9689 0.8931 0.0000 -vt 0.8915 0.8357 0.0000 -vt 0.8911 0.7428 0.0000 -vt 0.9662 0.6847 0.0000 -vt 0.7025 0.9520 0.0000 -vt 0.7600 0.8750 0.0000 -vt 0.8529 0.8747 0.0000 -vt 0.9109 0.9512 0.0000 -vt 0.6436 0.6859 0.0000 -vt 0.7207 0.7435 0.0000 -vt 0.7210 0.8369 0.0000 -vt 0.6444 0.8955 0.0000 -vt 0.9884 0.9237 0.0000 -vt 0.9417 0.9708 0.0000 -vt 0.7813 0.2656 0.0000 -vt 0.7813 0.5000 0.0000 -vt 0.6721 0.9722 0.0000 -vt 0.6251 0.9265 0.0000 -vt 0.6237 0.6553 0.0000 -vt 0.6705 0.6082 0.0000 -vt 0.7813 -0.0000 0.0000 -vt 0.7813 0.2344 0.0000 -vt 0.9403 0.6072 0.0000 -vt 0.9874 0.6539 0.0000 -vt 0.7725 0.7362 0.0000 -vt 0.7728 0.8432 0.0000 -vt 0.7527 0.8235 0.0000 -vt 0.7524 0.7565 0.0000 -vt 0.8392 0.7360 0.0000 -vt 0.8595 0.7561 0.0000 -vt 0.8597 0.8227 0.0000 -vt 0.8396 0.8430 0.0000 -# 84 texture coords - -g headusOBJexport002 -usemtl Material__46 -s off -f 1/1/1 2/2/1 3/3/1 4/4/1 -f 5/5/2 6/6/2 7/7/2 8/8/2 -f 9/9/3 10/10/3 11/11/3 12/12/3 -f 13/13/4 14/14/4 15/15/4 16/16/4 -s 1 -f 17/17/5 18/18/6 19/19/7 20/20/8 -f 21/21/9 22/22/10 23/23/11 24/24/12 -f 25/25/13 26/26/14 27/27/15 28/28/16 -f 29/29/17 30/30/18 31/31/19 32/32/20 -f 12/33/21 15/34/22 18/35/6 17/36/5 -f 16/37/23 1/38/24 24/39/12 23/40/11 -f 2/41/25 5/42/26 26/43/14 25/44/13 -f 6/45/27 11/46/28 30/47/18 29/48/17 -s 2 -f 3/49/29 33/50/29 34/51/29 4/52/29 -f 7/53/29 35/54/29 36/55/29 8/56/29 -f 9/57/29 37/58/29 38/59/29 10/60/29 -f 13/61/29 39/62/29 40/63/29 14/64/29 -f 9/57/29 14/64/29 40/63/29 37/58/29 -f 4/52/29 34/51/29 39/62/29 13/61/29 -f 8/56/29 36/55/29 33/50/29 3/49/29 -f 10/60/29 38/59/29 35/54/29 7/53/29 -s 1 -f 25/25/13 28/28/16 3/3/30 2/2/25 -s 2 -f 10/60/29 7/53/29 32/65/29 31/66/29 -s 1 -f 17/17/5 20/20/8 9/9/31 12/12/21 -f 23/23/11 22/22/10 13/13/32 16/16/23 -f 11/67/28 10/68/33 31/31/19 30/30/18 -f 29/29/17 32/32/20 7/7/34 6/6/27 -s 2 -f 14/64/29 9/57/29 20/69/29 19/70/29 -s 1 -f 15/15/22 14/14/35 19/19/7 18/18/6 -s 2 -f 4/52/29 13/61/29 22/71/29 21/72/29 -s 1 -f 1/73/24 4/74/36 21/21/9 24/24/12 -s 2 -f 8/56/29 3/49/29 28/75/29 27/76/29 -s 1 -f 41/77/37 42/78/38 43/79/39 44/80/40 -f 45/81/41 41/77/37 34/51/42 33/50/43 -f 46/82/44 45/81/41 33/50/43 36/55/45 -f 47/83/46 46/82/44 36/55/45 35/54/47 -f 48/84/48 47/83/46 35/54/47 38/59/49 -f 42/78/38 48/84/48 38/59/49 37/58/50 -f 43/79/39 42/78/38 37/58/50 40/63/51 -f 44/80/40 43/79/39 40/63/51 39/62/52 -f 41/77/37 44/80/40 39/62/52 34/51/42 -f 48/84/48 45/81/41 46/82/44 47/83/46 -f 45/81/41 48/84/48 42/78/38 41/77/37 -f 16/37/23 15/34/22 12/33/21 1/38/24 -f 2/41/25 11/46/28 6/45/27 5/42/26 -f 11/46/28 2/41/25 1/38/24 12/33/21 -f 5/5/26 8/8/53 27/27/15 26/26/14 -# 46 polygons - diff --git a/src/main/resources/assets/bloodmagic/models/bloodaltar.obj b/src/main/resources/assets/bloodmagic/models/bloodaltar.obj deleted file mode 100644 index 88037009..00000000 --- a/src/main/resources/assets/bloodmagic/models/bloodaltar.obj +++ /dev/null @@ -1,262 +0,0 @@ -# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware -# File Created: 07.08.2013 20:11:26 - -mtllib bloodaltar.mtl - -# -# object headusOBJexport002 -# - -v -4.5000 -0.0003 7.0000 -v 4.5000 -0.0003 7.0000 -v 4.0172 8.0000 6.2483 -v -4.0172 8.0000 6.2483 -v 6.9379 -0.0003 4.4994 -v 7.0199 -0.0003 -4.4998 -v 6.2600 8.0000 -4.0177 -v 6.1868 8.0000 4.0159 -v -4.0172 8.0000 -6.2496 -v 4.0172 8.0000 -6.2496 -v 4.5000 -0.0003 -7.0000 -v -4.5000 -0.0003 -7.0000 -v -6.2489 8.0000 4.0165 -v -6.2489 8.0000 -4.0622 -v -7.0000 -0.0003 -4.5497 -v -7.0000 -0.0003 4.5000 -v -5.6437 -0.0003 -7.7219 -v -7.6983 -0.0003 -5.7082 -v -6.9967 8.0000 -5.2528 -v -5.1927 8.0000 -7.0210 -v -5.2002 8.0000 7.0079 -v -7.0086 8.0000 5.1996 -v -7.7102 -0.0003 5.6512 -v -5.6513 -0.0003 7.7101 -v 5.6513 -0.0003 7.7101 -v 7.7102 -0.0003 5.6512 -v 7.0086 8.0000 5.1996 -v 5.2002 8.0000 7.0079 -v 7.7102 -0.0003 -5.6513 -v 5.6513 -0.0003 -7.7102 -v 5.2003 8.0000 -7.0092 -v 7.0086 8.0000 -5.2009 -v 1.7912 8.0000 3.2817 -v -1.7910 8.0000 3.2817 -v 3.2857 8.0000 -1.7950 -v 3.2857 8.0000 1.7872 -v -1.7906 8.0000 -3.2897 -v 1.7912 8.0000 -3.2895 -v -3.2855 8.0000 1.7872 -v -3.2853 8.0000 -1.8147 -v -1.2845 6.5000 2.0590 -v -1.2889 6.5000 -2.0668 -v -2.0626 6.5000 -1.3033 -v -2.0627 6.5000 1.2808 -v 1.2846 6.5000 2.0590 -v 2.0629 6.5000 1.2808 -v 2.0629 6.5000 -1.2885 -v 1.2847 6.5000 -2.0667 -# 48 vertices - -vn 0.0000 0.0935 0.9956 -vn 0.9955 0.0940 0.0091 -vn 0.0000 0.0934 -0.9956 -vn -0.9956 0.0935 -0.0000 -vn -0.1018 -0.5549 -0.8257 -vn -0.8232 -0.5551 -0.1189 -vn -0.9907 0.0943 -0.0983 -vn -0.0769 0.0913 -0.9928 -vn -0.0882 0.0938 0.9917 -vn -0.9919 0.0919 0.0872 -vn -0.8248 -0.5547 0.1099 -vn -0.1106 -0.5553 0.8243 -vn 0.1099 -0.5547 0.8248 -vn 0.8274 -0.5533 0.0960 -vn 0.9933 0.0927 0.0690 -vn 0.0872 0.0920 0.9919 -vn 0.8238 -0.5552 -0.1145 -vn 0.1106 -0.5553 -0.8243 -vn 0.0882 0.0937 -0.9917 -vn 0.9916 0.0921 -0.0908 -vn 0.2232 -0.9083 -0.3537 -vn -0.3592 -0.9076 0.2175 -vn -0.3569 -0.9078 -0.2202 -vn 0.2206 -0.9080 0.3561 -vn -0.2201 -0.9078 0.3569 -vn 0.3437 -0.9101 -0.2313 -vn 0.3617 -0.9067 0.2168 -vn -0.2206 -0.9081 -0.3561 -vn 0.0000 1.0000 -0.0000 -vn -0.5381 0.0439 0.8417 -vn 0.5465 0.0428 -0.8364 -vn -0.8417 0.0438 -0.5381 -vn -0.5397 0.0463 -0.8406 -vn 0.8456 0.0447 0.5319 -vn -0.8459 0.0470 0.5313 -vn 0.5397 0.0464 0.8406 -vn 0.1872 0.8722 -0.4520 -vn 0.1856 0.8723 0.4523 -vn 0.4516 0.8720 0.1888 -vn 0.4520 0.8722 -0.1872 -vn -0.1872 0.8722 -0.4520 -vn 0.2870 0.6616 -0.6928 -vn -0.2870 0.6616 -0.6928 -vn -0.4519 0.8722 -0.1872 -vn -0.6928 0.6616 -0.2869 -vn -0.4519 0.8722 0.1872 -vn -0.6928 0.6616 0.2869 -vn -0.1872 0.8722 0.4519 -vn -0.2870 0.6616 0.6927 -vn 0.2848 0.6611 0.6941 -vn 0.6914 0.6621 0.2891 -vn 0.6928 0.6616 -0.2869 -vn 0.8207 0.0426 -0.5698 -# 53 vertex normals - -vt -0.0000 0.2656 0.0000 -vt 0.2031 0.2656 0.0000 -vt 0.2031 0.5000 0.0000 -vt 0.0000 0.5000 0.0000 -vt 0.3906 0.2656 0.0000 -vt 0.5938 0.2656 0.0000 -vt 0.5938 0.5000 0.0000 -vt 0.3906 0.5000 0.0000 -vt 0.2031 0.2344 0.0000 -vt -0.0000 0.2344 0.0000 -vt -0.0000 0.0000 0.0000 -vt 0.2031 0.0000 0.0000 -vt 0.5938 0.2344 0.0000 -vt 0.3906 0.2344 0.0000 -vt 0.3906 -0.0000 0.0000 -vt 0.5938 0.0000 0.0000 -vt 0.2500 0.0000 0.0000 -vt 0.3438 0.0000 0.0000 -vt 0.3438 0.2344 0.0000 -vt 0.2500 0.2344 0.0000 -vt 0.7344 0.2344 0.0000 -vt 0.6406 0.2344 0.0000 -vt 0.6406 0.0000 0.0000 -vt 0.7344 -0.0000 0.0000 -vt 0.2500 0.2656 0.0000 -vt 0.3438 0.2656 0.0000 -vt 0.3438 0.5000 0.0000 -vt 0.2656 0.5000 0.0000 -vt 0.6406 0.2656 0.0000 -vt 0.7344 0.2656 0.0000 -vt 0.7344 0.5000 0.0000 -vt 0.6406 0.5000 0.0000 -vt 0.0938 0.5781 0.0000 -vt 0.0313 0.6406 0.0000 -vt 0.0000 0.6094 0.0000 -vt 0.0625 0.5469 0.0000 -vt 0.0313 0.9063 0.0000 -vt 0.0938 0.9688 0.0000 -vt 0.0625 1.0000 0.0000 -vt 0.0000 0.9375 0.0000 -vt 0.3750 0.9688 0.0000 -vt 0.4375 0.9063 0.0000 -vt 0.4688 0.9375 0.0000 -vt 0.4063 1.0000 0.0000 -vt 0.4375 0.6406 0.0000 -vt 0.3750 0.5781 0.0000 -vt 0.4063 0.5469 0.0000 -vt 0.4688 0.6094 0.0000 -vt 0.9097 0.6270 0.0000 -vt 0.8522 0.7042 0.0000 -vt 0.7593 0.7045 0.0000 -vt 0.7012 0.6278 0.0000 -vt 0.9689 0.8931 0.0000 -vt 0.8915 0.8357 0.0000 -vt 0.8911 0.7428 0.0000 -vt 0.9662 0.6847 0.0000 -vt 0.7025 0.9520 0.0000 -vt 0.7600 0.8750 0.0000 -vt 0.8529 0.8747 0.0000 -vt 0.9109 0.9512 0.0000 -vt 0.6436 0.6859 0.0000 -vt 0.7207 0.7435 0.0000 -vt 0.7210 0.8369 0.0000 -vt 0.6444 0.8955 0.0000 -vt 0.9884 0.9237 0.0000 -vt 0.9417 0.9708 0.0000 -vt 0.7813 0.2656 0.0000 -vt 0.7813 0.5000 0.0000 -vt 0.6721 0.9722 0.0000 -vt 0.6251 0.9265 0.0000 -vt 0.6237 0.6553 0.0000 -vt 0.6705 0.6082 0.0000 -vt 0.7813 -0.0000 0.0000 -vt 0.7813 0.2344 0.0000 -vt 0.9403 0.6072 0.0000 -vt 0.9874 0.6539 0.0000 -vt 0.7725 0.7362 0.0000 -vt 0.7728 0.8432 0.0000 -vt 0.7527 0.8235 0.0000 -vt 0.7524 0.7565 0.0000 -vt 0.8392 0.7360 0.0000 -vt 0.8595 0.7561 0.0000 -vt 0.8597 0.8227 0.0000 -vt 0.8396 0.8430 0.0000 -# 84 texture coords - -g headusOBJexport002 -usemtl Material__46 -s off -f 1/1/1 2/2/1 3/3/1 4/4/1 -f 5/5/2 6/6/2 7/7/2 8/8/2 -f 9/9/3 10/10/3 11/11/3 12/12/3 -f 13/13/4 14/14/4 15/15/4 16/16/4 -s 1 -f 17/17/5 18/18/6 19/19/7 20/20/8 -f 21/21/9 22/22/10 23/23/11 24/24/12 -f 25/25/13 26/26/14 27/27/15 28/28/16 -f 29/29/17 30/30/18 31/31/19 32/32/20 -f 12/33/21 15/34/22 18/35/6 17/36/5 -f 16/37/23 1/38/24 24/39/12 23/40/11 -f 2/41/25 5/42/26 26/43/14 25/44/13 -f 6/45/27 11/46/28 30/47/18 29/48/17 -s 2 -f 3/49/29 33/50/29 34/51/29 4/52/29 -f 7/53/29 35/54/29 36/55/29 8/56/29 -f 9/57/29 37/58/29 38/59/29 10/60/29 -f 13/61/29 39/62/29 40/63/29 14/64/29 -f 9/57/29 14/64/29 40/63/29 37/58/29 -f 4/52/29 34/51/29 39/62/29 13/61/29 -f 8/56/29 36/55/29 33/50/29 3/49/29 -f 10/60/29 38/59/29 35/54/29 7/53/29 -s 1 -f 25/25/13 28/28/16 3/3/30 2/2/25 -s 2 -f 10/60/29 7/53/29 32/65/29 31/66/29 -s 1 -f 17/17/5 20/20/8 9/9/31 12/12/21 -f 23/23/11 22/22/10 13/13/32 16/16/23 -f 11/67/28 10/68/33 31/31/19 30/30/18 -f 29/29/17 32/32/20 7/7/34 6/6/27 -s 2 -f 14/64/29 9/57/29 20/69/29 19/70/29 -s 1 -f 15/15/22 14/14/35 19/19/7 18/18/6 -s 2 -f 4/52/29 13/61/29 22/71/29 21/72/29 -s 1 -f 1/73/24 4/74/36 21/21/9 24/24/12 -s 2 -f 8/56/29 3/49/29 28/75/29 27/76/29 -s 1 -f 41/77/37 42/78/38 43/79/39 44/80/40 -f 45/81/41 41/77/37 34/51/42 33/50/43 -f 46/82/44 45/81/41 33/50/43 36/55/45 -f 47/83/46 46/82/44 36/55/45 35/54/47 -f 48/84/48 47/83/46 35/54/47 38/59/49 -f 42/78/38 48/84/48 38/59/49 37/58/50 -f 43/79/39 42/78/38 37/58/50 40/63/51 -f 44/80/40 43/79/39 40/63/51 39/62/52 -f 41/77/37 44/80/40 39/62/52 34/51/42 -f 48/84/48 45/81/41 46/82/44 47/83/46 -f 45/81/41 48/84/48 42/78/38 41/77/37 -f 16/37/23 15/34/22 12/33/21 1/38/24 -f 2/41/25 11/46/28 6/45/27 5/42/26 -f 11/46/28 2/41/25 1/38/24 12/33/21 -f 5/5/26 8/8/53 27/27/15 26/26/14 -# 46 polygons - diff --git a/src/main/resources/assets/bloodmagic/models/item/alchemytable.json b/src/main/resources/assets/bloodmagic/models/item/alchemytable.json deleted file mode 100644 index 53bc252a..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/alchemytable.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "bloodmagic:block/alchemytable", - "display": { - "gui": { - "rotation": [ 30, 225, 0 ], - "translation": [ -2.5, -1, 0 ], - "scale":[ 0.4, 0.4, 0.4 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/altar.json b/src/main/resources/assets/bloodmagic/models/item/altar.json deleted file mode 100644 index 945aff81..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/altar.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/bloodaltar" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/ritual_dismantler.json b/src/main/resources/assets/bloodmagic/models/item/altar_builder.json similarity index 50% rename from src/main/resources/assets/bloodmagic/models/item/ritual_dismantler.json rename to src/main/resources/assets/bloodmagic/models/item/altar_builder.json index dc88c182..8673e720 100644 --- a/src/main/resources/assets/bloodmagic/models/item/ritual_dismantler.json +++ b/src/main/resources/assets/bloodmagic/models/item/altar_builder.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "bloodmagic:items/ritual_dismantler" + "layer0": "bloodmagic:items/altar_builder" } } \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/blood_orb_apprentice.json b/src/main/resources/assets/bloodmagic/models/item/blood_orb_apprentice.json new file mode 100644 index 00000000..6d9873b8 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/blood_orb_apprentice.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/blood_orb_apprentice" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/blood_orb_archmage.json b/src/main/resources/assets/bloodmagic/models/item/blood_orb_archmage.json new file mode 100644 index 00000000..ded5df56 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/blood_orb_archmage.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/blood_orb_archmage" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/blood_orb_magician.json b/src/main/resources/assets/bloodmagic/models/item/blood_orb_magician.json new file mode 100644 index 00000000..a46fee43 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/blood_orb_magician.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/blood_orb_magician" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/blood_orb_master.json b/src/main/resources/assets/bloodmagic/models/item/blood_orb_master.json new file mode 100644 index 00000000..75d6d644 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/blood_orb_master.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/blood_orb_master" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/blood_orb_transcendent.json b/src/main/resources/assets/bloodmagic/models/item/blood_orb_transcendent.json new file mode 100644 index 00000000..645a8967 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/blood_orb_transcendent.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/blood_orb_transcendent" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/blood_orb_weak.json b/src/main/resources/assets/bloodmagic/models/item/blood_orb_weak.json new file mode 100644 index 00000000..542f6fe9 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/blood_orb_weak.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/blood_orb_weak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/book.json b/src/main/resources/assets/bloodmagic/models/item/book.json deleted file mode 100644 index 11cfc959..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/book.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "bloodmagic:item/sanguine_scientiem_guide_book" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_corrosive.json b/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_corrosive.json deleted file mode 100644 index 0f5ae214..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_corrosive.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "bloodmagic:items/SentientBow_corrosive" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ -80, 260, -40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "thirdperson_lefthand": { - "rotation": [ -80, -280, 40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_corrosive_pulling_0.json b/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_corrosive_pulling_0.json deleted file mode 100644 index e271c35f..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_corrosive_pulling_0.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "bloodmagic:items/SentientBow_corrosive_pulling_0" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ -80, 260, -40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "thirdperson_lefthand": { - "rotation": [ -80, -280, 40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_corrosive_pulling_1.json b/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_corrosive_pulling_1.json deleted file mode 100644 index 10c92cc6..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_corrosive_pulling_1.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "bloodmagic:items/SentientBow_corrosive_pulling_1" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ -80, 260, -40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "thirdperson_lefthand": { - "rotation": [ -80, -280, 40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - } - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_corrosive_pulling_2.json b/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_corrosive_pulling_2.json deleted file mode 100644 index b8599446..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_corrosive_pulling_2.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "bloodmagic:items/SentientBow_corrosive_pulling_2" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ -80, 260, -40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "thirdperson_lefthand": { - "rotation": [ -80, -280, 40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - } - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_destructive.json b/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_destructive.json deleted file mode 100644 index e9b94f1b..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_destructive.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "bloodmagic:items/SentientBow_destructive" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ -80, 260, -40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "thirdperson_lefthand": { - "rotation": [ -80, -280, 40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_destructive_pulling_0.json b/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_destructive_pulling_0.json deleted file mode 100644 index 06f33bc6..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_destructive_pulling_0.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "bloodmagic:items/SentientBow_destructive_pulling_0" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ -80, 260, -40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "thirdperson_lefthand": { - "rotation": [ -80, -280, 40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_destructive_pulling_1.json b/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_destructive_pulling_1.json deleted file mode 100644 index ef5cb818..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_destructive_pulling_1.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "bloodmagic:items/SentientBow_destructive_pulling_1" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ -80, 260, -40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "thirdperson_lefthand": { - "rotation": [ -80, -280, 40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - } - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_destructive_pulling_2.json b/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_destructive_pulling_2.json deleted file mode 100644 index 0ce0bb52..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_destructive_pulling_2.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "bloodmagic:items/SentientBow_destructive_pulling_2" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ -80, 260, -40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "thirdperson_lefthand": { - "rotation": [ -80, -280, 40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - } - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_pulling_0.json b/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_pulling_0.json deleted file mode 100644 index b6704fe2..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_pulling_0.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "bloodmagic:items/SentientBow_pulling_0" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ -80, 260, -40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "thirdperson_lefthand": { - "rotation": [ -80, -280, 40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_pulling_1.json b/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_pulling_1.json deleted file mode 100644 index 74d75dfd..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_pulling_1.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "bloodmagic:items/SentientBow_pulling_1" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ -80, 260, -40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "thirdperson_lefthand": { - "rotation": [ -80, -280, 40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - } - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_pulling_2.json b/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_pulling_2.json deleted file mode 100644 index 42dc030c..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_pulling_2.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "bloodmagic:items/SentientBow_pulling_2" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ -80, 260, -40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "thirdperson_lefthand": { - "rotation": [ -80, -280, 40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - } - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_steadfast.json b/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_steadfast.json deleted file mode 100644 index 7cd37a46..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_steadfast.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "bloodmagic:items/SentientBow_steadfast" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ -80, 260, -40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "thirdperson_lefthand": { - "rotation": [ -80, -280, 40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_steadfast_pulling_0.json b/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_steadfast_pulling_0.json deleted file mode 100644 index 03ac3941..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_steadfast_pulling_0.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "bloodmagic:items/SentientBow_steadfast_pulling_0" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ -80, 260, -40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "thirdperson_lefthand": { - "rotation": [ -80, -280, 40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_steadfast_pulling_1.json b/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_steadfast_pulling_1.json deleted file mode 100644 index fad82f89..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_steadfast_pulling_1.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "bloodmagic:items/SentientBow_steadfast_pulling_1" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ -80, 260, -40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "thirdperson_lefthand": { - "rotation": [ -80, -280, 40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - } - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_steadfast_pulling_2.json b/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_steadfast_pulling_2.json deleted file mode 100644 index 53cd4281..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_steadfast_pulling_2.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "bloodmagic:items/SentientBow_steadfast_pulling_2" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ -80, 260, -40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "thirdperson_lefthand": { - "rotation": [ -80, -280, 40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - } - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_vengeful.json b/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_vengeful.json deleted file mode 100644 index 4d9876eb..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_vengeful.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "bloodmagic:items/SentientBow_vengeful" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ -80, 260, -40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "thirdperson_lefthand": { - "rotation": [ -80, -280, 40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_vengeful_pulling_0.json b/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_vengeful_pulling_0.json deleted file mode 100644 index de5f6833..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_vengeful_pulling_0.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "bloodmagic:items/SentientBow_vengeful_pulling_0" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ -80, 260, -40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "thirdperson_lefthand": { - "rotation": [ -80, -280, 40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_vengeful_pulling_1.json b/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_vengeful_pulling_1.json deleted file mode 100644 index f77b1508..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_vengeful_pulling_1.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "bloodmagic:items/SentientBow_vengeful_pulling_1" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ -80, 260, -40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "thirdperson_lefthand": { - "rotation": [ -80, -280, 40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - } - } -} diff --git a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_vengeful_pulling_2.json b/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_vengeful_pulling_2.json deleted file mode 100644 index 618b904d..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_vengeful_pulling_2.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parent": "builtin/generated", - "textures": { - "layer0": "bloodmagic:items/SentientBow_vengeful_pulling_2" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ -80, 260, -40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "thirdperson_lefthand": { - "rotation": [ -80, -280, 40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - } - } -} - diff --git a/src/main/resources/assets/bloodmagic/models/item/dagger_self_sacrifice.json b/src/main/resources/assets/bloodmagic/models/item/dagger_self_sacrifice.json new file mode 100644 index 00000000..1bbc527a --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/dagger_self_sacrifice.json @@ -0,0 +1,14 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/dagger_self_sacrifice" + }, + "overrides": [ + { + "predicate": { + "bloodmagic:charged": 1.0 + }, + "model": "bloodmagic:item/dagger_self_sacrifice_charged" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/dagger_self_sacrifice_charged.json b/src/main/resources/assets/bloodmagic/models/item/dagger_self_sacrifice_charged.json new file mode 100644 index 00000000..52da00a6 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/dagger_self_sacrifice_charged.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/dagger_self_sacrifice_charged" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/dagger_self_sacrifice_creative.json b/src/main/resources/assets/bloodmagic/models/item/dagger_self_sacrifice_creative.json new file mode 100644 index 00000000..383c7d6a --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/dagger_self_sacrifice_creative.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/dagger_self_sacrifice" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/demon_will_crystal_corrosive.json b/src/main/resources/assets/bloodmagic/models/item/demon_will_crystal_corrosive.json new file mode 100644 index 00000000..b6cd510b --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/demon_will_crystal_corrosive.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/demon_will_crystal_corrosive" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/demon_will_crystal_destructive.json b/src/main/resources/assets/bloodmagic/models/item/demon_will_crystal_destructive.json new file mode 100644 index 00000000..44574f89 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/demon_will_crystal_destructive.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/demon_will_crystal_destructive" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/demon_will_crystal_raw.json b/src/main/resources/assets/bloodmagic/models/item/demon_will_crystal_raw.json new file mode 100644 index 00000000..1cab3cdd --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/demon_will_crystal_raw.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/demon_will_crystal_raw" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/demon_will_crystal_steadfast.json b/src/main/resources/assets/bloodmagic/models/item/demon_will_crystal_steadfast.json new file mode 100644 index 00000000..f31ce893 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/demon_will_crystal_steadfast.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/demon_will_crystal_steadfast" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/demon_will_crystal_vengeful.json b/src/main/resources/assets/bloodmagic/models/item/demon_will_crystal_vengeful.json new file mode 100644 index 00000000..cdb56ea0 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/demon_will_crystal_vengeful.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/demon_will_crystal_vengeful" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/demoncrucible.json b/src/main/resources/assets/bloodmagic/models/item/demoncrucible.json deleted file mode 100644 index 00ca898b..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/demoncrucible.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/demoncrucible" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/demoncrystallizer.json b/src/main/resources/assets/bloodmagic/models/item/demoncrystallizer.json deleted file mode 100644 index e10f069e..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/demoncrystallizer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/demoncrystallizer" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/demonpylon.json b/src/main/resources/assets/bloodmagic/models/item/demonpylon.json deleted file mode 100644 index 7a67ce9b..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/demonpylon.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/demonpylon" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/doubt_bucket.json b/src/main/resources/assets/bloodmagic/models/item/doubt_bucket.json deleted file mode 100644 index 7988cf44..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/doubt_bucket.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "parent": "forge:item/bucket_drip", - "loader": "forge:bucket", - "fluid": "bloodmagic:test_fluid" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/incensealtar.json b/src/main/resources/assets/bloodmagic/models/item/incensealtar.json deleted file mode 100644 index 2ae61ae6..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/incensealtar.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/incensealtar" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/life_essence_bucket.json b/src/main/resources/assets/bloodmagic/models/item/life_essence_bucket.json deleted file mode 100644 index 7988cf44..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/life_essence_bucket.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "parent": "forge:item/bucket_drip", - "loader": "forge:bucket", - "fluid": "bloodmagic:test_fluid" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/living_armor_chest.json b/src/main/resources/assets/bloodmagic/models/item/living_armor_chest.json new file mode 100644 index 00000000..09512fd3 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/living_armor_chest.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/living_armor_chest" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/living_armor_feet.json b/src/main/resources/assets/bloodmagic/models/item/living_armor_feet.json new file mode 100644 index 00000000..fa403aae --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/living_armor_feet.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/living_armor_feet" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/living_armor_head.json b/src/main/resources/assets/bloodmagic/models/item/living_armor_head.json new file mode 100644 index 00000000..136e2a38 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/living_armor_head.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/living_armor_head" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/living_armor_legs.json b/src/main/resources/assets/bloodmagic/models/item/living_armor_legs.json new file mode 100644 index 00000000..5ac9eeaa --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/living_armor_legs.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/living_armor_legs" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/living_tome.json b/src/main/resources/assets/bloodmagic/models/item/living_tome.json new file mode 100644 index 00000000..dbd50cb5 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/living_tome.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/living_tome" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/sentient_bow.json b/src/main/resources/assets/bloodmagic/models/item/sentient_bow.json deleted file mode 100644 index 94066618..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/sentient_bow.json +++ /dev/null @@ -1,169 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "bloodmagic:items/SentientBow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ -80, 260, -40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "thirdperson_lefthand": { - "rotation": [ -80, -280, 40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - } - }, - "overrides": [ - { - "predicate": { - "type": 1 - }, - "model": "bloodmagic:item/bow/ItemSentientBow_corrosive" - }, - { - "predicate": { - "type": 2 - }, - "model": "bloodmagic:item/bow/ItemSentientBow_destructive" - }, - { - "predicate": { - "type": 3 - }, - "model": "bloodmagic:item/bow/ItemSentientBow_vengeful" - }, - { - "predicate": { - "type": 4 - }, - "model": "bloodmagic:item/bow/ItemSentientBow_steadfast" - }, - { - "predicate": { - "type": 0, - "pulling": 1 - }, - "model": "bloodmagic:item/bow/ItemSentientBow_pulling_0" - }, - { - "predicate": { - "type": 1, - "pulling": 1 - }, - "model": "bloodmagic:item/bow/ItemSentientBow_corrosive_pulling_0" - }, - { - "predicate": { - "type": 2, - "pulling": 1 - }, - "model": "bloodmagic:item/bow/ItemSentientBow_destructive_pulling_0" - }, - { - "predicate": { - "type": 3, - "pulling": 1 - }, - "model": "bloodmagic:item/bow/ItemSentientBow_vengeful_pulling_0" - }, - { - "predicate": { - "type": 4, - "pulling": 1 - }, - "model": "bloodmagic:item/bow/ItemSentientBow_steadfast_pulling_0" - }, - { - "predicate": { - "type": 0, - "pulling": 1, - "pull": 0.65 - }, - "model": "bloodmagic:item/bow/ItemSentientBow_pulling_1" - }, - { - "predicate": { - "type": 1, - "pulling": 1, - "pull": 0.65 - }, - "model": "bloodmagic:item/bow/ItemSentientBow_corrosive_pulling_1" - }, - { - "predicate": { - "type": 2, - "pulling": 1, - "pull": 0.65 - }, - "model": "bloodmagic:item/bow/ItemSentientBow_destructive_pulling_1" - }, - { - "predicate": { - "type": 3, - "pulling": 1, - "pull": 0.65 - }, - "model": "bloodmagic:item/bow/ItemSentientBow_vengeful_pulling_1" - }, - { - "predicate": { - "type": 4, - "pulling": 1, - "pull": 0.65 - }, - "model": "bloodmagic:item/bow/ItemSentientBow_steadfast_pulling_1" - }, - { - "predicate": { - "type": 0, - "pulling": 1, - "pull": 0.9 - }, - "model": "bloodmagic:item/bow/ItemSentientBow_pulling_2" - }, - { - "predicate": { - "type": 1, - "pulling": 1, - "pull": 0.9 - }, - "model": "bloodmagic:item/bow/ItemSentientBow_corrosive_pulling_2" - }, - { - "predicate": { - "type": 2, - "pulling": 1, - "pull": 0.9 - }, - "model": "bloodmagic:item/bow/ItemSentientBow_destructive_pulling_2" - }, - { - "predicate": { - "type": 3, - "pulling": 1, - "pull": 0.9 - }, - "model": "bloodmagic:item/bow/ItemSentientBow_vengeful_pulling_2" - }, - { - "predicate": { - "type": 4, - "pulling": 1, - "pull": 0.9 - }, - "model": "bloodmagic:item/bow/ItemSentientBow_steadfast_pulling_2" - } - ] -} diff --git a/src/main/resources/assets/bloodmagic/models/item/sigil_air.json b/src/main/resources/assets/bloodmagic/models/item/sigil_air.json new file mode 100644 index 00000000..103ec83b --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/sigil_air.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/sigil/air" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/sigil_divination.json b/src/main/resources/assets/bloodmagic/models/item/sigil_divination.json new file mode 100644 index 00000000..f2ec93b5 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/sigil_divination.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/sigil/divination" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/sigil_fast_miner.json b/src/main/resources/assets/bloodmagic/models/item/sigil_fast_miner.json new file mode 100644 index 00000000..0a90c045 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/sigil_fast_miner.json @@ -0,0 +1,14 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/sigil/fast_miner" + }, + "overrides": [ + { + "predicate": { + "bloodmagic:toggled": 1 + }, + "model": "bloodmagic:item/sigil_fast_miner_toggled" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/sigil_fast_miner_toggled.json b/src/main/resources/assets/bloodmagic/models/item/sigil_fast_miner_toggled.json new file mode 100644 index 00000000..4cd404db --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/sigil_fast_miner_toggled.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/sigil/fast_miner_toggled" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/slate_blank.json b/src/main/resources/assets/bloodmagic/models/item/slate_blank.json new file mode 100644 index 00000000..33b8b8ae --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/slate_blank.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/slate_blank" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/slate_demonic.json b/src/main/resources/assets/bloodmagic/models/item/slate_demonic.json new file mode 100644 index 00000000..5e052dea --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/slate_demonic.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/slate_demonic" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/slate_ethereal.json b/src/main/resources/assets/bloodmagic/models/item/slate_ethereal.json new file mode 100644 index 00000000..6194449c --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/slate_ethereal.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/slate_ethereal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/slate_imbued.json b/src/main/resources/assets/bloodmagic/models/item/slate_imbued.json new file mode 100644 index 00000000..a3bcdd1c --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/slate_imbued.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/slate_imbued" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/slate_reinforced.json b/src/main/resources/assets/bloodmagic/models/item/slate_reinforced.json new file mode 100644 index 00000000..293d021e --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/slate_reinforced.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/slate_reinforced" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/soul/monster_soul.json b/src/main/resources/assets/bloodmagic/models/item/soul/monster_soul.json new file mode 100644 index 00000000..d41f788f --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/soul/monster_soul.json @@ -0,0 +1,32 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/soul/monster_soul_raw" + }, + "overrides": [ + { + "predicate": { + "bloodmagic:will": 0.1 + }, + "model": "bloodmagic:item/soul/monster_soul_corrosive" + }, + { + "predicate": { + "bloodmagic:will": 0.2 + }, + "model": "bloodmagic:item/soul/monster_soul_destructive" + }, + { + "predicate": { + "bloodmagic:will": 0.3 + }, + "model": "bloodmagic:item/soul/monster_soul_vengeful" + }, + { + "predicate": { + "bloodmagic:will": 0.4 + }, + "model": "bloodmagic:item/soul/monster_soul_steadfast" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/soul/monster_soul_corrosive.json b/src/main/resources/assets/bloodmagic/models/item/soul/monster_soul_corrosive.json new file mode 100644 index 00000000..27b7461b --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/soul/monster_soul_corrosive.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/soul/monster_soul_corrosive" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/soul/monster_soul_destructive.json b/src/main/resources/assets/bloodmagic/models/item/soul/monster_soul_destructive.json new file mode 100644 index 00000000..e1224220 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/soul/monster_soul_destructive.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/soul/monster_soul_destructive" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/soul/monster_soul_raw.json b/src/main/resources/assets/bloodmagic/models/item/soul/monster_soul_raw.json new file mode 100644 index 00000000..2a9f7797 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/soul/monster_soul_raw.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/soul/monster_soul_raw" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/soul/monster_soul_steadfast.json b/src/main/resources/assets/bloodmagic/models/item/soul/monster_soul_steadfast.json new file mode 100644 index 00000000..714f481e --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/soul/monster_soul_steadfast.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/soul/monster_soul_steadfast" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/soul/monster_soul_vengeful.json b/src/main/resources/assets/bloodmagic/models/item/soul/monster_soul_vengeful.json new file mode 100644 index 00000000..bf62db7e --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/soul/monster_soul_vengeful.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/soul/monster_soul_vengeful" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword.json b/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword.json new file mode 100644 index 00000000..41be86f5 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword.json @@ -0,0 +1,70 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/soul/sentient_sword_raw" + }, + "overrides": [ + { + "predicate": { + "bloodmagic:active": 1.0 + }, + "model": "bloodmagic:item/soul/sentient_sword_raw_active" + }, + { + "predicate": { + "bloodmagic:will": 0.1, + "bloodmagic:active": 0.0 + }, + "model": "bloodmagic:item/soul/sentient_sword_corrosive" + }, + { + "predicate": { + "bloodmagic:will": 0.1, + "bloodmagic:active": 1.0 + }, + "model": "bloodmagic:item/soul/sentient_sword_corrosive_active" + }, + { + "predicate": { + "bloodmagic:will": 0.2, + "bloodmagic:active": 0.0 + }, + "model": "bloodmagic:item/soul/sentient_sword_destructive" + }, + { + "predicate": { + "bloodmagic:will": 0.2, + "bloodmagic:active": 1.0 + }, + "model": "bloodmagic:item/soul/sentient_sword_destructive_active" + }, + { + "predicate": { + "bloodmagic:will": 0.3, + "bloodmagic:active": 0.0 + }, + "model": "bloodmagic:item/soul/sentient_sword_vengeful" + }, + { + "predicate": { + "bloodmagic:will": 0.3, + "bloodmagic:active": 1.0 + }, + "model": "bloodmagic:item/soul/sentient_sword_vengeful_active" + }, + { + "predicate": { + "bloodmagic:will": 0.4, + "bloodmagic:active": 0.0 + }, + "model": "bloodmagic:item/soul/sentient_sword_steadfast" + }, + { + "predicate": { + "bloodmagic:will": 0.4, + "bloodmagic:active": 1.0 + }, + "model": "bloodmagic:item/soul/sentient_sword_steadfast_active" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword_corrosive.json b/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword_corrosive.json new file mode 100644 index 00000000..7fffc02f --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword_corrosive.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/soul/sentient_sword_corrosive" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword_corrosive_active.json b/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword_corrosive_active.json new file mode 100644 index 00000000..8a82d0ed --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword_corrosive_active.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/soul/sentient_sword_corrosive_active" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword_destructive.json b/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword_destructive.json new file mode 100644 index 00000000..eb1f96c1 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword_destructive.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/soul/sentient_sword_destructive" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword_destructive_active.json b/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword_destructive_active.json new file mode 100644 index 00000000..e20babf3 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword_destructive_active.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/soul/sentient_sword_destructive_active" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword_raw_active.json b/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword_raw_active.json new file mode 100644 index 00000000..888581e1 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword_raw_active.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/soul/sentient_sword_raw_active" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword_steadfast.json b/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword_steadfast.json new file mode 100644 index 00000000..e41cdbbc --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword_steadfast.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/soul/sentient_sword_steadfast" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword_steadfast_active.json b/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword_steadfast_active.json new file mode 100644 index 00000000..8eac4d16 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword_steadfast_active.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/soul/sentient_sword_steadfast_active" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword_vengeful.json b/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword_vengeful.json new file mode 100644 index 00000000..c06e6227 --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword_vengeful.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/soul/sentient_sword_vengeful" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword_vengeful_active.json b/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword_vengeful_active.json new file mode 100644 index 00000000..45418c5d --- /dev/null +++ b/src/main/resources/assets/bloodmagic/models/item/soul/sentient_sword_vengeful_active.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "bloodmagic:items/soul/sentient_sword_vengeful_active" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/models/item/soulforge.json b/src/main/resources/assets/bloodmagic/models/item/soulforge.json deleted file mode 100644 index 3b715b5e..00000000 --- a/src/main/resources/assets/bloodmagic/models/item/soulforge.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "bloodmagic:block/soulforge" -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/recipes/_constants.json b/src/main/resources/assets/bloodmagic/recipes/_constants.json new file mode 100644 index 00000000..5296fe7f --- /dev/null +++ b/src/main/resources/assets/bloodmagic/recipes/_constants.json @@ -0,0 +1,9 @@ +[ + { + "ingredient": { + "type": "forge:ore_dict", + "ore": "stone" + }, + "name": "STONE" + } +] \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/schematics/four_way_corridor.json b/src/main/resources/assets/bloodmagic/schematics/four_way_corridor.json deleted file mode 100644 index 6e3e792f..00000000 --- a/src/main/resources/assets/bloodmagic/schematics/four_way_corridor.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "dungeonWeight": 2, - "structureMap": { - "bloodmagic:four_way_corridor": { - "x": 0, - "y": 0, - "z": 0 - } - }, - "doorMap": { - "north": [ - { - "x": 5, - "y": 0, - "z": 0 - } - ], - "south": [ - { - "x": 5, - "y": 0, - "z": 10 - } - ], - "west": [ - { - "x": 0, - "y": 0, - "z": 5 - } - ], - "east": [ - { - "x": 10, - "y": 0, - "z": 5 - } - ] - }, - "descriptorList": [ - { - "minimumOffset": { - "x": 0, - "y": 0, - "z": 0 - }, - "maximumOffset": { - "x": 11, - "y": 6, - "z": 11 - }, - "blockPosCache": [], - "cache": true - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/schematics/four_way_corridor_loot.json b/src/main/resources/assets/bloodmagic/schematics/four_way_corridor_loot.json deleted file mode 100644 index 6ceff35d..00000000 --- a/src/main/resources/assets/bloodmagic/schematics/four_way_corridor_loot.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "dungeonWeight": 1, - "structureMap": { - "bloodmagic:four_way_corridor_loot": { - "x": 0, - "y": 0, - "z": 0 - } - }, - "doorMap": { - "north": [ - { - "x": 5, - "y": 5, - "z": 0 - } - ], - "south": [ - { - "x": 5, - "y": 5, - "z": 10 - } - ], - "west": [ - { - "x": 0, - "y": 5, - "z": 5 - } - ], - "east": [ - { - "x": 10, - "y": 5, - "z": 5 - } - ] - }, - "descriptorList": [ - { - "minimumOffset": { - "x": 0, - "y": 0, - "z": 0 - }, - "maximumOffset": { - "x": 11, - "y": 11, - "z": 11 - }, - "blockPosCache": [], - "cache": true - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/schematics/ore_hold_1.json b/src/main/resources/assets/bloodmagic/schematics/ore_hold_1.json deleted file mode 100644 index ec51994a..00000000 --- a/src/main/resources/assets/bloodmagic/schematics/ore_hold_1.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "dungeonWeight": 4, - "structureMap": { - "bloodmagic:ore_hold_1": { - "x": 0, - "y": 0, - "z": 0 - } - }, - "doorMap": { - "north": [ - { - "x": 5, - "y": 0, - "z": 0 - }, - { - "x": 2, - "y": 5, - "z": 0 - }, - { - "x": 12, - "y": 5, - "z": 0 - } - ], - "south": [ - { - "x": 5, - "y": 0, - "z": 14 - }, - { - "x": 2, - "y": 5, - "z": 14 - }, - { - "x": 12, - "y": 5, - "z": 14 - } - ], - "west": [ - { - "x": 0, - "y": 5, - "z": 7 - } - ] - }, - "descriptorList": [ - { - "minimumOffset": { - "x": 0, - "y": 0, - "z": 0 - }, - "maximumOffset": { - "x": 15, - "y": 12, - "z": 15 - }, - "blockPosCache": [], - "cache": true - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/schematics/overlapped_corridor.json b/src/main/resources/assets/bloodmagic/schematics/overlapped_corridor.json deleted file mode 100644 index dfbd5e4a..00000000 --- a/src/main/resources/assets/bloodmagic/schematics/overlapped_corridor.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "dungeonWeight": 2, - "structureMap": { - "bloodmagic:overlapped_corridor": { - "x": 0, - "y": 0, - "z": 0 - } - }, - "doorMap": { - "north": [ - { - "x": 5, - "y": 0, - "z": 0 - } - ], - "south": [ - { - "x": 5, - "y": 0, - "z": 10 - } - ], - "west": [ - { - "x": 0, - "y": 4, - "z": 5 - } - ], - "east": [ - { - "x": 10, - "y": 4, - "z": 5 - } - ] - }, - "descriptorList": [ - { - "minimumOffset": { - "x": 3, - "y": 0, - "z": 0 - }, - "maximumOffset": { - "x": 8, - "y": 5, - "z": 11 - }, - "blockPosCache": [], - "cache": true - }, - { - "minimumOffset": { - "x": 0, - "y": 4, - "z": 3 - }, - "maximumOffset": { - "x": 11, - "y": 9, - "z": 8 - }, - "blockPosCache": [], - "cache": true - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/schematics/schematics.json b/src/main/resources/assets/bloodmagic/schematics/schematics.json deleted file mode 100644 index a1915c05..00000000 --- a/src/main/resources/assets/bloodmagic/schematics/schematics.json +++ /dev/null @@ -1,7 +0,0 @@ -[ - "bloodmagic:t_corridor", - "bloodmagic:four_way_corridor_loot", - "bloodmagic:four_way_corridor", - "bloodmagic:ore_hold_1", - "bloodmagic:straight_corridor" -] \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/schematics/spiral_staircase.json b/src/main/resources/assets/bloodmagic/schematics/spiral_staircase.json deleted file mode 100644 index 31eda76a..00000000 --- a/src/main/resources/assets/bloodmagic/schematics/spiral_staircase.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "dungeonWeight": 4, - "structureMap": { - "bloodmagic:spiral_staircase": { - "x": 0, - "y": 0, - "z": 0 - } - }, - "doorMap": { - "north": [ - { - "x": 5, - "y": 0, - "z": 0 - }, - { - "x": 5, - "y": 12, - "z": 0 - } - ], - "south": [ - { - "x": 5, - "y": 0, - "z": 14 - }, - { - "x": 5, - "y": 12, - "z": 10 - } - ], - "west": [ - { - "x": 0, - "y": 0, - "z": 5 - }, - { - "x": 0, - "y": 12, - "z": 5 - } - ], - "east": [ - { - "x": 10, - "y": 0, - "z": 5 - }, - { - "x": 10, - "y": 6, - "z": 5 - }, - { - "x": 10, - "y": 12, - "z": 5 - } - ] - }, - "descriptorList": [ - { - "minimumOffset": { - "x": 0, - "y": 0, - "z": 0 - }, - "maximumOffset": { - "x": 11, - "y": 18, - "z": 11 - }, - "blockPosCache": [], - "cache": true - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/schematics/straight_corridor.json b/src/main/resources/assets/bloodmagic/schematics/straight_corridor.json deleted file mode 100644 index 537eee82..00000000 --- a/src/main/resources/assets/bloodmagic/schematics/straight_corridor.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "dungeonWeight": 2, - "structureMap": { - "bloodmagic:straight_corridor": { - "x": 0, - "y": 0, - "z": 0 - } - }, - "doorMap": { - "west": [ - { - "x": 0, - "y": 0, - "z": 2 - } - ], - "east": [ - { - "x": 10, - "y": 0, - "z": 2 - } - ] - }, - "descriptorList": [ - { - "minimumOffset": { - "x": 0, - "y": 0, - "z": 0 - }, - "maximumOffset": { - "x": 11, - "y": 5, - "z": 5 - }, - "blockPosCache": [], - "cache": true - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/schematics/t_corridor.json b/src/main/resources/assets/bloodmagic/schematics/t_corridor.json deleted file mode 100644 index 6bc5f643..00000000 --- a/src/main/resources/assets/bloodmagic/schematics/t_corridor.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "dungeonWeight": 2, - "structureMap": { - "bloodmagic:t_corridor": { - "x": 0, - "y": 0, - "z": 0 - } - }, - "doorMap": { - "north": [ - { - "x": 5, - "y": 0, - "z": 0 - } - ], - "west": [ - { - "x": 0, - "y": 0, - "z": 5 - } - ], - "east": [ - { - "x": 10, - "y": 0, - "z": 5 - } - ] - }, - "descriptorList": [ - { - "minimumOffset": { - "x": 0, - "y": 0, - "z": 0 - }, - "maximumOffset": { - "x": 11, - "y": 5, - "z": 8 - }, - "blockPosCache": [], - "cache": true - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/textures/block/airritualstone.png b/src/main/resources/assets/bloodmagic/textures/block/airritualstone.png deleted file mode 100644 index 7dfa2296..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/airritualstone.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/arc_bottom.png b/src/main/resources/assets/bloodmagic/textures/block/arc_bottom.png deleted file mode 100644 index 2ab0e120..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/arc_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/arc_front.png b/src/main/resources/assets/bloodmagic/textures/block/arc_front.png deleted file mode 100644 index 7b6cffb4..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/arc_front.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/arc_side.png b/src/main/resources/assets/bloodmagic/textures/block/arc_side.png deleted file mode 100644 index ec176079..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/arc_side.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/arc_top.png b/src/main/resources/assets/bloodmagic/textures/block/arc_top.png deleted file mode 100644 index 8baa7de3..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/arc_top.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/bloodsocket.png b/src/main/resources/assets/bloodmagic/textures/block/bloodsocket.png deleted file mode 100644 index fe7219a8..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/bloodsocket.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/bloodtank.png b/src/main/resources/assets/bloodmagic/textures/block/bloodtank.png deleted file mode 100644 index 053e8280..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/bloodtank.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/creeping_doubt_1.png b/src/main/resources/assets/bloodmagic/textures/block/creeping_doubt_1.png deleted file mode 100644 index a6005e5a..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/creeping_doubt_1.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/creeping_doubt_2.png b/src/main/resources/assets/bloodmagic/textures/block/creeping_doubt_2.png deleted file mode 100644 index cf6e8cf0..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/creeping_doubt_2.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/creeping_doubt_3.png b/src/main/resources/assets/bloodmagic/textures/block/creeping_doubt_3.png deleted file mode 100644 index b0bc850b..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/creeping_doubt_3.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/creeping_doubt_4.png b/src/main/resources/assets/bloodmagic/textures/block/creeping_doubt_4.png deleted file mode 100644 index ad7ba3bb..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/creeping_doubt_4.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/creeping_doubt_5.png b/src/main/resources/assets/bloodmagic/textures/block/creeping_doubt_5.png deleted file mode 100644 index 78631666..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/creeping_doubt_5.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/creeping_doubt_6.png b/src/main/resources/assets/bloodmagic/textures/block/creeping_doubt_6.png deleted file mode 100644 index 6dc36ae0..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/creeping_doubt_6.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/creeping_doubt_7.png b/src/main/resources/assets/bloodmagic/textures/block/creeping_doubt_7.png deleted file mode 100644 index ee33cede..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/creeping_doubt_7.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/creeping_doubt_8.png b/src/main/resources/assets/bloodmagic/textures/block/creeping_doubt_8.png deleted file mode 100644 index 0ca1b657..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/creeping_doubt_8.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_ore.png b/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_ore.png deleted file mode 100644 index 3771f3a2..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_ore.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/duskritualstone.png b/src/main/resources/assets/bloodmagic/textures/block/duskritualstone.png deleted file mode 100644 index 3bc12099..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/duskritualstone.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/earthritualstone.png b/src/main/resources/assets/bloodmagic/textures/block/earthritualstone.png deleted file mode 100644 index 7fc0b3b4..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/earthritualstone.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/empty.png b/src/main/resources/assets/bloodmagic/textures/block/empty.png deleted file mode 100644 index 5ac03397..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/empty.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/emptysocket.png b/src/main/resources/assets/bloodmagic/textures/block/emptysocket.png deleted file mode 100644 index 4e536eee..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/emptysocket.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/etherealopaquemimic.png b/src/main/resources/assets/bloodmagic/textures/block/etherealopaquemimic.png deleted file mode 100644 index b5b0f000..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/etherealopaquemimic.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/fireritualstone.png b/src/main/resources/assets/bloodmagic/textures/block/fireritualstone.png deleted file mode 100644 index 69fe25c6..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/fireritualstone.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/imperfectritualstone.png b/src/main/resources/assets/bloodmagic/textures/block/imperfectritualstone.png deleted file mode 100644 index 528cc375..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/imperfectritualstone.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/largebloodstonebrick.png b/src/main/resources/assets/bloodmagic/textures/block/largebloodstonebrick.png deleted file mode 100644 index 4935a71f..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/largebloodstonebrick.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/lightritualstone.png b/src/main/resources/assets/bloodmagic/textures/block/lightritualstone.png deleted file mode 100644 index b8415523..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/lightritualstone.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/liquid_doubt_flowing.png b/src/main/resources/assets/bloodmagic/textures/block/liquid_doubt_flowing.png deleted file mode 100644 index 3eaa219e..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/liquid_doubt_flowing.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/liquid_doubt_flowing.png.mcmeta b/src/main/resources/assets/bloodmagic/textures/block/liquid_doubt_flowing.png.mcmeta deleted file mode 100644 index 8e55e43b..00000000 --- a/src/main/resources/assets/bloodmagic/textures/block/liquid_doubt_flowing.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation": { - "frametime": 3 - } -} diff --git a/src/main/resources/assets/bloodmagic/textures/block/liquid_doubt_still.png b/src/main/resources/assets/bloodmagic/textures/block/liquid_doubt_still.png deleted file mode 100644 index b9c8daf0..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/liquid_doubt_still.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/liquid_doubt_still.png.mcmeta b/src/main/resources/assets/bloodmagic/textures/block/liquid_doubt_still.png.mcmeta deleted file mode 100644 index 7ceb3639..00000000 --- a/src/main/resources/assets/bloodmagic/textures/block/liquid_doubt_still.png.mcmeta +++ /dev/null @@ -1,45 +0,0 @@ -{ - "animation": { - "frametime": 2, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 18, - 17, - 16, - 15, - 14, - 13, - 12, - 11, - 10, - 9, - 8, - 7, - 6, - 5, - 4, - 3, - 2, - 1 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/textures/block/masterritualstone.png b/src/main/resources/assets/bloodmagic/textures/block/masterritualstone.png deleted file mode 100644 index a2776cfe..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/masterritualstone.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/masterritualstone_inverted.png b/src/main/resources/assets/bloodmagic/textures/block/masterritualstone_inverted.png deleted file mode 100644 index 9ba93d8b..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/masterritualstone_inverted.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/nether_soil.png b/src/main/resources/assets/bloodmagic/textures/block/nether_soil.png deleted file mode 100644 index 4241d53f..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/nether_soil.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/nether_soil.png.mcmeta b/src/main/resources/assets/bloodmagic/textures/block/nether_soil.png.mcmeta deleted file mode 100644 index 7ceb3639..00000000 --- a/src/main/resources/assets/bloodmagic/textures/block/nether_soil.png.mcmeta +++ /dev/null @@ -1,45 +0,0 @@ -{ - "animation": { - "frametime": 2, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 18, - 17, - 16, - 15, - 14, - 13, - 12, - 11, - 10, - 9, - 8, - 7, - 6, - 5, - 4, - 3, - 2, - 1 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/bloodmagic/textures/block/obsidianbrickpath.png b/src/main/resources/assets/bloodmagic/textures/block/obsidianbrickpath.png deleted file mode 100644 index f06a218e..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/obsidianbrickpath.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/obsidiantilepath.png b/src/main/resources/assets/bloodmagic/textures/block/obsidiantilepath.png deleted file mode 100644 index 0a5c2ebf..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/obsidiantilepath.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/phantomblock.png b/src/main/resources/assets/bloodmagic/textures/block/phantomblock.png deleted file mode 100644 index 81c4f64c..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/phantomblock.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/ritualstone.png b/src/main/resources/assets/bloodmagic/textures/block/ritualstone.png deleted file mode 100644 index 1001bb27..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/ritualstone.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/sentientmimic.png b/src/main/resources/assets/bloodmagic/textures/block/sentientmimic.png deleted file mode 100644 index b2393417..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/sentientmimic.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/shardcluster.png b/src/main/resources/assets/bloodmagic/textures/block/shardcluster.png deleted file mode 100644 index 6a1cfa3e..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/shardcluster.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/shardclusterbrick.png b/src/main/resources/assets/bloodmagic/textures/block/shardclusterbrick.png deleted file mode 100644 index a2510fe0..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/shardclusterbrick.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/simpletranscircle.png b/src/main/resources/assets/bloodmagic/textures/block/simpletranscircle.png deleted file mode 100644 index d178e55b..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/simpletranscircle.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/solidclearmimic.png b/src/main/resources/assets/bloodmagic/textures/block/solidclearmimic.png deleted file mode 100644 index 8c571249..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/solidclearmimic.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/solidlightmimic.png b/src/main/resources/assets/bloodmagic/textures/block/solidlightmimic.png deleted file mode 100644 index 9d020edd..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/solidlightmimic.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/solidopaquemimic.png b/src/main/resources/assets/bloodmagic/textures/block/solidopaquemimic.png deleted file mode 100644 index 567f230c..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/solidopaquemimic.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/soul_forge.png b/src/main/resources/assets/bloodmagic/textures/block/soul_forge.png deleted file mode 100644 index 1001bb27..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/soul_forge.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/soulforge.png b/src/main/resources/assets/bloodmagic/textures/block/soulforge.png deleted file mode 100644 index 88c185db..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/soulforge.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/spectralblock.png b/src/main/resources/assets/bloodmagic/textures/block/spectralblock.png deleted file mode 100644 index 996fc22a..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/spectralblock.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/stonebrickpath.png b/src/main/resources/assets/bloodmagic/textures/block/stonebrickpath.png deleted file mode 100644 index c470ec95..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/stonebrickpath.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/stonetilepath.png b/src/main/resources/assets/bloodmagic/textures/block/stonetilepath.png deleted file mode 100644 index 1432c7ca..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/stonetilepath.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/teleposer_side.png b/src/main/resources/assets/bloodmagic/textures/block/teleposer_side.png deleted file mode 100644 index 2aa2cfdd..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/teleposer_side.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/teleposer_top.png b/src/main/resources/assets/bloodmagic/textures/block/teleposer_top.png deleted file mode 100644 index 6e419697..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/teleposer_top.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/waterritualstone.png b/src/main/resources/assets/bloodmagic/textures/block/waterritualstone.png deleted file mode 100644 index a0b3a91f..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/waterritualstone.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/woodbrickpath.png b/src/main/resources/assets/bloodmagic/textures/block/woodbrickpath.png deleted file mode 100644 index 003fd2b3..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/woodbrickpath.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/woodtilepath.png b/src/main/resources/assets/bloodmagic/textures/block/woodtilepath.png deleted file mode 100644 index 18aa0477..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/woodtilepath.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/wornstonebrickpath.png b/src/main/resources/assets/bloodmagic/textures/block/wornstonebrickpath.png deleted file mode 100644 index d2774c79..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/wornstonebrickpath.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/block/wornstonetilepath.png b/src/main/resources/assets/bloodmagic/textures/block/wornstonetilepath.png deleted file mode 100644 index 0df77da0..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/block/wornstonetilepath.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/altar.png b/src/main/resources/assets/bloodmagic/textures/blocks/blood_altar.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/models/altar.png rename to src/main/resources/assets/bloodmagic/textures/blocks/blood_altar.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/accelerationrune.png b/src/main/resources/assets/bloodmagic/textures/blocks/blood_rune/blood_rune_acceleration.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/accelerationrune.png rename to src/main/resources/assets/bloodmagic/textures/blocks/blood_rune/blood_rune_acceleration.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/bettercapacityrune.png b/src/main/resources/assets/bloodmagic/textures/blocks/blood_rune/blood_rune_augmented_capacity.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/bettercapacityrune.png rename to src/main/resources/assets/bloodmagic/textures/blocks/blood_rune/blood_rune_augmented_capacity.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/blankrune.png b/src/main/resources/assets/bloodmagic/textures/blocks/blood_rune/blood_rune_blank.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/blankrune.png rename to src/main/resources/assets/bloodmagic/textures/blocks/blood_rune/blood_rune_blank.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/altarcapacityrune.png b/src/main/resources/assets/bloodmagic/textures/blocks/blood_rune/blood_rune_capacity.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/altarcapacityrune.png rename to src/main/resources/assets/bloodmagic/textures/blocks/blood_rune/blood_rune_capacity.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/chargingrune.png b/src/main/resources/assets/bloodmagic/textures/blocks/blood_rune/blood_rune_charging.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/chargingrune.png rename to src/main/resources/assets/bloodmagic/textures/blocks/blood_rune/blood_rune_charging.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dislocationrune.png b/src/main/resources/assets/bloodmagic/textures/blocks/blood_rune/blood_rune_displacement.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dislocationrune.png rename to src/main/resources/assets/bloodmagic/textures/blocks/blood_rune/blood_rune_displacement.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/efficiencyrune.png b/src/main/resources/assets/bloodmagic/textures/blocks/blood_rune/blood_rune_efficiency.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/efficiencyrune.png rename to src/main/resources/assets/bloodmagic/textures/blocks/blood_rune/blood_rune_efficiency.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/orbcapacityrune.png b/src/main/resources/assets/bloodmagic/textures/blocks/blood_rune/blood_rune_orb.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/orbcapacityrune.png rename to src/main/resources/assets/bloodmagic/textures/blocks/blood_rune/blood_rune_orb.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/sacrificerune.png b/src/main/resources/assets/bloodmagic/textures/blocks/blood_rune/blood_rune_sacrifice.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/sacrificerune.png rename to src/main/resources/assets/bloodmagic/textures/blocks/blood_rune/blood_rune_sacrifice.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/selfsacrificerune.png b/src/main/resources/assets/bloodmagic/textures/blocks/blood_rune/blood_rune_self_sacrifice.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/selfsacrificerune.png rename to src/main/resources/assets/bloodmagic/textures/blocks/blood_rune/blood_rune_self_sacrifice.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/speedrune.png b/src/main/resources/assets/bloodmagic/textures/blocks/blood_rune/blood_rune_speed.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/speedrune.png rename to src/main/resources/assets/bloodmagic/textures/blocks/blood_rune/blood_rune_speed.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/bloodstonebrick.png b/src/main/resources/assets/bloodmagic/textures/blocks/bloodstone_brick.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/bloodstonebrick.png rename to src/main/resources/assets/bloodmagic/textures/blocks/bloodstone_brick.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/bloodlight.png b/src/main/resources/assets/bloodmagic/textures/blocks/bloodstone_tile.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/bloodlight.png rename to src/main/resources/assets/bloodmagic/textures/blocks/bloodstone_tile.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick1_c.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_1_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick1_c.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_1_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick1_d.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_1_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick1_d.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_1_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick1.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_1_raw.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick1.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_1_raw.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick1_s.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_1_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick1_s.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_1_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick1_v.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_1_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick1_v.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_1_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick2_c.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_2_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick2_c.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_2_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick2_d.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_2_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick2_d.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_2_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick2.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_2_raw.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick2.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_2_raw.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick2_s.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_2_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick2_s.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_2_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick2_v.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_2_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick2_v.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_2_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick3_c.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_3_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick3_c.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_3_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick3_d.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_3_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick3_d.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_3_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick3.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_3_raw.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick3.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_3_raw.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick3_s.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_3_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick3_s.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_3_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick3_v.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_3_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_brick3_v.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_3_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_eye_c.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_eye_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_eye_c.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_eye_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_eye_d.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_eye_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_eye_d.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_eye_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_eye.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_eye_raw.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_eye.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_eye_raw.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_eye_s.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_eye_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_eye_s.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_eye_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_eye_v.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_eye_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_eye_v.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_eye_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarbottom_c.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_bottom_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarbottom_c.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_bottom_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarbottom_d.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_bottom_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarbottom_d.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_bottom_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarbottom.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_bottom_raw.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarbottom.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_bottom_raw.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarbottom_s.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_bottom_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarbottom_s.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_bottom_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarbottom_v.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_bottom_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarbottom_v.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_bottom_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillar_c.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillar_c.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillar_d.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillar_d.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarheart_c.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_heart_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarheart_c.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_heart_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarheart_d.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_heart_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarheart_d.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_heart_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarheart.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_heart_raw.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarheart.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_heart_raw.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarheart_s.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_heart_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarheart_s.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_heart_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarheart_v.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_heart_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarheart_v.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_heart_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillar.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_raw.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillar.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_raw.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarspecial_c.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_special_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarspecial_c.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_special_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarspecial_d.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_special_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarspecial_d.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_special_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarspecial.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_special_raw.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarspecial.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_special_raw.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarspecial_s.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_special_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarspecial_s.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_special_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarspecial_v.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_special_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillarspecial_v.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_special_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillar_s.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillar_s.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillartop_c.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_top_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillartop_c.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_top_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillartop_d.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_top_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillartop_d.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_top_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillartop.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_top_raw.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillartop.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_top_raw.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillartop_s.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_top_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillartop_s.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_top_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillartop_v.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_top_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillartop_v.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_top_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillar_v.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_pillar_v.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_pillar_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_smallbrick_c.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_small_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_smallbrick_c.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_small_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_smallbrick_d.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_small_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_smallbrick_d.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_small_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_smallbrick.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_small_raw.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_smallbrick.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_small_raw.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_smallbrick_s.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_small_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_smallbrick_s.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_small_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_smallbrick_v.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_small_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_smallbrick_v.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_small_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tile_c.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_tile_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tile_c.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_tile_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tile_d.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_tile_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tile_d.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_tile_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tile.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_tile_raw.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tile.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_tile_raw.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tilespecial_c.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_tile_special_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tilespecial_c.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_tile_special_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tilespecial_d.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_tile_special_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tilespecial_d.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_tile_special_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tilespecial.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_tile_special_raw.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tilespecial.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_tile_special_raw.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tilespecial_s.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_tile_special_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tilespecial_s.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_tile_special_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tilespecial_v.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_tile_special_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tilespecial_v.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_tile_special_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tile_s.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_tile_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tile_s.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_tile_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tile_v.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_tile_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_tile_v.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_brick_tile_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_metal_c.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_metal_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_metal_c.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_metal_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_metal_d.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_metal_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_metal_d.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_metal_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_metal.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_metal_raw.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_metal.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_metal_raw.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_metal_s.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_metal_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_metal_s.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_metal_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_metal_v.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_metal_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_metal_v.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_metal_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_stone_c.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_stone_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_stone_c.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_stone_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_stone_d.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_stone_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_stone_d.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_stone_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_polished_c.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_stone_polished_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_polished_c.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_stone_polished_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_polished_d.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_stone_polished_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_polished_d.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_stone_polished_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_polished.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_stone_polished_raw.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_polished.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_stone_polished_raw.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_polished_s.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_stone_polished_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_polished_s.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_stone_polished_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_polished_v.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_stone_polished_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_polished_v.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_stone_polished_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_stone.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_stone_raw.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_stone.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_stone_raw.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_stone_s.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_stone_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_stone_s.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_stone_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_stone_v.png b/src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_stone_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/dungeon/dungeon_stone_v.png rename to src/main/resources/assets/bloodmagic/textures/blocks/dungeon/demon_stone_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/lifeessenceflowing.png b/src/main/resources/assets/bloodmagic/textures/blocks/life_essence_flowing.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/lifeessenceflowing.png rename to src/main/resources/assets/bloodmagic/textures/blocks/life_essence_flowing.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/lifeessenceflowing.png.mcmeta b/src/main/resources/assets/bloodmagic/textures/blocks/life_essence_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/lifeessenceflowing.png.mcmeta rename to src/main/resources/assets/bloodmagic/textures/blocks/life_essence_flowing.png.mcmeta diff --git a/src/main/resources/assets/bloodmagic/textures/block/lifeessencestill.png b/src/main/resources/assets/bloodmagic/textures/blocks/life_essence_still.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/lifeessencestill.png rename to src/main/resources/assets/bloodmagic/textures/blocks/life_essence_still.png diff --git a/src/main/resources/assets/bloodmagic/textures/block/lifeessencestill.png.mcmeta b/src/main/resources/assets/bloodmagic/textures/blocks/life_essence_still.png.mcmeta similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/block/lifeessencestill.png.mcmeta rename to src/main/resources/assets/bloodmagic/textures/blocks/life_essence_still.png.mcmeta diff --git a/src/main/resources/assets/bloodmagic/textures/entities/bloodelytra.png b/src/main/resources/assets/bloodmagic/textures/entities/bloodelytra.png deleted file mode 100644 index 681994c4..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/entities/bloodelytra.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/entities/defaultcrystallayer.png b/src/main/resources/assets/bloodmagic/textures/entities/defaultcrystallayer.png deleted file mode 100644 index 5f2cc19c..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/entities/defaultcrystallayer.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/entities/energyblastprojectile.png b/src/main/resources/assets/bloodmagic/textures/entities/energyblastprojectile.png deleted file mode 100644 index a2e8c7f7..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/entities/energyblastprojectile.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/entities/explosionprojectile.png b/src/main/resources/assets/bloodmagic/textures/entities/explosionprojectile.png deleted file mode 100644 index 94323bc4..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/entities/explosionprojectile.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/entities/fireprojectile.png b/src/main/resources/assets/bloodmagic/textures/entities/fireprojectile.png deleted file mode 100644 index ca9d61e0..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/entities/fireprojectile.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/entities/holyprojectile.png b/src/main/resources/assets/bloodmagic/textures/entities/holyprojectile.png deleted file mode 100644 index 52fb9ad3..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/entities/holyprojectile.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/entities/iceprojectile.png b/src/main/resources/assets/bloodmagic/textures/entities/iceprojectile.png deleted file mode 100644 index 5a09b07a..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/entities/iceprojectile.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/entities/lightningprojectile.png b/src/main/resources/assets/bloodmagic/textures/entities/lightningprojectile.png deleted file mode 100644 index 1ede4513..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/entities/lightningprojectile.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/entities/mudprojectile.png b/src/main/resources/assets/bloodmagic/textures/entities/mudprojectile.png deleted file mode 100644 index 097cd22b..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/entities/mudprojectile.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/entities/nodebeam.png b/src/main/resources/assets/bloodmagic/textures/entities/nodebeam.png deleted file mode 100644 index 67545b45..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/entities/nodebeam.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/entities/overlay/overlay_raw.png b/src/main/resources/assets/bloodmagic/textures/entities/overlay/overlay_raw.png deleted file mode 100644 index c2f9110e..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/entities/overlay/overlay_raw.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/entities/soularrow.png b/src/main/resources/assets/bloodmagic/textures/entities/soularrow.png deleted file mode 100644 index 10830442..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/entities/soularrow.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/entities/soularrow_corrosive.png b/src/main/resources/assets/bloodmagic/textures/entities/soularrow_corrosive.png deleted file mode 100644 index b636b2a3..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/entities/soularrow_corrosive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/entities/soularrow_destructive.png b/src/main/resources/assets/bloodmagic/textures/entities/soularrow_destructive.png deleted file mode 100644 index 42a19c2a..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/entities/soularrow_destructive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/entities/soularrow_steadfast.png b/src/main/resources/assets/bloodmagic/textures/entities/soularrow_steadfast.png deleted file mode 100644 index 9e234d87..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/entities/soularrow_steadfast.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/entities/soularrow_vengeful.png b/src/main/resources/assets/bloodmagic/textures/entities/soularrow_vengeful.png deleted file mode 100644 index 15682ce2..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/entities/soularrow_vengeful.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/entities/specter.png b/src/main/resources/assets/bloodmagic/textures/entities/specter.png deleted file mode 100644 index 283ca154..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/entities/specter.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/entities/waterprojectile.png b/src/main/resources/assets/bloodmagic/textures/entities/waterprojectile.png deleted file mode 100644 index 3950a85a..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/entities/waterprojectile.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/entities/windgustprojectile.png b/src/main/resources/assets/bloodmagic/textures/entities/windgustprojectile.png deleted file mode 100644 index fab71f51..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/entities/windgustprojectile.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/entities/zombie_raw.png b/src/main/resources/assets/bloodmagic/textures/entities/zombie_raw.png deleted file mode 100644 index 4e9c7723..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/entities/zombie_raw.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/gui/alchemytable.png b/src/main/resources/assets/bloodmagic/textures/gui/alchemytable.png deleted file mode 100644 index a92eac01..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/gui/alchemytable.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/gui/arc_gui.png b/src/main/resources/assets/bloodmagic/textures/gui/arc_gui.png deleted file mode 100644 index 5bd03fae..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/gui/arc_gui.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/gui/bookcrafting.png b/src/main/resources/assets/bloodmagic/textures/gui/bookcrafting.png deleted file mode 100644 index e9ee759f..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/gui/bookcrafting.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/gui/bookfurnace.png b/src/main/resources/assets/bloodmagic/textures/gui/bookfurnace.png deleted file mode 100644 index cda94fb0..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/gui/bookfurnace.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/gui/bookleft.png b/src/main/resources/assets/bloodmagic/textures/gui/bookleft.png deleted file mode 100644 index 08b462df..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/gui/bookleft.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/gui/bookright.png b/src/main/resources/assets/bloodmagic/textures/gui/bookright.png deleted file mode 100644 index 8c255a77..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/gui/bookright.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/gui/crucible.png b/src/main/resources/assets/bloodmagic/textures/gui/crucible.png deleted file mode 100644 index c321fcef..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/gui/crucible.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/gui/guitrap.png b/src/main/resources/assets/bloodmagic/textures/gui/guitrap.png deleted file mode 100644 index 2fdb824e..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/gui/guitrap.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/gui/jei/altar.png b/src/main/resources/assets/bloodmagic/textures/gui/jei/blood_altar.png similarity index 100% rename from src/main/resources/assets/bloodmagic/gui/jei/altar.png rename to src/main/resources/assets/bloodmagic/textures/gui/jei/blood_altar.png diff --git a/src/main/resources/assets/bloodmagic/textures/gui/masterroutingnode.png b/src/main/resources/assets/bloodmagic/textures/gui/masterroutingnode.png deleted file mode 100644 index 4039c1c4..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/gui/masterroutingnode.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/gui/patchouli_book/crafting.png b/src/main/resources/assets/bloodmagic/textures/gui/patchouli_book/crafting.png deleted file mode 100644 index 15f1ffd5..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/gui/patchouli_book/crafting.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/gui/patchouli_book/page_filler.png b/src/main/resources/assets/bloodmagic/textures/gui/patchouli_book/page_filler.png deleted file mode 100644 index c26fdf41..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/gui/patchouli_book/page_filler.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/gui/routingnode.png b/src/main/resources/assets/bloodmagic/textures/gui/routingnode.png deleted file mode 100644 index 70caad83..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/gui/routingnode.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/gui/soulforge.png b/src/main/resources/assets/bloodmagic/textures/gui/soulforge.png deleted file mode 100644 index 641d2cf6..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/gui/soulforge.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/gui/buttons_compat.png b/src/main/resources/assets/bloodmagic/textures/gui/sprites.png similarity index 84% rename from src/main/resources/assets/bloodmagic/textures/gui/buttons_compat.png rename to src/main/resources/assets/bloodmagic/textures/gui/sprites.png index 811f7ac1..4bb3d4df 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/gui/buttons_compat.png and b/src/main/resources/assets/bloodmagic/textures/gui/sprites.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/gui/teleposer.png b/src/main/resources/assets/bloodmagic/textures/gui/teleposer.png deleted file mode 100644 index 7be6c0e3..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/gui/teleposer.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/gui/thaumcraft/gui_research_back.jpg b/src/main/resources/assets/bloodmagic/textures/gui/thaumcraft/gui_research_back.jpg deleted file mode 100644 index ec52a850..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/gui/thaumcraft/gui_research_back.jpg and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/gui/thaumcraft/gui_research_back_over.png b/src/main/resources/assets/bloodmagic/textures/gui/thaumcraft/gui_research_back_over.png deleted file mode 100644 index e69de29b..00000000 diff --git a/src/main/resources/assets/bloodmagic/textures/gui/widgets.png b/src/main/resources/assets/bloodmagic/textures/gui/widgets.png deleted file mode 100644 index 4c80a03c..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/gui/widgets.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/hud/bars.png b/src/main/resources/assets/bloodmagic/textures/hud/bars.png deleted file mode 100644 index e4e0e784..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/hud/bars.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/activationcrystalawakened.png b/src/main/resources/assets/bloodmagic/textures/item/activationcrystalawakened.png deleted file mode 100644 index ef212c7f..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/activationcrystalawakened.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/activationcrystalcreative.png b/src/main/resources/assets/bloodmagic/textures/item/activationcrystalcreative.png deleted file mode 100644 index dc65e113..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/activationcrystalcreative.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/activationcrystalweak.png b/src/main/resources/assets/bloodmagic/textures/item/activationcrystalweak.png deleted file mode 100644 index 895ad35f..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/activationcrystalweak.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/airscribetool.png b/src/main/resources/assets/bloodmagic/textures/item/airscribetool.png deleted file mode 100644 index 7bf1b9fe..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/airscribetool.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/alchemic_liquid.png b/src/main/resources/assets/bloodmagic/textures/item/alchemic_liquid.png deleted file mode 100644 index 4930364f..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/alchemic_liquid.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/alchemic_ribbon.png b/src/main/resources/assets/bloodmagic/textures/item/alchemic_ribbon.png deleted file mode 100644 index 7a497e46..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/alchemic_ribbon.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/alchemic_ribbon_will.png b/src/main/resources/assets/bloodmagic/textures/item/alchemic_ribbon_will.png deleted file mode 100644 index d6fbc202..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/alchemic_ribbon_will.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/alchemic_vial.png b/src/main/resources/assets/bloodmagic/textures/item/alchemic_vial.png deleted file mode 100644 index 3062b21d..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/alchemic_vial.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/alchemic_vial_will.png b/src/main/resources/assets/bloodmagic/textures/item/alchemic_vial_will.png deleted file mode 100644 index d087b452..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/alchemic_vial_will.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/ampouleempty.png b/src/main/resources/assets/bloodmagic/textures/item/ampouleempty.png deleted file mode 100644 index cb47e288..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/ampouleempty.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/ampoulefull.png b/src/main/resources/assets/bloodmagic/textures/item/ampoulefull.png deleted file mode 100644 index 049b2d75..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/ampoulefull.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/antiseptic.png b/src/main/resources/assets/bloodmagic/textures/item/antiseptic.png deleted file mode 100644 index e86f4711..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/antiseptic.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/arcaneashes.png b/src/main/resources/assets/bloodmagic/textures/item/arcaneashes.png deleted file mode 100644 index 43025e28..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/arcaneashes.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/basiccuttingfluid.png b/src/main/resources/assets/bloodmagic/textures/item/basiccuttingfluid.png deleted file mode 100644 index 3c39b9a1..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/basiccuttingfluid.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/blackpudding.png b/src/main/resources/assets/bloodmagic/textures/item/blackpudding.png deleted file mode 100644 index eab4ccdd..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/blackpudding.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/blanksigil.png b/src/main/resources/assets/bloodmagic/textures/item/blanksigil.png deleted file mode 100644 index c4d5b80a..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/blanksigil.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/bloodlightsigil.png b/src/main/resources/assets/bloodmagic/textures/item/bloodlightsigil.png deleted file mode 100644 index 2c62fc0a..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/bloodlightsigil.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/bloodpack.png b/src/main/resources/assets/bloodmagic/textures/item/bloodpack.png deleted file mode 100644 index a3c2b114..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/bloodpack.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/bouncesigil_activated.png b/src/main/resources/assets/bloodmagic/textures/item/bouncesigil_activated.png deleted file mode 100644 index 649f337b..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/bouncesigil_activated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/bouncesigil_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/bouncesigil_deactivated.png deleted file mode 100644 index 8b3ceb94..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/bouncesigil_deactivated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/boundaxe_activated.png b/src/main/resources/assets/bloodmagic/textures/item/boundaxe_activated.png deleted file mode 100644 index b51a565b..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/boundaxe_activated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/boundpickaxe_activated.png b/src/main/resources/assets/bloodmagic/textures/item/boundpickaxe_activated.png deleted file mode 100644 index 54c2a6ea..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/boundpickaxe_activated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/boundshovel_activated.png b/src/main/resources/assets/bloodmagic/textures/item/boundshovel_activated.png deleted file mode 100644 index 05be9eff..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/boundshovel_activated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/boundsword_activated.png b/src/main/resources/assets/bloodmagic/textures/item/boundsword_activated.png deleted file mode 100644 index e47e75d7..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/boundsword_activated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/boundtool.png b/src/main/resources/assets/bloodmagic/textures/item/boundtool.png deleted file mode 100644 index 3901bc01..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/boundtool.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/bridgesigil_activated.png b/src/main/resources/assets/bloodmagic/textures/item/bridgesigil_activated.png deleted file mode 100644 index 057c64bd..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/bridgesigil_activated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/bridgesigil_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/bridgesigil_deactivated.png deleted file mode 100644 index 15f46a2c..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/bridgesigil_deactivated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/clawsigil_activated.png b/src/main/resources/assets/bloodmagic/textures/item/clawsigil_activated.png deleted file mode 100644 index 72a9254b..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/clawsigil_activated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/clawsigil_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/clawsigil_deactivated.png deleted file mode 100644 index e849c542..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/clawsigil_deactivated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/coagulant.png b/src/main/resources/assets/bloodmagic/textures/item/coagulant.png deleted file mode 100644 index 23bda1b1..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/coagulant.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/coalsand.png b/src/main/resources/assets/bloodmagic/textures/item/coalsand.png deleted file mode 100644 index b41ff836..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/coalsand.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/componentframeparts.png b/src/main/resources/assets/bloodmagic/textures/item/componentframeparts.png deleted file mode 100644 index 3995a1f8..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/componentframeparts.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/compressionsigil_activated.png b/src/main/resources/assets/bloodmagic/textures/item/compressionsigil_activated.png deleted file mode 100644 index cef30337..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/compressionsigil_activated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/compressionsigil_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/compressionsigil_deactivated.png deleted file mode 100644 index 985bffc5..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/compressionsigil_deactivated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/copperfragment.png b/src/main/resources/assets/bloodmagic/textures/item/copperfragment.png deleted file mode 100644 index b668f31a..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/copperfragment.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/coppergravel.png b/src/main/resources/assets/bloodmagic/textures/item/coppergravel.png deleted file mode 100644 index 7a5b958a..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/coppergravel.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/coppersand.png b/src/main/resources/assets/bloodmagic/textures/item/coppersand.png deleted file mode 100644 index 586ec8d6..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/coppersand.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/corrupted_dust.png b/src/main/resources/assets/bloodmagic/textures/item/corrupted_dust.png deleted file mode 100644 index 78d4bf16..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/corrupted_dust.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/corrupted_tinydust.png b/src/main/resources/assets/bloodmagic/textures/item/corrupted_tinydust.png deleted file mode 100644 index 8d2caac1..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/corrupted_tinydust.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/crucibleupgrade.png b/src/main/resources/assets/bloodmagic/textures/item/crucibleupgrade.png deleted file mode 100644 index a9e20b5e..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/crucibleupgrade.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/crystalline_resonator.png b/src/main/resources/assets/bloodmagic/textures/item/crystalline_resonator.png deleted file mode 100644 index 4c1f0282..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/crystalline_resonator.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/daggerofsacrifice.png b/src/main/resources/assets/bloodmagic/textures/item/daggerofsacrifice.png deleted file mode 100644 index 9cc2efe6..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/daggerofsacrifice.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/dawnscribetool.png b/src/main/resources/assets/bloodmagic/textures/item/dawnscribetool.png deleted file mode 100644 index 4a9ad4e4..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/dawnscribetool.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/demonbloodshard.png b/src/main/resources/assets/bloodmagic/textures/item/demonbloodshard.png deleted file mode 100644 index 58fd68af..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/demonbloodshard.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/demonicteleposerfocus.png b/src/main/resources/assets/bloodmagic/textures/item/demonicteleposerfocus.png deleted file mode 100644 index a9814d3d..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/demonicteleposerfocus.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/demonwillgauge.png b/src/main/resources/assets/bloodmagic/textures/item/demonwillgauge.png deleted file mode 100644 index 9b2fcb9b..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/demonwillgauge.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/dungeon_tester.png b/src/main/resources/assets/bloodmagic/textures/item/dungeon_tester.png deleted file mode 100644 index 8a46b4d1..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/dungeon_tester.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/duskscribetool.png b/src/main/resources/assets/bloodmagic/textures/item/duskscribetool.png deleted file mode 100644 index 30f3034b..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/duskscribetool.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/earthscribetool.png b/src/main/resources/assets/bloodmagic/textures/item/earthscribetool.png deleted file mode 100644 index 619db4c9..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/earthscribetool.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/elementalsigil_activated.png b/src/main/resources/assets/bloodmagic/textures/item/elementalsigil_activated.png deleted file mode 100644 index 3ab8b9f6..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/elementalsigil_activated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/elementalsigil_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/elementalsigil_deactivated.png deleted file mode 100644 index dee96edf..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/elementalsigil_deactivated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/enhancedteleposerfocus.png b/src/main/resources/assets/bloodmagic/textures/item/enhancedteleposerfocus.png deleted file mode 100644 index 714a63f6..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/enhancedteleposerfocus.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/experiencebook.png b/src/main/resources/assets/bloodmagic/textures/item/experiencebook.png deleted file mode 100644 index 4b76970f..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/experiencebook.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/explosivepowder.png b/src/main/resources/assets/bloodmagic/textures/item/explosivepowder.png deleted file mode 100644 index 635b2a36..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/explosivepowder.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/firescribetool.png b/src/main/resources/assets/bloodmagic/textures/item/firescribetool.png deleted file mode 100644 index 4ac43b4d..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/firescribetool.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/fluidrouterfilterexact.png b/src/main/resources/assets/bloodmagic/textures/item/fluidrouterfilterexact.png deleted file mode 100644 index 5de1391d..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/fluidrouterfilterexact.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/fragment_netherite_scrap.png b/src/main/resources/assets/bloodmagic/textures/item/fragment_netherite_scrap.png deleted file mode 100644 index eb3371df..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/fragment_netherite_scrap.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/furnacecell_primitive.png b/src/main/resources/assets/bloodmagic/textures/item/furnacecell_primitive.png deleted file mode 100644 index 8df342d5..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/furnacecell_primitive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/goldfragment.png b/src/main/resources/assets/bloodmagic/textures/item/goldfragment.png deleted file mode 100644 index 24d21b30..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/goldfragment.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/goldgravel.png b/src/main/resources/assets/bloodmagic/textures/item/goldgravel.png deleted file mode 100644 index 142a993a..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/goldgravel.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/goldsand.png b/src/main/resources/assets/bloodmagic/textures/item/goldsand.png deleted file mode 100644 index 83d37677..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/goldsand.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/gravel_netherite_scrap.png b/src/main/resources/assets/bloodmagic/textures/item/gravel_netherite_scrap.png deleted file mode 100644 index 1ccb1dd1..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/gravel_netherite_scrap.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/growthsigil_activated.png b/src/main/resources/assets/bloodmagic/textures/item/growthsigil_activated.png deleted file mode 100644 index b401e8e7..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/growthsigil_activated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/growthsigil_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/growthsigil_deactivated.png deleted file mode 100644 index a8021625..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/growthsigil_deactivated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/harvestgoddesssigil_activated.png b/src/main/resources/assets/bloodmagic/textures/item/harvestgoddesssigil_activated.png deleted file mode 100644 index 50b02bcf..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/harvestgoddesssigil_activated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/harvestgoddesssigil_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/harvestgoddesssigil_deactivated.png deleted file mode 100644 index 7601b998..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/harvestgoddesssigil_deactivated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/hastesigil_activated.png b/src/main/resources/assets/bloodmagic/textures/item/hastesigil_activated.png deleted file mode 100644 index e972be2b..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/hastesigil_activated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/hastesigil_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/hastesigil_deactivated.png deleted file mode 100644 index e87d23d1..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/hastesigil_deactivated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/icarusscroll_activated.png b/src/main/resources/assets/bloodmagic/textures/item/icarusscroll_activated.png deleted file mode 100644 index 767852ce..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/icarusscroll_activated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/icarusscroll_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/icarusscroll_deactivated.png deleted file mode 100644 index d16e87e0..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/icarusscroll_deactivated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/icesigil_activated.png b/src/main/resources/assets/bloodmagic/textures/item/icesigil_activated.png deleted file mode 100644 index c816a470..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/icesigil_activated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/icesigil_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/icesigil_deactivated.png deleted file mode 100644 index 3855383f..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/icesigil_deactivated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/information.png b/src/main/resources/assets/bloodmagic/textures/item/information.png deleted file mode 100644 index 934511d2..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/information.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/ingot_hellforged.png b/src/main/resources/assets/bloodmagic/textures/item/ingot_hellforged.png deleted file mode 100644 index 0f58d71e..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/ingot_hellforged.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/inputroutingfocus.png b/src/main/resources/assets/bloodmagic/textures/item/inputroutingfocus.png deleted file mode 100644 index 68d0ef62..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/inputroutingfocus.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/ironfragment.png b/src/main/resources/assets/bloodmagic/textures/item/ironfragment.png deleted file mode 100644 index dd381fb5..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/ironfragment.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/irongravel.png b/src/main/resources/assets/bloodmagic/textures/item/irongravel.png deleted file mode 100644 index ee1a7b0a..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/irongravel.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/ironsand.png b/src/main/resources/assets/bloodmagic/textures/item/ironsand.png deleted file mode 100644 index 97421c10..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/ironsand.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/item_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/item_deactivated.png deleted file mode 100644 index d085eddd..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/item_deactivated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/itemrouterfilterexact.png b/src/main/resources/assets/bloodmagic/textures/item/itemrouterfilterexact.png deleted file mode 100644 index c39fe022..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/itemrouterfilterexact.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/itemrouterfilterignorenbt.png b/src/main/resources/assets/bloodmagic/textures/item/itemrouterfilterignorenbt.png deleted file mode 100644 index d8952e5f..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/itemrouterfilterignorenbt.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/itemrouterfiltermoditems.png b/src/main/resources/assets/bloodmagic/textures/item/itemrouterfiltermoditems.png deleted file mode 100644 index 01a6f0b8..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/itemrouterfiltermoditems.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/itemrouterfilteroredict.png b/src/main/resources/assets/bloodmagic/textures/item/itemrouterfilteroredict.png deleted file mode 100644 index 253b0399..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/itemrouterfilteroredict.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/lavacrystal.png b/src/main/resources/assets/bloodmagic/textures/item/lavacrystal.png deleted file mode 100644 index a9be5d26..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/lavacrystal.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/lavasigil.png b/src/main/resources/assets/bloodmagic/textures/item/lavasigil.png deleted file mode 100644 index 756c77b8..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/lavasigil.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/lifebucket.png b/src/main/resources/assets/bloodmagic/textures/item/lifebucket.png deleted file mode 100644 index 97a2999e..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/lifebucket.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/melee_anointment.png b/src/main/resources/assets/bloodmagic/textures/item/melee_anointment.png deleted file mode 100644 index 049b2d75..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/melee_anointment.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/mundanelengtheningcatalyst.png b/src/main/resources/assets/bloodmagic/textures/item/mundanelengtheningcatalyst.png deleted file mode 100644 index 6162e225..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/mundanelengtheningcatalyst.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/mundanepowercatalyst.png b/src/main/resources/assets/bloodmagic/textures/item/mundanepowercatalyst.png deleted file mode 100644 index 80590eac..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/mundanepowercatalyst.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/neurotoxin.png b/src/main/resources/assets/bloodmagic/textures/item/neurotoxin.png deleted file mode 100644 index 765cf5bd..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/neurotoxin.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/noderouter.png b/src/main/resources/assets/bloodmagic/textures/item/noderouter.png deleted file mode 100644 index 776c5fc9..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/noderouter.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/plantfibres.png b/src/main/resources/assets/bloodmagic/textures/item/plantfibres.png deleted file mode 100644 index 3829df0f..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/plantfibres.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/plantoil.png b/src/main/resources/assets/bloodmagic/textures/item/plantoil.png deleted file mode 100644 index 967c6064..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/plantoil.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/potionflask_outline.png b/src/main/resources/assets/bloodmagic/textures/item/potionflask_outline.png deleted file mode 100644 index 44c23e26..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/potionflask_outline.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/potionflask_overlay.png b/src/main/resources/assets/bloodmagic/textures/item/potionflask_overlay.png deleted file mode 100644 index 2d969bfb..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/potionflask_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/potionflask_underlay.png b/src/main/resources/assets/bloodmagic/textures/item/potionflask_underlay.png deleted file mode 100644 index 27f29198..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/potionflask_underlay.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/primitive_crystalline_resonator.png b/src/main/resources/assets/bloodmagic/textures/item/primitive_crystalline_resonator.png deleted file mode 100644 index 542a89fe..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/primitive_crystalline_resonator.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/primitive_explosive_cell.png b/src/main/resources/assets/bloodmagic/textures/item/primitive_explosive_cell.png deleted file mode 100644 index def67745..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/primitive_explosive_cell.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/primitive_hydration_cell.png b/src/main/resources/assets/bloodmagic/textures/item/primitive_hydration_cell.png deleted file mode 100644 index 5b6c29ae..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/primitive_hydration_cell.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/reagentaffinity.png b/src/main/resources/assets/bloodmagic/textures/item/reagentaffinity.png deleted file mode 100644 index 4ad926ee..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/reagentaffinity.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/reagentair.png b/src/main/resources/assets/bloodmagic/textures/item/reagentair.png deleted file mode 100644 index c4213d4e..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/reagentair.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/reagentbinding.png b/src/main/resources/assets/bloodmagic/textures/item/reagentbinding.png deleted file mode 100644 index 30273557..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/reagentbinding.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/reagentbloodlight.png b/src/main/resources/assets/bloodmagic/textures/item/reagentbloodlight.png deleted file mode 100644 index b1801cc5..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/reagentbloodlight.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/reagentbounce.png b/src/main/resources/assets/bloodmagic/textures/item/reagentbounce.png deleted file mode 100644 index 9bb11b72..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/reagentbounce.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/reagentbridge.png b/src/main/resources/assets/bloodmagic/textures/item/reagentbridge.png deleted file mode 100644 index 17df28c6..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/reagentbridge.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/reagentclaw.png b/src/main/resources/assets/bloodmagic/textures/item/reagentclaw.png deleted file mode 100644 index 7343b4b0..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/reagentclaw.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/reagentcompression.png b/src/main/resources/assets/bloodmagic/textures/item/reagentcompression.png deleted file mode 100644 index 7b183305..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/reagentcompression.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/reagentfastminer.png b/src/main/resources/assets/bloodmagic/textures/item/reagentfastminer.png deleted file mode 100644 index 5808d389..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/reagentfastminer.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/reagentfrost.png b/src/main/resources/assets/bloodmagic/textures/item/reagentfrost.png deleted file mode 100644 index c4213d4e..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/reagentfrost.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/reagentgrowth.png b/src/main/resources/assets/bloodmagic/textures/item/reagentgrowth.png deleted file mode 100644 index ec1b8f74..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/reagentgrowth.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/reagenthaste.png b/src/main/resources/assets/bloodmagic/textures/item/reagenthaste.png deleted file mode 100644 index f6530434..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/reagenthaste.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/reagentholding.png b/src/main/resources/assets/bloodmagic/textures/item/reagentholding.png deleted file mode 100644 index f6530434..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/reagentholding.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/reagentlava.png b/src/main/resources/assets/bloodmagic/textures/item/reagentlava.png deleted file mode 100644 index 9dbc6600..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/reagentlava.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/reagentmagnetism.png b/src/main/resources/assets/bloodmagic/textures/item/reagentmagnetism.png deleted file mode 100644 index 9bb11b72..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/reagentmagnetism.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/reagentseverance.png b/src/main/resources/assets/bloodmagic/textures/item/reagentseverance.png deleted file mode 100644 index ccf83f68..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/reagentseverance.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/reagentsight.png b/src/main/resources/assets/bloodmagic/textures/item/reagentsight.png deleted file mode 100644 index 8e1cab2a..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/reagentsight.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/reagentsuppression.png b/src/main/resources/assets/bloodmagic/textures/item/reagentsuppression.png deleted file mode 100644 index 5cf01d09..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/reagentsuppression.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/reagentteleposition.png b/src/main/resources/assets/bloodmagic/textures/item/reagentteleposition.png deleted file mode 100644 index 7cf96b3c..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/reagentteleposition.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/reagenttransposition.png b/src/main/resources/assets/bloodmagic/textures/item/reagenttransposition.png deleted file mode 100644 index 556a63b6..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/reagenttransposition.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/reagentvoid.png b/src/main/resources/assets/bloodmagic/textures/item/reagentvoid.png deleted file mode 100644 index 4f090836..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/reagentvoid.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/reagentwater.png b/src/main/resources/assets/bloodmagic/textures/item/reagentwater.png deleted file mode 100644 index 7343b4b0..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/reagentwater.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/reagentwind.png b/src/main/resources/assets/bloodmagic/textures/item/reagentwind.png deleted file mode 100644 index 74863eb3..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/reagentwind.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/reinforcedteleposerfocus.png b/src/main/resources/assets/bloodmagic/textures/item/reinforcedteleposerfocus.png deleted file mode 100644 index 80c548df..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/reinforcedteleposerfocus.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/ritual_dismantler.png b/src/main/resources/assets/bloodmagic/textures/item/ritual_dismantler.png deleted file mode 100644 index 4451a808..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/ritual_dismantler.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/ritualdiviner.png b/src/main/resources/assets/bloodmagic/textures/item/ritualdiviner.png deleted file mode 100644 index e06871c7..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/ritualdiviner.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/ritualdivinerdawn.png b/src/main/resources/assets/bloodmagic/textures/item/ritualdivinerdawn.png deleted file mode 100644 index e06871c7..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/ritualdivinerdawn.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/ritualdivinerdusk.png b/src/main/resources/assets/bloodmagic/textures/item/ritualdivinerdusk.png deleted file mode 100644 index e06871c7..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/ritualdivinerdusk.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/ritualtinkerer.png b/src/main/resources/assets/bloodmagic/textures/item/ritualtinkerer.png deleted file mode 100644 index 37baf9ee..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/ritualtinkerer.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sacrificeplate.png b/src/main/resources/assets/bloodmagic/textures/item/sacrificeplate.png deleted file mode 100644 index 04a7d531..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sacrificeplate.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/saltpeter.png b/src/main/resources/assets/bloodmagic/textures/item/saltpeter.png deleted file mode 100644 index f1cf832f..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/saltpeter.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sand_hellforged.png b/src/main/resources/assets/bloodmagic/textures/item/sand_hellforged.png deleted file mode 100644 index ad1fe281..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sand_hellforged.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sand_netherite.png b/src/main/resources/assets/bloodmagic/textures/item/sand_netherite.png deleted file mode 100644 index e6420a5c..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sand_netherite.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sanguine_scientiem_guide_book.png b/src/main/resources/assets/bloodmagic/textures/item/sanguine_scientiem_guide_book.png deleted file mode 100644 index c7b9026b..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sanguine_scientiem_guide_book.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sanguinebook.png b/src/main/resources/assets/bloodmagic/textures/item/sanguinebook.png deleted file mode 100644 index b2f07bf0..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sanguinebook.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sanguinereverter.png b/src/main/resources/assets/bloodmagic/textures/item/sanguinereverter.png deleted file mode 100644 index 729c693f..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sanguinereverter.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/seersigil.png b/src/main/resources/assets/bloodmagic/textures/item/seersigil.png deleted file mode 100644 index ff99c09a..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/seersigil.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/selfsacrificeplate.png b/src/main/resources/assets/bloodmagic/textures/item/selfsacrificeplate.png deleted file mode 100644 index 098aca58..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/selfsacrificeplate.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_activated.png b/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_activated.png deleted file mode 100644 index 1728e89e..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_activated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_corrosive_activated.png b/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_corrosive_activated.png deleted file mode 100644 index acfb68fa..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_corrosive_activated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_corrosive_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_corrosive_deactivated.png deleted file mode 100644 index 8beb0cb5..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_corrosive_deactivated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_deactivated.png deleted file mode 100644 index 04180841..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_deactivated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_destructive_activated.png b/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_destructive_activated.png deleted file mode 100644 index 2b3ccd50..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_destructive_activated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_destructive_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_destructive_deactivated.png deleted file mode 100644 index b8c33e02..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_destructive_deactivated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_steadfast_activated.png b/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_steadfast_activated.png deleted file mode 100644 index 358cb3cf..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_steadfast_activated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_steadfast_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_steadfast_deactivated.png deleted file mode 100644 index b29a3b7c..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_steadfast_deactivated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_vengeful_activated.png b/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_vengeful_activated.png deleted file mode 100644 index e1e8f4a7..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_vengeful_activated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_vengeful_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_vengeful_deactivated.png deleted file mode 100644 index 3064d35f..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientarmourgem_vengeful_deactivated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientarrow.png b/src/main/resources/assets/bloodmagic/textures/item/sentientarrow.png deleted file mode 100644 index 77bcf9ae..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientarrow.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientboots.png b/src/main/resources/assets/bloodmagic/textures/item/sentientboots.png deleted file mode 100644 index 2095b81b..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientboots.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientboots_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/sentientboots_corrosive.png deleted file mode 100644 index 9d445592..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientboots_corrosive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientboots_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/sentientboots_destructive.png deleted file mode 100644 index 33e1315e..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientboots_destructive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientboots_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/sentientboots_steadfast.png deleted file mode 100644 index cd5720af..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientboots_steadfast.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientboots_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/sentientboots_vengeful.png deleted file mode 100644 index 8eacc9fc..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientboots_vengeful.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientbow.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow.png deleted file mode 100644 index 2d0b94b1..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientbow.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_corrosive.png deleted file mode 100644 index 8b500190..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_corrosive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_corrosive_pulling_0.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_corrosive_pulling_0.png deleted file mode 100644 index 7227a2c4..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_corrosive_pulling_0.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_corrosive_pulling_1.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_corrosive_pulling_1.png deleted file mode 100644 index 04584366..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_corrosive_pulling_1.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_corrosive_pulling_2.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_corrosive_pulling_2.png deleted file mode 100644 index cbf2afdb..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_corrosive_pulling_2.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_destructive.png deleted file mode 100644 index cc59eaaa..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_destructive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_destructive_pulling_0.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_destructive_pulling_0.png deleted file mode 100644 index a73cdcd8..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_destructive_pulling_0.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_destructive_pulling_1.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_destructive_pulling_1.png deleted file mode 100644 index b8fca1de..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_destructive_pulling_1.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_destructive_pulling_2.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_destructive_pulling_2.png deleted file mode 100644 index 7c9880e9..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_destructive_pulling_2.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_pulling_0.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_pulling_0.png deleted file mode 100644 index ff44e383..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_pulling_0.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_pulling_1.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_pulling_1.png deleted file mode 100644 index 89e04f1e..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_pulling_1.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_pulling_2.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_pulling_2.png deleted file mode 100644 index d22fa81f..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_pulling_2.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_steadfast.png deleted file mode 100644 index cb5bcd48..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_steadfast.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_steadfast_pulling_0.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_steadfast_pulling_0.png deleted file mode 100644 index df81a646..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_steadfast_pulling_0.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_steadfast_pulling_1.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_steadfast_pulling_1.png deleted file mode 100644 index e38c3cc5..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_steadfast_pulling_1.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_steadfast_pulling_2.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_steadfast_pulling_2.png deleted file mode 100644 index 93697924..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_steadfast_pulling_2.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_vengeful.png deleted file mode 100644 index d42f1d75..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_vengeful.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_vengeful_pulling_0.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_vengeful_pulling_0.png deleted file mode 100644 index 082aa7fe..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_vengeful_pulling_0.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_vengeful_pulling_1.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_vengeful_pulling_1.png deleted file mode 100644 index 42c7c9cd..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_vengeful_pulling_1.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_vengeful_pulling_2.png b/src/main/resources/assets/bloodmagic/textures/item/sentientbow_vengeful_pulling_2.png deleted file mode 100644 index 067e5505..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientbow_vengeful_pulling_2.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentienthelmet.png b/src/main/resources/assets/bloodmagic/textures/item/sentienthelmet.png deleted file mode 100644 index f467f2e2..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentienthelmet.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentienthelmet_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/sentienthelmet_corrosive.png deleted file mode 100644 index a52612ff..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentienthelmet_corrosive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentienthelmet_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/sentienthelmet_destructive.png deleted file mode 100644 index b7fac684..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentienthelmet_destructive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentienthelmet_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/sentienthelmet_steadfast.png deleted file mode 100644 index 30a9fec8..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentienthelmet_steadfast.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentienthelmet_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/sentienthelmet_vengeful.png deleted file mode 100644 index 6ecbf405..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentienthelmet_vengeful.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientleggings.png b/src/main/resources/assets/bloodmagic/textures/item/sentientleggings.png deleted file mode 100644 index 1d8fbcc5..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientleggings.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientleggings_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/sentientleggings_corrosive.png deleted file mode 100644 index ab2b9393..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientleggings_corrosive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientleggings_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/sentientleggings_destructive.png deleted file mode 100644 index 17d9d34a..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientleggings_destructive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientleggings_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/sentientleggings_steadfast.png deleted file mode 100644 index ba85024a..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientleggings_steadfast.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientleggings_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/sentientleggings_vengeful.png deleted file mode 100644 index 4f0c4022..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientleggings_vengeful.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientplate.png b/src/main/resources/assets/bloodmagic/textures/item/sentientplate.png deleted file mode 100644 index d61fdaa5..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientplate.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientplate_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/sentientplate_corrosive.png deleted file mode 100644 index f94aa59f..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientplate_corrosive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientplate_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/sentientplate_destructive.png deleted file mode 100644 index dde01e16..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientplate_destructive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientplate_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/sentientplate_steadfast.png deleted file mode 100644 index 2d047285..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientplate_steadfast.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sentientplate_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/sentientplate_vengeful.png deleted file mode 100644 index 6a7781f2..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sentientplate_vengeful.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/set_area.png b/src/main/resources/assets/bloodmagic/textures/item/set_area.png deleted file mode 100644 index f43368b6..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/set_area.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/set_will_types.png b/src/main/resources/assets/bloodmagic/textures/item/set_will_types.png deleted file mode 100644 index b50ff47d..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/set_will_types.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sheatheditem.png b/src/main/resources/assets/bloodmagic/textures/item/sheatheditem.png deleted file mode 100644 index b12e6d87..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sheatheditem.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sigilofholding.png b/src/main/resources/assets/bloodmagic/textures/item/sigilofholding.png deleted file mode 100644 index 55056c4b..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sigilofholding.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sigilofmagnetism_activated.png b/src/main/resources/assets/bloodmagic/textures/item/sigilofmagnetism_activated.png deleted file mode 100644 index cbc1dbd1..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sigilofmagnetism_activated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sigilofmagnetism_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/sigilofmagnetism_deactivated.png deleted file mode 100644 index d54bdcf2..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sigilofmagnetism_deactivated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sigilofseverance_activated.png b/src/main/resources/assets/bloodmagic/textures/item/sigilofseverance_activated.png deleted file mode 100644 index 828bda85..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sigilofseverance_activated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sigilofseverance_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/sigilofseverance_deactivated.png deleted file mode 100644 index 21e74f95..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sigilofseverance_deactivated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sigilofsuppression_activated.png b/src/main/resources/assets/bloodmagic/textures/item/sigilofsuppression_activated.png deleted file mode 100644 index 5ec26fa5..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sigilofsuppression_activated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sigilofsuppression_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/sigilofsuppression_deactivated.png deleted file mode 100644 index 6760ffc2..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sigilofsuppression_deactivated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sigiloverlay.png b/src/main/resources/assets/bloodmagic/textures/item/sigiloverlay.png deleted file mode 100644 index 9cf1de51..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sigiloverlay.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/slate_ampoule.png b/src/main/resources/assets/bloodmagic/textures/item/slate_ampoule.png deleted file mode 100644 index c40f1b5d..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/slate_ampoule.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulaxe.png b/src/main/resources/assets/bloodmagic/textures/item/soulaxe.png deleted file mode 100644 index 9de970d9..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulaxe.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulaxe_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/soulaxe_corrosive.png deleted file mode 100644 index 2a0dd394..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulaxe_corrosive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulaxe_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/soulaxe_destructive.png deleted file mode 100644 index 5b8c8d2c..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulaxe_destructive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulaxe_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/soulaxe_steadfast.png deleted file mode 100644 index b4c5ebf9..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulaxe_steadfast.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulaxe_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/soulaxe_vengeful.png deleted file mode 100644 index d7299c6c..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulaxe_vengeful.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulgemcommon.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemcommon.png deleted file mode 100644 index 01b03fee..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulgemcommon.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulgemcommon_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemcommon_corrosive.png deleted file mode 100644 index 406bba2a..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulgemcommon_corrosive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulgemcommon_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemcommon_destructive.png deleted file mode 100644 index 1f9cc266..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulgemcommon_destructive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulgemcommon_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemcommon_steadfast.png deleted file mode 100644 index 47803fec..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulgemcommon_steadfast.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulgemcommon_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemcommon_vengeful.png deleted file mode 100644 index 43789d75..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulgemcommon_vengeful.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulgemgrand.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemgrand.png deleted file mode 100644 index fbb41c8d..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulgemgrand.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulgemgrand_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemgrand_corrosive.png deleted file mode 100644 index 5886e18b..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulgemgrand_corrosive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulgemgrand_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemgrand_destructive.png deleted file mode 100644 index aad55d4b..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulgemgrand_destructive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulgemgrand_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemgrand_steadfast.png deleted file mode 100644 index a5b0d374..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulgemgrand_steadfast.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulgemgrand_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemgrand_vengeful.png deleted file mode 100644 index 97d38990..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulgemgrand_vengeful.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulgemgreater.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemgreater.png deleted file mode 100644 index 28ae2f0d..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulgemgreater.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulgemgreater_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemgreater_corrosive.png deleted file mode 100644 index 9213631a..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulgemgreater_corrosive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulgemgreater_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemgreater_destructive.png deleted file mode 100644 index 2ade6647..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulgemgreater_destructive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulgemgreater_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemgreater_steadfast.png deleted file mode 100644 index 1415d67f..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulgemgreater_steadfast.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulgemgreater_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemgreater_vengeful.png deleted file mode 100644 index a96ba1b1..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulgemgreater_vengeful.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulgemlesser.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemlesser.png deleted file mode 100644 index 060fca67..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulgemlesser.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulgemlesser_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemlesser_corrosive.png deleted file mode 100644 index 16fc1e6d..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulgemlesser_corrosive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulgemlesser_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemlesser_destructive.png deleted file mode 100644 index 02b5f0a5..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulgemlesser_destructive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulgemlesser_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemlesser_steadfast.png deleted file mode 100644 index 19e16a83..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulgemlesser_steadfast.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulgemlesser_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/soulgemlesser_vengeful.png deleted file mode 100644 index 703888ad..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulgemlesser_vengeful.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulgempetty.png b/src/main/resources/assets/bloodmagic/textures/item/soulgempetty.png deleted file mode 100644 index 06c8e124..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulgempetty.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulgempetty_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/soulgempetty_corrosive.png deleted file mode 100644 index e792af92..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulgempetty_corrosive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulgempetty_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/soulgempetty_destructive.png deleted file mode 100644 index b0d48dd6..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulgempetty_destructive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulgempetty_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/soulgempetty_steadfast.png deleted file mode 100644 index c4b55877..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulgempetty_steadfast.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulgempetty_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/soulgempetty_vengeful.png deleted file mode 100644 index 222bda3f..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulgempetty_vengeful.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulpickaxe.png b/src/main/resources/assets/bloodmagic/textures/item/soulpickaxe.png deleted file mode 100644 index 74a39b34..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulpickaxe.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulpickaxe_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/soulpickaxe_corrosive.png deleted file mode 100644 index a70bbe96..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulpickaxe_corrosive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulpickaxe_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/soulpickaxe_destructive.png deleted file mode 100644 index 573e6b19..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulpickaxe_destructive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulpickaxe_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/soulpickaxe_steadfast.png deleted file mode 100644 index 065fc4fc..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulpickaxe_steadfast.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulpickaxe_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/soulpickaxe_vengeful.png deleted file mode 100644 index 6be3b218..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulpickaxe_vengeful.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulscythe.png b/src/main/resources/assets/bloodmagic/textures/item/soulscythe.png deleted file mode 100644 index 2adb8ae5..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulscythe.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulscythe_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/soulscythe_corrosive.png deleted file mode 100644 index 79328204..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulscythe_corrosive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulscythe_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/soulscythe_destructive.png deleted file mode 100644 index adeb8589..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulscythe_destructive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulscythe_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/soulscythe_steadfast.png deleted file mode 100644 index bdac5fbf..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulscythe_steadfast.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulscythe_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/soulscythe_vengeful.png deleted file mode 100644 index 9c3c04f5..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulscythe_vengeful.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulshovel.png b/src/main/resources/assets/bloodmagic/textures/item/soulshovel.png deleted file mode 100644 index e3fd8d62..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulshovel.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulshovel_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/soulshovel_corrosive.png deleted file mode 100644 index f5b51e26..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulshovel_corrosive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulshovel_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/soulshovel_destructive.png deleted file mode 100644 index 42c62019..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulshovel_destructive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulshovel_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/soulshovel_steadfast.png deleted file mode 100644 index da2e7f16..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulshovel_steadfast.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulshovel_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/soulshovel_vengeful.png deleted file mode 100644 index 11c5263a..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulshovel_vengeful.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulsnare.png b/src/main/resources/assets/bloodmagic/textures/item/soulsnare.png deleted file mode 100644 index 37de2c13..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulsnare.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulsnare_corrosive.png b/src/main/resources/assets/bloodmagic/textures/item/soulsnare_corrosive.png deleted file mode 100644 index a279a8f0..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulsnare_corrosive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulsnare_destructive.png b/src/main/resources/assets/bloodmagic/textures/item/soulsnare_destructive.png deleted file mode 100644 index ba6bff2f..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulsnare_destructive.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulsnare_steadfast.png b/src/main/resources/assets/bloodmagic/textures/item/soulsnare_steadfast.png deleted file mode 100644 index 89c7a870..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulsnare_steadfast.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulsnare_vengeful.png b/src/main/resources/assets/bloodmagic/textures/item/soulsnare_vengeful.png deleted file mode 100644 index 251d1850..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/soulsnare_vengeful.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/sulfur.png b/src/main/resources/assets/bloodmagic/textures/item/sulfur.png deleted file mode 100644 index 46f1cc46..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/sulfur.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/teleposerfocus.png b/src/main/resources/assets/bloodmagic/textures/item/teleposerfocus.png deleted file mode 100644 index d66e2d67..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/teleposerfocus.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/telepositionsigil.png b/src/main/resources/assets/bloodmagic/textures/item/telepositionsigil.png deleted file mode 100644 index f399a031..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/telepositionsigil.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/throwing_dagger.png b/src/main/resources/assets/bloodmagic/textures/item/throwing_dagger.png deleted file mode 100644 index c73953b4..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/throwing_dagger.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/throwing_dagger_letter.png b/src/main/resources/assets/bloodmagic/textures/item/throwing_dagger_letter.png deleted file mode 100644 index 50051eed..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/throwing_dagger_letter.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/throwing_dagger_syringe.png b/src/main/resources/assets/bloodmagic/textures/item/throwing_dagger_syringe.png deleted file mode 100644 index 501b6360..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/throwing_dagger_syringe.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/transpositionsigil.png b/src/main/resources/assets/bloodmagic/textures/item/transpositionsigil.png deleted file mode 100644 index e637b0c4..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/transpositionsigil.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/upgradetome.png b/src/main/resources/assets/bloodmagic/textures/item/upgradetome.png deleted file mode 100644 index 2d224d82..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/upgradetome.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/upgradetrainer.png b/src/main/resources/assets/bloodmagic/textures/item/upgradetrainer.png deleted file mode 100644 index 77a489be..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/upgradetrainer.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/voidsigil.png b/src/main/resources/assets/bloodmagic/textures/item/voidsigil.png deleted file mode 100644 index c25365e6..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/voidsigil.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/warriorsigil_activated.png b/src/main/resources/assets/bloodmagic/textures/item/warriorsigil_activated.png deleted file mode 100644 index 2c031b41..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/warriorsigil_activated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/warriorsigil_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/warriorsigil_deactivated.png deleted file mode 100644 index adcc645f..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/warriorsigil_deactivated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/waterscribetool.png b/src/main/resources/assets/bloodmagic/textures/item/waterscribetool.png deleted file mode 100644 index 1b6bb1ed..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/waterscribetool.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/watersigil.png b/src/main/resources/assets/bloodmagic/textures/item/watersigil.png deleted file mode 100644 index 7732d0bc..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/watersigil.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/weakbloodshard.png b/src/main/resources/assets/bloodmagic/textures/item/weakbloodshard.png deleted file mode 100644 index 0bd62181..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/weakbloodshard.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/windsigil_activated.png b/src/main/resources/assets/bloodmagic/textures/item/windsigil_activated.png deleted file mode 100644 index 843684ce..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/windsigil_activated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/windsigil_deactivated.png b/src/main/resources/assets/bloodmagic/textures/item/windsigil_deactivated.png deleted file mode 100644 index 7ebc6476..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/item/windsigil_deactivated.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/item/altarmaker.png b/src/main/resources/assets/bloodmagic/textures/items/altar_builder.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/altarmaker.png rename to src/main/resources/assets/bloodmagic/textures/items/altar_builder.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/apprenticebloodorb.png b/src/main/resources/assets/bloodmagic/textures/items/blood_orb_apprentice.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/apprenticebloodorb.png rename to src/main/resources/assets/bloodmagic/textures/items/blood_orb_apprentice.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/archmagebloodorb.png b/src/main/resources/assets/bloodmagic/textures/items/blood_orb_archmage.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/archmagebloodorb.png rename to src/main/resources/assets/bloodmagic/textures/items/blood_orb_archmage.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/magicianbloodorb.png b/src/main/resources/assets/bloodmagic/textures/items/blood_orb_magician.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/magicianbloodorb.png rename to src/main/resources/assets/bloodmagic/textures/items/blood_orb_magician.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/masterbloodorb.png b/src/main/resources/assets/bloodmagic/textures/items/blood_orb_master.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/masterbloodorb.png rename to src/main/resources/assets/bloodmagic/textures/items/blood_orb_master.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/transcendentbloodorb.png b/src/main/resources/assets/bloodmagic/textures/items/blood_orb_transcendent.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/transcendentbloodorb.png rename to src/main/resources/assets/bloodmagic/textures/items/blood_orb_transcendent.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/weakbloodorb.png b/src/main/resources/assets/bloodmagic/textures/items/blood_orb_weak.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/weakbloodorb.png rename to src/main/resources/assets/bloodmagic/textures/items/blood_orb_weak.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/sacrificialdagger.png b/src/main/resources/assets/bloodmagic/textures/items/dagger_self_sacrifice.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/sacrificialdagger.png rename to src/main/resources/assets/bloodmagic/textures/items/dagger_self_sacrifice.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/sacrificialdagger_ceremonial.png b/src/main/resources/assets/bloodmagic/textures/items/dagger_self_sacrifice_charged.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/sacrificialdagger_ceremonial.png rename to src/main/resources/assets/bloodmagic/textures/items/dagger_self_sacrifice_charged.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/corrosivecrystal.png b/src/main/resources/assets/bloodmagic/textures/items/demon_will_crystal_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/corrosivecrystal.png rename to src/main/resources/assets/bloodmagic/textures/items/demon_will_crystal_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/destructivecrystal.png b/src/main/resources/assets/bloodmagic/textures/items/demon_will_crystal_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/destructivecrystal.png rename to src/main/resources/assets/bloodmagic/textures/items/demon_will_crystal_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/defaultcrystal.png b/src/main/resources/assets/bloodmagic/textures/items/demon_will_crystal_raw.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/defaultcrystal.png rename to src/main/resources/assets/bloodmagic/textures/items/demon_will_crystal_raw.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/steadfastcrystal.png b/src/main/resources/assets/bloodmagic/textures/items/demon_will_crystal_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/steadfastcrystal.png rename to src/main/resources/assets/bloodmagic/textures/items/demon_will_crystal_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/vengefulcrystal.png b/src/main/resources/assets/bloodmagic/textures/items/demon_will_crystal_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/vengefulcrystal.png rename to src/main/resources/assets/bloodmagic/textures/items/demon_will_crystal_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/livingplate.png b/src/main/resources/assets/bloodmagic/textures/items/living_armor_chest.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/livingplate.png rename to src/main/resources/assets/bloodmagic/textures/items/living_armor_chest.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/livingboots.png b/src/main/resources/assets/bloodmagic/textures/items/living_armor_feet.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/livingboots.png rename to src/main/resources/assets/bloodmagic/textures/items/living_armor_feet.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/livinghelmet.png b/src/main/resources/assets/bloodmagic/textures/items/living_armor_head.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/livinghelmet.png rename to src/main/resources/assets/bloodmagic/textures/items/living_armor_head.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/livingleggings.png b/src/main/resources/assets/bloodmagic/textures/items/living_armor_legs.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/livingleggings.png rename to src/main/resources/assets/bloodmagic/textures/items/living_armor_legs.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/mailorder.png b/src/main/resources/assets/bloodmagic/textures/items/living_tome.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/mailorder.png rename to src/main/resources/assets/bloodmagic/textures/items/living_tome.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/airsigil.png b/src/main/resources/assets/bloodmagic/textures/items/sigil/air.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/airsigil.png rename to src/main/resources/assets/bloodmagic/textures/items/sigil/air.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/divinationsigil.png b/src/main/resources/assets/bloodmagic/textures/items/sigil/divination.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/divinationsigil.png rename to src/main/resources/assets/bloodmagic/textures/items/sigil/divination.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/miningsigil_deactivated.png b/src/main/resources/assets/bloodmagic/textures/items/sigil/fast_miner.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/miningsigil_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/items/sigil/fast_miner.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/miningsigil_activated.png b/src/main/resources/assets/bloodmagic/textures/items/sigil/fast_miner_toggled.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/miningsigil_activated.png rename to src/main/resources/assets/bloodmagic/textures/items/sigil/fast_miner_toggled.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/blankslate.png b/src/main/resources/assets/bloodmagic/textures/items/slate_blank.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/blankslate.png rename to src/main/resources/assets/bloodmagic/textures/items/slate_blank.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/demonslate.png b/src/main/resources/assets/bloodmagic/textures/items/slate_demonic.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/demonslate.png rename to src/main/resources/assets/bloodmagic/textures/items/slate_demonic.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/etherealslate.png b/src/main/resources/assets/bloodmagic/textures/items/slate_ethereal.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/etherealslate.png rename to src/main/resources/assets/bloodmagic/textures/items/slate_ethereal.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/infusedslate.png b/src/main/resources/assets/bloodmagic/textures/items/slate_imbued.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/infusedslate.png rename to src/main/resources/assets/bloodmagic/textures/items/slate_imbued.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/reinforcedslate.png b/src/main/resources/assets/bloodmagic/textures/items/slate_reinforced.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/reinforcedslate.png rename to src/main/resources/assets/bloodmagic/textures/items/slate_reinforced.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/basemonstersoul_corrosive.png b/src/main/resources/assets/bloodmagic/textures/items/soul/monster_soul_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/basemonstersoul_corrosive.png rename to src/main/resources/assets/bloodmagic/textures/items/soul/monster_soul_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/basemonstersoul_destructive.png b/src/main/resources/assets/bloodmagic/textures/items/soul/monster_soul_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/basemonstersoul_destructive.png rename to src/main/resources/assets/bloodmagic/textures/items/soul/monster_soul_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/basemonstersoul.png b/src/main/resources/assets/bloodmagic/textures/items/soul/monster_soul_raw.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/basemonstersoul.png rename to src/main/resources/assets/bloodmagic/textures/items/soul/monster_soul_raw.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/basemonstersoul_steadfast.png b/src/main/resources/assets/bloodmagic/textures/items/soul/monster_soul_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/basemonstersoul_steadfast.png rename to src/main/resources/assets/bloodmagic/textures/items/soul/monster_soul_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/basemonstersoul_vengeful.png b/src/main/resources/assets/bloodmagic/textures/items/soul/monster_soul_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/basemonstersoul_vengeful.png rename to src/main/resources/assets/bloodmagic/textures/items/soul/monster_soul_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulsword_corrosive_deactivated.png b/src/main/resources/assets/bloodmagic/textures/items/soul/sentient_sword_corrosive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/soulsword_corrosive_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/items/soul/sentient_sword_corrosive.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulsword_corrosive_activated.png b/src/main/resources/assets/bloodmagic/textures/items/soul/sentient_sword_corrosive_active.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/soulsword_corrosive_activated.png rename to src/main/resources/assets/bloodmagic/textures/items/soul/sentient_sword_corrosive_active.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulsword_destructive_deactivated.png b/src/main/resources/assets/bloodmagic/textures/items/soul/sentient_sword_destructive.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/soulsword_destructive_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/items/soul/sentient_sword_destructive.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulsword_destructive_activated.png b/src/main/resources/assets/bloodmagic/textures/items/soul/sentient_sword_destructive_active.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/soulsword_destructive_activated.png rename to src/main/resources/assets/bloodmagic/textures/items/soul/sentient_sword_destructive_active.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulsword_deactivated.png b/src/main/resources/assets/bloodmagic/textures/items/soul/sentient_sword_raw.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/soulsword_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/items/soul/sentient_sword_raw.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulsword_activated.png b/src/main/resources/assets/bloodmagic/textures/items/soul/sentient_sword_raw_active.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/soulsword_activated.png rename to src/main/resources/assets/bloodmagic/textures/items/soul/sentient_sword_raw_active.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulsword_steadfast_deactivated.png b/src/main/resources/assets/bloodmagic/textures/items/soul/sentient_sword_steadfast.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/soulsword_steadfast_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/items/soul/sentient_sword_steadfast.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulsword_steadfast_activated.png b/src/main/resources/assets/bloodmagic/textures/items/soul/sentient_sword_steadfast_active.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/soulsword_steadfast_activated.png rename to src/main/resources/assets/bloodmagic/textures/items/soul/sentient_sword_steadfast_active.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulsword_vengeful_deactivated.png b/src/main/resources/assets/bloodmagic/textures/items/soul/sentient_sword_vengeful.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/soulsword_vengeful_deactivated.png rename to src/main/resources/assets/bloodmagic/textures/items/soul/sentient_sword_vengeful.png diff --git a/src/main/resources/assets/bloodmagic/textures/item/soulsword_vengeful_activated.png b/src/main/resources/assets/bloodmagic/textures/items/soul/sentient_sword_vengeful_active.png similarity index 100% rename from src/main/resources/assets/bloodmagic/textures/item/soulsword_vengeful_activated.png rename to src/main/resources/assets/bloodmagic/textures/items/soul/sentient_sword_vengeful_active.png diff --git a/src/main/resources/assets/bloodmagic/textures/misc/beam2.png b/src/main/resources/assets/bloodmagic/textures/misc/beam2.png deleted file mode 100644 index aa338d92..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/beam2.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/potions.png b/src/main/resources/assets/bloodmagic/textures/misc/potions.png deleted file mode 100644 index f2892812..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/potions.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/altars/t1.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/altars/t1.png deleted file mode 100644 index fa546bfb..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/altars/t1.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/altars/t2.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/altars/t2.png deleted file mode 100644 index 896d122d..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/altars/t2.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/altars/t3.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/altars/t3.png deleted file mode 100644 index 319f42fe..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/altars/t3.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/altars/t4.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/altars/t4.png deleted file mode 100644 index 245186e8..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/altars/t4.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/altars/t5.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/altars/t5.png deleted file mode 100644 index ee7da23f..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/altars/t5.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/altars/t6.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/altars/t6.png deleted file mode 100644 index 09382a54..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/altars/t6.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/demons/ring1.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/demons/ring1.png deleted file mode 100644 index 8c4f9c87..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/demons/ring1.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/demons/ring2.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/demons/ring2.png deleted file mode 100644 index 9a2a82a9..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/demons/ring2.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/alchemy.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/alchemy.png deleted file mode 100644 index 3ece0e52..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/alchemy.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/animalgrowth.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/animalgrowth.png deleted file mode 100644 index 4923dcc7..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/animalgrowth.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/beatinganvil.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/beatinganvil.png deleted file mode 100644 index 4f33c651..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/beatinganvil.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/binding.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/binding.png deleted file mode 100644 index f9491698..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/binding.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/containment.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/containment.png deleted file mode 100644 index ead4ad6b..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/containment.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/convocation.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/convocation.png deleted file mode 100644 index c2283d2e..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/convocation.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/crusher.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/crusher.png deleted file mode 100644 index 67d0e505..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/crusher.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/dome.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/dome.png deleted file mode 100644 index 9a033208..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/dome.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/ellipsoid.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/ellipsoid.png deleted file mode 100644 index 139bf181..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/ellipsoid.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/eternalsoul.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/eternalsoul.png deleted file mode 100644 index af6e9dc5..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/eternalsoul.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/evaporation.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/evaporation.png deleted file mode 100644 index 041ace21..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/evaporation.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/expulsion.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/expulsion.png deleted file mode 100644 index c85964fc..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/expulsion.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/featheredearth.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/featheredearth.png deleted file mode 100644 index 26bff791..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/featheredearth.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/featheredknife.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/featheredknife.png deleted file mode 100644 index 89a0e261..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/featheredknife.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/flight.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/flight.png deleted file mode 100644 index cf298475..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/flight.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/gaia.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/gaia.png deleted file mode 100644 index 3efc61be..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/gaia.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/greengrove.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/greengrove.png deleted file mode 100644 index 7a0e8adf..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/greengrove.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/harvest.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/harvest.png deleted file mode 100644 index 81b3415b..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/harvest.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/interdiction.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/interdiction.png deleted file mode 100644 index e0a48ce5..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/interdiction.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/jump.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/jump.png deleted file mode 100644 index 117643c7..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/jump.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/lava.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/lava.png deleted file mode 100644 index 98eec256..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/lava.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/magnetism.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/magnetism.png deleted file mode 100644 index 1c864edc..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/magnetism.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/meteor.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/meteor.png deleted file mode 100644 index a27e6fac..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/meteor.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/phantomhands.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/phantomhands.png deleted file mode 100644 index 2044d3e4..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/phantomhands.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/regeneration.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/regeneration.png deleted file mode 100644 index 3df4b616..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/regeneration.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/sacrosanctity.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/sacrosanctity.png deleted file mode 100644 index 569467d0..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/sacrosanctity.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/speed.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/speed.png deleted file mode 100644 index b5e0595e..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/speed.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/stallingomega.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/stallingomega.png deleted file mode 100644 index 76ead6fa..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/stallingomega.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/stomach.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/stomach.png deleted file mode 100644 index 5a30fc8a..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/stomach.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/symmetryomega.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/symmetryomega.png deleted file mode 100644 index 700df856..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/symmetryomega.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/unbinding.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/unbinding.png deleted file mode 100644 index 5219bca4..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/unbinding.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/veilofevil.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/veilofevil.png deleted file mode 100644 index 7b1b51b5..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/veilofevil.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/water.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/water.png deleted file mode 100644 index cc1b8798..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/water.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/wellofsuffering.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/wellofsuffering.png deleted file mode 100644 index b19e996b..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/wellofsuffering.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/zephyr.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/zephyr.png deleted file mode 100644 index 5a3b097d..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/rituals/zephyr.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/spells/conduit.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/spells/conduit.png deleted file mode 100644 index bfc678c1..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/spells/conduit.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/spells/effect.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/spells/effect.png deleted file mode 100644 index 631bbbd7..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/spells/effect.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/spells/enhancement.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/spells/enhancement.png deleted file mode 100644 index 9fb4852b..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/spells/enhancement.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/spells/modifier.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/spells/modifier.png deleted file mode 100644 index 86c886d9..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/spells/modifier.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/spells/paradigm.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/spells/paradigm.png deleted file mode 100644 index 4a4835c7..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/spells/paradigm.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/spells/simplespelltable.png b/src/main/resources/assets/bloodmagic/textures/misc/screenshots/spells/simplespelltable.png deleted file mode 100644 index 1113ee1d..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/misc/screenshots/spells/simplespelltable.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/airsigil.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/airsigil.png deleted file mode 100644 index 323362d8..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/airsigil.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/basearray.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/basearray.png deleted file mode 100644 index 1d3709be..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/basearray.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/bindingarray.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/bindingarray.png deleted file mode 100644 index 7309f9f8..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/bindingarray.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/bindinglightningarray.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/bindinglightningarray.png deleted file mode 100644 index 529d6cf0..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/bindinglightningarray.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/bouncearray.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/bouncearray.png deleted file mode 100644 index 96bd0087..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/bouncearray.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/divinationsigil.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/divinationsigil.png deleted file mode 100644 index 598c297b..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/divinationsigil.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/elementalaffinitysigil.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/elementalaffinitysigil.png deleted file mode 100644 index c643d430..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/elementalaffinitysigil.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/fastminersigil.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/fastminersigil.png deleted file mode 100644 index 76d20b23..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/fastminersigil.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/furnacearray.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/furnacearray.png deleted file mode 100644 index 5639657d..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/furnacearray.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/growthsigil.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/growthsigil.png deleted file mode 100644 index dfcf86c0..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/growthsigil.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/hastesigil.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/hastesigil.png deleted file mode 100644 index 8654f74f..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/hastesigil.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/lavasigil.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/lavasigil.png deleted file mode 100644 index be12b5a5..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/lavasigil.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/lightsigil.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/lightsigil.png deleted file mode 100644 index 61efcd2e..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/lightsigil.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/magnetismsigil.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/magnetismsigil.png deleted file mode 100644 index 63fa80c2..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/magnetismsigil.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/mobsacrifice.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/mobsacrifice.png deleted file mode 100644 index 71701844..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/mobsacrifice.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/moonarray.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/moonarray.png deleted file mode 100644 index ef620b91..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/moonarray.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/moonarrayinside.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/moonarrayinside.png deleted file mode 100644 index 16cfc50d..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/moonarrayinside.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/moonarrayoutside.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/moonarrayoutside.png deleted file mode 100644 index d6c7dd9d..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/moonarrayoutside.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/moonarraysymbols.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/moonarraysymbols.png deleted file mode 100644 index 438c9a11..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/moonarraysymbols.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/movementarray.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/movementarray.png deleted file mode 100644 index 8149c383..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/movementarray.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/shardoflaputa.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/shardoflaputa.png deleted file mode 100644 index 2ae4fd52..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/shardoflaputa.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/sightsigil.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/sightsigil.png deleted file mode 100644 index ea384ead..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/sightsigil.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/skeletonturret1.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/skeletonturret1.png deleted file mode 100644 index 81bfb1b8..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/skeletonturret1.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/skeletonturret2.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/skeletonturret2.png deleted file mode 100644 index 115aad73..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/skeletonturret2.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/spikearray.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/spikearray.png deleted file mode 100644 index 7e312f51..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/spikearray.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/stupidarray.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/stupidarray.png deleted file mode 100644 index 9a962b8a..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/stupidarray.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/sunarray.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/sunarray.png deleted file mode 100644 index edd7d778..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/sunarray.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/sunarraycircle.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/sunarraycircle.png deleted file mode 100644 index 5b882d6e..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/sunarraycircle.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/sunarrayspikes.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/sunarrayspikes.png deleted file mode 100644 index 172e248d..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/sunarrayspikes.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/suppressionsigil.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/suppressionsigil.png deleted file mode 100644 index 2ec3163a..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/suppressionsigil.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/teleportation.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/teleportation.png deleted file mode 100644 index de03c724..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/teleportation.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/teleportationarray.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/teleportationarray.png deleted file mode 100644 index 988113d3..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/teleportationarray.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/updraftarray.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/updraftarray.png deleted file mode 100644 index 7f5b6184..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/updraftarray.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/voidsigil.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/voidsigil.png deleted file mode 100644 index 3e05776d..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/voidsigil.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/watersigil.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/watersigil.png deleted file mode 100644 index 2a8e511d..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/watersigil.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/wiparray.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/wiparray.png deleted file mode 100644 index 11297382..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/wiparray.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/zombiebeacon.png b/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/zombiebeacon.png deleted file mode 100644 index 52f57df6..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemyarrays/zombiebeacon.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/alchemytable.png b/src/main/resources/assets/bloodmagic/textures/models/alchemytable.png deleted file mode 100644 index 95bc51ef..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/alchemytable.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/models/armor/livingarmour_layer_1.png b/src/main/resources/assets/bloodmagic/textures/models/armor/living_armor_layer_1.png similarity index 100% rename from src/main/resources/assets/bloodmagic/models/armor/livingarmour_layer_1.png rename to src/main/resources/assets/bloodmagic/textures/models/armor/living_armor_layer_1.png diff --git a/src/main/resources/assets/bloodmagic/models/armor/livingarmour_layer_2.png b/src/main/resources/assets/bloodmagic/textures/models/armor/living_armor_layer_2.png similarity index 100% rename from src/main/resources/assets/bloodmagic/models/armor/livingarmour_layer_2.png rename to src/main/resources/assets/bloodmagic/textures/models/armor/living_armor_layer_2.png diff --git a/src/main/resources/assets/bloodmagic/textures/models/corrosivecrystal.png b/src/main/resources/assets/bloodmagic/textures/models/corrosivecrystal.png deleted file mode 100644 index 27f6c52b..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/corrosivecrystal.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/defaultcrystal.png b/src/main/resources/assets/bloodmagic/textures/models/defaultcrystal.png deleted file mode 100644 index cbdab181..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/defaultcrystal.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/demoncrucible.png b/src/main/resources/assets/bloodmagic/textures/models/demoncrucible.png deleted file mode 100644 index dda871ad..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/demoncrucible.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/demoncrystallizer.png b/src/main/resources/assets/bloodmagic/textures/models/demoncrystallizer.png deleted file mode 100644 index 370a1f77..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/demoncrystallizer.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/demonpylon.png b/src/main/resources/assets/bloodmagic/textures/models/demonpylon.png deleted file mode 100644 index af5ad2bd..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/demonpylon.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/destructivecrystal.png b/src/main/resources/assets/bloodmagic/textures/models/destructivecrystal.png deleted file mode 100644 index f526b6a2..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/destructivecrystal.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/energybazookamainprojectile.png b/src/main/resources/assets/bloodmagic/textures/models/energybazookamainprojectile.png deleted file mode 100644 index 8a7e86aa..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/energybazookamainprojectile.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/hellfireforge.png b/src/main/resources/assets/bloodmagic/textures/models/hellfireforge.png deleted file mode 100644 index 081ab182..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/hellfireforge.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/incensealtar.png b/src/main/resources/assets/bloodmagic/textures/models/incensealtar.png deleted file mode 100644 index 68db9263..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/incensealtar.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/meteor.png b/src/main/resources/assets/bloodmagic/textures/models/meteor.png deleted file mode 100644 index e6926d12..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/meteor.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/mobsacrificeswirl.png b/src/main/resources/assets/bloodmagic/textures/models/mobsacrificeswirl.png deleted file mode 100644 index 023cf956..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/mobsacrificeswirl.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/modelinputroutingnode.png b/src/main/resources/assets/bloodmagic/textures/models/modelinputroutingnode.png deleted file mode 100644 index 1d756a47..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/modelinputroutingnode.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/modelmasterroutingnode.png b/src/main/resources/assets/bloodmagic/textures/models/modelmasterroutingnode.png deleted file mode 100644 index b861ffad..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/modelmasterroutingnode.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/modeloutputroutingnode.png b/src/main/resources/assets/bloodmagic/textures/models/modeloutputroutingnode.png deleted file mode 100644 index cdb5bd95..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/modeloutputroutingnode.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/modelroutingnode.png b/src/main/resources/assets/bloodmagic/textures/models/modelroutingnode.png deleted file mode 100644 index e51bb211..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/modelroutingnode.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/pedestal.png b/src/main/resources/assets/bloodmagic/textures/models/pedestal.png deleted file mode 100644 index 1ca87111..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/pedestal.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/pillar_base.png b/src/main/resources/assets/bloodmagic/textures/models/pillar_base.png deleted file mode 100644 index 61b2c875..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/pillar_base.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/pillar_base_c.png b/src/main/resources/assets/bloodmagic/textures/models/pillar_base_c.png deleted file mode 100644 index aa76e68c..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/pillar_base_c.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/pillar_base_d.png b/src/main/resources/assets/bloodmagic/textures/models/pillar_base_d.png deleted file mode 100644 index dc8ef737..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/pillar_base_d.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/pillar_base_s.png b/src/main/resources/assets/bloodmagic/textures/models/pillar_base_s.png deleted file mode 100644 index 1c6a0cc0..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/pillar_base_s.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/pillar_base_v.png b/src/main/resources/assets/bloodmagic/textures/models/pillar_base_v.png deleted file mode 100644 index 963acab1..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/pillar_base_v.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/pillar_mid.png b/src/main/resources/assets/bloodmagic/textures/models/pillar_mid.png deleted file mode 100644 index 2e16a4b2..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/pillar_mid.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/pillar_mid_c.png b/src/main/resources/assets/bloodmagic/textures/models/pillar_mid_c.png deleted file mode 100644 index 604fb8b5..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/pillar_mid_c.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/pillar_mid_d.png b/src/main/resources/assets/bloodmagic/textures/models/pillar_mid_d.png deleted file mode 100644 index a2962ef4..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/pillar_mid_d.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/pillar_mid_s.png b/src/main/resources/assets/bloodmagic/textures/models/pillar_mid_s.png deleted file mode 100644 index 3ebb670c..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/pillar_mid_s.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/pillar_mid_v.png b/src/main/resources/assets/bloodmagic/textures/models/pillar_mid_v.png deleted file mode 100644 index c778eede..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/pillar_mid_v.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/plinth.png b/src/main/resources/assets/bloodmagic/textures/models/plinth.png deleted file mode 100644 index e6ecd340..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/plinth.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/reagent.png b/src/main/resources/assets/bloodmagic/textures/models/reagent.png deleted file mode 100644 index c89dc730..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/reagent.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/simpletranscircle.png b/src/main/resources/assets/bloodmagic/textures/models/simpletranscircle.png deleted file mode 100644 index 77669e56..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/simpletranscircle.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/steadfastcrystal.png b/src/main/resources/assets/bloodmagic/textures/models/steadfastcrystal.png deleted file mode 100644 index 7f93d339..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/steadfastcrystal.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/vengefulcrystal.png b/src/main/resources/assets/bloodmagic/textures/models/vengefulcrystal.png deleted file mode 100644 index 5f707825..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/vengefulcrystal.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/writingtable.png b/src/main/resources/assets/bloodmagic/textures/models/writingtable.png deleted file mode 100644 index 73ed7ddd..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/writingtable.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/potions/boost.png b/src/main/resources/assets/bloodmagic/textures/potions/boost.png deleted file mode 100644 index 27f6c52b..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/potions/boost.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic_guide/lang/en_us.lang b/src/main/resources/assets/bloodmagic_guide/lang/en_us.lang new file mode 100644 index 00000000..ecb62b1c --- /dev/null +++ b/src/main/resources/assets/bloodmagic_guide/lang/en_us.lang @@ -0,0 +1,3 @@ +# simple descriptions as we go so there's *something* for everything +guide.bloodmagic:living_armor_upgrade_jump=Increases jump height. Decreases fall damage. Above level 2, it will also increase forward momentum while jumping. +guide.bloodmagic:living_armor_upgrade_arrow_protect=Decreases damage taken from projectiles. \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/anointment/bow_power.json b/src/main/resources/data/bloodmagic/anointment/bow_power.json deleted file mode 100644 index 602a88c4..00000000 --- a/src/main/resources/data/bloodmagic/anointment/bow_power.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "id": "bloodmagic:bow_power", - "bonuses": { - "damage": [ - 1.25, - 1.5, - 1.75 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/anointment/hidden_knowledge.json b/src/main/resources/data/bloodmagic/anointment/hidden_knowledge.json deleted file mode 100644 index b7e2a2d6..00000000 --- a/src/main/resources/data/bloodmagic/anointment/hidden_knowledge.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "id": "bloodmagic:hidden_knowledge", - "bonuses": { - "exp": [ - 2, - 4, - 6 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/anointment/holy_water.json b/src/main/resources/data/bloodmagic/anointment/holy_water.json deleted file mode 100644 index 58a29778..00000000 --- a/src/main/resources/data/bloodmagic/anointment/holy_water.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "id": "bloodmagic:holy_water", - "bonuses": { - "damage": [ - 5, - 10, - 15 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/anointment/melee_damage.json b/src/main/resources/data/bloodmagic/anointment/melee_damage.json deleted file mode 100644 index e0a0f500..00000000 --- a/src/main/resources/data/bloodmagic/anointment/melee_damage.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "id": "bloodmagic:melee_damage", - "bonuses": { - "damage": [ - 3, - 6, - 9 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/anointment/quick_draw.json b/src/main/resources/data/bloodmagic/anointment/quick_draw.json deleted file mode 100644 index 6f9f3685..00000000 --- a/src/main/resources/data/bloodmagic/anointment/quick_draw.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "id": "bloodmagic:quick_draw", - "bonuses": { - "speed": [ - 0.5, - 1, - 1.5 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/living_armor/digging.json b/src/main/resources/data/bloodmagic/living_armor/digging.json deleted file mode 100644 index 96a24ecb..00000000 --- a/src/main/resources/data/bloodmagic/living_armor/digging.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "id": "bloodmagic:digging", - "levels": [ - { "xp": 128, "cost": 5 }, - { "xp": 512, "cost": 10 }, - { "xp": 1024, "cost": 18 }, - { "xp": 2048, "cost": 32 }, - { "xp": 8192, "cost": 60 }, - { "xp": 16000, "cost": 90 }, - { "xp": 32000, "cost": 140 }, - { "xp": 50000, "cost": 180 }, - { "xp": 80000, "cost": 240 }, - { "xp": 150000, "cost": 300 } - ], - "bonuses": { - "speed_time": [ - 0, - 50, - 60, - 100, - 100, - 100, - 100, - 150, - 150, - 150 - ], - "speed_level": [ - 0, - 0, - 0, - 1, - 1, - 1, - 1, - 1, - 2, - 2 - ], - "speed_modifier": [ - 0.1, - 0.2, - 0.3, - 0.4, - 0.5, - 0.6, - 0.8, - 1, - 1.2, - 1.5 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/living_armor/experienced.json b/src/main/resources/data/bloodmagic/living_armor/experienced.json deleted file mode 100644 index 304dd659..00000000 --- a/src/main/resources/data/bloodmagic/living_armor/experienced.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "id": "bloodmagic:experienced", - "levels": [ - { "xp": 100, "cost": 7 }, - { "xp": 400, "cost": 13 }, - { "xp": 1000, "cost": 22 }, - { "xp": 1600, "cost": 40 }, - { "xp": 3200, "cost": 65 }, - { "xp": 5000, "cost": 90 }, - { "xp": 7000, "cost": 130 }, - { "xp": 9200, "cost": 180 }, - { "xp": 11500, "cost": 250 }, - { "xp": 14000, "cost": 350 } - ], - "bonuses": { - "exp": [ - 0.15, - 0.3, - 0.45, - 0.6, - 0.75, - 0.9, - 1.05, - 1.2, - 1.35, - 1.5 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/living_armor/fall_protect.json b/src/main/resources/data/bloodmagic/living_armor/fall_protect.json deleted file mode 100644 index 2e30bafa..00000000 --- a/src/main/resources/data/bloodmagic/living_armor/fall_protect.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "id": "bloodmagic:fall_protect", - "levels": [ - { "xp": 30, "cost": 2 }, - { "xp": 200, "cost": 5 }, - { "xp": 400, "cost": 9 }, - { "xp": 800, "cost": 15 }, - { "xp": 1500, "cost": 25 } - ], - "bonuses": { - "protection": [ - 0.2, - 0.4, - 0.6, - 0.8, - 1 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/living_armor/fire_resist.json b/src/main/resources/data/bloodmagic/living_armor/fire_resist.json deleted file mode 100644 index 6266703d..00000000 --- a/src/main/resources/data/bloodmagic/living_armor/fire_resist.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "id": "bloodmagic:fire_resist", - "levels": [ - { "xp": 1200, "cost": 2 }, - { "xp": 3600, "cost": 6 }, - { "xp": 12000, "cost": 14 }, - { "xp": 24000, "cost": 25 }, - { "xp": 30000, "cost": 40 } - ], - "bonuses": { - "cooldown_time": [ - 6000, - 4800, - 4800, - 3600, - 2400 - ], - "resist_duration": [ - 600, - 600, - 800, - 1000, - 1200 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/living_armor/grave_digger.json b/src/main/resources/data/bloodmagic/living_armor/grave_digger.json deleted file mode 100644 index 38152a35..00000000 --- a/src/main/resources/data/bloodmagic/living_armor/grave_digger.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "id": "bloodmagic:grave_digger", - "levels": [ - { "xp": 200, "cost": 5 }, - { "xp": 800, "cost": 12 }, - { "xp": 1300, "cost": 20 }, - { "xp": 2500, "cost": 35 }, - { "xp": 3800, "cost": 49 }, - { "xp": 5000, "cost": 78 }, - { "xp": 7000, "cost": 110 }, - { "xp": 9200, "cost": 160 }, - { "xp": 11500, "cost": 215 }, - { "xp": 14000, "cost": 320 } - ], - "bonuses": { - "damage": [ - 1 - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/living_armor/health.json b/src/main/resources/data/bloodmagic/living_armor/health.json deleted file mode 100644 index 46debd74..00000000 --- a/src/main/resources/data/bloodmagic/living_armor/health.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "id": "bloodmagic:health", - "levels": [ - { "xp": 80, "cost": 5 }, - { "xp": 200, "cost": 12 }, - { "xp": 340, "cost": 20 }, - { "xp": 540, "cost": 35 }, - { "xp": 800, "cost": 49 }, - { "xp": 1600, "cost": 78 }, - { "xp": 2800, "cost": 110 }, - { "xp": 5000, "cost": 160 }, - { "xp": 7600, "cost": 215 }, - { "xp": 10000, "cost": 320 } - ], - "bonuses": { - "hp": [ - 4, - 8, - 12, - 16, - 20, - 26, - 32, - 38, - 44, - 50 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/living_armor/jump.json b/src/main/resources/data/bloodmagic/living_armor/jump.json deleted file mode 100644 index 3bfe6019..00000000 --- a/src/main/resources/data/bloodmagic/living_armor/jump.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "id": "bloodmagic:jump", - "levels": [ - { "xp": 30, "cost": 3 }, - { "xp": 200, "cost": 6 }, - { "xp": 400, "cost": 11 }, - { "xp": 700, "cost": 23 }, - { "xp": 1100, "cost": 37 }, - { "xp": 1500, "cost": 50 }, - { "xp": 2000, "cost": 70 }, - { "xp": 2800, "cost": 100 }, - { "xp": 3600, "cost": 140 }, - { "xp": 5000, "cost": 200 } - ], - "bonuses": { - "jump": [ - 0.1, - 0.2, - 0.3, - 0.4, - 0.5, - 0.7, - 0.75, - 0.9, - 1.1, - 1.3 - ], - "fall": [ - 0.33, - 0.4, - 0.45, - 0.5, - 0.55, - 0.60, - 0.65, - 0.75, - 0.85, - 0.95 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/living_armor/knockback_resist.json b/src/main/resources/data/bloodmagic/living_armor/knockback_resist.json deleted file mode 100644 index e74626ea..00000000 --- a/src/main/resources/data/bloodmagic/living_armor/knockback_resist.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "id": "bloodmagic:knockback_resist", - "levels": [ - { "xp": 100, "cost": 3 }, - { "xp": 200, "cost": 7 }, - { "xp": 300, "cost": 13 }, - { "xp": 500, "cost": 26 }, - { "xp": 1000, "cost": 42 } - ], - "bonuses": { - "kb": [ - 0.2, - 0.4, - 0.6, - 0.8, - 1.0 - ], - "hp": [ - 0, - 0, - 0, - 4, - 10 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/living_armor/melee_damage.json b/src/main/resources/data/bloodmagic/living_armor/melee_damage.json deleted file mode 100644 index 963cc11c..00000000 --- a/src/main/resources/data/bloodmagic/living_armor/melee_damage.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "id": "bloodmagic:melee_damage", - "levels": [ - { "xp": 200, "cost": 5 }, - { "xp": 800, "cost": 12 }, - { "xp": 1300, "cost": 20 }, - { "xp": 2500, "cost": 35 }, - { "xp": 3800, "cost": 49 }, - { "xp": 5000, "cost": 78 }, - { "xp": 7000, "cost": 110 }, - { "xp": 9200, "cost": 160 }, - { "xp": 11500, "cost": 215 }, - { "xp": 14000, "cost": 320 } - ], - "bonuses": { - "damage": [ - 0.5, - 1, - 1.5, - 2, - 2.5, - 3, - 4, - 5, - 6, - 7 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/living_armor/physical_protect.json b/src/main/resources/data/bloodmagic/living_armor/physical_protect.json deleted file mode 100644 index bfb72198..00000000 --- a/src/main/resources/data/bloodmagic/living_armor/physical_protect.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "id": "bloodmagic:physical_protect", - "levels": [ - { "xp": 30, "cost": 5 }, - { "xp": 200, "cost": 10 }, - { "xp": 400, "cost": 18 }, - { "xp": 800, "cost": 35 }, - { "xp": 1500, "cost": 65 }, - { "xp": 2500, "cost": 100 }, - { "xp": 3500, "cost": 140 }, - { "xp": 5000, "cost": 190 }, - { "xp": 7000, "cost": 250 }, - { "xp": 15000, "cost": 300 } - ], - "bonuses": { - "protection": [ - 0.1, - 0.3, - 0.4, - 0.6, - 0.7, - 0.75, - 0.77, - 0.8, - 0.83, - 0.85 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/living_armor/poison_resist.json b/src/main/resources/data/bloodmagic/living_armor/poison_resist.json deleted file mode 100644 index 42312197..00000000 --- a/src/main/resources/data/bloodmagic/living_armor/poison_resist.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "id": "bloodmagic:poison_resist", - "levels": [ - { "xp": 1200, "cost": 2 }, - { "xp": 3600, "cost": 6 }, - { "xp": 12000, "cost": 14 }, - { "xp": 24000, "cost": 25 }, - { "xp": 30000, "cost": 40 } - ], - "bonuses": { - "cooldown": [ - 1200, - 800, - 600, - 300, - 100 - ], - "max_cure": [ - 0, - 1, - 2, - 2, - 3 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/living_armor/self_sacrifice.json b/src/main/resources/data/bloodmagic/living_armor/self_sacrifice.json deleted file mode 100644 index 08ba85f7..00000000 --- a/src/main/resources/data/bloodmagic/living_armor/self_sacrifice.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "id": "bloodmagic:self_sacrifice", - "levels": [ - { "xp": 30, "cost": 7 }, - { "xp": 200, "cost": 13 }, - { "xp": 400, "cost": 22 }, - { "xp": 700, "cost": 40 }, - { "xp": 1100, "cost": 65 }, - { "xp": 1500, "cost": 90 }, - { "xp": 2000, "cost": 130 }, - { "xp": 2800, "cost": 180 }, - { "xp": 3600, "cost": 250 }, - { "xp": 5000, "cost": 350 } - ], - "bonuses": { - "self_mod": [ - 0.15, - 0.3, - 0.45, - 0.6, - 0.75, - 0.9, - 1.05, - 1.2, - 1.35, - 1.5 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/living_armor/speed.json b/src/main/resources/data/bloodmagic/living_armor/speed.json deleted file mode 100644 index 717abf5b..00000000 --- a/src/main/resources/data/bloodmagic/living_armor/speed.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "id": "bloodmagic:speed", - "levels": [ - { "xp": 200, "cost": 3 }, - { "xp": 1000, "cost": 7 }, - { "xp": 2000, "cost": 13 }, - { "xp": 4000, "cost": 26 }, - { "xp": 7000, "cost": 42 }, - { "xp": 15000, "cost": 60 }, - { "xp": 25000, "cost": 90 }, - { "xp": 35000, "cost": 130 }, - { "xp": 50000, "cost": 180 }, - { "xp": 70000, "cost": 250 } - ], - "bonuses": { - "speed_time": [ - 0, - 0, - 0, - 0, - 0, - 20, - 60, - 60, - 100, - 200 - ], - "speed_level": [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 2 - ], - "speed_modifier": [ - 0.1, - 0.2, - 0.3, - 0.4, - 0.5, - 0.7, - 0.9, - 1.1, - 1.3, - 1.5 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/living_armor/sprint_attack.json b/src/main/resources/data/bloodmagic/living_armor/sprint_attack.json deleted file mode 100644 index f9c7166c..00000000 --- a/src/main/resources/data/bloodmagic/living_armor/sprint_attack.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "id": "bloodmagic:sprint_attack", - "levels": [ - { "xp": 200, "cost": 3 }, - { "xp": 800, "cost": 7 }, - { "xp": 1300, "cost": 15 }, - { "xp": 2500, "cost": 25 }, - { "xp": 3800, "cost": 40 } - ], - "bonuses": { - "damage_boost": [ - 0.5, - 0.75, - 1, - 1.25, - 1.5 - ], - "kb": [ - 1, - 2, - 3, - 4, - 5 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/loot_modifiers/fortune.json b/src/main/resources/data/bloodmagic/loot_modifiers/fortune.json deleted file mode 100644 index d62cfa37..00000000 --- a/src/main/resources/data/bloodmagic/loot_modifiers/fortune.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "bloodmagic:fortune", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/loot_modifiers/looting.json b/src/main/resources/data/bloodmagic/loot_modifiers/looting.json deleted file mode 100644 index fe391f6f..00000000 --- a/src/main/resources/data/bloodmagic/loot_modifiers/looting.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "bloodmagic:looting", - "conditions": [ - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/loot_modifiers/silk_touch_bamboo.json b/src/main/resources/data/bloodmagic/loot_modifiers/silk_touch_bamboo.json deleted file mode 100644 index 1e88d9b9..00000000 --- a/src/main/resources/data/bloodmagic/loot_modifiers/silk_touch_bamboo.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "bloodmagic:silk_touch_bamboo", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/loot_modifiers/smelt.json b/src/main/resources/data/bloodmagic/loot_modifiers/smelt.json deleted file mode 100644 index 4e9bf5a5..00000000 --- a/src/main/resources/data/bloodmagic/loot_modifiers/smelt.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "bloodmagic:smelt", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/book.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/book.json deleted file mode 100644 index 4d8fef9b..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/book.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "guide.bloodmagic.name", - "subtitle": "Alchemical Wizardry", - "landing_text": "Welcome to $(6)Blood Magic$()! $(br2)$(l:bloodmagic:utility/nyi)A lot of stuff$() isn't yet implemented, so please excuse our dust. $(br2)Click $(l:bloodmagic:utility/getting_started)HERE$() to get started. If you find any bugs, please report them on our $(l:https://github.com/WayofTime/BloodMagic/issues)Github$().", - "book_texture": "patchouli:textures/gui/book_red.png", - "filler_texture": "bloodmagic:textures/gui/patchouli_book/page_filler.png", - "creative_tab": "bloodmagictab", - "model": "bloodmagic:book", - "show_progress": false, - "macros": { - "$(water)": "$(#0000AA)", - "$(air)": "$(#AAAA00)", - "$(fire)": "$(#AA0000)", - "$(earth)": "$(#00AA00)", - "$(blank)": "$(#888888)", - "$(steadfast)": "$(#0000AA)", - "$(destructive)": "$(#AAAA00)", - "$(vengeful)": "$(#AA0000)", - "$(corrosive)": "$(#00AA00)", - "$(raw)": "$(#36C6C6)", - "$(blood)": "$(#AA0000)" - } -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/alchemy_array.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/alchemy_array.json deleted file mode 100644 index 1896d31d..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/alchemy_array.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "Alchemy Arrays", - "description": "Alchemy Arrays are simple effects that originate from circles that are drawn on the ground using $(l:bloodmagic:alchemy_array/functional_arrays/arcane_ash)Arcane Ashes.$(/l) They are simple to build and can be really useful in both early game and late game applications.", - "icon": "bloodmagic:arcaneashes", - "sortnum": 2 -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/alchemy_array/functional_array.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/alchemy_array/functional_array.json deleted file mode 100644 index 96640011..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/alchemy_array/functional_array.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "Functional Arrays", - "description": "", - "icon": "bloodmagic:arcaneashes", - "parent": "bloodmagic:alchemy_array", - "sortnum": 0 -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/alchemy_array/living_equipment.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/alchemy_array/living_equipment.json deleted file mode 100644 index b864678c..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/alchemy_array/living_equipment.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "Living Equipment", - "description": "with some $(item)Arcane Ashes$() and a handful of this new $(item)Binding Reagent$(), a whole world of defense and utility has opened up before you.", - "icon": "bloodmagic:livinghelmet", - "parent": "bloodmagic:alchemy_array", - "sortnum": 2 -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/alchemy_array/living_equipment/armor_upgrades.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/alchemy_array/living_equipment/armor_upgrades.json deleted file mode 100644 index 0ea58b6e..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/alchemy_array/living_equipment/armor_upgrades.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "Living Armor Upgrades", - "description": "A list of available Living Armor Upgrades.", - "icon": "bloodmagic:upgradetome", - "parent": "bloodmagic:alchemy_array/living_equipment" -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/alchemy_array/sigil.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/alchemy_array/sigil.json deleted file mode 100644 index af82aeeb..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/alchemy_array/sigil.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "Sigils", - "description": "$(item)Sigils$() are formed using an $(l:bloodmagic:alchemy_array/crafting_array)Alchemy Array$(), some form of $(item)Reagent$() and a $(l:bloodmagic:altar/slates)Slate$(). They draw LP from your $(altar/soul_network)Soul Network$() in order to perform all sorts of useful tasks.", - "icon": "bloodmagic:divinationsigil", - "parent": "bloodmagic:alchemy_array", - "sortnum": 1 -} diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/alchemy_table.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/alchemy_table.json deleted file mode 100644 index 958b5ccf..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/alchemy_table.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "Alchemy Table", - "description": "", - "icon": "bloodmagic:alchemytable", - "sortnum": 1 -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/alchemy_table/anointments.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/alchemy_table/anointments.json deleted file mode 100644 index 66adbb00..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/alchemy_table/anointments.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "Anointments", - "description": "", - "icon": "bloodmagic:smelting_anointment", - "parent": "bloodmagic:alchemy_table" -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/altar.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/altar.json deleted file mode 100644 index b82a7c93..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/altar.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "Blood Altars", - "description": "One of the central concepts of Blood Magic is building a glorious ziggurat to focus your power. These pages will guide you in the construction of this masterwork.", - "icon": "bloodmagic:altar", - "sortnum": 0 -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/altar/blood_rune.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/altar/blood_rune.json deleted file mode 100644 index 2d89895a..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/altar/blood_rune.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "Blood Runes", - "description": "There's lots of different runes. They do cool stuff! Take your pick.", - "icon": "bloodmagic:blankrune", - "parent": "bloodmagic:altar" -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/demon_will.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/demon_will.json deleted file mode 100644 index ce8f99e1..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/demon_will.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "Demon Will", - "description": "$(item)Demon Will$() is one of the first things you can create with $(6)Blood Magic$(). Once you have gathered some with a $(l:bloodmagic:demon_will/soul_snare)Soul Snare$(), you will be able to craft a $(l:bloodmagic:demon_will/soul_gem)Petty Tartaric Gem$() and a $(l:bloodmagic:demon_will/sentient_sword)Sentient Sword$(/l)$().", - "icon": "bloodmagic:basemonstersoul", - "sortnum": 3 -} diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/rituals.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/rituals.json deleted file mode 100644 index 047ec904..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/rituals.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "Rituals", - "description": "Rituals consume LP from your $(l:bloodmagic:altar/soul_network)Soul Network$(/l) in order to do a variety of tasks. $(br2)For information on specific rituals, click the Master Ritual Stone below.$(br2)>>> <<<", - "icon": "bloodmagic:ritualdiviner", - "sortnum": 4 -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/rituals/ritual_list.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/rituals/ritual_list.json deleted file mode 100644 index 065d9f1a..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/rituals/ritual_list.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "List of Rituals", - "description": "Some simpler $(item)rituals$() will be available to you when you have a Tier III $(l:bloodmagic:altar/blood_altar)Blood Altar$(), but the more advanced ones will require Dusk Runes, and thus a Tier IV Altar. $(br2) Use the $(l:bloodmagic:rituals/ritual_diviner)Ritual Diviner$() to assemble the rituals, and don't forget to keep your $(l:bloodmagic:altar/soul_network)Soul Network$() topped off!", - "icon": "bloodmagic:masterritualstone", - "parent": "bloodmagic:rituals" -} diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/utility.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/utility.json deleted file mode 100644 index 08a62079..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/categories/utility.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "Utility Blocks & Items", - "description": "AKA the \"Miscellaneous\" bin. General information about the mod goes here, along with anything else that doesn't quite fit in another category, yet doesn't have enough to warrant a category of its own.", - "icon": "bloodmagic:incensealtar", - "sortnum": 99 -} diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/functional_arrays/arcane_ash.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/functional_arrays/arcane_ash.json deleted file mode 100644 index 22a0d810..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/functional_arrays/arcane_ash.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "name": "Alchemy Array Basics", - "icon": "bloodmagic:arcaneashes", - "category": "bloodmagic:alchemy_array/functional_array", - "extra_recipe_mappings":[["bloodmagic:arcaneashes", 1]], - "pages": [ - { - "type": "text", - "text": "$(item)Arcane Ashes$() is an item that is pivotal in the creation of Alchemy Arrays. $(item)Arcane Ashes$() can be crafted in the $(l:bloodmagic:alchemy_table/alchemy_table)Alchemy Table($()) using some early game items." - }, - { - "type": "crafting_alchemy_table", - "heading": "Arcane Ashes", - "recipe": "bloodmagic:alchemytable/arcane_ash" - }, - { - "type": "text", - "text": "In order to create an Alchemy Array, right click the top of the ground with the $(item)Arcane Ashes$() (although any solid block face works) - this will consume 1 durability out of 20 from the $(item)Arcane Ashes$() and draw a simple Alchemy Array, that by itself has no effects.$(bl2)When you click on the Alchemy Array, it will consume a single item from the stack in your hand and hold it in the array. These items are then used to determine the Alchemy Array's effect." - }, - { - "type": "image", - "images": [ - "bloodmagic:images/entries/alchemy_array/simple_array.png", - "bloodmagic:images/entries/alchemy_array/divination_array_1.png", - "bloodmagic:images/entries/alchemy_array/divination_array_2.png" - ], - "title": "Alchemy Array", - "border": true, - "text": "Alchemy Array showing array with: no inputs; only the base item; both base and catalyst." - }, - { - "type": "text", - "text": "Each effect requires two items: a base and a catalyst. The base is the first item that you click the array with after it is drawn, and the catalyst is the second item. When you apply the input, the design of the array will change if it is valid, and the array will start activating once you apply the catalyst.$(br2)Although only a few arrays are currently implemented, eventually you will have arrays that range from simple $(l:bloodmagic:alchemy_array/crafting_array)crafting arrays$(/l) to even teleportation arrays." - } - ] -} diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/functional_arrays/crafting_array.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/functional_arrays/crafting_array.json deleted file mode 100644 index c652a006..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/functional_arrays/crafting_array.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "Crafting with Arrays", - "icon": "bloodmagic:divinationsigil", - "category": "bloodmagic:alchemy_array/functional_array", - "pages": [ - { - "type": "text", - "text": "$(1)Alchemy Arrays of Crafting$() are one of the simplest forms of array. These arrays inscribe the $(item)base item$() onto the $(item)catalyst$(), transforming them both into a useful item (after a small, pretty animation)." - }, - { - "type": "text", - "text": "While some of these resulting items can be crafted $(l:bloodmagic:alchemy_array/sigil/divination)using very simple ingredients$(/l), others require additional steps to create useful items." - } - ] -} diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/functional_arrays/movement_arrays.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/functional_arrays/movement_arrays.json deleted file mode 100644 index 303671fd..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/functional_arrays/movement_arrays.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "Movement Array", - "icon": "minecraft:feather", - "category": "bloodmagic:alchemy_array/functional_array", - "pages": [ - { - "type": "text", - "text": "The Movement Arrays are a pair of arrays that thows players, mobs, items, etc in a specific direction. One will throw the items horizontally, while the other will throw them vertically." - }, - { - "type": "2x_functional_array", - "a.heading": "Speed Array", - "a.recipe": "bloodmagic:array/movement", - "a.image": "movementarray.png", - "b.heading": "Updraft Array", - "b.recipe": "bloodmagic:array/updraft", - "b.image": "updraftarray.png" - } - ] -} diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/functional_arrays/spike_array.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/functional_arrays/spike_array.json deleted file mode 100644 index 84e73b99..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/functional_arrays/spike_array.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "Spike Array", - "icon": "minecraft:iron_ingot", - "category": "bloodmagic:alchemy_array/functional_array", - "pages": [ - { - "type": "text", - "text": "The Spike Array is a rather simple array with a single purpose. When a living entity steps into the array, they are hit with a full heart of damage. This is good for mob traps, or for making your base a bit spikier for players." - }, - { - "type": "functional_array", - "heading": "Spike Array", - "recipe": "bloodmagic:array/spike", - "image": "spikearray.png" - } - ] -} diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/functional_arrays/time_arrays.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/functional_arrays/time_arrays.json deleted file mode 100644 index a14c9526..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/functional_arrays/time_arrays.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "Day/Night Arrays", - "icon": "minecraft:clock", - "category": "bloodmagic:alchemy_array/functional_array", - "pages": [ - { - "type": "text", - "text": "Time-based arrays are straight-forward arrays that control the time of day. The items will be consumed once the array starts changing the time. These recipes are temporary and will change in the future.$(br2)The Day array will change the time of day to the next sunrise. The Night array will change the time of day to the next sunset." - }, - { - "type": "2x_functional_array", - "a.heading": "New Dawn", - "a.recipe": "bloodmagic:array/day", - "a.image": "sunarray.png", - "b.heading": "True Twilight", - "b.recipe": "bloodmagic:array/night", - "b.image": "moonarray.png" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/body_builder.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/body_builder.json deleted file mode 100644 index 50a5f4eb..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/body_builder.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "Body Builder", - "icon": "minecraft:cooked_beef", - "category": "bloodmagic:alchemy_array/living_equipment/armor_upgrades", - "pages": [ - { - "type": "text", - "text": "Effect: Grants Knockback Resistance and bonus Health. Caps out at 100% Resistance and 10 half-hearts of health. $(br2)Trained by: Eating food. $(br2)Maximum level: 5" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/charging_strike.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/charging_strike.json deleted file mode 100644 index be90ac0c..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/charging_strike.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "Charging Strike", - "icon": "minecraft:golden_axe", - "category": "bloodmagic:alchemy_array/living_equipment/armor_upgrades", - "pages": [ - { - "type": "text", - "text": "Effect: Increases damage and knockback from sprinting attacks, up to +50%. $(br2)Trained by: Dealing damage while sprinting. $(br2)Maximum level: 5" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/dwarven_might.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/dwarven_might.json deleted file mode 100644 index 4c631ac8..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/dwarven_might.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "Dwarven Might", - "icon": "minecraft:diamond_pickaxe", - "category": "bloodmagic:alchemy_array/living_equipment/armor_upgrades", - "pages": [ - { - "type": "text", - "text": "Effect: Increases mining speed while mining identical blocks. After a certain level, gives a Haste buff after breaking blocks. $(br2)Trained by: Mining. $(br2)Maximum level: 10" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/experienced.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/experienced.json deleted file mode 100644 index 72d28543..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/experienced.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "Experienced", - "icon": "minecraft:experience_bottle", - "category": "bloodmagic:alchemy_array/living_equipment/armor_upgrades", - "pages": [ - { - "type": "text", - "text": "Effect: Increases XP drops from killing mobs, up to 150%. $(br2)Trained by: Collecting XP. $(br2)Maximum level: 10" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/gift_of_ignis.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/gift_of_ignis.json deleted file mode 100644 index fe91e876..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/gift_of_ignis.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "Gift of Ignis", - "icon": "minecraft:blaze_powder", - "category": "bloodmagic:alchemy_array/living_equipment/armor_upgrades", - "pages": [ - { - "type": "text", - "text": "Effect: Provides Fire Resistance. Higher levels last longer and recharge faster. $(br2)Trained by: Being on Fire. ($(item)Potions of Fire Resistance$() may be your friend here.) $(br2)Maximum level: 5" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/healthy.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/healthy.json deleted file mode 100644 index 7c116464..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/healthy.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "Healthy", - "icon": "minecraft:golden_apple", - "category": "bloodmagic:alchemy_array/living_equipment/armor_upgrades", - "pages": [ - { - "type": "text", - "text": "Effect: Grants additional health, up to 50 half-hearts. $(br2)Trained by: Restoring health (Ordinary healing, or via $(item)Potions of Healing$() or $(item)Potions of Regeneration$().) $(br2)Maximum level: 10" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/pin_cushion.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/pin_cushion.json deleted file mode 100644 index 2db0a331..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/pin_cushion.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "Pin Cushion", - "icon": "minecraft:arrow", - "category": "bloodmagic:alchemy_array/living_equipment/armor_upgrades", - "pages": [ - { - "type": "text", - "text": "Effect: Offers protection from arrows. $(br2)Trained by: Being shot. $(br2)Maximum level: 10" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/poison_resistance.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/poison_resistance.json deleted file mode 100644 index 80969677..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/poison_resistance.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "Poison Resistance", - "icon": "minecraft:milk_bucket", - "category": "bloodmagic:alchemy_array/living_equipment/armor_upgrades", - "pages": [ - { - "type": "text", - "text": "Effect: Cures Poison. Has a cooldown which shortens with additional levels. $(br2)Trained by: Being Poisoned. $(br2)Maximum level: 5" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/quick_feet.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/quick_feet.json deleted file mode 100644 index 086ac451..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/quick_feet.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "Quick Feet", - "icon": "minecraft:sugar", - "category": "bloodmagic:alchemy_array/living_equipment/armor_upgrades", - "pages": [ - { - "type": "text", - "text": "Effect: Increases player movement speed up to 150%. $(br2)Trained by: Running around. $(br2)Maximum level: 10" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/soft_fall.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/soft_fall.json deleted file mode 100644 index a24cff98..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/soft_fall.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "Soft Fall", - "icon": "minecraft:feather", - "category": "bloodmagic:alchemy_array/living_equipment/armor_upgrades", - "pages": [ - { - "type": "text", - "text": "Effect: Reduces fall damage, up to complete immunity. $(br2)Trained by: Getting hurt from falls. $(br2)Maximum level: 5" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/strong_legs.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/strong_legs.json deleted file mode 100644 index 9b99545f..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/strong_legs.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "Strong Legs", - "icon": "minecraft:diamond_leggings", - "category": "bloodmagic:alchemy_array/living_equipment/armor_upgrades", - "pages": [ - { - "type": "text", - "text": "Effect: Increases jump height and reduces fall damage, up to a maximum of an additional 7.5 blocks and 83% fall resistance. $(br2)Trained by: Jumping around. $(br2)Maximum level: 10" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/tough.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/tough.json deleted file mode 100644 index aedce14b..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/tough.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "Tough", - "icon": "minecraft:shield", - "category": "bloodmagic:alchemy_array/living_equipment/armor_upgrades", - "pages": [ - { - "type": "text", - "text": "Effect: Protects you from non-projectile harm. $(br2)Trained by: Taking damage from anything but projectiles. $(br2)Maximum level: 10" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/tough_palms.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/tough_palms.json deleted file mode 100644 index 857cb83b..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/armor_upgrades/tough_palms.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "Tough Palms", - "icon": "bloodmagic:sacrificialdagger", - "category": "bloodmagic:alchemy_array/living_equipment/armor_upgrades", - "pages": [ - { - "type": "text", - "text": "Effect: Grants a bonus to Self Sacrifice, up to an additional 150%. $(br2)Trained by: Sacrificing Blood with the Sacrificial Knife. $(br2)Maximum level: 10" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/living_basics.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/living_basics.json deleted file mode 100644 index a4fb2a4e..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/living_basics.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "Living Equipment Basics", - "icon": "bloodmagic:reagentbinding", - "priority": true, - "category": "bloodmagic:alchemy_array/living_equipment", - "priority": "true", - "extra_recipe_mappings":[["bloodmagic:reagentbinding", 1]], - "pages": [ - { - "type": "text", - "text": "To create $(item)Living Equipment$(), you will first need $(item)Iron Armor$() (or $(item)Iron Armour$(), if you prefer), some $(l:bloodmagic:alchemy_array/functional_arrays/arcane_ash)Arcane Ash$(), and some $(item)Binding Reagent$(). You'll also need at least a $(br)$(l:bloodmagic:demon_will/soul_gem)Common Tartaric Gem$() in order to hold the $(item)Demon Will$() required." - }, - { - "type": "crafting_alchemy_table", - "heading": "Binding Reagent", - "recipe": "bloodmagic:alchemytable/reagent_binding", - "text": "$(italic)It clings to me tightly...$()" - }, - { - "type": "text", - "text": "as with any other Alchemy Array, right click the top of the ground with the $(item)Arcane Ashes$() and apply the $(item)Binding Reagent$(). Then place in your $(item)Iron Helmet$(), $(item)Iron Chestplate$(), $(item)Iron Leggings$() or $(item)Iron Boots$(), stand back, and watch the show.$(br2) Living Equipment starts off equivalent to Iron, but it has $(item)Upgrade Points$() that can, with care, be spent to train it in specific ways. It starts with 100, but there may be ways to surpass this limitation..." - }, - { - "type": "crafting_array", - "heading": "Ritual of Binding", - "recipe": "bloodmagic:array/living_helmet", - "text": "It's alive, all right... and it's learning from me. I'd best be careful what I teach it. $(br2)I can keep a closer eye on what it's learned so far by holding shift when I look at it." - } - ] -} diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/living_upgrades.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/living_upgrades.json deleted file mode 100644 index 92a18ee9..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/living_equipment/living_upgrades.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "Living Equipment Upgrades", - "icon": "bloodmagic:upgradetome", - "priority": true, - "category": "bloodmagic:alchemy_array/living_equipment", - "extra_recipe_mappings":[["bloodmagic:upgradetome", 0]], - "pages": [ - { - "type": "text", - "text": "While wearing this new armour, you have felt it growing, trying to assist you with various tasks it has seen you perform. $(br2)It seems to be able to perform in a number of areas, but its growth is limited, and trying to do everything at once is quite fruitless." - }, - { - "type": "text", - "text": "Perhaps multiple specialised sets may be a good idea? Of course, you'll have to train it carefully if you want more than a smattering of poorly-directed benefits. $(br2)Fortunately, you have devised a $(l:rituals/ritual_list/ritual_upgrade_remove)Ritual$() that will assist with training, and $(l:rituals/ritual_list/ritual_armour_evolve)another one$() that will imbue your armour with a greater ability to grow." - } - ] -} diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/air.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/air.json deleted file mode 100644 index 3cc3dc28..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/air.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "Air Sigil", - "icon": "bloodmagic:airsigil", - "category": "bloodmagic:alchemy_array/sigil", - "extra_recipe_mappings":[ - ["bloodmagic:reagentair", 1], - ["bloodmagic:airsigil", 1] - ], - "pages": [ - { - "type": "text", - "text": "Throws you in the direction you're facing, at a cost of 50 LP per use. Note that this does not provide any sort of Feather Falling effect, so be careful when landing! A good way to get around quickly, albeit with some risk. Many an unwary mage has met their end by running out of LP in their $(l:bloodmagic:altar/soul_network)Soul Network$() while flying miles above the countryside." - }, - { - "type": "crafting_2-step_sigil", - "alchemy_table.heading": "Air Reagent", - "alchemy_table.recipe": "bloodmagic:alchemytable/reagent_air", - "array.heading": "Air Sigil", - "array.recipe": "bloodmagic:array/airsigil", - "array.text": "$(italic)I feel lighter already..." - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/blood_light.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/blood_light.json deleted file mode 100644 index c7d0c769..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/blood_light.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "Sigil of the Blood Lamp", - "icon": "bloodmagic:bloodlightsigil", - "category": "bloodmagic:alchemy_array/sigil", - "extra_recipe_mappings":[ - ["bloodmagic:reagentbloodlight", 1], - ["bloodmagic:bloodlightsigil", 1] - ], - "pages": [ - { - "type": "text", - "text": "The $(item)Sigil of the Blood Lamp$() is a handy tool for any miner, dungeon delver, or simply any Blood Mage that doesn't like dark patches and feels that torches and glowstone blocks get in the way. When used, this sigil launches a Blood Light in the direction you are facing. When it hits a block, it spawns a nearly-invisible light source at a cost of 10LP." - }, - { - "type": "crafting_2-step_sigil", - "alchemy_table.heading": "Blood Lamp Reagent", - "alchemy_table.recipe": "bloodmagic:alchemytable/reagent_blood_light", - "array.heading": "Sigil of the Blood Lamp", - "array.recipe": "bloodmagic:array/bloodlightsigil", - "array.text": "$(italic)I see a light!" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/divination.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/divination.json deleted file mode 100644 index 612488ed..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/divination.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "name": "Divination Sigil", - "icon": "bloodmagic:divinationsigil", - "category": "bloodmagic:alchemy_array/sigil", - "extra_recipe_mappings":[ - ["bloodmagic:divinationsigil", 1] - ], - "pages": [ - { - "type": "text", - "text": "The $(item)Divination Sigil$() is probably the first of many sigils that you would like to craft in Blood Magic. In order to craft the sigil, you need to create an $(l:bloodmagic:alchemy_array/functional_arrays/arcane_ash)Alchemy Array$(/l) and use $(item)Redstone Dust$() and a $(item)Blank Slate$() as the base and catalyst items, respectively." - }, - { - "type": "crafting_array", - "heading": "Divination Sigil", - "recipe": "bloodmagic:array/divinationsigil", - "text": " $(italic)Peer into the soul." - }, - { - "type": "image", - "images": [ - "bloodmagic:images/entries/sigil/divination_sigil.png" - ], - "title": "Divination Sigil Array", - "border": true, - "text": "The Divination Sigil, next to its crafting array." - }, - { - "type": "text", - "text": "The Divination Sigil has two primary uses: $(br)$(li)When the player right-clicks in the air with the sigil, it will display the amount of LP that is in the owner's $(l:bloodmagic:altar/soul_network)Soul Network.$(/l)$(li)When clicking on a $(l:bloodmagic:altar/blood_altar)Blood Altar$(/l), it will tell the player the altar's current Tier, the amount of LP stored in the altar, as well as its current max capacity. Having a $(item)Divination Sigil$() on hand can also be helpful for other block applications, but that will be covered later." - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/grove.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/grove.json deleted file mode 100644 index 0d3bf70a..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/grove.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "name": "Sigil of the Green Grove", - "icon": "bloodmagic:growthsigil", - "category": "bloodmagic:alchemy_array/sigil", - "extra_recipe_mappings":[ - ["bloodmagic:reagentgrowth", 1], - ["bloodmagic:growthsigil", 1] - ], - "pages": [ - { - "type": "text", - "text": "The $(item)Sigil of the Green Grove$() is an item that has multiple uses. Crafted in an array with a $(item)Growth Reagent$(item) and a $(item)Reinforced Slate$(), the sigil can use the power of your stored life force to nourish and grow nearby plants." - }, - { - "type": "crafting_2-step_sigil", - "alchemy_table.heading": "Growth Reagent", - "alchemy_table.recipe": "bloodmagic:alchemytable/reagent_growth", - "array.heading": "Sigil of the Green Grove", - "array.recipe": "bloodmagic:array/growthsigil" - }, - { - "type": "image", - "images": [ - "bloodmagic:images/entries/sigil/grove_sigil1.png", - "bloodmagic:images/entries/sigil/grove_sigil2.png", - "bloodmagic:images/entries/sigil/grove_sigil3.png" - ], - "title": "Green Grove Sigil Array", - "border": true, - "text": "The Sigil of the Green Grove's array, plus its primary uses." - }, - { - "type": "text", - "text": "If you right click on a block that is $(2)IGrowable$(), it will apply the bonemeal effect while consuming 150LP.$(br2)However, if you shift-right-click the sigil in the air, the sigil will light up to indicate that it is activated, and will consume 150LP every 10 seconds. Every block in a 7x7x5 high volume centered on the player will have a growth tick applied to it. Good for farming those taters!" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/holding.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/holding.json deleted file mode 100644 index abadeedf..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/holding.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "Sigil of Holding", - "icon": "bloodmagic:sigilofholding", - "category": "bloodmagic:alchemy_array/sigil", - "extra_recipe_mappings":[ - ["bloodmagic:reagentholding", 1], - ["bloodmagic:sigilofholding", 1] - ], - "pages": [ - { - "type": "text", - "text": "[Needs content pass from Wrince or WayofTime]$(br2)Press \"$(k:bloodmagic.keybind.open_holding)\" while holding the sigil to open its inventory.$()$(br)Press \"$(k:bloodmagic.keybind.cycle_holding_pos)\" to cycle forward,$() or \"$(k:bloodmagic.keybind.cycle_holding_neg)\" to cycle backwards.$() Sneaking and using your mousewheel also works.$(br2)If you don't see any keybinds there, then you don't have any set yet." - }, - { - "type": "crafting_2-step_sigil", - "alchemy_table.heading": "Holding Reagent", - "alchemy_table.recipe": "bloodmagic:alchemytable/reagent_holding", - "array.heading": "Sigil of Holding", - "array.recipe": "bloodmagic:array/holdingsigil", - "array.text": "$(italic)Sigil-ception" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/ice.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/ice.json deleted file mode 100644 index 770bdf2e..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/ice.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "Sigil of the Frozen Lake [NYI]", - "icon": "bloodmagic:icesigil", - "category": "bloodmagic:alchemy_array/sigil", - "extra_recipe_mappings":[ - ["bloodmagic:icesigil", 0] - ], - "pages": [ - { - "type": "text", - "text": "[WIP Notes]$(br)[Not Yet Implemented]$(br2)Frostwalker Enchantment as a Sigil." - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/lava.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/lava.json deleted file mode 100644 index 5602904c..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/lava.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "name": "Lava Sigil", - "icon": "bloodmagic:lavasigil", - "category": "bloodmagic:alchemy_array/sigil", - "extra_recipe_mappings":[ - ["bloodmagic:reagentlava", 1], - ["bloodmagic:lavasigil", 1] - ], - "pages": [ - { - "type": "text", - "text": "The sister sigil to the $(l:bloodmagic:alchemy_array/sigil/water)Water Sigil,$(/l) the $(item)Lava Sigil$() creates a source block of lava where you click on the ground for the cost of 1000LP. Crafted in an $(l:bloodmagic:alchemy_array/functional_arrays/arcane_ash)Alchemy Array$(/l) using a $(item)Lava Reagent$() and a $(item)Blank Slate,$() it'll drain 5 hearts from you if you don't have enough LP in your $(l:bloodmagic:altar/soul_network)Soul Network.$(/l)" - }, - { - "type": "crafting_2-step_sigil", - "alchemy_table.heading": "Lava Reagent", - "alchemy_table.recipe": "bloodmagic:alchemytable/reagent_lava", - "array.heading": "Lava Sigil", - "array.recipe": "bloodmagic:array/lavasigil", - "array.text": "$(italic)HOT! DO NOT EAT" - }, - { - "type": "image", - "images": [ - "bloodmagic:images/entries/sigil/lava_sigil1.png", - "bloodmagic:images/entries/sigil/lava_sigil2.png" - ], - "title": "Lava Sigil Array", - "border": true, - "text": "The Lava Sigil, next to its crafting array, plus its primary use." - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/magnetism.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/magnetism.json deleted file mode 100644 index 9c83a3a5..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/magnetism.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "Sigil of Magnetism", - "icon": "bloodmagic:sigilofmagnetism", - "category": "bloodmagic:alchemy_array/sigil", - "extra_recipe_mappings":[ - ["bloodmagic:reagentmagnetism", 1], - ["bloodmagic:sigilofmagnetism", 1] - ], - "pages": [ - { - "type": "text", - "text": "[WIP Notes]$(br)[Not Yet Implemented]$(br2)Attacts items in the world towards the holder for pickup." - }, - { - "type": "crafting_2-step_sigil", - "alchemy_table.heading": "Magnetism Reagent", - "alchemy_table.recipe": "bloodmagic:alchemytable/reagent_magnetism", - "array.heading": "Sigil of Magnetism", - "array.recipe": "bloodmagic:array/magnetismsigil" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/mining.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/mining.json deleted file mode 100644 index bf620f8f..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/mining.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "name": "Sigil of the Fast Miner", - "icon": "bloodmagic:miningsigil", - "category": "bloodmagic:alchemy_array/sigil", - "extra_recipe_mappings":[ - ["bloodmagic:reagentfastminer", 1], - ["bloodmagic:miningsigil", 1] - ], - "pages": [ - { - "type": "text", - "text": "The $(item)Sigil of the Fast Miner$() is a sigil that, when activated using shift-right-click, will consume 100LP every 10 seconds and apply the Haste potion effect. Thus, it increases your mining, digging, and cutting speeds. Crafted using the $(item)Mining Reagent$() and $(item)Reinforced Slate$() in an alchemy array." - }, - { - "type": "crafting_2-step_sigil", - "alchemy_table.heading": "Mining Reagent", - "alchemy_table.recipe": "bloodmagic:alchemytable/reagent_fastminer", - "array.heading": "Sigil of the Fast Miner", - "array.recipe": "bloodmagic:array/fastminersigil" - }, - { - "type": "image", - "images": [ - "bloodmagic:images/entries/sigil/mining_sigil1.png", - "bloodmagic:images/entries/sigil/mining_sigil2.png" - ], - "title": "Fast Miner Sigil Array", - "border": true, - "text": "The Sigil of the Fast Miner's array, plus its primary uses." - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/seer.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/seer.json deleted file mode 100644 index 21264a53..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/seer.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "name": "Seer's Sigil", - "icon": "bloodmagic:seersigil", - "category": "bloodmagic:alchemy_array/sigil", - "extra_recipe_mappings":[ - ["bloodmagic:reagentsight", 2], - ["bloodmagic:seersigil", 2] - ], - "pages": [ - { - "type": "text", - "text": "The $(item)Seer's Sigil$() is a more advanced form of the $(l:bloodmagic:alchemy_array/sigil/divination)Divination Sigil$(). Alongside showing the amount of LP in the bound player's $(l:bloodmagic:altar/soul_network)Soul Network$(/l), it also shows more information when looking at a $(l:bloodmagic:altar/blood_altar)Blood Altar$(/l)." - }, - { - "type": "crafting_2-step_sigil", - "alchemy_table.heading": "Sight Reagent", - "alchemy_table.recipe": "bloodmagic:alchemytable/reagent_sight", - "array.heading": "Seer's Sigil", - "array.recipe": "bloodmagic:array/seersigil", - "array.text": "$(italic)When seeing all is not enough" - }, - { - "type": "text", - "text": "From top to bottom, we have: $(li)The current Tier of the $(l:bloodmagic:altar/blood_altar)Blood Altar$(/l). $(li)The amount of blood currently inside the Altar, and the current total capacity of the Altar. (This defaults to 10,000mb, but may be increased with $(l:bloodmagic:altar/blood_rune/capacity_rune)Runes of Capacity$() and $(l:bloodmagic:altar/blood_rune/aug_capacity_rune)Runes of Augmented Capacity.$() $(li)The current crafting progress, if any. $(li)LP Consumption/Tick - how much LP the Altar will use per tick when crafting. $(li) Current LP Storage of any $(l:bloodmagic:altar/blood_rune/charging_rune)Charging Runes$() you may have." - }, - { - "type": "image", - "images": [ - "bloodmagic:images/entries/sigil/seer_sigil_info.png" - ], - "title": "Seer's Sigil Display", - "border": true, - "text": "The Seer's Sigil's displays this HUD when you are looking at a blood Altar." - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/void.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/void.json deleted file mode 100644 index 6bfa76ab..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/void.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "Void Sigil", - "icon": "bloodmagic:voidsigil", - "category": "bloodmagic:alchemy_array/sigil", - "extra_recipe_mappings":[ - ["bloodmagic:reagentvoid", 1], - ["bloodmagic:voidsigil", 1] - ], - "pages": [ - { - "type": "text", - "text": "The $(item)Void sigil$(), when right-clicked on any fluid, will destroy it at a cost of 50LP per block. Good for clearing out irksome lava flows without all that tedious placing and breaking of individual blocks." - }, - { - "type": "crafting_2-step_sigil", - "alchemy_table.heading": "Void Reagent", - "alchemy_table.recipe": "bloodmagic:alchemytable/reagent_void", - "array.heading": "Void Sigil", - "array.recipe": "bloodmagic:array/voidsigil", - "array.text": "$(italic)Better than a Swiffer\u00AE!" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/water.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/water.json deleted file mode 100644 index e43be9df..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_array/sigil/water.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "name": "Water Sigil", - "icon": "bloodmagic:watersigil", - "category": "bloodmagic:alchemy_array/sigil", - "extra_recipe_mappings":[ - ["bloodmagic:reagentwater", 1], - ["bloodmagic:watersigil", 1] - ], - "pages": [ - { - "type": "text", - "text": "The $(item)Water Sigil$() is a rather simple sigil. By right clicking on a block, you can drain 100LP from your $(l:bloodmagic:altar/soul_network)Soul Network$(/l) to place a source block of water in the world. If there's not enough LP, it will instead drain the toll from your health. Crafted using a $(item)Water Reagent$() and a $(item)Blank Slate.$()" - }, - { - "type": "crafting_2-step_sigil", - "alchemy_table.heading": "Water Reagent", - "alchemy_table.recipe": "bloodmagic:alchemytable/reagent_water", - "array.heading": "Water Sigil", - "array.recipe": "bloodmagic:array/watersigil", - "array.text": "$(italic)Infinite water, anyone?" - }, - { - "type": "image", - "images": [ - "bloodmagic:images/entries/sigil/water_sigil1.png", - "bloodmagic:images/entries/sigil/water_sigil2.png" - ], - "title": "Water Sigil Array", - "border": true, - "text": "The Water Sigil, next to its crafting array, plus its primary use." - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/alchemy_table.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/alchemy_table.json deleted file mode 100644 index 48a57843..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/alchemy_table.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "name": "Alchemy Table", - "icon": "bloodmagic:alchemytable", - "category": "bloodmagic:alchemy_table", - "extra_recipe_mappings":[ - ["bloodmagic:plantoil", 8], - ["bloodmagic:coalsand", 9] - ], - "pages": [ - { - "type": "text", - "text": "The Alchemy Table takes a little LP and a few ingredients to do some wondrous things!$(br2)A lot of its content is NYI. $(br2)Mouse over the LP arrow for more info." - }, - { - "type": "crafting", - "recipe": "bloodmagic:alchemy_table" - }, - { - "type": "image", - "images": [ - "bloodmagic:images/entries/alchemy_table/alchemy_table_gui.png" - ], - "title": "Alchemy Table GUI", - "border": true, - "text": "The Alchemy Table can be inserted into or extracted from. This is how it's configured." - }, - { - "type": "text", - "text": "The $(item)Alchemy Table$() has a number of buttons on its right hand side. These are, in order, $(underline)D$()own, $(underline)U$()p, $(underline)N$()orth, $(underline)S$()outh, $(underline)W$()est, and $(underline)e$()ast. To use them, first click on any slot in the Alchemy Table. (Here, we have selected the central 'finished item' slot, for demonstration.) Next, click on one of these six buttons to toggle whether or not the $(item)Alchemy Table$() should allow $(item)Hoppers$(), pipes, or other such external interference from this face. To return to the table's normal function," - }, - { - "type": "text", - "text": "simply click the slot again to deselect it. The icon displayed in the slot shows whether it is accepting inputs or providing outputs. In the example picture, we are allowing pipes to take from our central slot only on the $(underline)D$()own slot, and any attempts to extract items from other sides will not succeed. $(br2)The following pages document a number of recipes currently available for the Alchemy Table." - }, - - { - "type": "crafting_alchemy_table", - "heading": "Basic Cutting Fluid", - "anchor": "cutting_fluid", - "recipe": "bloodmagic:alchemytable/basic_cutting_fluid", - "text": "Basic Cutting Fluid is used for 2x Ore Processing. It is also used in the $(l:bloodmagic:utility/alchemical_reaction_chamber)Alchemical Reaction Chamber$(/l) and the $(l:bloodmagic:rituals/ritual_list/ritual_crushing)Ritual of the Crusher$() for the same purpose." - }, - { - "type": "2x_crafting_alchemy_table", - "a.heading": "Iron Sand", - "a.recipe": "bloodmagic:alchemytable/sand_iron", - "b.heading": "Gold Sand", - "b.recipe": "bloodmagic:alchemytable/sand_gold" - }, - { - "type": "text", - "text": "The Alchemy Table provides several ways to get vanilla items." - }, - { - "type": "3x_crafting_alchemy_table", - "a.heading": "Grass", - "a.recipe": "bloodmagic:alchemytable/grass_block", - "b.heading": "Leather", - "b.recipe": "bloodmagic:alchemytable/leather_from_flesh", - "c.heading": "Bread", - "c.recipe": "bloodmagic:alchemytable/bread" - }, - { - "type": "2x_crafting_alchemy_table", - "a.heading": "Clay", - "a.recipe": "bloodmagic:alchemytable/clay_from_sand", - "b.heading": "String", - "b.recipe": "bloodmagic:alchemytable/string" - }, - { - "type": "2x_crafting_alchemy_table", - "a.heading": "Flint", - "a.recipe": "bloodmagic:alchemytable/flint_from_gravel", - "b.heading": "Gunpowder", - "b.recipe": "bloodmagic:alchemytable/gunpowder", - "b.text": "Saltpeter NYI in Blood Magic." - }, - { - "type": "3x_crafting_alchemy_table", - "a.heading": "Plant Oil", - "a.recipe": "bloodmagic:alchemytable/plantoil_from_wheat", - "b.recipe": "bloodmagic:alchemytable/plantoil_from_carrots", - "c.recipe": "bloodmagic:alchemytable/plantoil_from_taters" - }, - { - "type": "3x_crafting_alchemy_table", - "a.heading": "Plant Oil Cont.", - "a.recipe": "bloodmagic:alchemytable/plantoil_from_beets", - "b.heading": "Coal Sand", - "b.recipe": "bloodmagic:alchemytable/sand_coal", - "c.heading": "Explosive Powder", - "c.recipe": "bloodmagic:alchemytable/explosive_powder" - } - ] -} diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments.json deleted file mode 100644 index fc0265ce..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "Anointments", - "icon": "bloodmagic:melee_anointment", - "category": "bloodmagic:alchemy_table", - "extra_recipe_mappings":[["bloodmagic:slate_vial", 1]], - "pages": [ - { - "type": "text", - "text": "$(item)Anointments$() are essentially $(item)potions$() for your tools, weapons, and even your $(l:bloodmagic:demon_will/explosive_charges)Charges$(). By right-clicking with the $(item)anointment$() in one hand, it will be applied to the item in your other hand, if possible. Not all anointments work on all equipment! $(br2)Unlike $(item)potions$(), $(item)anointments$() aren't timed; rather, they wear off a bit at a time as your tool or weapon is used." - }, - { - "type": "crafting_alchemy_table", - "heading": "Slate-infused Vial", - "recipe": "bloodmagic:alchemytable/slate_vial", - "text": "A sturdy Vial that can contain otherwise uncontainable mixtures." - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments/bow_power_anointment.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments/bow_power_anointment.json deleted file mode 100644 index 9a93a8ba..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments/bow_power_anointment.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "Iron Tip", - "icon": "bloodmagic:bow_power_anointment", - "category": "bloodmagic:alchemy_table/anointments", - "extra_recipe_mappings":[["bloodmagic:bow_power_anointment", 0]], - "pages": [ - { - "type": "crafting_alchemy_table", - "heading": "Iron Tip", - "recipe": "bloodmagic:alchemytable/bow_power_anointment", - "text": "Increases the damage of fired arrows by 25%. Also stacks with Vanilla enchantments. $(br2)Valid items: Bows, Crossbows.$(br2)Applies: Heavy Shot I (256 shots)" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments/fortune_anointment.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments/fortune_anointment.json deleted file mode 100644 index bda05b21..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments/fortune_anointment.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "Fortuna Extract", - "icon": "bloodmagic:fortune_anointment", - "category": "bloodmagic:alchemy_table/anointments", - "extra_recipe_mappings":[["bloodmagic:fortune_anointment", 0]], - "pages": [ - { - "type": "crafting_alchemy_table", - "heading": "Fortuna Extract", - "recipe": "bloodmagic:alchemytable/fortune_anointment", - "text": "Increases the yield of some harvested blocks. Also stacks with the Fortune enchantment. $(br2)Valid items: Tools, Swords, Charges. $(br2)Applies: Fortunate I (256 blocks)" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments/hidden_knowledge_anointment.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments/hidden_knowledge_anointment.json deleted file mode 100644 index 524f64e9..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments/hidden_knowledge_anointment.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "Miner's Secrets", - "icon": "bloodmagic:hidden_knowledge_anointment", - "category": "bloodmagic:alchemy_table/anointments", - "extra_recipe_mappings":[["bloodmagic:hidden_knowledge_anointment", 0]], - "pages": [ - { - "type": "crafting_alchemy_table", - "heading": "Miner's Secrets", - "recipe": "bloodmagic:alchemytable/hidden_knowledge_anointment", - "text": "Blocks drop exp on successful harvest. Drops +2exp per block. $(br2)Valid items: Tools, Swords, Charges.$(br2)Applies: Miner's Secrets I (256 blocks)" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments/holy_water_anointment.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments/holy_water_anointment.json deleted file mode 100644 index 17e0bc58..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments/holy_water_anointment.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "Holy Water", - "icon": "bloodmagic:holy_water_anointment", - "category": "bloodmagic:alchemy_table/anointments", - "extra_recipe_mappings":[["bloodmagic:holy_water_anointment", 0]], - "pages": [ - { - "type": "crafting_alchemy_table", - "heading": "Holy Water", - "recipe": "bloodmagic:alchemytable/holy_water_anointment", - "text": "Temporarily increases the melee damage dealt to undead mobs by +5. $(br2)Valid items: Tools, Swords.$(br2)Applies: Holy Light I (256 hits)" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments/looting_anointment.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments/looting_anointment.json deleted file mode 100644 index a236c120..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments/looting_anointment.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "Plunderer's Glint", - "icon": "bloodmagic:looting_anointment", - "category": "bloodmagic:alchemy_table/anointments", - "extra_recipe_mappings":[["bloodmagic:looting_anointment", 0]], - "pages": [ - { - "type": "crafting_alchemy_table", - "heading": "Plunderer's Glint", - "recipe": "bloodmagic:alchemytable/looting_anointment", - "text": "Increases the drops from killed mobs. Also stacks with the Looting enchantment.$(br2)Valid items: Tools, Swords.$(br2)Applies: Plundering I (256 hits)" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments/melee_anointment.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments/melee_anointment.json deleted file mode 100644 index 0f9deec8..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments/melee_anointment.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "Honing Oil", - "icon": "bloodmagic:melee_anointment", - "category": "bloodmagic:alchemy_table/anointments", - "extra_recipe_mappings":[["bloodmagic:melee_anointment", 0]], - "pages": [ - { - "type": "crafting_alchemy_table", - "heading": "Honing Oil", - "recipe": "bloodmagic:alchemytable/melee_damage_anointment", - "text": "Temporarily increases the melee damage dealt by +3. $(br2)Valid items: Tools, Swords.$(br2)Applies: Whetstone I (256 hits)" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments/quick_draw_anointment.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments/quick_draw_anointment.json deleted file mode 100644 index 7c19afc0..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments/quick_draw_anointment.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "Dexterity Alkahest", - "icon": "bloodmagic:quick_draw_anointment", - "category": "bloodmagic:alchemy_table/anointments", - "extra_recipe_mappings":[["bloodmagic:quick_draw_anointment", 0]], - "pages": [ - { - "type": "crafting_alchemy_table", - "heading": "Dexterity Alkahest", - "recipe": "bloodmagic:alchemytable/quick_draw_anointment", - "text": "Lowers the draw time of bows and crossbows by 33%. $(br2)Valid items: Bows, Crossbows.$(br2)Applies: Deft Hands I (256 shots)" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments/silk_touch_anointment.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments/silk_touch_anointment.json deleted file mode 100644 index 54fee0d5..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments/silk_touch_anointment.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "Soft Coating", - "icon": "bloodmagic:silk_touch_anointment", - "category": "bloodmagic:alchemy_table/anointments", - "extra_recipe_mappings":[["bloodmagic:silk_touch_anointment", 0]], - "pages": [ - { - "type": "crafting_alchemy_table", - "heading": "Soft Coating", - "recipe": "bloodmagic:alchemytable/silk_touch_anointment", - "text": "Applies Silk Touch to blocks harvested. Does not stack with the vanilla enchantment.$(br2)Valid items: Tools, Swords, Charges.$(br2)Applies: Soft Touch I (256 blocks)" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments/smelting_anointment.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments/smelting_anointment.json deleted file mode 100644 index 693f0660..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/alchemy_table/anointments/smelting_anointment.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "Slow-burning Oil", - "icon": "bloodmagic:smelting_anointment", - "category": "bloodmagic:alchemy_table/anointments", - "extra_recipe_mappings":[["bloodmagic:smelting_anointment", 0]], - "pages": [ - { - "type": "crafting_alchemy_table", - "heading": "Slow-burning Oil", - "recipe": "bloodmagic:alchemytable/smelting_anointment", - "text": "Uses heat to smelt harvested blocks. $(br2)Valid items: Tools, Swords, Charges. $(br2)Applies: Heated Tool I (256 blocks)" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_altar.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_altar.json deleted file mode 100644 index 26acc078..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_altar.json +++ /dev/null @@ -1,178 +0,0 @@ -{ - "name": "The Blood Altar", - "icon": "bloodmagic:altar", - "category": "bloodmagic:altar", - "priority": "true", - "extra_recipe_mappings":[ - ["bloodmagic:daggerofsacrifice", 13] - ], - "pages": [ - { - "type": "text", - "text": "The $(item)Blood Altar$() is the central block of the mod, able to convert raw blood into pure life essence. While it may start off small and insignificant, its strength and size grows throughout the mod, acting as a cornerstone for most of your power." - }, - { - "type": "crafting", - "recipe": "bloodmagic:blood_altar" - }, - { - "type": "text", - "text": "When placed into the world, the Blood Altar converts $(1)Life Essence$() into power to transfigure items placed into it. By right-clicking on the Altar, you may insert one item from your hand into the Altar's internal inventory. Right-clicking with an empty hand will extract the item." - }, - { - "type": "multiblock", - "name": "Tier 1 Blood Altar", - "multiblock":{ - "pattern":[ - ["0"], - ["_"] - ], - "mapping":{ - "0": "bloodmagic:altar" - }, - "symmetrical": true - }, - "text": "The Tier 1 Blood Altar, which has no runes." - }, - { - "type": "text", - "text": "In order for you to add $(1)Life Essence$(), measured as \"LP\", you first have to craft a $(item)Sacrificial Knife$(). By right-clicking in the air with the knife, you can \"extract\" 200LP for the cost of one heart, placing it into a nearby Altar. The Altar starts with a maximum capacity of 10,000LP, and the blood level in the basin indicates the percentage filled. The $(l:bloodmagic:alchemy_array/sigil/divination)Divination Sigil$(/l) allows more detailed information about the Altar." - }, - { - "type": "crafting", - "recipe": "bloodmagic:sacrificial_dagger", - "anchor": "knife", - "text": "Keep in mind that 10% of the total LP the altar can hold will be absorbed into an invisible internal 'tank' used for extracting and inserting Life Essence into the Altar." - }, - { - "type": "text", - "text": "The Blood Altar will attempt to start to craft as soon as an item is placed inside by a player (or after a periodic 5 seconds). The LP inside of the Altar will slowly drain, indicated by red particles, transforming the item. If there is no LP in the Altar, gray smoke will appear to indicate that the Altar is losing progress instead. Once enough LP is consumed (cost multiplied by number in the item stack), the full stack will be transformed into a new item." - }, - { - "type": "text", - "text": "The first item that you will want to craft is a $(l:bloodmagic:altar/soul_network)Weak Blood Orb$(/l), which by default is a diamond plus 2000LP inside of a Tier 1 Blood Altar. All items that can be crafted by the Blood Altar can be found using Just Enough Items (JEI)." - }, - { - "type": "text", - "anchor": "blank_rune", - "text": "To upgrade the Blood Altar, you need to craft $(item)Blood Runes$() and place them around the Altar. Blood Runes act as upgrades to the Altar, and by using more advanced versions of the Blood Runes you can confer different effects on the Altar. The basic version, the $(item)Blank Rune$(), does not give any upgrades barring upgrading the Tier of the Altar." - }, - { - "type": "crafting", - "recipe": "bloodmagic:blood_rune_blank" - }, - { - "type": "text", - "text": "In order to upgrade the Blood Altar to Tier 2, you must place 8 $(item)Blood Runes$() around the Altar. The runes in the cardinals can be upgraded, but the corner runes cannot act as upgrade runes until Tier 3." - }, - { - "type": "multiblock", - "name": "Tier 2 Blood Altar", - "multiblock": { - "pattern":[ - ["___", "_0_", "___"], - ["___", "_A_", "___"], - ["BRB", "R_R", "BRB"] - ], - "mapping":{ - "A": "bloodmagic:altar", - "B": "bloodmagic:blankrune", - "R": "#bloodmagic:altar_components/bloodrune" - }, - "symmetrical": true - }, - "text": "The Tier 2 Blood Altar, which has 8 total runes." - }, - { - "type": "text", - "anchor": "dagger_of_sacrifice", - "text": "Now that you have a Tier 2 Altar, you can look into getting blood from somewhere other than yourself. The $(item)Dagger of Sacrifice$() will allow you to kill any mob (monster or passive) that stands within 2 blocks of your Altar, instantly killing them and granting you a decent sum of LP. You can increase the amount you get per kill with $(l:bloodmagic:altar/blood_rune/sacrifice_rune)Runes of Sacrifice$(). Different entities give different amounts of LP. Check your configs for more info." - }, - { - "type": "crafting_altar", - "heading": "Dagger of Sacrifice", - "recipe": "bloodmagic:altar/daggerofsacrifice", - "text": "Slaughtering villagers for fun and profit!" - }, - { - "type": "text", - "text": "To upgrade the Blood Altar to Tier 3, place 5 $(item)Blood Runes$() one block down and two blocks away from the previous set of runes along each edge. Then place two blocks (indicated by the $(item)Stone Bricks$()) in each corner, starting above the new ring of runes, and then cap each pillar with $(item)Glowstone Blocks$().$(br)To check that it is successfully upgraded, use a $(l:bloodmagic:alchemy_array/sigil/divination)Divination Sigil$(/l) to check the tier. Note that any non-air block can be used for the pillars below the Glowstone." - }, - { - "type": "multiblock", - "name": "Tier 3 Blood Altar", - "multiblock": { - "pattern":[ - ["G_____G", "_______", "_______", "___0___", "_______", "_______", "G_____G"], - ["P_____P", "_______", "_______", "___A___", "_______", "_______", "P_____P"], - ["P_____P", "_______", "__RRR__", "__R_R__", "__RRR__", "_______", "P_____P"], - ["_RRRRR_", "R_____R", "R_____R", "R_____R", "R_____R", "R_____R", "_RRRRR_"] - ], - "mapping":{ - "A": "bloodmagic:altar", - "R": "#bloodmagic:altar_components/bloodrune", - "G": "#bloodmagic:altar_components/glowstone", - "P": "minecraft:stone_bricks" - }, - "symmetrical": true - }, - "text": "The Tier 3 Blood Altar, which has 28 total runes." - }, - { - "type": "text", - "text": "To upgrade the Blood Altar to Tier 4, place 7 $(item) Blood Runes$() one block down and two blocks away from the previous set of runes along each edge. Then place four solid blocks in each corner, starting above the new ring of runes, and then cap each pillar with $(l:bloodmagic:utility/bloodstone_bricks)Bloodstone Bricks$(/l) and/or $(l:bloodmagic:utility/bloodstone_bricks)Large Bloodstone Bricks$(/l)." - }, - { - "type": "multiblock", - "name": "Tier 4 Blood Altar", - "multiblock": { - "pattern":[ - ["B_________B", "___________", "___________", "___________", "___________", "___________", "___________", "___________", "___________", "___________", "B_________B"], - ["P_________P", "___________", "__G_____G__", "___________", "___________", "_____0_____", "___________", "___________", "__G_____G__", "___________", "P_________P"], - ["P_________P", "___________", "__P_____P__", "___________", "___________", "_____A_____", "___________", "___________", "__P_____P__", "___________", "P_________P"], - ["P_________P", "___________", "__P_____P__", "___________", "____RRR____", "____R_R____", "____RRR____", "___________", "__P_____P__", "___________", "P_________P"], - ["P_________P", "___________", "___RRRRR___", "__R_____R__", "__R_____R__", "__R_____R__", "__R_____R__", "__R_____R__", "___RRRRR___", "___________", "P_________P"], - ["__RRRRRRR__", "___________", "R_________R", "R_________R", "R_________R", "R_________R", "R_________R", "R_________R", "R_________R", "___________", "__RRRRRRR__"] - ], - "mapping":{ - "A": "bloodmagic:altar", - "R": "#bloodmagic:altar_components/bloodrune", - "B": "#bloodmagic:altar_components/bloodstone", - "G": "#bloodmagic:altar_components/glowstone", - "P": "minecraft:stone_bricks" - }, - "symmetrical": true - }, - "text": "The Tier 4 Blood Altar, which has 56 total runes." - }, - { - "type": "text", - "text": "[WIP Notes]$(br)[Tier-5 has No Content yet!]" - }, - { - "type": "multiblock", - "name": "Tier 5 Blood Altar", - "multiblock": { - "pattern":[ - ["_________________", "_________________", "_________________", "___B_________B___", "_________________", "_________________", "_________________", "_________________", "_________________", "_________________", "_________________", "_________________", "_________________", "___B_________B___", "_________________", "_________________", "_________________"], - ["_________________", "_________________", "_________________", "___P_________P___", "_________________", "_____G_____G_____", "_________________", "_________________", "________0________", "_________________", "_________________", "_____G_____G_____", "_________________", "___P_________P___", "_________________", "_________________", "_________________"], - ["_________________", "_________________", "_________________", "___P_________P___", "_________________", "_____P_____P_____", "_________________", "_________________", "________A________", "_________________", "_________________", "_____P_____P_____", "_________________", "___P_________P___", "_________________", "_________________", "_________________"], - ["_________________", "_________________", "_________________", "___P_________P___", "_________________", "_____P_____P_____", "_________________", "_______RRR_______", "_______R_R_______", "_______RRR_______", "_________________", "_____P_____P_____", "_________________", "___P_________P___", "_________________", "_________________", "_________________"], - ["_________________", "_________________", "_________________", "___P_________P___", "_________________", "______RRRRR______", "_____R_____R_____", "_____R_____R_____", "_____R_____R_____", "_____R_____R_____", "_____R_____R_____", "______RRRRR______", "_________________", "___P_________P___", "_________________", "_________________", "_________________"], - ["N_______________N", "_________________", "_________________", "_____RRRRRRR_____", "_________________", "___R_________R___", "___R_________R___", "___R_________R___", "___R_________R___", "___R_________R___", "___R_________R___", "___R_________R___", "_________________", "_____RRRRRRR_____", "_________________", "_________________", "N_______________N"], - ["__RRRRRRRRRRRRR__", "_________________", "R_______________R", "R_______________R", "R_______________R", "R_______________R", "R_______________R", "R_______________R", "R_______________R", "R_______________R", "R_______________R", "R_______________R", "R_______________R", "R_______________R", "R_______________R", "_________________", "__RRRRRRRRRRRRR__"] - ], - "mapping":{ - "A": "bloodmagic:altar", - "R": "#bloodmagic:altar_components/bloodrune", - "B": "#bloodmagic:altar_components/bloodstone", - "G": "#bloodmagic:altar_components/glowstone", - "N": "#bloodmagic:altar_components/beacon", - "P": "minecraft:stone_bricks" - }, - "symmetrical": true - }, - "text": "The Tier 5 Blood Altar, which has 108 total runes." - } - ] -} diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_rune/acceleration_rune.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_rune/acceleration_rune.json deleted file mode 100644 index 14048e61..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_rune/acceleration_rune.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "Acceleration Rune", - "icon": "bloodmagic:accelerationrune", - "category": "bloodmagic:altar/blood_rune", - "pages": [ - { - "type": "text", - "text": "The $(item)Acceleration Rune$() increases the rate of a couple operations. While normally the operations of the $(l:bloodmagic:altar/blood_rune/charging_rune)Charging Rune$(/l) and $(l:bloodmagic:altar/blood_rune/dislocation_rune)Displacement Rune$(/l) occur every 20 ticks, one tick of the delay is removed per rune, down to a minimum of 1 operation per tick." - }, - { - "type": "crafting", - "recipe": "bloodmagic:blood_rune_acceleration" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_rune/aug_capacity_rune.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_rune/aug_capacity_rune.json deleted file mode 100644 index 2ff083b0..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_rune/aug_capacity_rune.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "Rune of Aug. Capacity", - "icon": "bloodmagic:bettercapacityrune", - "category": "bloodmagic:altar/blood_rune", - "pages": [ - { - "type": "text", - "text": "The $(item)Rune of Augmented Capacity$() increases the capacity of the $(l:bloodmagic:altar/blood_altar)Blood Altar$(/l) by a multiplicative +7.5% per rune. The Augmented Capacity runes apply $(o)after$() the regular $(l:bloodmagic:altar/blood_rune/capacity_rune)Capacity runes$()." - }, - { - "type": "crafting", - "title": "Rune of Aug. Capacity", - "recipe": "bloodmagic:blood_rune_aug_capacity" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_rune/capacity_rune.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_rune/capacity_rune.json deleted file mode 100644 index 93ca32cd..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_rune/capacity_rune.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "Rune of Capacity", - "icon": "bloodmagic:altarcapacityrune", - "category": "bloodmagic:altar/blood_rune", - "pages": [ - { - "type": "text", - "text": "The $(item)Rune of Capacity$() increases the capacity of the $(l:bloodmagic:altar/blood_altar)Blood Altar$(/l) by an additive +20% per rune." - }, - { - "type": "crafting", - "recipe": "bloodmagic:blood_rune_capacity" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_rune/charging_rune.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_rune/charging_rune.json deleted file mode 100644 index f9a77e09..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_rune/charging_rune.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "Charging Rune", - "icon": "bloodmagic:chargingrune", - "category": "bloodmagic:altar/blood_rune", - "pages": [ - { - "type": "text", - "text": "The $(item)Charging Rune$() is a unique Rune upgrade. When the $(l:bloodmagic:altar/blood_altar)Blood Altar$() is not crafting nor filling a $(l:bloodmagic:altar/soul_network)Blood Orb$(), it will syphon LP to charge an internal buffer. When next an item is placed inside of the Blood Altar, it will instantaneously consume the stored charge and apply it to the crafting of the item at a 1:1 ratio." - }, - { - "type": "text", - "text": " The Blood Altar does a charging tick once per 20 in-game ticks, which is reduced by 1 per $(l:bloodmagic:altar/blood_rune/acceleration_rune)Acceleration Rune.$(/l)$(br) The speed that the Blood Altar charges at per charging tick is: [10LP x $(l:bloodmagic:altar/blood_rune/charging_rune)Charging Runes$() x (1 + $(l:bloodmagic:altar/blood_rune/speed_rune)Speed Runes$()/10)] $(br)The maximum charge that a Blood Altar can hold is 1000LP per $(item)Charging Rune$(), which is then multiplied by: [(capacity of the main Blood Altar tank)/20000] if that value is above 1." - }, - { - "type": "crafting", - "recipe": "bloodmagic:blood_rune_charging" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_rune/dislocation_rune.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_rune/dislocation_rune.json deleted file mode 100644 index d6b5a64b..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_rune/dislocation_rune.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "Displacement Rune", - "icon": "bloodmagic:dislocationrune", - "category": "bloodmagic:altar/blood_rune", - "pages": [ - { - "type": "text", - "text": "The $(item)Displacement Rune$() increases the flowrate of LP into and out of the altar." - }, - { - "type": "crafting", - "recipe": "bloodmagic:blood_rune_displacement" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_rune/orb_rune.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_rune/orb_rune.json deleted file mode 100644 index c936f70b..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_rune/orb_rune.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "Rune of The Orb", - "icon": "bloodmagic:orbcapacityrune", - "category": "bloodmagic:altar/blood_rune", - "pages": [ - { - "type": "text", - "text": "The $(item)Rune of The Orb$() increases the capacity of the $(item)Blood Orb$() that is inside of the Altar by +2% additively per rune while it is inside of the Altar." - }, - { - "type": "crafting", - "recipe": "bloodmagic:blood_rune_orb" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_rune/sacrifice_rune.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_rune/sacrifice_rune.json deleted file mode 100644 index 56fbbd23..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_rune/sacrifice_rune.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "Rune of Sacrifice", - "icon": "bloodmagic:sacrificerune", - "category": "bloodmagic:altar/blood_rune", - "pages": [ - { - "type": "text", - "text": "The $(item)Rune of Sacrifice$() increases the LP gained in the Blood Altar through means that take health from non-player entities. Each rune gives a bonus of +10% additively per rune." - }, - { - "type": "crafting", - "recipe": "bloodmagic:blood_rune_sacrifice" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_rune/self_sacrifice_rune.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_rune/self_sacrifice_rune.json deleted file mode 100644 index 190204a9..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_rune/self_sacrifice_rune.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "Rune of Self Sacrifice", - "icon": "bloodmagic:selfsacrificerune", - "category": "bloodmagic:altar/blood_rune", - "pages": [ - { - "type": "text", - "text": "The $(item)Rune of Self Sacrifice$() increases the LP gained in the Blood Altar through means that use a player's health. Each rune gives a bonus of +10% additively per rune." - }, - { - "type": "crafting", - "recipe": "bloodmagic:blood_rune_self_sacrifice" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_rune/speed_rune.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_rune/speed_rune.json deleted file mode 100644 index 6bf4192b..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/blood_rune/speed_rune.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "Speed Rune", - "icon": "bloodmagic:speedrune", - "category": "bloodmagic:altar/blood_rune", - "pages": [ - { - "type": "text", - "text": "The $(item)Speed Rune$() increases all of the crafting operations of the Blood Altar. The crafting speed (and speed that the progress is lost when empty) increases by an additive +20% per rune." - }, - { - "type": "crafting", - "recipe": "bloodmagic:blood_rune_speed" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/redstone_automation.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/redstone_automation.json deleted file mode 100644 index 8e9c5be0..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/redstone_automation.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "name": "Redstone and Automation", - "icon": "minecraft:redstone", - "category": "bloodmagic:altar", - "pages": [ - { - "type": "text", - "text": "The $(l:bloodmagic:altar/blood_altar)Blood Altar$() is a fantastic tool, but standing around and waiting for slates to craft is not your idea of a good time. Luckily, items and LP can be automatically piped in and out of the altar, albeit with a few caveats. $(br2)While a simple $(item)Hopper$() lets you pipe items in, the Altar won't stop it from inputting more than 1 at a time. It will happily craft 64 slates in one" - }, - { - "type": "text", - "text": "go, consuming 64 times as much LP as usual to do so - but if you can't supply said LP fast enough, you're going to run into trouble. $(br2)Additionally, the altar makes no distinction between input and output, so without some sort of filter, items will be pulled in and out as fast as your item transfer system can handle. Perhaps a look at the Routing Nodes will be helpful... (once they're implemented, that is.)" - }, - { - "type": "text", - "text": "The altar also supports the transfer of blood, both to and from an external tank. Simply hook up your fluid pipe of choice and you can store excess blood for later crafts. $(br2)Note that the transfer speed is very slow by default. If you want to speed it up, you'd best look into $(l:bloodmagic:altar/blood_rune/acceleration_rune)Acceleration Runes$() and $(l:bloodmagic:altar/blood_rune/dislocation_rune)Displacement Runes$()." - }, - { - "type": "text", - "text": "Don't forget that this blood isn't taken directly from the altar itself, but rather from a second, secret internal tank. This tank can hold up to 10% of the blood that the altar itself can, so if the numbers don't appear to be adding up exactly right, or if blood appears to be vanishing from your altar, this is probably where it's going. The same limitations apply to blood being piped in." - }, - { - "type": "text", - "text": "(Also not implemented:) $(strike)The blood altar's LP value can be read via a comparator on the side, similar to a vanilla chest. $(br2)If you place a $(item)Bloodstone Brick$()$(strike) underneath the altar, the comparator will instead read the value of the $(l:bloodmagic:altar/soul_network)Soul Network$(/l) of the owner of any orb that is placed into the Altar. $(br2)The signal strength depends on the size of the orb in the altar, not the maximum LP of the network, so if you have" - }, - { - "type": "text", - "text": "$(strike)500,000 LP, a Weak Blood Orb would show as completely full, but a Master Blood Orb would show as only half full. This can be used to, for example, deactivate certain rituals when you are running low on LP, to ensure you don't run out. $(br2)Lastly, placing a $(item)Redstone Lamp$()$(strike) underneath the altar will make it output a redstone signal upon finishing a crafting operation. With a bit of cunning, this should allow you to fully automate the production of slates." - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/slates.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/slates.json deleted file mode 100644 index 65b6b3d1..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/slates.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "name": "Tiers of Slates", - "icon": "bloodmagic:blankslate", - "category": "bloodmagic:altar", - "extra_recipe_mappings":[ - ["bloodmagic:blankslate", 1], - ["bloodmagic:reinforcedslate", 1], - ["bloodmagic:infusedslate", 2], - ["bloodmagic:demonslate", 2] - ], - "pages": [ - { - "type": "text", - "text": "The $(l:bloodmagic:altar/blood_altar)Blood Altar$(/l)'s main use is the production of $(item)Slates$(). Each tier of slate requires the previous tier and a more powerful altar than the last. $(br2)Note that $(item)Etherial Slates$() aren't currently implemented by default, but may be if you're playing in a modpack. Check JEI for details." - }, - { - "type": "2x_crafting_altar", - "a.heading": "Blank Slate", - "a.recipe": "bloodmagic:altar/slate", - "b.heading": "Reinforced Slate", - "b.recipe": "bloodmagic:altar/reinforcedslate" - }, - { - "type": "2x_crafting_altar", - "a.heading": "Imbued Slate", - "a.recipe": "bloodmagic:altar/imbuedslate", - "b.heading": "Demonic Slate", - "b.recipe": "bloodmagic:altar/demonicslate" - } - ] -} - - diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/soul_network.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/soul_network.json deleted file mode 100644 index ae6945fe..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/altar/soul_network.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "name": "Soul Network", - "icon": "bloodmagic:weakbloodorb", - "category": "bloodmagic:altar", - "extra_recipe_mappings":[ - ["bloodmagic:weakbloodorb", 3], - ["bloodmagic:apprenticebloodorb", 3], - ["bloodmagic:magicianbloodorb", 4], - ["bloodmagic:masterbloodorb", 4] - ], - "pages": [ - { - "type": "text", - "text": "The Soul Network is the network that connects the user's soul to all of their bound items and blocks. Functionally, it is a global storage of LP unique to each player that can be added to and extracted from, using the player's bound items as an itermediary. When a player first uses an item that can be bound to a Soul Network, it will bind to the player and will be labeled as being" - }, - { - "type": "text", - "text": "\"owned\" by that player - any action that the item does that has an LP cost will drain from the owner's Soul Network. In some cases, if the item cannot get its LP from the Soul Network, it will instead directly take the LP from the user's health.$(br2) In order to fill the user's Soul Network the user will need to construct a $(item)Blood Orb$(). Blood orbs suck up LP from either the user when they are right-clicked at a 1 heart:200LP ratio, or by a bound orb" - }, - { - "type": "text", - "text": "being placed inside of a $(l:bloodmagic:altar/blood_altar)Blood Altar$(/l) with LP.$(br2) There is a separate Blood Orb that can be created for each Tier of the Blood Altar:$(li)$(item)Weak Blood Orb$(), Max capacity: 5k LP.$(li)$(item)Apprentice Blood Orb$(), Max capacity: 25k LP. $(li)$(item)Magician Blood Orb$(), Max capacity: 150k LP.$(li)$(item)Master Blood Orb$(), Max capacity: 1M LP." - }, - { - "type": "2x_crafting_altar", - "a.heading": "Weak Blood Orb", - "a.recipe": "bloodmagic:altar/weakbloodorb", - "b.heading": "Apprentice Blood Orb", - "b.recipe": "bloodmagic:altar/apprenticebloodorb" - }, - { - "type": "2x_crafting_altar", - "a.heading": "Magician Blood Orb", - "a.recipe": "bloodmagic:altar/magicianbloodorb", - "b.heading": "Master Blood Orb", - "b.recipe": "bloodmagic:altar/masterbloodorb" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/aspected_will.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/aspected_will.json deleted file mode 100644 index d61578b6..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/aspected_will.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "name": "Demon Will Aspects", - "icon": "bloodmagic:vengefulcrystal", - "category": "bloodmagic:demon_will", - "extra_recipe_mappings":[ - ["bloodmagic:steadfastdemoncrystal", 2], - ["bloodmagic:corrosivedemoncrystal", 2], - ["bloodmagic:destructivedemoncrystal", 2], - ["bloodmagic:vengefuldemoncrystal", 2], - ["bloodmagic:steadfastcrystal", 2], - ["bloodmagic:corrosivecrystal", 2], - ["bloodmagic:destructivecrystal", 2], - ["bloodmagic:vengefulcrystal", 2], - ["bloodmagic:basemonstersoul_vengeful", 2], - ["bloodmagic:basemonstersoul_corrosive", 2], - ["bloodmagic:basemonstersoul_steadfast", 2], - ["bloodmagic:basemonstersoul_destructive", 2] - ], - "pages": [ - { - "type": "text", - "text": "Unleashing $(l:bloodmagic:demon_will/demon_will)Demon Will$() into the atmosphere was definitely an excellent idea. Not only has it proven most useful in empowering $(item)Rituals$(), you have also successfully condensed it into a $(l:bloodmagic:demon_will/crystallized_will)Crystal Cluster$(), and are wondering what to turn your eye to next. $(br2)These $(item)Crystals$() feel somehow... conflicted, to you. A certain $(l:bloodmagic:rituals/ritual_list/ritual_crystal_split)Ritual$() may help coax them out into purer forms..." - }, - { - "type": "image", - "images": [ - "bloodmagic:images/entries/demon_will/will_splitting.png" - ], - "title": "Aspects of Will", - "border": true, - "text": "The $(l:bloodmagic:rituals/ritual_list/ritual_crystal_split)Resonance of the Faceted Crystal$() ritual in action." - }, - { - "type": "text", - "text": "Now we have $(item)Crystallized Will$() in four spicy new flavours! on the $(water)Water Rune$() we have $(steadfast)Steadfast Will$(), on the $(air)Air Rune$() we get $(destructive)Destructive Will$(), on the $(fire)Fire Rune$() comes $(vengeful)Vengeful Will$() and on the $(earth)Earth Rune$() we find $(corrosive)Corrosive Will.$() $(br2)These various new types of Will can be burned in the $(item)Demon Crucible$() just like Raw Will, and from there can be fed into various Rituals to great and fascinating effect." - }, - { - "type": "text", - "text": "However, they also change how your Sentient Tools behave, making them more powerful.$(br) $(li)$(raw)Raw Will$(): Increases damage and attack speed. $(corrosive)$(li)Corrosive Will$(): Attacks have a chance to apply poison or wither to your foes, otherwise same as $(raw)Raw$(). $(vengeful)$(li)Vengeful Will$(): increases damage, but not as much as $(raw)Raw$(). Increases attack speed more than any other type. Gives a movement speed buff that increases with higher amounts of Will." - }, - { - "type": "text", - "text": "$(steadfast)$(li)Steadfast Will$(): Increases damage (but not as much as $(raw)Raw$()) and grants Absorption after a kill. $(destructive)$(li)Destructive Will$(): Increases damage more than any other will type, but increases attack speed more slowly than any other type. Top Tier is still faster than an unempowered tool / equivalent iron tool, but slower than any other will type." - }, - { - "type": "text", - "text": "You may be wondering: \"How on earth do I get this will into a usable form?\" Well, the answer is simple. Just place an EMPTY $(l:bloodmagic:demon_will/soul_gem)Tartaric Gem$() into a $(l:bloodmagic:demon_will/soul_forge)Hellfire Forge$() in the same chunk as a $(item)Demon Crucible$(), then feed the Demon Crucible with Will Crystals of the desired aspect. Your $(l:bloodmagic:demon_will/soul_gem)Tartaric Gem$() will fill with that aspect of will. You can change which kind of will your $(raw)Sentient Tools$() use by right-clicking while holding them." - }, - { - "type": "text", - "text": "Note that your $(raw)Sentient Tools$() will take on the aspect of the largest amount of $(raw)Will$() in your inventory. If you're carrying 10 $(corrosive)Corrosive Will$() in one $(l:bloodmagic:demon_will/soul_gem)Tartaric Gem$(), and 1,000 $(raw)Raw Will$() in another, then your sword will remain $(raw)Raw$()." - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/crystallized_will.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/crystallized_will.json deleted file mode 100644 index 6bc4ef7e..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/crystallized_will.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "name": "Crystallized Will", - "icon": "bloodmagic:defaultcrystal", - "category": "bloodmagic:demon_will", - "extra_recipe_mappings":[ - ["bloodmagic:demoncrucible", 1], - ["bloodmagic:demoncrystallizer", 4], - ["bloodmagic:rawdemoncrystal", 4], - ["bloodmagic:defaultcrystal", 4] - ], - "pages": [ - { - "type": "text", - "text": "Now that you have plenty of $(l:bloodmagic:demon_will/demon_will)Demon Will$() in your $(l:bloodmagic:demon_will/soul_gem)Tartaric Gem$(), it's time to explore what happens when you unleash it upon the world. $(br)First off, you'll need to create a $(item)Demon Crucible$(), and then fill it with $(l:bloodmagic:demon_will/demon_will)Demon Will$()." - }, - { - "type": "crafting_soulforge", - "heading": "Demon Crucible", - "recipe": "bloodmagic:soulforge/demon_crucible", - "text": "This will burn $(l:bloodmagic:demon_will/demon_will)Demon Will$() and release it into the atmosphere. Put a charged $(l:bloodmagic:demon_will/soul_gem)Tartaric Gem$() or any aspect of $(item)Demon Crystal$() into it and let it run." - }, - { - "type": "image", - "images": [ - "bloodmagic:images/entries/demon_will/demon_crucible.png" - ], - "title": "Demon Crucible", - "border": true, - "text": "The $(item)Demon Crucible$(), with a $(l:bloodmagic:demon_will/soul_gem)Tartaric Gem$() inside it." - }, - { - "type": "text", - "text": "Now we have $(raw)Raw Will$() in the atmosphere. Great, now what? $(br2)Some $(l:bloodmagic:rituals/ritual_tinkerer)Rituals$() benefit from $(raw)Raw Will$(), but the main benefit from this is the ability to create $(item)Demon Will Crystals$() and from there, split them into their $(l:bloodmagic:demon_will/aspected_will)Aspects$(). $(br2)Once you have some of these Aspected Will Crystals, you can burn them in the crucible to unleash them into the atmosphere for your rituals to benefit from." - }, - { - "type": "crafting_soulforge", - "heading": "Demon Crystallizer", - "recipe": "bloodmagic:soulforge/demon_crystallizer", - "text": "This will slowly consume $(l:bloodmagic:demon_will/demon_will)Demon Will$() from the atmosphere to produce $(item)Will Crystals$(). The first spire costs about 100 will to form, and all subsequent spires cost 40 each, but can be burned for 50 in the $(item)Demon Crucible$(). The largest $(item)Crystal Cluster$() can be up to 7 spires." - }, - { - "type": "text", - "text": "If you have at least 1,000 total Will in your inventory (Across any number of $(l:bloodmagic:demon_will/soul_gem)Tartaric Gems$()), you can harvest these crystals by right-clicking the spire with an empty hand. This will remove all but the central spire. $(br2)However, if you have not got this much will, $(italic)really$() need that central spire, or are just in a hurry, you can harvest the whole lot with a pickaxe." - }, - { - "type": "relations", - "title": "Related Links", - "entries": [ - "rituals/ritual_tinkerer", - "rituals/rituals_list/ritual_crystal_split", - "rituals/rituals_list/ritual_crystal_harvest", - "demon_will/aspected_will" - ], - "text": "There's more I can do, I can feel it..." - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/demon_will.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/demon_will.json deleted file mode 100644 index 053561f4..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/demon_will.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "Demon Will", - "icon": "bloodmagic:basemonstersoul", - "category": "bloodmagic:demon_will", - "extra_recipe_mappings":[["bloodmagic:basemonstersoul", 0]], - "pages": [ - { - "type": "text", - "text": "Once you have a $(l:bloodmagic:altar/blood_altar)Blood Altar$(), you'll need to gather a few $(item)Demon Wills$(). There are two ways to get Demon Will:$(br)$(li)Killing a mob that has been hit with a $(l:bloodmagic:demon_will/soul_snare)Soul Snare$(/l) and is killed when white particle effects appear.$(li)By killing a hostile mob with a $(l:bloodmagic:demon_will/sentient_sword)Sentient Sword$().$(br)Since you are just beginning to use the mod, you will not yet have a $(l:bloodmagic:demon_will/sentient_sword)Sentient Sword$()," - }, - { - "type": "text", - "text": "and thus will need to use a $(l:bloodmagic:demon_will/soul_snare)Soul Snare$(). $(br2)$(item)Demon Will$() is a recurring resource in $(6)Blood Magic$(), and is used to power the $(l:bloodmagic:demon_will/soul_forge)Hellfire Forge$(). $(br2)In the lore of $(6)Blood Magic$(), $(raw)Demon Will$() is the residual effect of when a demon imbues its will into the bodies of the dead." - }, - { - "type": "image", - "images": ["bloodmagic:images/entries/demon_will/demon_will.png"], - "title": "Demon Will", - "border": true - }, - { - "type": "text", - "text": "Once you have some $(raw)Will$(), you can use it to craft useful tools in the $(l:bloodmagic:demon_will/soul_forge)Hellfire Forge,$(). If you find them cluttering up your inventory, perhaps a $(l:bloodmagic:demon_will/soul_gem)Tartaric Gem$() may help." - } - ] -} diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/explosive_charges.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/explosive_charges.json deleted file mode 100644 index f99d722b..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/explosive_charges.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "name": "Explosive Charges", - "icon": "bloodmagic:shaped_charge", - "category": "bloodmagic:demon_will", - "extra_recipe_mappings":[ - ["bloodmagic:shaped_charge", 2], - ["bloodmagic:deforester_charge", 4], - ["bloodmagic:vein_charge", 6], - ["bloodmagic:fungal_charge", 8] - ], - "pages":[ - { - "type": "text", - "text": "Mining and foresting is all well and good for those who refuse to dream big, but what self-respecting sanguimancer would ever stoop to that? $(br2)With this in mind, you have devised some devious little devices. Simply throw them at some pesky trees, rocks, or whatever else you wish to cease to be and wait for them to self-ignite." - }, - { - "type": "text", - "text": "Not only that, you can improve their functionality by $(item)Anointing$() them with certain ingredients and a little $(raw)Will$(), as described after each entry. $(br2)The currently avaliable anointments are as follows: $(li)Fortunate - broken blocks are affected by $(item)Fortune I$(). $(li)Heated Tool - Broken blocks are $(item)Smelted$(). $(li)Soft Touch - Broken blocks are affected by $(item)Silk Touch$()." - }, - { - "type": "crafting_soulforge", - "heading": "Shaped Charge", - "recipe": "bloodmagic:soulforge/shaped_charge", - "anchor":"shaped_charge", - "text": "The $(item)Shaped Charge$() will destroy a 5x5x5 cube facing whichever side of a block it lands on, dropping all blocks as though mined with a pickaxe. It even works on Obsidian, and provides a most satisfying $(o)KABOOM$() whilst doing so." - }, - { - "type": "3x_crafting_soulforge", - "a.heading": "Fortunate", - "a.recipe": "bloodmagic:soulforge/shaped_charge_fortune_1", - "b.heading": "Heated Tool", - "b.recipe": "bloodmagic:soulforge/shaped_charge_smelting", - "c.heading": "Soft Touch", - "c.recipe": "bloodmagic:soulforge/shaped_charge_silk_touch" - }, - { - "type": "crafting_soulforge", - "heading": "Deforester Charge", - "recipe": "bloodmagic:soulforge/deforester_charge", - "anchor":"deforester_charge", - "text": "The $(item)Deforester Charge$() is for felling trees. It can be used on logs or leaves, and will fell all but the mightiest of trees, breaking up to $(item)two stacks$() of logs at a time (and neatly stripping away any leaves it encounters in the process!) Even the giant trees of the Jungle will fall in a matter of seconds." - }, - { - "type": "3x_crafting_soulforge", - "a.heading": "Fortunate", - "a.recipe": "bloodmagic:soulforge/deforester_charge_fortune_1", - "b.heading": "Heated Tool", - "b.recipe": "bloodmagic:soulforge/deforester_charge_smelting", - "c.heading": "Soft Touch", - "c.recipe": "bloodmagic:soulforge/deforester_charge_silk_touch" - }, - { - "type": "crafting_soulforge", - "heading": "Controlled Charge", - "recipe": "bloodmagic:soulforge/vein_charge", - "anchor":"controlled_charge", - "text": "The $(item)Controlled Charge$(), only destroys blocks $(underline)identical to the block it lands on$(). It will destroy up to $(item)Three stacks$() of blocks, seeking out from the original point. As with other charges, all mined blocks will be dropped." - }, - { - "type": "3x_crafting_soulforge", - "a.heading": "Fortunate", - "a.recipe": "bloodmagic:soulforge/vein_charge_fortune_1", - "b.heading": "Heated Tool", - "b.recipe": "bloodmagic:soulforge/vein_charge_smelting", - "c.heading": "Soft Touch", - "c.recipe": "bloodmagic:soulforge/vein_charge_silk_touch" - }, - { - "type": "crafting_soulforge", - "heading": "Fungal Charge", - "recipe": "bloodmagic:soulforge/fungal_charge", - "anchor":"fungal_charge", - "text": "The $(item)Fungal Charge$() is for felling giant mushrooms, both in the Overworld and the Nether. Although doubtful that you will ever reach this in a single charge, it can break up to $(item)three stacks of blocks$()." - }, - { - "type": "3x_crafting_soulforge", - "a.heading": "Fortunate", - "a.recipe": "bloodmagic:soulforge/fungal_charge_fortune_1", - "b.heading": "Heated Tool", - "b.recipe": "bloodmagic:soulforge/fungal_charge_smelting", - "c.heading": "Soft Touch", - "c.recipe": "bloodmagic:soulforge/fungal_charge_silk_touch" - } - ] -} diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/sentient_sword.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/sentient_sword.json deleted file mode 100644 index 00058e13..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/sentient_sword.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "Sentient Sword", - "icon": "bloodmagic:soulsword", - "category": "bloodmagic:demon_will", - "extra_recipe_mappings":[["bloodmagic:soulsword", 1]], - "pages": [ - { - "type": "text", - "text": "The $(item)Sentient Sword$() is a much more effective tool for collecting $(l:bloodmagic:demon_will/demon_will)Demon Will$() than $(l:bloodmagic:demon_will/soul_snare)Soul Snares$() could ever hope to be. It may seem weak at first, but it is powered by the Wills you carry, so crafting a $(l:bloodmagic:demon_will/soul_gem)Tartaric Gem$() is a must. $(br2) Note that the sword, as with all $(l:bloodmagic:demon_will/sentient_tools)Sentient Tools$(), can be repaired with $(l:bloodmagic:demon_will/crystallized_will)Crystallized Will$() in an Anvil." - }, - { - "type": "crafting_soulforge", - "heading": "Sentient Sword", - "recipe": "bloodmagic:soulforge/sentientsword", - "text": "This sword will serve you well." - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/sentient_tools.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/sentient_tools.json deleted file mode 100644 index f8e80fd2..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/sentient_tools.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "name": "Sentient Tools", - "icon": "bloodmagic:soulpickaxe", - "category": "bloodmagic:demon_will", - "extra_recipe_mappings":[ - ["bloodmagic:soulpickaxe", 1], - ["bloodmagic:soulscythe", 3], - ["bloodmagic:soulaxe", 5], - ["bloodmagic:soulshovel", 7] - ], - "pages": [ - { - "type": "text", - "text": "The $(l:bloodmagic:demon_will/sentient_sword)Sentient Sword$() has proven to be a resounding success. You find yourself wondering how other tools may react to a similar treatment... $(br2) Note that these tools, as with the $(l:bloodmagic:demon_will/sentient_sword)Sentient sword$(), can be repaired with $(l:bloodmagic:demon_will/crystallized_will)Crystallized Will$() in an Anvil." - }, - { - "type": "crafting_soulforge", - "heading": "Sentient Pickaxe", - "recipe": "bloodmagic:soulforge/sentientpickaxe", - "text": "This pickaxe improves with Will, cutting through stone with ease. With no Will to power it, it is only slightly better than the $(item)Iron Pickaxe$() it was crafted from; However, with a full enough $(l:bloodmagic:demon_will/soul_gem)Tartaric Gem$(), you forsee it surpassing even a $(item)Netherite Pickaxe$()." - }, - { - "type": "text", - "text": "The $(item)Sentient Scythe$() is a slightly different tool to its iron counterpart. Infusing it with will has transmuted it into a fearsone weapon. While slow and not as powerful as the other weapons, its great swings will damage all enemies in its range, making it an excellent choice for crowd control." - }, - { - "type": "crafting_soulforge", - "heading": "Sentient Scythe", - "recipe": "bloodmagic:soulforge/sentientscythe", - "text": "As with the pickaxe, with no Will to power your scythe, it is comparatively blunt and unwieldy; However, with a full enough $(l:bloodmagic:demon_will/soul_gem)Tartaric Gem$(), you forsee it becoming a devestating tool. $(br)Did we mention that it still functions as a hoe?" - }, - { - "type": "text", - "text": "Much like the $(item)Sentient Pickaxe$(), the $(item)Sentient Axe$() is a noticable improvement over its Iron counterpart. Additionally, it gets a noticable buff in its damage output, making it a fearsome weapon for those who don't mind its unwieldy nature." - }, - { - "type": "crafting_soulforge", - "heading": "Sentient Axe", - "recipe": "bloodmagic:soulforge/sentientaxe", - "text": "As with the pickaxe, with no Will to power your axe, it is only slightly better than the $(item)Iron Axe$() it was crafted from; However, with a full enough $(l:bloodmagic:demon_will/soul_gem)Tartaric Gem$(), you forsee it surpassing even a $(item)Netherite Axe$()." - }, - { - "type": "text", - "text": "Much like the $(item)Sentient Pickaxe$(), the $(item)Sentient Shovel$() is a noticable improvement over its Iron counterpart, even without additional $(l:bloodmagic:demon_will/demon_will)Demon Will$() to power it." - }, - { - "type": "crafting_soulforge", - "heading": "Sentient Shovel", - "recipe": "bloodmagic:soulforge/sentientshovel", - "text": "As with the pickaxe, with no Will to power your shovel, it is only slightly better than the $(item)Iron shovel$() it was crafted from; However, with a full enough $(l:bloodmagic:demon_will/soul_gem)Tartaric Gem$(), you forsee it surpassing even a $(item)Netherite Shovel$()." - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/soul_forge.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/soul_forge.json deleted file mode 100644 index 0f14fd5a..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/soul_forge.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "Hellfire Forge", - "icon": "bloodmagic:soulforge", - "category": "bloodmagic:demon_will", - "pages": [ - { - "type": "text", - "text": "The $(item)Hellfire Forge$() is one of the core crafting mechanics of $(6)Blood Magic$(), alongside the $(l:bloodmagic:altar/blood_altar)Blood Altar$(/l) itself. Here, you can work with the $(l:bloodmagic:demon_will/demon_will)Demon Will$() you have harvested from mobs, to allow you to create $(l:bloodmagic:demon_will/sentient_tools)Sentient Tools$(), including the $(l:bloodmagic:demon_will/sentient_sword)Sentient Sword$(), $(l:bloodmagic:demon_will/soul_gem)Tartaric Gems$(), various $(item)reagents$(), $(l:bloodmagic:alchemy_array/functional_arrays/arcane_ash)Arcane Ash$(), and many things besides." - }, - { - "type": "crafting", - "recipe": "bloodmagic:soul_forge" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/soul_gem.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/soul_gem.json deleted file mode 100644 index b39397ab..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/soul_gem.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "name": "Tartaric Gems", - "icon": "bloodmagic:soulgemgreater", - "category": "bloodmagic:demon_will", - "extra_recipe_mappings":[ - ["bloodmagic:soulgempetty", 1], - ["bloodmagic:soulgemlesser", 3], - ["bloodmagic:soulgemcommon", 5], - ["bloodmagic:soulgemgreater", 7] - ], - "pages": [ - { - "type": "text", - "text": "$(l:bloodmagic:demon_will/demon_will)Demon Will$() is a very useful resource, but the fragments you have been getting so far are decidedly lacking in power. What you need is a storage item; A $(item)Tartaric Gem$() seems just the thing. What's more, it can absorb any leftover $(l:bloodmagic:demon_will/demon_will)Demon Will$() you might have lying around. Just drop them onto the floor and your shiny new gem will absorb them." - }, - { - "type": "crafting_soulforge", - "heading": "Petty Tartaric Gem", - "recipe": "bloodmagic:soulforge/pettytartaricgem", - "text": "Your first gem will hold a maximum of 64 $(l:bloodmagic:demon_will/demon_will)Will$(). Much more compact than before!" - }, - { - "type": "text", - "text": "Your $(item)Petty Tartaric Gem$() is a useful tool, but it's clearly lacking in power. By carefully working it with $(item)Diamond$(), $(item)Lapis$(), and $(item)Redstone$(), you have found a way to quadruple its storage capabilities." - }, - { - "type": "crafting_soulforge", - "heading": "Lesser Tartaric Gem", - "recipe": "bloodmagic:soulforge/lessertartaricgem", - "text": "This reinforced gem can hold up to 256 $(l:bloodmagic:demon_will/demon_will)Will$(). $(br2)Note: You only need one gem when upgrading - the $(item)Hellfire Forge$() will draw $(raw)Will$() from the gem it's crafting before trying to use will from the gem in its Gem Slot. Don't worry, the newly crafted gem will hold any leftover $(raw)Will$() from the process." - }, - { - "type": "text", - "text": "Your $(item)Lesser Tartaric Gem$() is a noted improvement, but once more you chafe under its limitations. To progress further will involve focusing on your $(l:bloodmagic:altar/blood_altar)Blood Altar$(), as you require the powers of an $(l:bloodmagic:altar/slates)Imbued Slate$(). Combining this slate with your gem and further refining it with another $(item)Diamond$() and a $(item)Block of Gold$(), you have found a way to once again quadruple its storage capabilities." - }, - { - "type": "crafting_soulforge", - "heading": "Common Tartaric Gem", - "recipe": "bloodmagic:soulforge/commontartaricgem", - "text": "This intricate gem can hold an impressive 1,024 $(l:bloodmagic:demon_will/demon_will)Will$()." - }, - { - "type": "text", - "text": "You have clearly outdone yourself with the creation of the $(item)Common Tartaric Gem$(), but you feel there is still more you can do. However, getting more out of your gem will involve the culmination of all your work so far. Not only do you need a $(l:bloodmagic:altar/slates)Demonic Slate$(), you also require a $(l:bloodmagic:utility/alchemical_reaction_chamber#blood_shard)Weak Blood Shard$() $(o)and$() a $(l:bloodmagic:demon_will/crystallized_will)Demon Will Crystal$(). Of course, it will come with rewards to match, powering your $(l:bloodmagic:demon_will/sentient_tools)Sentient Tools$() like nothing you have seen before..." - }, - { - "type": "crafting_soulforge", - "heading": "Greater Tartaric Gem", - "recipe": "bloodmagic:soulforge/greatertartaricgem", - "text": "This masterpiece of artifice can hold an astounding 4,096 $(l:bloodmagic:demon_will/demon_will)Will$()." - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/soul_snare.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/soul_snare.json deleted file mode 100644 index 29babbd6..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/soul_snare.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "Your First Will", - "icon": "bloodmagic:soulsnare", - "category": "bloodmagic:demon_will", - "priority": "true", - "pages": [ - { - "type": "crafting_altar", - "heading": "Soul Snare", - "recipe": "bloodmagic:altar/soul_snare", - "text": "$(item)Soul Snares$() are your gateway into the $(l:bloodmagic:demon_will/demon_will)Demon Will$() portion of $(6)Blood Magic$()." - }, - { - "type": "text", - "text": "Using the Snare is simple enough - craft a good quantity of them and throw them at hostile mobs. White particle effects will appear around them; then it's time to go in for the kill. On death, they will drop a $(l:bloodmagic:demon_will/demon_will)Demon Will$(). Before you ask, yes, the Looting enchantment will improve your odds. Once you've gathered a couple, you can get to work on crafting yourself a $(l:bloodmagic:demon_will/sentient_sword)Sentient Sword$() and a $(l:bloodmagic:demon_will/soul_gem)Tartaric Gem$() - these will make collecting $(l:bloodmagic:demon_will/demon_will)Demon Will$() much easier." - }, - { - "type": "image", - "images": [ - "bloodmagic:images/entries/demon_will/snare_particles.png" - ], - "title": "Snare on Skeleton", - "border": true, - "text": "A skeleton with white particles after hit by a snare." - } - ] -} - - - diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/throwing_daggers.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/throwing_daggers.json deleted file mode 100644 index 5f38fb40..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/demon_will/throwing_daggers.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "name": "Throwing Daggers", - "icon": "bloodmagic:throwing_dagger", - "category": "bloodmagic:demon_will", - "extra_recipe_mappings":[ - ["bloodmagic:throwing_dagger", 1], - ["bloodmagic:throwing_dagger_syringe", 2], - ["bloodmagic:slate_ampoule", 3] - ], - "pages":[ - { - "type": "text", - "text": "$(item)Bows$() and $(item)Crossbows$() are fine enough in their way, but sifting through $(item)Gravel$() for $(item)Flint$() and murdering chickens for their $(item)Feathers$() is, frankly, beneath you. These shiny (and extremely sharp) $(item)Throwing Daggers$() also have some quite devious effects, if you do say so yourself." - }, - { - "type": "crafting_soulforge", - "heading": "Iron Throwing Dagger", - "recipe": "bloodmagic:soulforge/throwing_dagger", - "anchor":"iron_throwing_dagger", - "text": "The $(item)Iron Throwing Dagger$() is a fast-hitting attack, dealing 10 damage with a decent cooldown. Not only that, but if you have some $(l:bloodmagic:demon_will/demon_will)Demon Will$() on you (be it in its raw form, or stored within a $(l:bloodmagic:demon_will/soul_gem)Tartaric Gem$(), it will drop $(raw)Will$() as a $(l:bloodmagic:demon_will/sentient_sword)Sentient Sword$() would." - }, - { - "type": "crafting_soulforge", - "heading": "Syringe Throwing Dagger", - "recipe": "bloodmagic:soulforge/throwing_dagger_syringe", - "anchor":"syringe_throwing_dagger", - "text": "The $(item)Syringe Throwing Dagger$() is for the Sanguimancer more interested of the acquisition of $(blood)Blood$() than $(raw)Will$(). While it deals slightly less damage, it is noticeably cheaper, and enemies killed by this weapon have a chance of dropping a $(item)Slate Ampoule$() - or more, if they're hearty enough." - }, - { - "type": "spotlight", - "item": "bloodmagic:slate_ampoule", - "title": "Slate Ampoule", - "text": "These delightful little vials can be crushed when near a $(l:bloodmagic:altar/blood_altar)Blood Altar$() in order to transfer $(blood)500 LP$() into it, destroying the $(item)Ampoule$() in the process. These gains are unaffected by any $(item)Runes$() you may have." - } - ] -} diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/activation_crystals.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/activation_crystals.json deleted file mode 100644 index e5cb0378..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/activation_crystals.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "Activation Crystals", - "icon": "bloodmagic:activationcrystalweak", - "category": "bloodmagic:rituals", - "extra_recipe_mappings":[ - ["bloodmagic:activationcrystalweak", 1], - ["bloodmagic:activationcrystalawakened", 3] - ], - "pages": [ - { - "type": "text", - "text": "Your rituals require more than simply the correct arrangement of blocks and Sigils. An effort of will is required to open a channel from your Soul Network to the ritual, and The $(item)Activation Crystal$() will allow you to focus yourself enough to activate your rituals." - }, - { - "type": "crafting_altar", - "heading": "Weak Activation Crystal", - "recipe": "bloodmagic:weak_activation_crystal", - "text": "This crystal should do for now." - }, - { - "type": "text", - "text": "Eventually, you will find rituals that are too demanding for your current crystal. For now, you do not know what to do, save that a stronger crystal will be needed..." - }, - { - "type": "text", - "title": "Awakened Activation Crystal", - "text": "Not Yet Implemented." - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_basics.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_basics.json deleted file mode 100644 index e1be7278..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_basics.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "name": "Rituals - Getting Started", - "icon": "bloodmagic:activationcrystalcreative", - "category": "bloodmagic:rituals", - "priority": "true", - "pages": [ - { - "type": "text", - "text": "Once you have gotten your $(l:bloodmagic:altar/blood_altar)Blood Altar$(/l) to Tier 3, you can delve into the wonderful world of Rituals. $(br2)For working with rituals, you will require the following: $(li)An $(l:bloodmagic:rituals/activation_crystals)Activation Crystal$(). At tier 3 only the $(item)Weak Crystal$() is avaliable. $(li)A $(item)Master Ritual Stone$(). Every ritual requires exactly one of these at its centre." - }, - { - "type": "text", - "text": "$(li)Enough Ritual Stones to built the Ritual. $(li)(Recommended) A $(l:bloodmagic:rituals/ritual_diviner)Ritual Diviner$(). Although not required, it will make ritual construction significantly easier. $(br2)Building a ritual is relatively straightforward. Simply shift+click with the Ritual Diviner in hand until it displays the name of the desired ritual. Check the number of runes required by mousing over it in your" - }, - { - "type": "text", - "text": "inventory and holding shift. $(br2)Place down a Master Ritual Stone, and hold right-click until all the stones have been placed and painted with the correct element. Finally, right click the Master Ritual Stone with your Activation Crystal. If you've done everything right, you should get a message saying 'A rush of energy flows through the ritual!'. The ritual is now active." - }, - { - "type": "text", - "text": "If this does not occur, a few things may have gone wrong. If you instead get text saying 'You feel a push, but are too weak to complete this ritual', then you do not have enough LP in your Soul Network to activate the ritual. $(br2) If the message reads 'You feel that these runes are not configured correctly...', then something has gone wrong in the placement of the runes. Check the area for any blockages (such as grass, stone, etc) and try again." - }, - { - "type": "text", - "text": "Remember that some rituals extend several blocks above and below the Master Ritual Stone. If you get no error, ensure that the activation crystal is bound to your soul network - this can be accomplished by right-clicking it. $(br2) It is important to note that the crystal does not have to be bound to YOUR network - if you can get a hold of another player's crystal, you can activate rituals using their blood-pool. Guard yours well!" - }, - { - "type": "text", - "text": "one last note; all rituals respond to a $(item)Redstone$() signal, so sticking a lever on the side of the Master Ritual Stone is a good way to deactivate it. You can combine this knowledge with some of the information in $(l:bloodmagic:altar/redstone_automation)Redstone and Automation$() to ensure your rituals shut down automatically long before your Soul Network runs dry." - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_diviner.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_diviner.json deleted file mode 100644 index 4cbe1545..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_diviner.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "name": "The Ritual Diviner", - "icon": "bloodmagic:ritualdiviner", - "category": "bloodmagic:rituals", - "extra_recipe_mappings":[ - ["bloodmagic:airscribetool", 4], - ["bloodmagic:firescribetool", 4], - ["bloodmagic:waterscribetool", 5], - ["bloodmagic:earthscribetool", 5], - ["bloodmagic:duskscribetool", 6] - ], - "pages": [ - { - "type": "text", - "text": "Crafting rituals is an intricate business; Even if you have the correct $(item)Inscription Tools$(), you can't just slap runic inscriptions down any old how and expect things to happen. Luckily, the $(item)Ritual Diviner$() is here to help." - }, - { - "type": "crafting", - "recipe": "bloodmagic:ritual_diviner_0" - }, - { - "type": "text", - "text": "The base Ritual Diviner requires one of each $(item)Elemental Inscription Tool$() for its construction, and thus a tier 3 $(l:bloodmagic:altar/blood_altar)Blood Altar$(/l). The four base Elemental Inscription Tools can be crafted in your Altar for 1,000 LP each, as defined on the following pages. You can also use these tools to inscribe runes by hand, but this should only seriously be used for decorative purposes, as it is both slow and inaccurate." - }, - { - "type": "crafting", - "recipe": "bloodmagic:ritual_diviner_1", - "anchor": "dusk", - "text": "There is also an augmented version of the Ritual Diviner, for creating more powerful rituals." - }, - { - "type": "2x_crafting_altar", - "a.heading": "Inscription Tool: Air", - "a.recipe": "bloodmagic:altar/air_tool", - "b.heading": "Inscription Tool: Fire", - "b.recipe": "bloodmagic:altar/fire_tool" - }, - { - "type": "2x_crafting_altar", - "a.heading": "Inscription Tool: Water", - "a.recipe": "bloodmagic:altar/water_tool", - "b.heading": "Inscription Tool: Earth", - "b.recipe": "bloodmagic:altar/earth_tool" - }, - { - "type": "crafting_altar", - "heading": "Inscription Tool: Dusk", - "recipe": "bloodmagic:altar/dusk_tool" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_animal_growth.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_animal_growth.json deleted file mode 100644 index a9ab94b4..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_animal_growth.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "name": "Ritual of the Shepherd", - "icon": "minecraft:white_wool", - "category": "bloodmagic:rituals/ritual_list", - "pages": [ - { - "type": "multiblock", - "name": "Ritual of the Shepherd", - "multiblock":{ - "pattern":[ - ["_EDE_", - "A_W_A", - "DW0WD", - "A_W_A", - "_EDE_"] - ], - "mapping":{ - "0": "bloodmagic:masterritualstone", - "W": "bloodmagic:waterritualstone", - "A": "#bloodmagic:ritual_stones/air_or_earth", - "E": "#bloodmagic:ritual_stones/earth_or_air", - "D": "bloodmagic:duskritualstone" - }, - "symetrical": true - }, - "text": "Use a $(l:bloodmagic:rituals/ritual_diviner#dusk)Ritual Diviner [Dusk]$(/l) for easier construction." - }, - { - "type": "text", - "text": "Increases the maturity rate of baby animals within its range.$(br2)$(water)Water Runes: 4$(br)$(air)Air Runes: 4$(br)$(br)$(earth)Earth Runes: 4$(br)$()Dusk Runes: 4$(br2)$()Total Runes: 16" - }, - { - "type": "spotlight", - "item": "bloodmagic:defaultcrystal", - "title": "Raw", - "text": "Increases the speed of the ritual based on the total amount of $(raw)Raw Will$() in the Aura." - }, - { - "type": "spotlight", - "item": "bloodmagic:vengefulcrystal", - "title": "Vengeful", - "text": "Decreases the time it takes for adults to breed again." - }, - { - "type": "spotlight", - "item": "bloodmagic:destructivecrystal", - "title": "Destructive", - "text": "Causes adults that have not bred lately to run at mobs and explode." - }, - { - "type": "spotlight", - "item": "bloodmagic:steadfastcrystal", - "title": "Steadfast", - "text": "Automatically breeds adults within its area using items in the connected chest." - }, - { - "type": "spotlight", - "item": "bloodmagic:ritualtinkerer", - "title": "Range", - "text": "(Growth) Animals within this range will grow much faster. $(br) $(li)Maximum Volume: Full Range. $(li)Horizontal Radius: 7 $(li)Vertical Radius: 7" - }, - { - "type": "spotlight", - "item": "bloodmagic:ritualtinkerer", - "title": "Range", - "text": "(Chest) Chest for breeding items (if properly augmented, requires $(steadfast)Steadfast Will$()).$(br) $(li)Maximum Volume: 1 $(li)Horizontal Radius: 3 $(li)Vertical Radius: 3" - } - ] -} - - diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_armour_evolve.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_armour_evolve.json deleted file mode 100644 index ffc86706..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_armour_evolve.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "name": "Ritual of Living Evolution", - "icon": "bloodmagic:livingplate", - "category": "bloodmagic:rituals/ritual_list", - "pages": [ - { - "type": "multiblock", - "name": "Ritual of Living Evolution", - "multiblock":{ - "pattern":[ - ["_________", "_________", "_________", "____E____", "___E_E___", "____E____", "_________", "_________", "_________"], - ["_________", "_E_____E_", "_________", "___D_D___", "_________", "___D_D___", "_________", "_E_____E_", "_________"], - ["_________", "_E_____E_", "_________", "_________", "_________", "_________", "_________", "_E_____E_", "_________"], - ["_________", "_E_____E_", "_________", "___D_D___", "_________", "___D_D___", "_________", "_E_____E_", "_________"], - ["____E____", "_E_____E_", "__FF_FF__", "__FD_DF__", "E___0___E", "__FD_DF__", "__FF_FF__", "_E_____E_", "____E____"] - ], - "mapping":{ - "0": "bloodmagic:masterritualstone", - "F": "bloodmagic:fireritualstone", - "E": "bloodmagic:earthritualstone", - "D": "bloodmagic:duskritualstone" - }, - "symetrical": true - }, - "text": "Use a $(l:bloodmagic:rituals/ritual_diviner#dusk)Ritual Diviner [Dusk]$(/l) for easier construction." - }, - { - "type": "text", - "text": "Increases the amount of maximum Upgrade Points on your Living Armor to 300.$(br2)$(fire)Fire Runes: 12$(br)$(earth)Earth Runes: 24$(br)$()Dusk Runes: 12$(br2)$()Total Runes: 48" - } - ] -} diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_crushing.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_crushing.json deleted file mode 100644 index 62b053e0..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_crushing.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "name": "Ritual of the Crusher", - "icon": "minecraft:iron_pickaxe", - "category": "bloodmagic:rituals/ritual_list", - "pages": [ - { - "type": "multiblock", - "name": "Ritual of the Crusher", - "multiblock":{ - "pattern":[ - ["__A__", "_____", "A___A", "_____", "__A__"], - ["D_F_D", "__E__", "FE0EF", "__E__", "D_F_D"] - ], - "mapping":{ - "0": "bloodmagic:masterritualstone", - "A": "bloodmagic:airritualstone", - "F": "bloodmagic:fireritualstone", - "E": "bloodmagic:earthritualstone", - "D": "bloodmagic:duskritualstone" - }, - "symetrical": true - }, - "text": "Use a $(l:bloodmagic:rituals/ritual_diviner#dusk)Ritual Diviner [Dusk]$(/l) for easier construction." - }, - { - "type": "text", - "text": "Breaks blocks within its $(item)Crushing Range$() and places the items into the linked $(item)Chest$().$(br2)$(air)Air Runes: 4$(br)$(fire)Fire Runes: 4$(br)$(earth)Earth Runes: 4$(br)$()Dusk Runes: 4$(br2)$()Total Runes: 16" - }, - { - "type": "spotlight", - "item": "bloodmagic:defaultcrystal", - "title": "Raw", - "text": "Increases the speed of the ritual based on the total amount of $(raw)Raw Will$() in the Aura." - }, - { - "type": "spotlight", - "item": "bloodmagic:corrosivecrystal", - "title": "Corrosive", - "text": "All blocks are broken to be processed with a form of $(l:bloodmagic:alchemy_table/alchemy_table#cutting_fluid)Cutting Fluid$(). Overrides $(item)Silk Touch$() where applicable." - }, - { - "type": "spotlight", - "item": "bloodmagic:vengefulcrystal", - "title": "Vengeful", - "text": "Compresses the inventory on successful operation (e.g. coal into Coal Blocks, Redstone into Blocks of Redstone, etc). Currently only does one compression per operation." - }, - { - "type": "spotlight", - "item": "bloodmagic:destructivecrystal", - "title": "Destructive", - "text": "Blocks are broken down forcefully: all blocks broken are affected by $(item)Fortune III.$()" - }, - { - "type": "spotlight", - "item": "bloodmagic:steadfastcrystal", - "title": "Steadfast", - "text": "Causes all blocks that are broken to be picked up with $(item)Silk Touch$(). Overrides $(item)Fortune$() where applicable." - }, - { - "type": "spotlight", - "item": "bloodmagic:ritualtinkerer", - "title": "Range", - "text": "(Chest) The location of the inventory that the ritual will place the broken blocks into. $(br) $(li)Maximum Volume: 1 $(li)Horizontal Radius: 3 $(li)Vertical Radius: 3" - }, - { - "type": "spotlight", - "item": "bloodmagic:ritualtinkerer", - "title": "Range", - "text": "(Crushing) The blocks that the ritual will break. $(br) $(li)Maximum Volume: 50 $(li)Horizontal Radius: 10 $(li)Vertical Radius: 10" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_crystal_harvest.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_crystal_harvest.json deleted file mode 100644 index cba3241c..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_crystal_harvest.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "name": "Crack of the Fractured Crystal", - "icon": "bloodmagic:defaultcrystal", - "category": "bloodmagic:rituals/ritual_list", - "pages": [ - { - "type": "multiblock", - "name": "Crack of the Fractured Crystal", - "multiblock":{ - "pattern":[ - ["_______", "_______", "___D___", "__D_D__", "___D___", "_______", "_______"], - ["ED___DE", "D_____D", "__A_A__", "___0___", "__A_A__", "D_____D", "ED___DE"], - ["E_FFF_E", "___F___", "F__F__F", "FFF_FFF", "F__F__F", "___F___", "E_FFF_E"] - ], - "mapping":{ - "0": "bloodmagic:masterritualstone", - "A": "bloodmagic:airritualstone", - "F": "bloodmagic:fireritualstone", - "E": "bloodmagic:earthritualstone", - "D": "bloodmagic:duskritualstone" - }, - "symetrical": true - }, - "text": "Use a $(l:bloodmagic:rituals/ritual_diviner#dusk)Ritual Diviner [Dusk]$(/l) for easier construction." - }, - { - "type": "text", - "text": "Breaks $(raw)Demon Will$() Crystal Clusters of all aspects within its range, dropping the results on top of the crystals. $(br2)$(air)Air Runes: 4 $(br)$(fire)Fire Runes: 20 $(br)$(earth)Earth Runes: 8 $(br)$()Dusk Runes: 12 $(br2)$()Total Runes: 44" - }, - { - "type": "spotlight", - "item": "bloodmagic:ritualtinkerer", - "title": "Range", - "text": "(Crystal) All $(raw)Demon Will$() crystal clusters have a single crystal broken off, spawning the crystal into the world. If there is only one crystal on the cluster, it will not break it. $(br) $(li)Maximum Volume: 250 $(li)Horizontal Radius: 5 $(li)Vertical Radius: 7" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_crystal_split.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_crystal_split.json deleted file mode 100644 index 85f767bc..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_crystal_split.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "name": "Resonance of the Faceted Crystal", - "icon": "bloodmagic:vengefulcrystal", - "category": "bloodmagic:rituals/ritual_list", - "pages": [ - { - "type": "multiblock", - "name": "Resonance of the Faceted Crystal", - "multiblock":{ - "pattern":[ - ["__D__", "_BFB_", "DE0AD", "_BWB_", "__D__"], - ["_D_D_", "D___D", "_____", "D___D", "_D_D_"] - ], - "mapping":{ - "0": "bloodmagic:masterritualstone", - "B": "bloodmagic:ritualstone", - "W": "#bloodmagic:ritual_stones/water_earth_fire_air", - "A": "#bloodmagic:ritual_stones/air_water_earth_fire", - "F": "#bloodmagic:ritual_stones/fire_air_water_earth", - "E": "#bloodmagic:ritual_stones/earth_fire_air_water", - "D": "bloodmagic:duskritualstone" - }, - "symetrical": false - }, - "text": "Use a $(l:bloodmagic:rituals/ritual_diviner#dusk)Ritual Diviner [Dusk]$(/l) for easier construction." - }, - { - "type": "text", - "text": "Splits apart a well-grown $(raw)Raw Crystal Cluster$() into several aspected crystal clusters. For additional setup information, see the next page. For more information on Aspected Will, see $(l:bloodmagic:demon_will/aspected_will)Aspected Will$(). $(br2)$(blank)Blank Runes: 4 $(br)$(water)Water Runes: 1 $(br)$(air)Air Runes: 1 $(br)$(fire)Fire Runes: 1 $(br)$(earth)Earth Runes: 1 $(br)$()Dusk Runes: 12 $(br2)$()Total Runes: 20" - }, - { - "type": "image", - "title": "Ritual Setup", - "images": ["bloodmagic:images/entries/demon_will/will_splitting.png"], - "border": true, - "text": "Recommended setup for the Resonance of the Faceted Crystal ritual." - }, - { - "type": "text", - "text": "This ritual takes a well grown (5 spires) $(l:bloodmagic:demon_will/crystallized_will)Raw Crystal Cluster$(/l) located 2 blocks above the $(item)Master Ritual Stone$(), and splits it into new single spires of each $(l:bloodmagic:demon_will/aspected_will)Aspected Will$(/l) Crystal Clusters located directly above the 4 elemental Ritual Stones. This spacing is designed to accommodate a $(item)Demon Crystallizer$() on top of the $(item)Master Ritual Stone$().$(br2)For information on growing Demon Will Crystals, please see $(l:bloodmagic:demon_will/crystallized_will)Crystallized Will$(/l)." - } - ] -} diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_ellipse.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_ellipse.json deleted file mode 100644 index 553d3e51..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_ellipse.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "name": "Focus of the Ellipsoid", - "icon": "minecraft:bucket", - "category": "bloodmagic:rituals/ritual_list", - "pages": [ - { - "type": "multiblock", - "name": "Focus of the Ellipsoid", - "multiblock":{ - "pattern":[ - ["_____AAA___", - "_____A_____", - "__WWW__EE__", - "F_W_____E__", - "F___D_D_E__", - "FF___0___FF", - "__E_D_D___F", - "__E_____W_F", - "__EE__WWW__", - "_____A_____", - "___AAA_____"] - ], - "mapping":{ - "0": "bloodmagic:masterritualstone", - "W": "#bloodmagic:ritual_stones/water_or_earth", - "A": "#bloodmagic:ritual_stones/air_or_fire", - "F": "#bloodmagic:ritual_stones/fire_or_air", - "E": "#bloodmagic:ritual_stones/earth_or_water", - "D": "bloodmagic:duskritualstone" - }, - "symetrical": false - }, - "text": "Use a $(l:bloodmagic:rituals/ritual_diviner#dusk)Ritual Diviner [Dusk]$(/l) for easier construction." - }, - { - "type": "text", - "text": "Creates a hollow spheroid around the ritual using the blocks in the attached chest. Good for building complicated shapes, such as the mighty gold dome above your Evil Lair. ... You do have one of those, right? $(br2)$(water)Water Runes: 8$(br)$(air)Air Runes: 8$(br)$(fire)Fire Runes: 8$(br)$(earth)Earth Runes: 8$(br)$()Dusk Runes: 4$(br2)$()Total Runes: 36" - }, - { - "type": "spotlight", - "item": "bloodmagic:ritualtinkerer", - "title": "Range", - "text": "(Chest) The location of the inventory that the ritual will grab blocks from to place in the world. $(br) $(li)Maximum Volume: 1 $(li)Horizontal Radius: 3 $(li)Vertical Radius: 3" - }, - { - "type": "spotlight", - "item": "bloodmagic:ritualtinkerer", - "title": "Range", - "text": "(Placement) The range that the ritual will place its blocks in. Note that the Spheroid is centered on the ritual - if one side is shorter than the side opposite, the spheroid will be truncated. $(br) $(li)Maximum Volume: Full Range. $(li)Horizontal Radius: 32 $(li)Vertical Radius: 32" - } - ] -} diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_feathered_knife.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_feathered_knife.json deleted file mode 100644 index 03865209..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_feathered_knife.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "name": "Ritual of the Feathered Knife", - "icon": "bloodmagic:sacrificialdagger", - "category": "bloodmagic:rituals/ritual_list", - "pages": [ - { - "type": "multiblock", - "name": "Ritual of the Feathered Knife", - "multiblock":{ - "pattern":[ - ["_EE___EE_", "EA_____AE", "E_______E", "____D____", "___D0D___", "____D____", "E_______E", "EA_____AE", "_EE___EE_"], - ["__F___F__", "_________", "F___W___F", "___A_A___", "__W___W__", "___A_A___", "F___W___F", "_________", "__F___F__"] - ], - "mapping":{ - "0": "bloodmagic:masterritualstone", - "W": "bloodmagic:waterritualstone", - "A": "bloodmagic:airritualstone", - "F": "bloodmagic:fireritualstone", - "E": "bloodmagic:earthritualstone", - "D": "bloodmagic:duskritualstone" - }, - "symetrical": true - }, - "text": "Use a $(l:bloodmagic:rituals/ritual_diviner#dusk)Ritual Diviner [Dusk]$(/l) for easier construction." - }, - { - "type": "text", - "text": "Drains health from players in its area and puts the LP into a nearby blood altar. LP Gains are affected by $(l:bloodmagic:altar/blood_rune/self_sacrifice_rune)Runes of Self Sacrifice.$() $(br2)$(water)Water Runes: 4$() $(br)$(air)Air Runes: 8$() $(br)$(fire)Fire Runes: 8$() $(br)$(earth)Earth Runes: 16$() $(br)Dusk Runes: 4 $(br2)Total Runes: 40" - }, - { - "type": "spotlight", - "item": "bloodmagic:defaultcrystal", - "title": "Raw", - "text": "Increases the speed of the ritual based on the total amount of $(raw)Raw Will$() in the Aura." - }, - { - "type": "spotlight", - "item": "bloodmagic:corrosivecrystal", - "title": "Corrosive", - "text": "Uses the player's current Incense Bonus (if any) to increase the yield. Stand near an $(l:bloodmagic:utility/incense_altar)Incense Altar$() to maintain this bonus." - }, - { - "type": "spotlight", - "item": "bloodmagic:vengefulcrystal", - "title": "Vengeful", - "text": "Sets the minimum health for sacrificing to 10%. Overridden by $(steadfast)Steadfast$() for the Owner if active." - }, - { - "type": "spotlight", - "item": "bloodmagic:destructivecrystal", - "title": "Destructive", - "text": "Increases the yield of the ritual based on the total amount of $(destructive)Destructive Will$() in the Aura." - }, - { - "type": "spotlight", - "item": "bloodmagic:steadfastcrystal", - "title": "Steadfast", - "text": "Sets the minimum health for sacrificing from 30% to 70%." - }, - { - "type": "spotlight", - "item": "bloodmagic:ritualtinkerer", - "title": "Range", - "text": "(Altar) This range defines the area that the ritual searches for the $(l:bloodmagic:altar/blood_altar)Blood Altar$(/l). Changing this will either expand or limit the range to a certain region. $(br) $(li)Maximum Volume: Full Range. $(li)Horizontal Radius: 10 $(li)Vertical Radius: 15" - }, - { - "type": "spotlight", - "item": "bloodmagic:ritualtinkerer", - "title": "Range", - "text": "(Damage) This defines where the ritual will damage a player. Players inside of this range will receive damage over time up to the specified limit. $(br) $(li)Maximum Volume: Full Range. $(li)Horizontal Radius: 25 $(li)Vertical Radius: 15" - } - ] -} - - - - diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_green_grove.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_green_grove.json deleted file mode 100644 index 736054b7..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_green_grove.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "name": "Ritual of the Green Grove", - "icon": "minecraft:bone_meal", - "category": "bloodmagic:rituals/ritual_list", - "pages": [ - { - "type": "multiblock", - "name": "Ritual of the Green Grove", - "multiblock":{ - "pattern":[ - ["EWE", - "W0W", - "EWE"] - ], - "mapping":{ - "0": "bloodmagic:masterritualstone", - "E": "bloodmagic:earthritualstone", - "W": "bloodmagic:waterritualstone" - }, - "symetrical": true - }, - "text": "Use a $(l:bloodmagic:rituals/ritual_diviner)Ritual Diviner$(/l) for easier construction." - }, - { - "type": "text", - "text": "Grows crops within its area.$(br2)$(water)Water Runes: 4$() $(br)$(earth)Earth Runes: 4$() $(br2)Total Runes: 8" - }, - { - "type": "spotlight", - "item": "bloodmagic:defaultcrystal", - "title": "Raw", - "text": "Increases the speed of all ritual operations based on the total amount of $(raw)Raw Will$() in the Aura." - }, - { - "type": "spotlight", - "item": "bloodmagic:corrosivecrystal", - "title": "Corrosive", - "text": "Entities within range are attacked by nearby plants, leeching away their life to feed their own growth." - }, - { - "type": "spotlight", - "item": "bloodmagic:vengefulcrystal", - "title": "Vengeful", - "text": "Increases the rate that a growth tick is successful." - }, - { - "type": "spotlight", - "item": "bloodmagic:destructivecrystal", - "title": "Destructive", - "text": "Increases the maximum growth range of the ritual based on the total amount of $(destructive)Destructive Will$() in the Aura." - }, - { - "type": "spotlight", - "item": "bloodmagic:steadfastcrystal", - "title": "Steadfast", - "text": "Seeds are replanted and blocks are hydrated within the specified range." - }, - { - "type": "spotlight", - "item": "bloodmagic:ritualtinkerer", - "title": "Range", - "text": "(Growth) The area that the ritual will grow plants in. $(br) $(li)Maximum Volume: 81 $(li)Horizontal Radius: 4 $(li)Vertical Radius: 4" - }, - { - "type": "spotlight", - "item": "bloodmagic:ritualtinkerer", - "title": "Range", - "text": "(Steadfast) Blocks within this range are rehydrated into farmland, and seeds within the area are planted nearby. $(br) $(li)Maximum Volume: Full Range. $(li)Horizontal Radius: 15 $(li)Vertical Radius: 15" - }, - { - "type": "spotlight", - "item": "bloodmagic:ritualtinkerer", - "title": "Range", - "text": "(Corrosive) Entities in this area have their life drained to grow nearby crops. $(br) $(li)Maximum Volume: Full Range. $(li)Horizontal Radius: 15 $(li)Vertical Radius: 15" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_harvest.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_harvest.json deleted file mode 100644 index 615e679b..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_harvest.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "Reap of the Harvest Moon", - "icon": "minecraft:wheat", - "category": "bloodmagic:rituals/ritual_list", - "pages": [ - { - "type": "multiblock", - "name": "Reap of the Harvest Moon", - "multiblock":{ - "pattern":[ - ["_WE_EW_", - "W__E__W", - "E_D_D_E", - "_E_0_E_", - "E_D_D_E", - "W__E__W", - "_WE_EW_"] - ], - "mapping":{ - "0": "bloodmagic:masterritualstone", - "W": "bloodmagic:waterritualstone", - "E": "bloodmagic:earthritualstone", - "D": "bloodmagic:duskritualstone" - }, - "symetrical": true - }, - "text": "Use a $(l:bloodmagic:rituals/ritual_diviner#dusk)Ritual Diviner [Dusk]$(/l) for easier construction." - }, - { - "type": "text", - "text": "Harvests plants within its range, dropping the results on the ground.$(br2)$(water)Water Runes: 8$(br)$(earth)Earth Runes: 12$(br)$()Dusk Runes: 4$(br2)$()Total Runes: 24" - }, - { - "type": "spotlight", - "item": "bloodmagic:ritualtinkerer", - "title": "Range", - "text": "(Harvesting) Plants within this range will be harvested. $(br) $(li)Maximum Volume: Full Range. $(li)Horizontal Radius: 15 $(li)Vertical Radius: 15" - } - ] -} - diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_lava.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_lava.json deleted file mode 100644 index f9a8c693..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_lava.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "name": "Serenade of the Nether", - "icon": "minecraft:lava_bucket", - "category": "bloodmagic:rituals/ritual_list", - "pages": [ - { - "type": "multiblock", - "name": "Serenade of the Nether", - "multiblock":{ - "pattern":[ - ["_F_", - "F0F", - "_F_"] - ], - "mapping":{ - "0": "bloodmagic:masterritualstone", - "F": "bloodmagic:fireritualstone" - }, - "symetrical": true - }, - "text": "Use a $(l:bloodmagic:rituals/ritual_diviner)Ritual Diviner$(/l) for easier construction." - }, - { - "type": "text", - "text": "Generates a source of lava from the master ritual stone.$(br2)$(fire)Fire Runes: 4$()$(br2)Total Runes: 4" - }, - { - "type": "spotlight", - "item": "bloodmagic:defaultcrystal", - "title": "Raw", - "text": "Decreases the LP cost of placing lava and allows the lava to be directly placed into a tank or other fluid-handling block." - }, - { - "type": "spotlight", - "item": "bloodmagic:corrosivecrystal", - "title": "Corrosive", - "text": "Entities within range that are immune to fire (e.g. pigmen, blazes) are damaged severely." - }, - { - "type": "spotlight", - "item": "bloodmagic:vengefulcrystal", - "title": "Vengeful", - "text": "Entities in this range are afflicted by Fire Fuse. When the debuff ends, they will do a wonderful impression of a firework." - }, - { - "type": "spotlight", - "item": "bloodmagic:destructivecrystal", - "title": "Destructive", - "text": "Lava placement range is increased based on the total amount of $(destructive)Destructive Will$() in the Aura." - }, - { - "type": "spotlight", - "item": "bloodmagic:steadfastcrystal", - "title": "Steadfast", - "text": "Players in this range have Fire Resist applied." - }, - { - "type": "spotlight", - "item": "bloodmagic:ritualtinkerer", - "title": "Range", - "text": "(Lava) The area that the ritual will place lava source blocks. $(br) $(li)Maximum Volume: 9 $(li)Horizontal Radius: 3 $(li)Vertical Radius: 3" - }, - { - "type": "spotlight", - "item": "bloodmagic:ritualtinkerer", - "title": "Range", - "text": "(Corrosive) Entities within this range that are immune to fire damage are hurt proportional to the Will. $(br) $(li)Maximum Volume: Full Range. $(li)Horizontal Radius: 10 $(li)Vertical Radius: 10" - }, - { - "type": "spotlight", - "item": "bloodmagic:ritualtinkerer", - "title": "Range", - "text": "(Vengeful) Entities in this range are afflicted by Fire Fuse. $(br) $(li)Maximum Volume: Full Range. $(li)Horizontal Radius: 10 $(li)Vertical Radius: 10" - }, - { - "type": "spotlight", - "item": "bloodmagic:ritualtinkerer", - "title": "Range", - "text": "(Steadfast) Players in this range have Fire Resist applied. $(br) $(li)Maximum Volume: Full Range. $(li)Horizontal Radius: 10 $(li)Vertical Radius: 10" - }, - { - "type": "spotlight", - "item": "bloodmagic:ritualtinkerer", - "title": "Range", - "text": "(Raw) The tank that the ritual will place lava into. $(br) $(li)Maximum Volume: 1 $(li)Horizontal Radius: 10 $(li)Vertical Radius: 10" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_magnetic.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_magnetic.json deleted file mode 100644 index 79d74155..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_magnetic.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "Ritual of Magnetism", - "icon": "minecraft:iron_ore", - "category": "bloodmagic:rituals/ritual_list", - "pages": [ - { - "type": "multiblock", - "name": "Ritual of Magnetism", - "multiblock":{ - "pattern":[ - ["__F__", "_____", "F___F", "_____", "__F__"], - ["A_E_A", "_____", "E___E", "_____", "A_E_A"], - ["_____", "_E_E_", "__0__", "_E_E_", "_____"] - ], - "mapping":{ - "0": "bloodmagic:masterritualstone", - "A": "bloodmagic:airritualstone", - "F": "bloodmagic:fireritualstone", - "E": "bloodmagic:earthritualstone" - }, - "symetrical": true - }, - "text": "Use a $(l:bloodmagic:rituals/ritual_diviner)Ritual Diviner$(/l) for easier construction." - }, - { - "type": "text", - "text": "Pulls up ores from the ground below and puts them into its placement range.$(br2)$(air)Air Runes: 4$(br)$(fire)Fire Runes: 4$(br)$(earth)Earth Runes: 8$(br2)$()Total Runes: 16" - }, - { - "type": "text", - "text": "By default, the $()Ritual of Magnetism$() searches down to bedrock in a radius of 3 blocks out from the $(item)Master Ritual Stone$() for ores to collect. This can be augmented by placing an expensive block directly underneath the MRS, as follows: $(br2)$(li)$(item)Block of Iron$() - 7 blocks. $(li)$(item)Block of Gold$() - 15 blocks. $(li)$(item)Block of Diamond$() - 31 blocks." - }, - { - "type": "spotlight", - "item": "bloodmagic:ritualtinkerer", - "title": "Range", - "text": "(Placement) The range that the ritual will place the grabbed ores into. $(br) $(li)Maximum Volume: 50 $(li)Horizontal Radius: 4 $(li)Vertical Radius: 4" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_regeneration.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_regeneration.json deleted file mode 100644 index 57cacbfe..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_regeneration.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "name": "Ritual of Regeneration", - "icon": "minecraft:golden_apple", - "category": "bloodmagic:rituals/ritual_list", - "pages": [ - { - "type": "multiblock", - "name": "Ritual of Regeneration", - "multiblock":{ - "pattern":[ - ["EEW_F_F_WEE", "E____F____E", "W_D_____D_W", "___________", "A_________A", "_A___0___A_", "A_________A", "___________", "W_D_____D_W", "E____F____E", "EEW_F_F_WEE"], - ["_E_______E_", "E_________E", "___________", "___________", "___________", "___________", "___________", "___________", "___________", "E_________E", "_E_______E_"] - ], - "mapping":{ - "0": "bloodmagic:masterritualstone", - "W": "bloodmagic:waterritualstone", - "A": "#bloodmagic:ritual_stones/air_or_fire", - "F": "#bloodmagic:ritual_stones/fire_or_air", - "E": "bloodmagic:earthritualstone", - "D": "bloodmagic:duskritualstone" - }, - "symetrical": true - }, - "text": "Use a $(l:bloodmagic:rituals/ritual_diviner#dusk)Ritual Diviner [Dusk]$(/l) for easier construction." - }, - { - "type": "text", - "text": "Casts regeneration on entities within its range if they are missing health. $(br2)$(water)Water Runes: 8 $(br)$(air)Air Runes: 6 $(br)$(fire)Fire Runes: 6 $(br)$(earth)Earth Runes: 20 $(br)$()Dusk Runes: 4$(br2)$()Total Runes: 44" - }, - { - "type": "spotlight", - "item": "bloodmagic:corrosivecrystal", - "title": "Corrosive", - "text": "Steals health from non-players inside of its Vampirism range and directly heals players." - }, - { - "type": "spotlight", - "item": "bloodmagic:ritualtinkerer", - "title": "Range", - "text": "(Healing) Entities within this range will receive a regeneration buff. $(br) $(li)Maximum Volume: Full Range. $(li)Horizontal Radius: 20 $(li)Vertical Radius: 20" - }, - { - "type": "spotlight", - "item": "bloodmagic:ritualtinkerer", - "title": "Range", - "text": "(Vampirism) Mobs within this range have their health syphoned to heal players in the Healing range. $(br) $(li)Maximum Volume: Full Range. $(li)Horizontal Radius: 20 $(li)Vertical Radius: 20" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_upgrade_remove.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_upgrade_remove.json deleted file mode 100644 index 2bb7d05f..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_upgrade_remove.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "name": "Sound of the Cleansing Soul", - "icon": "bloodmagic:upgradetome", - "category": "bloodmagic:rituals/ritual_list", - "pages": [ - { - "type": "multiblock", - "name": "Sound of the Cleansing Soul", - "multiblock":{ - "pattern":[ - ["_________", "_________", "_________", "____A____", "___A_A___", "____A____", "_________", "_________", "_________"], - ["_________", "_E_____E_", "_________", "___W_W___", "_________", "___W_W___", "_________", "_E_____E_", "_________"], - ["_________", "_E_____E_", "_________", "_________", "_________", "_________", "_________", "_E_____E_", "_________"], - ["_________", "_E_____E_", "_________", "___W_W___", "_________", "___W_W___", "_________", "_E_____E_", "_________"], - ["____E____", "_E_____E_", "__FF_FF__", "__FD_DF__", "E___0___E", "__FD_DF__", "__FF_FF__", "_E_____E_", "____E____"] - ], - "mapping":{ - "0": "bloodmagic:masterritualstone", - "W": "bloodmagic:waterritualstone", - "A": "bloodmagic:airritualstone", - "F": "bloodmagic:fireritualstone", - "E": "bloodmagic:earthritualstone", - "D": "bloodmagic:duskritualstone" - }, - "symetrical": true - }, - "text": "Use a $(l:bloodmagic:rituals/ritual_diviner#dusk)Ritual Diviner [Dusk]$(/l) for easier construction." - }, - { - "type": "text", - "text": "Removes all upgrades (and downgrades) from your $(l:bloodmagic:alchemy_array/living_equipment/living_basics)Living Armour$() and gives you the corresponding Upgrade (and Downgrade) $(l:bloodmagic:alchemy_array/living_equipment/living_upgrades)Tomes$(). You can right click while holding one of these $(item)Tomes$() to re-apply them to your $(l:bloodmagic:alchemy_array/living_equipment/living_basics)Living Armour$() again.$(br2)$(water)Water Runes: 8 $(br)$(air)Air Runes: 4 $(br)$(fire)Fire Runes: 12 $(br)$(earth)Earth Runes: 20 $(br)$()Dusk Runes: 4 $(br2)$()Total Runes: 48" - } - ] -} diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_water.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_water.json deleted file mode 100644 index 518f74a0..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_water.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "Ritual of the Full Spring", - "icon": "minecraft:water_bucket", - "category": "bloodmagic:rituals/ritual_list", - "pages": [ - { - "type": "multiblock", - "name": "Ritual of the Full Spring", - "multiblock":{ - "pattern":[ - ["W_W", - "_0_", - "W_W"] - ], - "mapping":{ - "0": "bloodmagic:masterritualstone", - "W": "bloodmagic:waterritualstone" - }, - "symetrical": true - }, - "text": "Use a $(l:bloodmagic:rituals/ritual_diviner)Ritual Diviner$(/l) for easier construction." - }, - { - "type": "text", - "text": "Generates a source of water from the master ritual stone.$(br2)$(water)Water Runes: 4$()$(br2)Total Runes: 4" - }, - { - "type": "spotlight", - "item": "bloodmagic:defaultcrystal", - "title": "Raw", - "text": "allows the water to be directly placed into a Tank or other fluid-handling block." - }, - { - "type": "spotlight", - "item": "bloodmagic:ritualtinkerer", - "title": "Range", - "text": "(Water) The area within which the Ritual will place Source Blocks. $(br2)$(li)Maximum Volume: 9 $(li)Horizontal Radius: 3 $(li)Vertical Radius: 3 " - } - ] -} diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_well_of_suffering.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_well_of_suffering.json deleted file mode 100644 index 135c7740..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_list/ritual_well_of_suffering.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "name": "Well of Suffering", - "icon": "bloodmagic:life_essence_bucket", - "category": "bloodmagic:rituals/ritual_list", - "pages": [ - { - "type": "multiblock", - "name": "Well Of Suffering", - "multiblock":{ - "pattern":[ - ["____A____", "_________", "_________", "_________", "A_______A", "_________", "_________", "_________", "____A____"], - ["___W_W___", "_________", "_________", "W__F_F__W", "____0____", "W__F_F__W", "_________", "_________", "___W_W___"], - ["__W___W__", "_D_____D_", "W_F_E_F_W", "_________", "__E___E__", "_________", "W_F_E_F_W", "_D_____D_", "__W___W__"] - - ], - "mapping":{ - "0": "bloodmagic:masterritualstone", - "W": "bloodmagic:waterritualstone", - "A": "bloodmagic:airritualstone", - "F": "bloodmagic:fireritualstone", - "E": "bloodmagic:earthritualstone", - "D": "bloodmagic:duskritualstone" - }, - "symetrical": true - }, - "text": "Use a $(l:bloodmagic:rituals/ritual_diviner)Ritual Diviner [Dusk]$(/l) for easier construction." - }, - { - "type": "text", - "text": "This ritual attacks mobs within its damage zone and puts the harvested $(blood)Blood$() into a nearby $(l:bloodmagic:altar/blood_altar)Blood Altar$(). Put a $(l:bloodmagic:altar/soul_network)Blood Orb$() in the Altar, maybe add a few $(l:bloodmagic:altar/blood_rune/sacrifice_rune)Runes of Sacrifice$() for good measure and you'll never have to worry about your LP supplies again... As long as you can supply enough mobs.$(br)$(water)Water Runes: 16$(br)$(air)Air Runes: 4$(br)$(fire)Fire Runes: 8$(br)$(earth)Earth Runes: 4$(br)$()Dusk Runes: 4$(br2)$()Total Runes: 36" - }, - { - "type": "spotlight", - "item": "bloodmagic:ritualtinkerer", - "title": "Range", - "text": "(Altar) The area that the ritual searches for a $(l:bloodmagic:altar/blood_altar)Blood Altar$() to deposit its Blood into. $(br2)$(li)Maximum Volume: Full Range. $(li)Horizontal Radius: 10 $(li)Vertical Radius: 15 " - }, - { - "type": "spotlight", - "item": "bloodmagic:ritualtinkerer", - "title": "Range", - "text": "(Damage) All mobs within this area will take damage every second or so until they die. This does not include players, fortunately. $(br2)Mobs will drop $(item)Items$(), so be sure to set up something to clean up the mess. $(br2)$(li)Maximum Volume: Full Range. $(li)Horizontal Radius: 15 $(li)Vertical Radius: 15 " - } - ] -} diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_stones.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_stones.json deleted file mode 100644 index 5e27ac42..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_stones.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "Ritual Stones", - "icon": "bloodmagic:waterritualstone", - "category": "bloodmagic:rituals", - "extra_recipe_mappings":[ - ["bloodmagic:airritualstone", 0], - ["bloodmagic:fireritualstone", 0], - ["bloodmagic:waterritualstone", 0], - ["bloodmagic:earthritualstone", 0], - ["bloodmagic:duskritualstone", 0] - ], - "pages": [ - { - "type": "text", - "text": "$(item)Ritual Stones$() are the canvas upon which you will draw your $(item)Rituals$(). They also look quite nifty, and can be manually painted with the various $(l:bloodmagic:rituals/ritual_diviner)Elemental Inscription Tools$()." - }, - { - "type": "crafting", - "recipe": "bloodmagic:ritual_stone_blank", - "recipe2": "bloodmagic:ritual_stone_master" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_tinkerer.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_tinkerer.json deleted file mode 100644 index 62e82de5..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/rituals/ritual_tinkerer.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "Ritual Tinkerer", - "icon": "bloodmagic:ritualtinkerer", - "category": "bloodmagic:rituals", - "priority": "true", - "pages": [ - { - "type": "text", - "text": "The $(item)Ritual Tinkerer$() is an essential tool for the advanced Blood Mage who is looking for all they can get out of their Rituals. It has three main modes, as described overleaf." - }, - { - "type": "crafting", - "recipe": "bloodmagic:ritual_reader" - }, - { - "type": "text", - "text": "$(li)Information: Describes the function of the ritual, similar to the Ritual Diviner. $(li)Set Will Consumed: Tells the ritual which kinds of Demon Will (if any) to consume from the Aura. Specify this by carrying Demon Will Crystals in your hotbar, one for each type of will you wish the Ritual to consume. Further information about the effects of Demon Will upon Rituals can be found on each Ritual's respective page in this book." - }, - { - "type": "text", - "text": "$(li)Define Area: Specifies the zone that the ritual should work in, and displays the current zone. If multiple zones can be specified, shift-clicking will cycle through them. Some rituals can be expanded far beyond their default areas, but keep in mind that this will increase the LP cost to match..." - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/utility/alchemical_reaction_chamber.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/utility/alchemical_reaction_chamber.json deleted file mode 100644 index 389ff102..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/utility/alchemical_reaction_chamber.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "name": "Alchemical Reaction Chamber", - "icon": "bloodmagic:alchemicalreactionchamber", - "category": "bloodmagic:utility", - "extra_recipe_mappings":[ - ["bloodmagic:sanguinereverter", 2], - ["bloodmagic:weakbloodshard", 3], - ["bloodmagic:explosivepowder", 6], - ["bloodmagic:ironfragment", 7], - ["bloodmagic:goldfragment", 7], - ["bloodmagic:fragment_netherite_scrap", 7], - ["bloodmagic:irongravel", 9], - ["bloodmagic:goldgravel", 9], - ["bloodmagic:gravel_netherite_scrap", 9], - ["bloodmagic:ironsand", 7], - ["bloodmagic:goldsand", 7], - ["bloodmagic:sand_netherite", 7], - ["bloodmagic:sulfur", 7], - ["bloodmagic:primitive_crystalline_resonator", 8], - ["bloodmagic:basiccuttingfluid", 10] - ], - "pages": [ - { - "type": "text", - "text": "The $(item)Alchemical Reaction Chamber$() isn't fully implemented yet, but among other things it can function as a furnace, offers a form of ore-tripling, revert Blood Orbs, and is currently the only way to get $(item)Weak Blood Shards$(), specifically from an $(l:bloodmagic:altar/slates)Imbued Slate$()." - }, - { - "type": "crafting", - "recipe": "bloodmagic:arc" - }, - { - "type": "crafting_soulforge", - "heading": "Sanguine Reverter", - "recipe": "bloodmagic:soulforge/sanguine_reverter", - "anchor": "blood_shard", - "text": "The Sanguine Reverter is used to create Weak Blood Shards, and revert Blood Orbs to their input crafting item." - }, - { - "type": "3x_crafting_arc", - "a.heading": "Weak Blood Shard", - "a.recipe": "bloodmagic:arc/weakbloodshard", - "b.heading": "Revert Weak Blood Orb", - "b.recipe": "bloodmagic:arc/reversion/weak_blood_orb", - "c.heading": "Revert Apprentice Blood Orb", - "c.recipe": "bloodmagic:arc/reversion/apprentice_blood_orb" - }, - { - "type": "2x_crafting_arc", - "a.heading": "Revert Magician Blood Orb", - "a.recipe": "bloodmagic:arc/reversion/magician_blood_orb", - "b.heading": "Revert Master Blood Orb", - "b.recipe": "bloodmagic:arc/reversion/master_blood_orb", - "b.text": "Turn the page for more uses of the ARC." - }, - { - "type": "empty" - }, - { - "type": "crafting_alchemy_table", - "heading": "Explosive Powder", - "anchor": "ore_processing", - "recipe": "bloodmagic:alchemytable/explosive_powder", - "text": "Explosive Powder in the ARC is used to turn Ores into Ore Fragments for 3x Ore Processing, or turn Ingots into their Sand variant. It can also turn Netherrack into Sulfur and 5mb of Lava." - }, - { - "type": "3x_crafting_arc", - "a.heading": "Ore to 3 Ore Fragments", - "a.recipe": "bloodmagic:arc/fragmentsiron", - "b.heading": "Ingot to Metal Sand", - "b.recipe": "bloodmagic:arc/dustsfrom_ingot_iron", - "c.heading": "Sulfur and Lava", - "c.recipe": "bloodmagic:arc/netherrack_to_sulfer", - "c.fluid_output": "minecraft:lava_bucket" - }, - { - "type": "crafting_soulforge", - "heading": "Resonator", - "recipe": "bloodmagic:soulforge/primitive_crystalline_resonator", - "text": "The Resonator is used to turn Ore Fragments into the relevant Gravel for continued ore processing, and creates some tiny dusts that are NYI." - }, - { - "type": "crafting_arc", - "heading": "Ore Fragment to Metal Gravel", - "recipe": "bloodmagic:arc/gravelsiron" - }, - { - "type": "crafting_alchemy_table", - "heading": "Basic Cutting Fluid", - "recipe": "bloodmagic:alchemytable/basic_cutting_fluid", - "text": "Cutting Fluid turns a metal's Gravel into that metal's Sand for continued 3x ore processing. It can also turn an ore directly into two metal Sand for 2x Ore Processing. The same 2x Ore Processing is possible in the Alchemy Table, but doing it in the ARC will save you some LP." - }, - { - "type": "2x_crafting_arc", - "a.heading": "Metal Gravel to Metal Sand", - "a.recipe": "bloodmagic:arc/dustsfrom_gravel_iron", - "b.heading": "Ore to 2 Metal Sand", - "b.recipe": "bloodmagic:arc/dustsfrom_ore_iron" - }, - { - "type": "crafting", - "heading": "Fuel Cell (Furnace)", - "recipe": "bloodmagic:primitive_furnace_cell", - "text": "The ARC also functions as a Furnace, but the only fuel sources it accepts is the $(item)Primitive Fuel Cell$() or $(l:bloodmagic:utility/lava_crystal)Lava Crystal$(/l)." - }, - { - "type": "text", - "text": "The Primitive Fuel Cell is good for 128 individual uses. That's more than the Block of Coal used to craft it (60 items), and since it only loses durability when the crafting is finished it will not wase fuel." - }, - { - "type": "crafting", - "heading": "Hydration Cell", - "recipe": "bloodmagic:primitive_hydration_cell", - "text": "The Hydration Cell is used to make Clay, the Cornerstone of Balance." - }, - { - "type": "2x_crafting_arc", - "a.heading": "Clay from Sand", - "a.recipe": "bloodmagic:arc/clay_from_sand", - "a.fluid_input": "minecraft:water_bucket", - "b.heading": "Clay from Terracotta", - "b.recipe": "bloodmagic:arc/clay_from_terracotta", - "b.fluid_input": "minecraft:water_bucket" - } - ] -} diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/utility/bloodstone_bricks.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/utility/bloodstone_bricks.json deleted file mode 100644 index c1753cb3..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/utility/bloodstone_bricks.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "Bloodstone Bricks", - "icon": "bloodmagic:largebloodstonebrick", - "category": "bloodmagic:utility", - "pages":[ - { - "type": "text", - "text": "Bloodstone Bricks are a decorational block, and used as the capstones for the Tier-4 Blood Altar." - }, - { - "type": "crafting", - "recipe": "bloodmagic:largebloodstonebrick", - "recipe2": "bloodmagic:bloodstonebrick" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/utility/book_experience.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/utility/book_experience.json deleted file mode 100644 index 6946e58d..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/utility/book_experience.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "Tome of Peritia", - "icon": "bloodmagic:experiencebook", - "category": "bloodmagic:utility", - "pages": [ - { - "type": "text", - "text": "The $(item)Tome of Peritia$() allows you to safely store your experience $(br2)Shift + Right Click stores a level. Right Click retrieves a level. Hold right-click to store/retrive multiple levels." - }, - { - "type": "crafting", - "recipe": "bloodmagic:experience_tome" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/utility/changelog.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/utility/changelog.json deleted file mode 100644 index 18dbe6c1..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/utility/changelog.json +++ /dev/null @@ -1,117 +0,0 @@ -{ - "name": "Changelog", - "icon": "minecraft:map", - "category": "bloodmagic:utility", - "priority": "true", - "pages":[ - { - "type": "text", - "text": "All the changelogs of $(6)Blood Magic$() to date, from most recent to oldest." - }, - { - "type": "text", - "title": "3.1.0-15", - "text": "$(li)Majorly refactored the progression of the mod. Instead of starting with a $(l:bloodmagic:demon_will/soul_snare)Snare$(), you instead start by crafting the $(l:bloodmagic:altar/blood_altar)Blood Altar$(). The changes are documented in the guide, and you can follow its $(l:bloodmagic:utility/getting_started)Getting Started$() entry!$(li)Changed the tooltips so that they are gray, more easily differentiating them from the name of the item." - }, - { - "type": "text", - "text": "$(li)Added the $(l:bloodmagic:alchemy_array/holding)Sigil of Holding$().$(li)Changed the crafting of $(l:bloodmagic:demon_will/soul_gem)Tartaric Gems$() so that you no longer need to use the previous tier gem in the gem slot.$(li2)The $(l:bloodmagic:demon_will/soul_forge)Hellfire Forge$() will now syphon from the gem in the crafting table first, and all unused will from the consumed gem will be placed in the crafted gem." - }, - { - "type": "text", - "text": "$(li)Changed the GUI for the $(l:bloodmagic:alchemy_table/alchemy_table)Alchemy Table$(). See the updated section.$(li)Fixed $(l:bloodmagic:alchemy_table/anointments/looting_anointment)Plunderer's Glint$() not properly applying the Looting level.$(li)Also fixed a NPE crash due to $(l:bloodmagic:alchemy_table/anointments/bow_power_anointment)Iron Tip$(). Fixes some crashes due to mods using the ItemUsedFinish event.$(li)Fixed the $(l:bloodmagic:blood_altar/blood_altar)Blood Altar$() not being able to input fluids. About time, Way!" - }, - { - "type": "text", - "text": "$(li)Added new $(l:bloodmagic:demon_will/explosive_charges)Explosive Charges.$()$(li2)$(item)Fungal Charge$(), which is very useful for giant mushrooms and nether mushrooms.$(li2)$(item)Controlled Charge$(), which will destroy only blocks that match the block it is placed on.$(li)Added the ability to apply a few select Anointments to the charges. Only one can be applied to a charge at a time.$(li2)$(l:bloodmagic:alchemy_table/anointments/silk_touch_anointment)Soft Coating$()$(li2)$(l:bloodmagic:alchemy_table/anointments/fortune_anointment)Fortuna Extract$()" - }, - { - "type": "text", - "text": "$(li2)$(l:bloodmagic:alchemy_table/anointments/smelting_anointment)Slow-burning Oil$()$(li)Fixed the $(l:bloodmagic:alchemy_array/living_equipment/living_basics)Living Armour$() so that you cannot use an upgrade tome to usurp the point cap.$(li2)Fixed $(l:bloodmagic:alchemy_array/living_equipment/armor_upgrades/strong_legs)Strong Legs$()so that it no longer runs the program \"CrunchyLegs.exe\" - as a result, you no longer suffer fall damage from jumping on the same level. Removed the direct fall damage mitigation from Strong Legs." - }, - { - "type": "text", - "text": "$(li)Added two types of $(l:bloodmagic:demon_will/throwing_daggers)Throwing Daggers$() to the Blood Mage's offensive kit.$(li2)$(item)Iron Throwing Dagger$()$(li2)$(item)Syringe Throwing Dagger$()$(li)Refactored the guide so that it provides +2 to awesomeness.$()" - }, - { - "type": "text", - "title": "3.0.6-11", - "text": " $(li)Reimplemented the $(l:bloodmagic:rituals/ritual_list/ritual_well_of_suffering)Well of Suffering$(). $(li)Added several new items, called \"$(l:bloodmagic:alchemy_table/anointments)Anointments$()\"! These are items that provide temporary buffs to your tools and weapons, such as silk touch, higher damage, and more! Look them up in the Utility section of the book. These include: $(li2)Honing Oil $(li2)Soft Coating $(li2)Fortuna Extract $(li2)Holy Water" - }, - { - "type": "text", - "text": "$(li2)Miner's Secrets $(li2)Dexterity Alkahest $(li2)Iron Tip $(li2)Plunderer's Glint $(li2)Slow-burning Oil $(li)Made the $(l:bloodmagic:demon_will/explosive_charges#shaped_charge)Shaped Charge$() and $(l:bloodmagic:demon_will/explosive_charges#deforester_charge)Deforester Charge$() throwable." - }, - { - "type": "text", - "title": "3.0.5-10", - "text": "Fixed a crash with the $(l:bloodmagic:altar/blood_altar)Blood Altar$() on unload and adjusted the recipe for the $(l:bloodmagic:alchemy_array/functional_arrays/time_arrays)Day array$() to use $(item)Coal$() instead of $(item)Clocks$()." - }, - { - "type": "text", - "title": "3.0.4-9", - "text": "$(li)Added two new $(l:bloodmagic:demon_will/explosive_charges)explosives$(): $(li2)The $(l:bloodmagic:demon_will/explosive_charges#shaped_charge)Shaped Charge$(), which will break a 5x5x5 volume when placed. $(li2)The $(l:bloodmagic:demon_will/explosive_charges#deforester_charge)Deforester Charge$(), which can chop down a tree up to a maximum of 128 logs. $(li)(Both explosives drop all blocks affected, and do not cause further environmental nor entity damage.)" - }, - { - "type": "text", - "text": "$(li)Added new alchemy arrays: $(li2)$(l:bloodmagic:alchemy_array/functional_arrays/time_arrays)Two arrays$(), which changes the current daylight cycle to day and night. Recipes are temp. $(li)Fixed the following $(l:bloodmagic:alchemy_array/living_equipment/living_upgrades)Living Armour upgrades$() so that they are now obtainable: $(li2)Experienced $(li2)Body Builder" - }, - { - "type": "text", - "title": "3.0.3-8", - "text": "$(li)Updated the $(item)Sanguine Scientiem$() - it's very well written! Special thanks to both $(fire)VT-14$() and $(raw)Wrincewind$() for their long hours of effort to make this book better than I could have done! $(li)Fixed a crash with the $(l:bloodmagic:alchemy_array/living_equipment/living_basics)Living Armour$() when crafted and worn right after enchanting." - }, - { - "type": "text", - "title": "3.0.2-7", - "text": "Readded the $(l:bloodmagic:alchemy_array/living_equipment/living_basics)Living Armour$(). Currently only with a few $(l:bloodmagic:alchemy_array/living_equipment/living_upgrades)upgrades$(), and no downgrades. $(li)Pin Cushion $(li)Soft Fall $(li)Tough $(li)Strong Legs (Now can be temporarily deactivated when jumping by sneaking) $(li)Healthy $(li)Experienced $(li)Charging Strike $(li)Tough Palms $(li)Quick Feet $(li)Poison Resistance" - }, - { - "type": "text", - "text": "$(li)Gift of Ignis $(li)Dwarven Might $(li)Body Builder $(br2)Reimplemented the following rituals: $(li)$(l:bloodmagic:rituals/ritual_list/ritual_crystal_split)Resonance of the Faceted Crystal$() $(li)$(l:bloodmagic:rituals/ritual_list/ritual_crystal_harvest)Crack of the Fractured Crystal$() $(li)$(l:bloodmagic:rituals/ritual_list/ritual_harvest)Reap of the Harvest Moon$() (Mainly vanilla crops) $(li)$(l:bloodmagic:rituals/ritual_list/ritual_animal_growth)Ritual of the Shepherd$() $(li)$(l:bloodmagic:rituals/ritual_list/ritual_green_grove)Ritual of the Green Grove$() $(li)$(l:bloodmagic:rituals/ritual_list/ritual_ellipse)Focus of the Ellipsoid$() $(li)$(l:bloodmagic:rituals/ritual_list/ritual_upgrade_remove)Sound of the Cleansing Soul$()" - }, - { - "type": "text", - "text": "$(li)$(l:bloodmagic:rituals/ritual_list/ritual_armour_evolve)Ritual of Living Evolution$()" - }, - { - "type": "text", - "title": "3.0.1-6", - "text": "$(li)Reimplemented the $(l:bloodmagic:utility/incense_altar)Incense Altar$() with all appropriate blocks. $(li)Added guide entries for the $(l:bloodmagic:utility/incense_altar)Incense Altar$() and $(l:bloodmagic:altar/blood_altar)Blood Altar$(). Other misc entries added, too. $(li)Fixed a server-related crash on the client on the $(l:bloodmagic:alchemy_array/sigil/grove)Sigil of the Green Grove$(). $(li)Added $(l:bloodmagic:utility/alchemical_reaction_chamber#ore_processing)ore processing$() to $(item)Ancient Debris.$() $(li)Readded the other $(l:bloodmagic:demon_will/sentient_tools)Sentient Tool$() types (with one more on the way)." - }, - { - "type": "text", - "text": "$(li)Added a few WIP items that cannot be used yet - they're part of the D*$)@ D*#@(@* system that I'm adding for Tier 4. $(li)Added the API - It's still in flux, so expect it to change very soon! $(li)Probably forgot something important. $(li)Fixed a crash for the $(l:bloodmagic:utility/lava_crystal)Lava Crystal$() that made it blow up the Client if used on a server. No, that was not the intended purpose!" - }, - { - "type": "text", - "text": "$(li)Added the $(l:bloodmagic:rituals/ritual_tinkerer)Ritual Tinkerer$() for Rituals. $(li)Added the \"$(l:bloodmagic:utility/book_experience)Tome of Peritia$()\" again - stores EXP." - }, - { - "type": "text", - "title": "3.0.0-3", - "text": "$(li)Fix for an issue with the Will Handler, which would cause massive lag. $(li)Reimplemented some recipes which... were not properly implemented. These include the $(l:bloodmagic:alchemy_table/alchemy_table#cutting_fluid)Cutting Fluid$() recipes in the $(l:bloodmagic:alchemy_table/alchemy_table)Alchemy Table$(). Whoops! $(li)Reduced the cost of the $(l:bloodmagic:altar/blood_altar#blank_rune)Blank Rune$(), swapping one of the $(l:bloodmagic:altar/slates)Blank Slates$() for $(item)Smooth Stone$()." - }, - { - "type": "text", - "title": "3.0.0-1", - "text": "First update for $(item)Minecraft 1.16.3$()! Supposedly it should also work for 1.16.4, however it was built for 1.16.3. $(br2)This release is what I can best describe as \"early alpha\" - a lot of the systems are in place and working, however a few things are notably absent. This can mean that the system will either be fully revamped, reimplemented from previous MC versions at a later date, or" - }, - { - "type": "text", - "text": "will not be added to make room for another system. $(br2)Some of the things that are currently missing from this version of Blood Magic are: $(li)$(l:bloodmagic:alchemy_array/living_equipment/living_basics)Living Armour$(), which will need to be completely rewritten to fix some client-server bugs. $(li)Several rituals. Rituals ARE in this release, but only a handful. Most of the rituals WILL be readded. $(li)The $(l:bloodmagic:utility/incense_altar)Incense Altar$(). Will be reimplemented soon." - }, - { - "type": "text", - "text": "$(li)The Item Routing System. Might need to be reimplemented? And it'll need a bunch of insecticide, since there's some bugs that I've heard about. $(li)Tier 5 - there's not currently much in T5 from previous versions, so it's temporarily disabled until I've fully decided the upgrade path towards it. Although I won't give much away, it will involve demons. And *^$%@)$#. $(li)Tier 6 - Why do people still ask about this?" - }, - { - "type": "text", - "text": "And other systems and items that I have not specifically mentioned. $(br2)Notable new content that's currently being experimented with and/or tweaked: $(li)The $(item)Blood Magic Guide$()! It's being completely rewritten and is currently using the mod Patchouli! $(strike)It's a pretty Neat mod by Vazkii$() It's in its early stages of writing, but for now the plan is to have it be purely informational - main reason I am temporarily ditching the narrative-based" - }, - { - "type": "text", - "text": "guide is that I need some form of in-game guide that tells the user about all the new and improved systems in the mod. And building a comprehensive narrative makes such a thing slow moving. $(li)The $(l:bloodmagic:utility/alchemical_reaction_chamber)Alchemical Reaction Chamber$()! It's a multiple-use block that can process ores and is integral for reaching Tier 4. It's still being balanced, so any feedback on this is greatly appreciated. $(br2)I hope you will enjoy the mod! $(br) - WayofTime" - } - ] -} diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/utility/getting_started.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/utility/getting_started.json deleted file mode 100644 index 5ade9211..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/utility/getting_started.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "name": "Tiers & Getting Started", - "icon": "bloodmagic:sacrificialdagger", - "category": "bloodmagic:utility", - "priority": "true", - "pages": [ - { - "type": "text", - "text": "$(6)Blood Magic 3$()'s progression is still being reworked, and the first few steps are significantly different from Blood Magic 2's.$(br2)We do plan on adding better guideance, such as entry unlocking, but we are waiting until the progression is locked down. In the mean time, here is a quick overview on how to progress in this alpha version of $(6)Blood Magic 3$()." - }, - { - "type": "spotlight", - "item": "bloodmagic:altar", - "title": "Blood Altar (Tier-1)", - "text": "The first step of $(6)Blood Magic$() is to build a $(l:bloodmagic:altar/blood_altar)Blood Altar$() and $(l:bloodmagic:altar/blood_altar#knife)Sacrificial Knife$(). Use these to generate $(blood)LP$() from Self-Sacrificing.$(br2)Use this $(blood)LP$() to craft a $(l:bloodmagic:altar/soul_network)Weak Blood Orb$(), several $(l:bloodmagic:altar/slates)Blank Slates$(), and a few $(l:bloodmagic:demon_will/soul_snare)Soul Snares$()." - }, - { - "type": "spotlight", - "item": "bloodmagic:alchemytable", - "title": "Alchemy Table (Tier-1)", - "text": "The $(l:bloodmagic:alchemy_table/alchemy_table)Alchemy Table$() uses $(blood)LP$() from a player's $(blood)Soul Network$() (drawn from the $(l:bloodmagic:altar/soul_network)bound Blood Orb$() in it) to craft various different objects, such as:$(li)$(l:bloodmagic:alchemy_array/functional_arrays/arcane_ash)Arcane Ashes$()$(li)$(item)Reagents for Sigils$()$(li)$(item)Anointments$()$(li)$(thing)2x Ore Processing$()$(li)and various other odds and ends." - }, - { - "type": "spotlight", - "item": "bloodmagic:arcaneashes", - "title": "Alchemy Array (Tier-1)", - "text": "An $(thing)Alchemy Array$() is made by placing some $(l:bloodmagic:alchemy_array/functional_arrays/arcane_ash)Arcane Ashes$() on the ground. The Alchemy Array can have 2 items right clicked into it, and will either craft an item (such as a $(l:bloodmagic:alchemy_array/sigil/divination)Divination Sigil$()) or perform some kind of function (such as $(l:bloodmagic:alchemy_array/functional_arrays/time_arrays)turning day into night$())." - }, - { - "type": "spotlight", - "item": "bloodmagic:soulforge", - "title": "Hellfire Forge (Tier-1)", - "text": "The $(l:bloodmagic:demon_will/soul_forge)Hellfire Forge$() crafts using $(l:bloodmagic:demon_will/demon_will)Demon Will$(). You get your first $(raw)Will$() by using $(l:bloodmagic:demon_will/soul_snare)Soul Snares$(), though upgrading to a $(l:bloodmagic:demon_will/sentient_sword)Sentient Sword$() is recommended. The $(item)Hellfire Forge$() is used for stuff directly related to $(raw)Demon Will$() (like $(l:bloodmagic:demon_will/soul_gem)Tartaric Gems$() and $(l:bloodmagic:demon_will/sentient_tools)Sentient Tools$()), and consumables (like $(l:bloodmagic:demon_will/explosive_charges)Explosive Charges$() and $(l:bloodmagic:demon_will/throwing_daggers)Throwing Daggers$())." - }, - { - "type": "spotlight", - "item": "bloodmagic:daggerofsacrifice", - "title": "Tier Two", - "text": "At this point, you will be able to craft a $(l:bloodmagic:altar/blood_altar#dagger_of_sacrifice)Dagger of Sacrifice$() in order to slaughter mobs for more LP. Various $(item)Upgrade Runes$() should be avaliable for your $(item)Blood Altar$(), and some more $(item)Sigils$() will be available. As before, you should focus on further upgrading your $(l:bloodmagic:altar/blood_altar)Altar$()." - }, - { - "type": "spotlight", - "item": "bloodmagic:ritualdiviner", - "title": "Tier Three", - "text": "By this point, you will have the ability to create some $(l:bloodmagic:rituals/ritual_basics)basic Rituals$() and $(l:bloodmagic:alchemy_array/living_equipment/living_basics)Living Armour$() as well. This armour is very versatile, though you'll have to work hard to unlock its full potential. At this point you should look into upgrading your Altar and your $(l:bloodmagic:rituals/ritual_diviner)Ritual Diviner$()." - }, - { - "type": "spotlight", - "item": "bloodmagic:vengefulcrystal", - "title": "Tier Four", - "text": "This is the top tier. At this point you have access to everything that $(6)Blood Magic$() has to offer. You may want to look into the $(l:bloodmagic:rituals/ritual_tinkerer)Ritual Tinkerer$() and the various kinds of $(l:bloodmagic:demon_will/aspected_will)Will Aspects$() avaliable to you, and consider how they may be used to refine your existing rituals and alter how your $(l:bloodmagic:demon_will/sentient_tools)Sentient Tools$() and $(l:bloodmagic:demon_will/sentient_sword)Weapons$() work." - }, - { - "type": "spotlight", - "item": "bloodmagic:activationcrystalawakened", - "title": "Tier Five", - "text": "Currently, this is just a myth. Nothing's implemented at this stage." - }, - { - "type": "spotlight", - "item": "minecraft:barrier", - "title": "Tier Six?", - "text": "What? No. Look, even in 1.12, this only existed as a favor to pack makers and was otherwise unimplemented. You've come too far. Go back two pages." - } - ] -} diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/utility/incense_altar.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/utility/incense_altar.json deleted file mode 100644 index 01916ffe..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/utility/incense_altar.json +++ /dev/null @@ -1,107 +0,0 @@ -{ - "name": "Incense Altar", - "icon": "bloodmagic:incensealtar", - "category": "bloodmagic:utility", - "pages": [ - { - "type": "text", - "text": " The $(item)Incense Altar$() is a multiblock structure that can be used to boost your self-sacrificing at a $(l:bloodmagic:altar/blood_altar)Blood Altar.$(/l) By standing nearby your setup, the $(item)Incense Altar$() will calm your soul based on the area's total \"Tranquility\", allowing you to significantly increase your LP gains." - }, - { - "type": "crafting", - "recipe": "bloodmagic:incense_altar" - }, - { - "type": "text", - "text": " The basic Tier 1 setup of an $(item)Incense Altar$() is the altar itself; place it down anywhere (You may want to set up a 3x3 block platform, this will be helpful later) and stay within a 5 block radius of the altar.$(br2) While the altar is working, it will emit flame particles from its top and transform your $(l:bloodmagic:altar/blood_altar#knife)Sacrificial Knife.$(/l) Once your knife starts to shine, holding and releasing right click near a Blood Altar will sacrifice 90% of your health all at once." - }, - { - "type": "image", - "images": [ - "bloodmagic:images/entries/utility/incense_altar1.png" - ], - "title": "Basic Setup", - "border": true, - "text": "Basic setup showing the 3x3 square of blocks before the path blocks." - }, - { - "type": "text", - "text": " What is more, based on the total Tranquility of the area you will receive a bonus to the LP added to the altar. Hovering over the $(item)Incense Altar$() with either a $(l:bloodmagic:alchemy_array/sigil/divination)Divination Sigil$(/l) or $(l:bloodmagic:alchemy_array/sigil/seer)Seer's Sigil$() will display the total Tranquility of the setup (top number) and the percentage bonus received when sacrificing (bottom number). When you sacrifice, it will take the LP that you would normally get and multiply it by (1 + bonus/100)." - }, - { - "type": "image", - "images": [ - "bloodmagic:images/entries/utility/incense_altar2.png" - ], - "title": "Incense HUD", - "border": true, - "text": "Incense HUD, default in top left corner, showing a self-sacrifice bonus of +20%." - }, - { - "type": "text", - "text": " \"But Way, how can I increase this bonus?\" Why, by increasing the tranquility of the surrounding area! ...That may be a bit ambiguous.$(br2) To increase the Tranquility of the area, you must place paths leading out from your Incense Altar. These paths need to be constructed from a three wide set of Path blocks, such as the $(item)Wooden Path$(), that extend from the 3x3 set of solid reference blocks in all four cardinal directions." - }, - { - "type": "crafting", - "recipe": "bloodmagic:path/path_wood", - "recipe2": "bloodmagic:path/path_woodtile" - }, - { - "type": "crafting", - "recipe": "bloodmagic:path/path_stone", - "recipe2": "bloodmagic:path/path_stonetile" - }, - { - "type": "crafting", - "recipe": "bloodmagic:path/path_wornstone", - "recipe2": "bloodmagic:path/path_wornstonetile" - }, - { - "type": "text", - "text": " Each new \"ring\" of path blocks follow a set of rules:$(li)All path blocks on the same ring have to be on the same level.$(li)The next ring of path blocks may not be more than 5 blocks higher/lower than the previous ring.$(li)The blocks that are the same level or up to two blocks above the path blocks' ring count towards the total Tranquility - these are indicated by the glass blocks in the picture." - }, - { - "type": "image", - "images": [ - "bloodmagic:images/entries/utility/incense_altar.png" - ], - "title": "Incense Altar", - "border": true, - "text": "Incense Altar with different Path orientations." - }, - { - "type": "text", - "text": "Furthermore:$(li)The efficacy of each type of path block only lasts a certain distance: wooden paths can only go three rings, stone paths for up to five rings, worn stone paths for seven rings, and obsidian paths for nine rings.$(bn2) Now obviously, not every type of block will count towards your Tranquility. Not just any ol' cobble will do, no! We need crops, dirt, and even... lava?" - }, - { - "type": "text", - "text": " There are multiple block categories that count towards the total Tranquility. In no particular order, they are: Plants, Crops, Trees, Earthen, Water, Fire, and Lava. The Incense Altar will look at all of the blocks that are within its range (set by the path blocks) and tabulate how much total Tranquility of each Type there is. Once done, it will calculate the total Tranquility by square-rooting the Tranquility of each type and then adding them together." - }, - { - "type": "text", - "text": "This means that for later-game setups, it is best to have many different types of Tranquility. Although other mods may add their own, and more will be added later, the blocks that contribute to Tranquility are: Lava, Water, Life Essence, Netherrack, Dirt, Farmland, Potatoes, Carrots, Wheat, Netherwart, Beetroots, Leaves, Logs, Fire, and Grass." - }, - { - "type": "image", - "images": [ - "bloodmagic:images/entries/utility/incense_altar3.png" - ], - "title": "Incense Altar Setup", - "border": true, - "text": "Late-game Incense Altar setup with many different levels." - }, - { - "type": "text", - "text": "Of course, your setup can be as steep or as shallow as you want (Within reason, as defined earlier in this entry). $(br2) It is important to note that the tranquility bonus is capped by the size of your altar (and thus, the tier of path you are using). The caps are as follows: $(li) No Path: 20%. $(li) Wooden Path: 60%. $(li) Stone Path: 120%. $(li) Worn Stone Path: 200%. $(li) Obsidian Path: 300%. (Obsidian is NYI, sadly)" - }, - { - "type": "image", - "images": [ - "bloodmagic:images/entries/utility/incense_altar4.png" - ], - "title": "Incense Altar Setup", - "border": true, - "text": "A very simple Incense Altar. Note the (optional) mixing of different path blocks." - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/utility/lava_crystal.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/utility/lava_crystal.json deleted file mode 100644 index 3b7438e0..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/utility/lava_crystal.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "Lava Crystal", - "icon": "bloodmagic:lavacrystal", - "category": "bloodmagic:utility", - "pages": [ - { - "type": "text", - "text": "The $(item)Lava Crystal$() is a source of great heat. Between the lava used in its creation and the power of your Soul Network, you feel confident that it will never cool.$(br2) Right clicking on any block in the world will ignite it, at a cost of 100 LP." - }, - { - "type": "crafting", - "recipe": "bloodmagic:lava_crystal", - "text": "$(br)Furthermore, if placed in the fuel slot of a furnace, it will act as a never-ending fuel source, consuming 50LP to burn for 10 seconds, or long enough to cook one item." - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/utility/life_essence_bucket.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/utility/life_essence_bucket.json deleted file mode 100644 index 491d4e60..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/utility/life_essence_bucket.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "Bucket of Life", - "icon": "bloodmagic:life_essence_bucket", - "category": "bloodmagic:utility", - "extra_recipe_mappings":[["bloodmagic:life_essence_bucket", 1]], - "pages": [ - { - "type": "text", - "text": "Life Essence is all fine and good in the altar, where it can be used for crafting or funnelled into an $(l:bloodmagic:altar/soul_network)Orb$() to power Rituals, but what if you want to build a moat of the stuff around your $(l:bloodmagic:utility/incense_altar)Incense Altar$()? Fortunarely, extracting $(item)Life Essence$() is relatively trivial. Simply place a $(item)Bucket$() in the Blood Altar and wait a few seconds for it to fill up. 1LP=1mb, so 1,000LP should be plenty for your Bucket." - }, - { - "type": "crafting_altar", - "heading": "Bucket of Life", - "recipe": "bloodmagic:altar/bucket_life", - "text": "$(italic)It's definitely not blood. Blood would have coagulated by now. $(br2)... Why are you looking at me like that?$()" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/utility/nyi.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/utility/nyi.json deleted file mode 100644 index de49065d..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/entries/utility/nyi.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "name": "NOT YET IMPLEMENTED", - "icon": "minecraft:barrier", - "category": "bloodmagic:utility", - "pages": [ - { - "type": "text", - "text": "OK. Breaking the fourth wall here. Blood Magic is still in an early alpha, and a lot of things you may recall from earlier versions are Not Yet Implemented. Some of these things may come back in the future, others are done and dusted. (Looking at you, Bound Armour and Weapons...)$(br)$(li)Will Automation. Some of the rituals are being reworked, this is still under development." - }, - { - "type": "text", - "text": "$(li)Arcane Ash Rituals. Some of these are coming back soon(tm),for now wait and see. $(li)Ritual of Binding. This went out with 1.7.10, stop asking. $(li)Imperfect Rituals (Lapis etc). $(li)Sigil of Magnetism. $(li)Sigil of the Frozen Lake. $(li)Sigil of Elasticity. $(li)Potion Flasks. $(li)Sigil of Elemental Affinity. $(li)Sigil of the Claw. $(li)Demon Will Aura Gauge. $(li)Transfer Nodes." - }, - { - "type": "text", - "text": "$(li)Additional Living Armour Traits. (Some are in, but not all) $(li)Interdiction Ritual. $(li)Ritual of Containment. $(li)Ritual of High Jump. $(li)Ritual of the Satiated Stomach. $(li)Call of the Zephyr. $(li)Le Vulcano Frigius. $(li)Crash of the Timberman. $(li)Laying of the Filler. $(li)Ritual of Suppression. $(li)Teleposers. $(li)Ritual Dismantler. $(li)Ritual Diviner (Dawn)." - }, - { - "type": "text", - "text": "$(li)Demon Pylon. $(li)Grand Tartaric Gem. $(li)Spectral Weapons and Tools. $(li)Teleposition Sigil. $(li)Sigil of Suppression. $(li)Transposition Sigil. $(li)Sigil of Ender Severance. $(li)Sigil of Compression. $(li)Sigil of the Phantom Bridge. $(li)Assembly of the High Altar. $(li)Cry of the Eternal Soul. $(li)Hymn of Syphoning. $(li)Mark of the Falling Tower. $(li)Reverence of the Condor." - }, - { - "type": "text", - "text": "$(li)Ritual of Grounding. $(li)Ritual of Speed. $(li)The Gate of the Fold. $(li)Ritual of the Feathered Earth. $(li)Ritual of Expulsion. $(li)Most of Tier V. $(li)Archmage Blood Orb. $(li)Awakened Activation Crystal." - }, - { - "type": "text", - "text": "$(li)Training Bracelets. $(li)Penance of the Leadened Soul. $(br2)Other things may appear or disappear as the mod marches onwards from Alpha, through Beta, and hopefully one day to a full Stable Release. $(br2)For more information, check out the $(l:https://github.com/WayofTime/BloodMagic)Blood Magic Github$(), the $(l:https://www.curseforge.com/minecraft/mc-mods/blood-magic)Blood Magic Curseforge Page$(), and the $(l:https://discord.gg/VtNrGrs)Blood Magic Discord$()." - }, - { - "type": "text", - "text": "This manual was put together by Wrincewind and VT-14, building on Way's original manual, with some help from Patchouli and MinecraftGuides.net. Thank you for playing! :)"} - ] -} - - diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/2x_crafting_alchemy_table.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/2x_crafting_alchemy_table.json deleted file mode 100644 index c59a542a..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/2x_crafting_alchemy_table.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "include": [ - { - "template": "crafting_alchemy_table", - "as": "a", - "x": 0, - "y": 0 - }, - { - "template": "crafting_alchemy_table", - "as": "b", - "x": 0, - "y": 53 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/2x_crafting_altar.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/2x_crafting_altar.json deleted file mode 100644 index 12e73437..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/2x_crafting_altar.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "include": [ - { - "template": "crafting_altar", - "as": "a", - "x": 0, - "y": 0 - }, - { - "template": "crafting_altar", - "as": "b", - "x": 0, - "y": 75 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/2x_crafting_arc.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/2x_crafting_arc.json deleted file mode 100644 index ae6a4498..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/2x_crafting_arc.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "include": [ - { - "template": "crafting_arc", - "as": "a", - "x": 0, - "y": 0 - }, - { - "template": "crafting_arc", - "as": "b", - "x": 0, - "y": 53 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/2x_crafting_array.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/2x_crafting_array.json deleted file mode 100644 index 9d192548..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/2x_crafting_array.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "include": [ - { - "template": "crafting_array", - "as": "a", - "x": 0, - "y": 0 - }, - { - "template": "crafting_array", - "as": "b", - "x": 0, - "y": 65 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/2x_crafting_soulforge.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/2x_crafting_soulforge.json deleted file mode 100644 index 2e8d7d18..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/2x_crafting_soulforge.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "include": [ - { - "template": "crafting_soulforge", - "as": "a", - "x": 0, - "y": 0 - }, - { - "template": "crafting_soulforge", - "as": "b", - "x": 0, - "y": 65 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/2x_functional_array.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/2x_functional_array.json deleted file mode 100644 index 61f095a1..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/2x_functional_array.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "include": [ - { - "template": "functional_array", - "as": "a", - "x": 0, - "y": 0 - }, - { - "template": "functional_array", - "as": "b", - "x": 0, - "y": 65 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/3x_crafting_alchemy_table.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/3x_crafting_alchemy_table.json deleted file mode 100644 index 93144042..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/3x_crafting_alchemy_table.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "include": [ - { - "template": "crafting_alchemy_table", - "as": "a", - "x": 0, - "y": 0 - }, - { - "template": "crafting_alchemy_table", - "as": "b", - "x": 0, - "y": 53 - }, - { - "template": "crafting_alchemy_table", - "as": "c", - "x": 0, - "y": 106 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/3x_crafting_arc.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/3x_crafting_arc.json deleted file mode 100644 index ba3d6a42..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/3x_crafting_arc.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "include": [ - { - "template": "crafting_arc", - "as": "a", - "x": 0, - "y": 0 - }, - { - "template": "crafting_arc", - "as": "b", - "x": 0, - "y": 53 - }, - { - "template": "crafting_arc", - "as": "c", - "x": 0, - "y": 106 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/3x_crafting_soulforge.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/3x_crafting_soulforge.json deleted file mode 100644 index dc944e66..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/3x_crafting_soulforge.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "include": [ - { - "template": "crafting_soulforge", - "as": "a", - "x": 0, - "y": 0 - }, - { - "template": "crafting_soulforge", - "as": "b", - "x": 0, - "y": 53 - }, - { - "template": "crafting_soulforge", - "as": "c", - "x": 0, - "y": 106 - } - ] -} diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/crafting_2-step_sigil.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/crafting_2-step_sigil.json deleted file mode 100644 index adaaa240..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/crafting_2-step_sigil.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "include": [ - { - "template": "crafting_alchemy_table", - "as": "alchemy_table", - "x": 0, - "y": 0 - }, - { - "template": "crafting_array", - "as": "array", - "x": 0, - "y": 60 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/crafting_alchemy_table.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/crafting_alchemy_table.json deleted file mode 100644 index 3a261c22..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/crafting_alchemy_table.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "processor": "wayoftime.bloodmagic.compat.patchouli.processors.AlchemyTableProcessor", - "components": [ - { - "type": "header", - "text": "#heading", - "x": -1, - "y": -6 - }, - { - "type": "text", - "text": "#text", - "x": 0, - "y": 51 - }, - { - "type": "image", - "image": "bloodmagic:textures/gui/patchouli_book/crafting.png", - "x": 2, - "y": 4, - "u": 0, - "v": 154, - "texture_width": 128, - "texture_height": 256, - "width": 62, - "height": 43 - }, - { - "type": "image", - "image": "bloodmagic:textures/gui/patchouli_book/crafting.png", - "x": 65, - "y": 4, - "u": 44, - "v": 111, - "texture_width": 128, - "texture_height": 256, - "width": 49, - "height": 43 - }, - { - "type": "item", - "item": "bloodmagic:alchemytable", - "x": 94, - "y": 27 - }, - { - "type": "item", - "item": "#input1", - "x": 6, - "y": 8 - }, - { - "type": "item", - "item": "#input2", - "x": 25, - "y": 8 - }, - { - "type": "item", - "item": "#input3", - "x": 44, - "y": 8 - }, - { - "type": "item", - "item": "#input4", - "x": 6, - "y": 27 - }, - { - "type": "item", - "item": "#input5", - "x": 25, - "y": 27 - }, - { - "type": "item", - "item": "#input6", - "x": 44, - "y": 27 - }, - { - "type": "item", - "item": "#orb", - "x": 69, - "y": 27 - }, - { - "type": "tooltip", - "tooltip": ["Cost: #syphon# LP", "Duration: #time# Ticks"], - "x": 69, - "y": 8, - "width": 16, - "height": 16 - }, - { - "type": "text", - "text": "LP", - "x": 74, - "y": 6 - }, - { - "type": "item", - "item": "#output", - "x": 94, - "y": 8 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/crafting_altar.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/crafting_altar.json deleted file mode 100644 index ae327e85..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/crafting_altar.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "processor": "wayoftime.bloodmagic.compat.patchouli.processors.BloodAltarProcessor", - "components": [ - { - "type": "header", - "text": "#heading", - "x": -1, - "y": -6 - }, - { - "type": "image", - "image": "bloodmagic:textures/gui/patchouli_book/crafting.png", - "x": 9, - "y": 4, - "u": 0, - "v": 51, - "texture_width": 128, - "texture_height": 256, - "width": 98, - "height": 60 - }, - { - "type": "item", - "item": "bloodmagic:altar", - "x": 87, - "y": 46 - }, - { - "type": "item", - "item": "#input", - "x": 30, - "y": 8 - }, - { - "type": "item", - "item": "#output", - "x": 87, - "y": 27 - }, - { - "type": "text", - "text": "Tier: #tier# $(br)LP: #lp#", - "x": 59, - "y": 5 - }, - { - "type": "text", - "text": "#text", - "y": 67 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/crafting_arc.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/crafting_arc.json deleted file mode 100644 index b46dcbda..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/crafting_arc.json +++ /dev/null @@ -1,120 +0,0 @@ -{ - "processor": "wayoftime.bloodmagic.compat.patchouli.processors.ARCProcessor", - "components": [ - { - "type": "header", - "text": "#heading", - "x": -1, - "y": -6 - }, - { - "type": "text", - "text": "#text", - "x": 0, - "y": 51 - }, - { - "type": "item", - "item": "#fluid_input", - "x": 6, - "y": 26 - }, - { - "type": "item", - "item": "#fluid_output", - "x": 94, - "y": 7 - }, - { - "type": "image", - "image": "bloodmagic:textures/gui/patchouli_book/crafting.png", - "x": 2, - "y": 4, - "u": 0, - "v": 198, - "texture_width": 128, - "texture_height": 256, - "width": 112, - "height": 43 - }, - { - "type": "item", - "item": "bloodmagic:alchemicalreactionchamber", - "x": 94, - "y": 26 - }, - { - "type": "item", - "item": "#input", - "x": 6, - "y": 7 - }, - { - "type": "item", - "item": "#tool", - "x": 31, - "y": 26 - }, - { - "type": "item", - "item": "#output1", - "x": 56, - "y": 7 - }, - { - "type": "item", - "item": "#output2", - "x": 75, - "y": 7 - }, - { - "type": "text", - "text": "#chance2#%", - "guard": "#show_chance2", - "x": 75, - "y": 6 - }, - { - "type": "item", - "item": "#output3", - "x": 56, - "y": 26 - }, - { - "type": "text", - "text": "#chance3#%", - "guard": "#show_chance3", - "x": 56, - "y": 25 - }, - { - "type": "item", - "item": "#output4", - "x": 75, - "y": 26 - }, - { - "type": "text", - "text": "#chance4#%", - "guard": "#show_chance4", - "x": 75, - "y": 25 - }, - { - "type": "tooltip", - "guard": "#show_fluid_tooltip", - "tooltip": ["Input: #tooltip_fluid_input#", "Output: #tooltip_fluid_output#"], - "x": 31, - "y": 7, - "width": 16, - "height": 16 - }, - { - "type": "text", - "guard": "#show_fluid_tooltip", - "text": "Fluid", - "x": 31, - "y": 5 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/crafting_array.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/crafting_array.json deleted file mode 100644 index dbd6c723..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/crafting_array.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "processor": "wayoftime.bloodmagic.compat.patchouli.processors.AlchemyArrayProcessor", - "components": [ - { - "type": "header", - "text": "#heading", - "x": -1, - "y": -6 - }, - { - "type": "image", - "image": "bloodmagic:textures/gui/patchouli_book/crafting.png", - "x": 11, - "y": 4, - "u": 0, - "v": 0, - "texture_width": 128, - "texture_height": 256, - "width": 94, - "height": 50 - }, - { - "type": "item", - "item": "#baseinput", - "x": 28, - "y": 22 - }, - { - "type": "item", - "item": "#addedinput", - "x": 63, - "y": 10 - }, - { - "type": "item", - "item": "#output", - "x": 85, - "y": 22 - }, - { - "type": "item", - "item": "bloodmagic:arcaneashes", - "x": 85, - "y": 40 - }, - { - "type": "text", - "text": "#text", - "y": 58 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/crafting_soulforge.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/crafting_soulforge.json deleted file mode 100644 index 6a375357..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/crafting_soulforge.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "processor": "wayoftime.bloodmagic.compat.patchouli.processors.TartaricForgeProcessor", - "components": [ - { - "type": "header", - "text": "#heading", - "x": -1, - "y": -6 - }, - { - "type": "image", - "image": "bloodmagic:textures/gui/patchouli_book/crafting.png", - "x": 11, - "y": 4, - "u": 0, - "v": 111, - "texture_width": 128, - "texture_height": 256, - "width": 93, - "height": 43 - }, - { - "type": "item", - "item": "#input1", - "x": 15, - "y": 8 - }, - { - "type": "item", - "item": "#input2", - "x": 34, - "y": 8 - }, - { - "type": "item", - "item": "#input3", - "x": 15, - "y": 27 - }, - { - "type": "item", - "item": "#input4", - "x": 34, - "y": 27 - }, - { - "type": "item", - "item": "#will", - "x": 59, - "y": 27 - }, - { - "type": "item", - "item": "#output", - "x": 84, - "y": 8 - }, - { - "type": "item", - "item": "bloodmagic:soulforge", - "x": 84, - "y": 27 - }, - { - "type": "tooltip", - "tooltip": ["Minimum: #willrequired# Will", "Drained: #willdrain# Will"], - "x": 59, - "y": 8, - "width": 16, - "height": 16 - }, - { - "type": "text", - "text": "Will", - "x": 61, - "y": 6 - }, - { - "type": "text", - "text": "#text", - "y": 51 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/functional_array.json b/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/functional_array.json deleted file mode 100644 index 7be37120..00000000 --- a/src/main/resources/data/bloodmagic/patchouli_books/guide/en_us/templates/functional_array.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "processor": "wayoftime.bloodmagic.compat.patchouli.processors.AlchemyArrayProcessor", - "components": [ - { - "type": "header", - "text": "#heading", - "x": -1, - "y": -6 - }, - { - "type": "image", - "image": "bloodmagic:textures/gui/patchouli_book/crafting.png", - "x": 3, - "y": 4, - "u": 0, - "v": 0, - "texture_width": 128, - "texture_height": 256, - "width": 68, - "height": 50 - }, - { - "type": "image", - "image": "bloodmagic:textures/gui/patchouli_book/crafting.png", - "x": 71, - "y": 9, - "u": 62, - "v": 154, - "texture_width": 128, - "texture_height": 256, - "width": 40, - "height": 40 - }, - { - "type": "item", - "item": "#baseinput", - "x": 20, - "y": 22 - }, - { - "type": "item", - "item": "#addedinput", - "x": 55, - "y": 10 - }, - { - "type": "item", - "item": "bloodmagic:arcaneashes", - "x": 55, - "y": 35 - }, - { - "type": "text", - "text": "#text", - "y": 58 - }, - { - "type": "image", - "image": "bloodmagic:textures/models/alchemyarrays/#image#", - "x": 75, - "y": 13, - "u": 0, - "v": 0, - "texture_width": 512, - "texture_height": 512, - "width": 512, - "height": 512, - "scale": 0.0625 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/recipes/guide.json b/src/main/resources/data/bloodmagic/recipes/guide.json deleted file mode 100644 index 97922e75..00000000 --- a/src/main/resources/data/bloodmagic/recipes/guide.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:book" - }, - { - "item": "minecraft:glass" - } - ], - "result": { - "item": "patchouli:guide_book", - "nbt": { - "patchouli:book": "bloodmagic:guide" - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/structures/dungeon/pavilion/3x3_tnt.nbt b/src/main/resources/data/bloodmagic/structures/dungeon/pavilion/3x3_tnt.nbt deleted file mode 100644 index b3d28725..00000000 Binary files a/src/main/resources/data/bloodmagic/structures/dungeon/pavilion/3x3_tnt.nbt and /dev/null differ diff --git a/src/main/resources/data/bloodmagic/structures/dungeon/pavilion/test.nbt b/src/main/resources/data/bloodmagic/structures/dungeon/pavilion/test.nbt deleted file mode 100644 index 2883b7ac..00000000 Binary files a/src/main/resources/data/bloodmagic/structures/dungeon/pavilion/test.nbt and /dev/null differ diff --git a/src/main/resources/data/bloodmagic/structures/dungeon/pavilion/test2.nbt b/src/main/resources/data/bloodmagic/structures/dungeon/pavilion/test2.nbt deleted file mode 100644 index 60931552..00000000 Binary files a/src/main/resources/data/bloodmagic/structures/dungeon/pavilion/test2.nbt and /dev/null differ diff --git a/src/main/resources/data/bloodmagic/structures/four_way_corridor.nbt b/src/main/resources/data/bloodmagic/structures/four_way_corridor.nbt deleted file mode 100644 index e8a47680..00000000 Binary files a/src/main/resources/data/bloodmagic/structures/four_way_corridor.nbt and /dev/null differ diff --git a/src/main/resources/data/bloodmagic/structures/four_way_corridor_loot.nbt b/src/main/resources/data/bloodmagic/structures/four_way_corridor_loot.nbt deleted file mode 100644 index 2fdf1a41..00000000 Binary files a/src/main/resources/data/bloodmagic/structures/four_way_corridor_loot.nbt and /dev/null differ diff --git a/src/main/resources/data/bloodmagic/structures/ore_hold_1.nbt b/src/main/resources/data/bloodmagic/structures/ore_hold_1.nbt deleted file mode 100644 index 6ecc7b1e..00000000 Binary files a/src/main/resources/data/bloodmagic/structures/ore_hold_1.nbt and /dev/null differ diff --git a/src/main/resources/data/bloodmagic/structures/straight_corridor.nbt b/src/main/resources/data/bloodmagic/structures/straight_corridor.nbt deleted file mode 100644 index 0f244757..00000000 Binary files a/src/main/resources/data/bloodmagic/structures/straight_corridor.nbt and /dev/null differ diff --git a/src/main/resources/data/bloodmagic/structures/t_corridor.nbt b/src/main/resources/data/bloodmagic/structures/t_corridor.nbt deleted file mode 100644 index a9caf7e5..00000000 Binary files a/src/main/resources/data/bloodmagic/structures/t_corridor.nbt and /dev/null differ diff --git a/src/main/resources/data/bloodmagic/tags/blocks/altar_components/beacon.json b/src/main/resources/data/bloodmagic/tags/blocks/altar_components/beacon.json deleted file mode 100644 index 7b3492ad..00000000 --- a/src/main/resources/data/bloodmagic/tags/blocks/altar_components/beacon.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "minecraft:beacon" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/tags/blocks/altar_components/bloodrune.json b/src/main/resources/data/bloodmagic/tags/blocks/altar_components/bloodrune.json deleted file mode 100644 index 7f6f93b0..00000000 --- a/src/main/resources/data/bloodmagic/tags/blocks/altar_components/bloodrune.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "values": [ - "bloodmagic:blankrune", - "bloodmagic:speedrune", - "bloodmagic:sacrificerune", - "bloodmagic:selfsacrificerune", - "bloodmagic:dislocationrune", - "bloodmagic:altarcapacityrune", - "bloodmagic:bettercapacityrune", - "bloodmagic:orbcapacityrune", - "bloodmagic:accelerationrune", - "bloodmagic:chargingrune" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/tags/blocks/altar_components/bloodstone.json b/src/main/resources/data/bloodmagic/tags/blocks/altar_components/bloodstone.json deleted file mode 100644 index d4a485db..00000000 --- a/src/main/resources/data/bloodmagic/tags/blocks/altar_components/bloodstone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "bloodmagic:largebloodstonebrick", - "bloodmagic:bloodstonebrick" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/tags/blocks/altar_components/glowstone.json b/src/main/resources/data/bloodmagic/tags/blocks/altar_components/glowstone.json deleted file mode 100644 index 770fbfb2..00000000 --- a/src/main/resources/data/bloodmagic/tags/blocks/altar_components/glowstone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "minecraft:glowstone", - "minecraft:sea_lantern" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/air_or_earth.json b/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/air_or_earth.json deleted file mode 100644 index 4ed8fb27..00000000 --- a/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/air_or_earth.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "bloodmagic:airritualstone", - "bloodmagic:earthritualstone" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/air_or_fire.json b/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/air_or_fire.json deleted file mode 100644 index 61cd9671..00000000 --- a/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/air_or_fire.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "bloodmagic:airritualstone", - "bloodmagic:fireritualstone" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/air_water_earth_fire.json b/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/air_water_earth_fire.json deleted file mode 100644 index de155609..00000000 --- a/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/air_water_earth_fire.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "bloodmagic:airritualstone", - "bloodmagic:waterritualstone", - "bloodmagic:earthritualstone", - "bloodmagic:fireritualstone" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/earth_fire_air_water.json b/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/earth_fire_air_water.json deleted file mode 100644 index 0d59ce19..00000000 --- a/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/earth_fire_air_water.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "bloodmagic:earthritualstone", - "bloodmagic:fireritualstone", - "bloodmagic:airritualstone", - "bloodmagic:waterritualstone" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/earth_or_air.json b/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/earth_or_air.json deleted file mode 100644 index 3c15e031..00000000 --- a/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/earth_or_air.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "bloodmagic:earthritualstone", - "bloodmagic:airritualstone" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/earth_or_water.json b/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/earth_or_water.json deleted file mode 100644 index 01f41b58..00000000 --- a/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/earth_or_water.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "bloodmagic:earthritualstone", - "bloodmagic:waterritualstone" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/fire_air_water_earth.json b/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/fire_air_water_earth.json deleted file mode 100644 index 75c96637..00000000 --- a/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/fire_air_water_earth.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "bloodmagic:fireritualstone", - "bloodmagic:airritualstone", - "bloodmagic:waterritualstone", - "bloodmagic:earthritualstone" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/fire_or_air.json b/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/fire_or_air.json deleted file mode 100644 index 14dd35bf..00000000 --- a/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/fire_or_air.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "bloodmagic:fireritualstone", - "bloodmagic:airritualstone" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/water_earth_fire_air.json b/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/water_earth_fire_air.json deleted file mode 100644 index a343481d..00000000 --- a/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/water_earth_fire_air.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "bloodmagic:waterritualstone", - "bloodmagic:earthritualstone", - "bloodmagic:fireritualstone", - "bloodmagic:airritualstone" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/water_or_earth.json b/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/water_or_earth.json deleted file mode 100644 index 74fd587b..00000000 --- a/src/main/resources/data/bloodmagic/tags/blocks/ritual_stones/water_or_earth.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "bloodmagic:waterritualstone", - "bloodmagic:earthritualstone" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json b/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json deleted file mode 100644 index af646989..00000000 --- a/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "entries": [ - "bloodmagic:silk_touch_bamboo", - "bloodmagic:fortune", - "bloodmagic:looting", - "bloodmagic:smelt" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/bloodmagic/living_armor/arrow_protect.json b/src/main/resources/data/living_armor/arrow_protect.json similarity index 100% rename from src/main/resources/data/bloodmagic/living_armor/arrow_protect.json rename to src/main/resources/data/living_armor/arrow_protect.json diff --git a/src/main/resources/data/bloodmagic/living_armor/arrow_shot.json b/src/main/resources/data/living_armor/arrow_shot.json similarity index 100% rename from src/main/resources/data/bloodmagic/living_armor/arrow_shot.json rename to src/main/resources/data/living_armor/arrow_shot.json diff --git a/src/main/resources/data/bloodmagic/living_armor/critical_strike.json b/src/main/resources/data/living_armor/critical_strike.json similarity index 100% rename from src/main/resources/data/bloodmagic/living_armor/critical_strike.json rename to src/main/resources/data/living_armor/critical_strike.json diff --git a/src/main/resources/data/living_armor/jump.json b/src/main/resources/data/living_armor/jump.json new file mode 100644 index 00000000..57865813 --- /dev/null +++ b/src/main/resources/data/living_armor/jump.json @@ -0,0 +1,41 @@ +{ + "id": "bloodmagic:jump", + "levels": [ + { "xp": 10, "cost": 3 }, + { "xp": 20, "cost": 6 }, + { "xp": 30, "cost": 11 }, + { "xp": 40, "cost": 23 }, + { "xp": 40, "cost": 37 }, + { "xp": 40, "cost": 50 }, + { "xp": 40, "cost": 70 }, + { "xp": 40, "cost": 100 }, + { "xp": 40, "cost": 140 }, + { "xp": 40, "cost": 200 } + ], + "bonuses": { + "jump": [ + 0.1, + 0.2, + 0.3, + 0.4, + 0.5, + 0.7, + 0.75, + 0.9, + 1.1, + 1.3 + ], + "fall": [ + 0.1, + 0.2, + 0.3, + 0.4, + 0.5, + 0.6, + 0.7, + 0.75, + 0.8, + 0.85 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info new file mode 100644 index 00000000..eeff8b90 --- /dev/null +++ b/src/main/resources/mcmod.info @@ -0,0 +1,18 @@ +[ + { + "modid": "bloodmagic", + "name": "Blood Magic: Alchemical Wizardry", + "description": "Blood 'n shit.", + "version": "${version}", + "mcversion": "${mcversion}", + "url": "", + "updateUrl": "", + "authorList": [ + "WayofTime", + "TehNut" + ], + "credits": "CyanideX, Yulife, and BBoldt for the art.", + "logoFile": "", + "screenshots": [] + } +] diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index db8911aa..9aaf05d1 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,7 +1,6 @@ { - "pack": { - "description": "BloodMagic resources", - "pack_format": 6, - "_comment": "A pack_format of 6 requires json lang files and some texture changes from 1.16.2. Note: we require v6 pack meta for all mods." - } -} + "pack": { + "description": "Blood Magic: Alchemical Wizardry", + "pack_format": 3 + } +} \ No newline at end of file