From fa24ea4118de972837efc969a7eafaaeb56a0ee5 Mon Sep 17 00:00:00 2001 From: Vindex Date: Fri, 1 Jan 2016 10:06:57 +0100 Subject: [PATCH] Eclipse and IDEA formatting settings and Prevent reformatting EnumAltarTier so that IDEA doesn't mess with it --- .settings/BloodMagic1.8IDEA.jar | Bin 0 -> 1882 bytes .settings/org.eclipse.jdt.core.prefs | 14 +++++++------- .../bloodmagic/api/altar/EnumAltarTier.java | 2 ++ 3 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 .settings/BloodMagic1.8IDEA.jar diff --git a/.settings/BloodMagic1.8IDEA.jar b/.settings/BloodMagic1.8IDEA.jar new file mode 100644 index 0000000000000000000000000000000000000000..839031f4b68356c13ee33e461722e0551f2acf57 GIT binary patch literal 1882 zcmWIWW@Zs#;Nak32wpeeodF5R0onNlC7Jno#rnzlDXDtJC6zfqGC3nPH?>%=A~$EV zr;f&nlRkbrC(oSU{5U9JgXg*Px+l(ipVbaL;eEz;YiQ9qe@|Y$m1jJ8{myxu_2u=` z)jWB|TR)6RlTGWqKEunFmAt%MMPIo)`OCf)d@b$$Ui_srG)Tkyj3(3jQOHNWkCMDfGtI+V%za_tg zb?f%+ldF9E?AiOq){gTnz7CE#GkcOn+~)6;fBA1l>BPn@PExx=CPZjnaGO&nC3N(C z@Ny?nQ-`x6{yfv0O4b}$I(gTc0_{+qV+%I1rQKS@V1H=ARPEX;NAK4z+q~$;)7y); z`+t6`d3PFnqjiBB-)&3vHUQn|Z(t-$0%8j_K@2NE*pKYf&wSubhNWLVy# z$I6ritXSIxB9j7&ak7BXKZergK)$#o<3&f7)Z>lZ!WD{uYnQmM&HeuX5Hg*8XQiiAj>k&o zr3tQjHtngZKW&3-TIn!Em9>=*B{rPMBx&OGFUEaK+?X`a< z?tkJqbMKS*s>x^5LZ2-A75rrH#aICzbNkg_m)ZPLHJlkWox!)|73==ZNyoe8*_z`n z7=v5 zCBt9MihZUF7f(?5WnR}T;<@VNykNN!hsG~4NBg+V(my0~a|HQJ@qTuxYuQcB-BT90 zzPk2dyT!tb#a$bubAz@$jnEP}IBBg|*oIf-D(d>VtLxt0YEhc-DfCsI=)PE3 zjEi+kiPh1+BLCD=Up+n+fAnkIJ&yNt_};y(K6raqS*?Qg(=)-xJtzWeO? z?v;Q;#m=u+dvEOLvV9Y8J8SXozmFcK%Kc>p6=#k;Y5Y$a85owcBPW(aXvLW% zm89n6WO^xhy0|(jxaZ_2CFUpurAwUK* qib-f03)vi4D8qsb6v_xNm6br42Y9oxft0fXVG=M39|1KmFaQ8c&(xOy literal 0 HcmV?d00001 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index abce0930..e5860456 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -13,7 +13,7 @@ org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=1 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 @@ -21,7 +21,7 @@ org.eclipse.jdt.core.formatter.alignment_for_assignment=0 org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=49 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=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_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 @@ -30,7 +30,7 @@ org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=1 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 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=16 @@ -66,7 +66,7 @@ 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=false org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false org.eclipse.jdt.core.formatter.comment.indent_root_tags=true org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert @@ -119,7 +119,7 @@ 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_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=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 @@ -282,14 +282,14 @@ org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false org.eclipse.jdt.core.formatter.lineSplit=600 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=false +org.eclipse.jdt.core.formatter.use_on_off_tags=true org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=true org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarTier.java b/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarTier.java index d53deebc..435d3c2e 100644 --- a/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarTier.java +++ b/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarTier.java @@ -5,6 +5,7 @@ import net.minecraft.util.BlockPos; import java.util.ArrayList; +//@formatter:off @Getter public enum EnumAltarTier { @@ -136,6 +137,7 @@ public enum EnumAltarTier altarComponents.add(new AltarComponent(new BlockPos(i, -5, -11), EnumAltarComponent.BLOODRUNE).setUpgradeSlot()); } } +//@formatter:on }; public static final int MAXTIERS = values().length;