diff --git a/fml/eclipse/.gitignore b/fml/eclipse/.gitignore
deleted file mode 100644
index 2b9ab7d6a..000000000
--- a/fml/eclipse/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/*/bin
-/*/.settings/org.eclipse.ltk.core.refactoring.prefs
-*.cdt.*
-*.ajdt.*
-/.log
-*.m2e.*
diff --git a/fml/eclipse/.metadata/.gitignore b/fml/eclipse/.metadata/.gitignore
deleted file mode 100644
index 0ef40f1d0..000000000
--- a/fml/eclipse/.metadata/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.mylyn/
-.lock
-version.ini
\ No newline at end of file
diff --git a/fml/eclipse/.metadata/.plugins/.gitignore b/fml/eclipse/.metadata/.plugins/.gitignore
deleted file mode 100644
index 074e4a685..000000000
--- a/fml/eclipse/.metadata/.plugins/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-/org.eclipse.epp.usagedata.recording/
-/org.eclipse.jdt.core/
-/org.eclipse.jdt.launching/
-/org.eclipse.jdt.ui/
-/org.eclipse.ltk.core.refactoring/
-/org.eclipse.ltk.ui.refactoring/
-/org.eclipse.m2e.logback.configuration/
-/org.eclipse.mylyn.bugzilla.core/
-/org.eclipse.mylyn.tasks.ui/
-/org.eclipse.team.cvs.core/
-/org.eclipse.ui.workbench/
-/org.eclipse.wb.discovery.core/
diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.core.resources/.gitignore b/fml/eclipse/.metadata/.plugins/org.eclipse.core.resources/.gitignore
deleted file mode 100644
index 0618be605..000000000
--- a/fml/eclipse/.metadata/.plugins/org.eclipse.core.resources/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/.safetable/
-/.history/
-/.projects/*/*.snap
-/.projects/*/.syncinfo
-/.projects/*/.markers
-/.projects/*/*/
-/.root/
diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/.gitignore b/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/.gitignore
deleted file mode 100644
index 098f31643..000000000
--- a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-/org.eclipse.jdt.launching.prefs
-/org.eclipse.m2e.discovery.prefs
-/org.eclipse.mylyn.context.core.prefs
-/org.eclipse.mylyn.monitor.ui.prefs
-/org.eclipse.team.cvs.ui.prefs
-/org.eclipse.team.ui.prefs
-/org.eclipse.ui.workbench.prefs
-/org.eclipse.wst.sse.core.prefs
-/org.eclipse.epp.usagedata.gathering.prefs
-/org.eclipse.debug.ui.prefs
-/org.eclipse.jdt.ui.prefs
-/org.eclipse.ui.ide.prefs
diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs b/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index a469f5d3d..000000000
--- a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-refresh.enabled=true
-version=1
diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs b/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 25bd856bb..000000000
--- a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,305 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
-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.codeComplete.visibilityCheck=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedImport=ignore
-org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
-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_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
-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=16
-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_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
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-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_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
-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_package=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_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_method_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.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.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=true
-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
-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=true
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-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_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=8
-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_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=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=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=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_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_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_superinterfaces=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_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_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_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_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=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_binary_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_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
-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_superinterfaces=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_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_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_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_semicolon=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_semicolon_in_try_resources=do not 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_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_else_statement_on_same_line=true
-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=true
-org.eclipse.jdt.core.formatter.lineSplit=160
-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_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=false
-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_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
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
-org.eclipse.jdt.core.timeoutForParameterNameFromAttachedJavadoc=50
diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs b/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs
deleted file mode 100644
index d10033dc2..000000000
--- a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-lineNumberRuler=true
-overviewRuler_migration=migrated_3.1
-showWhitespaceCharacters=true
-spacesForTabs=true
diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs b/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs
deleted file mode 100644
index 08076f236..000000000
--- a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-showIntro=false
diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Clean-Client.launch b/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Clean-Client.launch
deleted file mode 100644
index 04cc3119e..000000000
--- a/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Clean-Client.launch
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Clean-Server.launch b/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Clean-Server.launch
deleted file mode 100644
index 894e6123e..000000000
--- a/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Clean-Server.launch
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Client.launch b/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Client.launch
deleted file mode 100644
index 5b742ab12..000000000
--- a/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Client.launch
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Server.launch b/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Server.launch
deleted file mode 100644
index 6b438eeaa..000000000
--- a/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Server.launch
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.debug.ui/.gitignore b/fml/eclipse/.metadata/.plugins/org.eclipse.debug.ui/.gitignore
deleted file mode 100644
index 98148b4c1..000000000
--- a/fml/eclipse/.metadata/.plugins/org.eclipse.debug.ui/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/dialog_settings.xml
-/launchConfigurationHistory.xml
diff --git a/fml/eclipse/Clean-Client/.classpath b/fml/eclipse/Clean-Client/.classpath
deleted file mode 100644
index 6dd00b061..000000000
--- a/fml/eclipse/Clean-Client/.classpath
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/fml/eclipse/Clean-Client/.project b/fml/eclipse/Clean-Client/.project
deleted file mode 100644
index cee33cd24..000000000
--- a/fml/eclipse/Clean-Client/.project
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
- Clean-Client
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
-
-
-
- jars
- 2
- MCP_LOC/jars
-
-
- lib
- 2
- MCP_LOC/lib
-
-
- src
- 2
- MCP_LOC/src-base/minecraft
-
-
- src-common
- 2
- MCP_LOC/src-base/common
-
-
-
-
- 0
- jars
- 13
-
- org.eclipse.ui.ide.multiFilter
- 1.0-name-matches-false-false-bin
-
-
-
- 1307293504507
- jars/bin
- 5
-
- org.eclipse.ui.ide.multiFilter
- 1.0-name-matches-false-false-*.jar
-
-
-
- 1307293480435
- jars/bin/natives
- 6
-
- org.eclipse.ui.ide.multiFilter
- 1.0-name-matches-false-false-*
-
-
-
-
-
- MCP_LOC
- $%7BPARENT-2-WORKSPACE_LOC%7D
-
-
-
diff --git a/fml/eclipse/Clean-Client/.settings/org.eclipse.jdt.core.prefs b/fml/eclipse/Clean-Client/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fff3b334b..000000000
--- a/fml/eclipse/Clean-Client/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Thu Jun 02 15:56:40 CEST 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/fml/eclipse/FML-Client/.classpath b/fml/eclipse/FML-Client/.classpath
deleted file mode 100644
index 5c2c2ed92..000000000
--- a/fml/eclipse/FML-Client/.classpath
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/fml/eclipse/FML-Client/.project b/fml/eclipse/FML-Client/.project
deleted file mode 100644
index fad25895a..000000000
--- a/fml/eclipse/FML-Client/.project
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
- FML-Client
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
-
-
-
- build.xml
- 1
- MCP_LOC/FML/build.xml
-
-
- client
- 2
- MCP_LOC/FML/client
-
-
- common
- 2
- MCP_LOC/FML/common
-
-
- jars
- 2
- MCP_LOC/jars
-
-
- lib
- 2
- MCP_LOC/lib
-
-
- src
- 2
- MCP_LOC/src-work/minecraft
-
-
- src-common
- 2
- MCP_LOC/src-work/common
-
-
- transformers
- 2
- MCP_LOC/FML/transformers
-
-
- common/fmlversion.properties
- 1
- MCP_LOC/FML/fmlversion.properties
-
-
-
-
- 0
- jars
- 13
-
- org.eclipse.ui.ide.multiFilter
- 1.0-name-matches-false-false-bin
-
-
-
- 1307293504507
- jars/bin
- 5
-
- org.eclipse.ui.ide.multiFilter
- 1.0-name-matches-false-false-*.jar
-
-
-
- 1307293480435
- jars/bin/natives
- 6
-
- org.eclipse.ui.ide.multiFilter
- 1.0-name-matches-false-false-*
-
-
-
-
-
- MCP_LOC
- $%7BPARENT-2-WORKSPACE_LOC%7D
-
-
-
diff --git a/fml/eclipse/FML-Client/.settings/org.eclipse.jdt.core.prefs b/fml/eclipse/FML-Client/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8000cd6ca..000000000
--- a/fml/eclipse/FML-Client/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,11 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/fml/eclipse/FML-Client/tstann.jpage b/fml/eclipse/FML-Client/tstann.jpage
deleted file mode 100644
index d8e96142a..000000000
--- a/fml/eclipse/FML-Client/tstann.jpage
+++ /dev/null
@@ -1,44 +0,0 @@
-java.io.FileInputStream fis = new java.io.FileInputStream(new java.io.File("/home/cpw/projects/FML/mc131/FML/eclipse/FML-MockMod/bin/cpw/mods/mockmod/MockMod.class"));
-
-System.out.println(new cpw.mods.fml.common.discovery.asm.ASMModParser(fis));
-com.sun.jdi.VMDisconnectedException: Got IOException from Virtual Machine
- at org.eclipse.jdi.internal.connect.PacketReceiveManager.getReply(PacketReceiveManager.java:179)
- at org.eclipse.jdi.internal.connect.PacketReceiveManager.getReply(PacketReceiveManager.java:197)
- at org.eclipse.jdi.internal.MirrorImpl.requestVM(MirrorImpl.java:191)
- at org.eclipse.jdi.internal.MirrorImpl.requestVM(MirrorImpl.java:226)
- at org.eclipse.jdi.internal.ObjectReferenceImpl.invokeMethod(ObjectReferenceImpl.java:428)
- at org.eclipse.jdt.internal.debug.core.model.JDIThread.invokeMethod(JDIThread.java:958)
- at org.eclipse.jdt.internal.debug.core.model.JDIObjectValue.sendMessage(JDIObjectValue.java:95)
- at org.eclipse.jdt.internal.debug.eval.LocalEvaluationEngine.run(LocalEvaluationEngine.java:226)
- at org.eclipse.jdt.internal.debug.core.model.JDIThread.runEvaluation(JDIThread.java:764)
- at org.eclipse.jdt.internal.debug.eval.LocalEvaluationEngine.acceptClassFiles(LocalEvaluationEngine.java:212)
- at org.eclipse.jdt.internal.core.eval.RequestorWrapper.acceptClassFiles(RequestorWrapper.java:48)
- at org.eclipse.jdt.internal.eval.EvaluationContext.evaluate(EvaluationContext.java:296)
- at org.eclipse.jdt.internal.eval.EvaluationContext.evaluate(EvaluationContext.java:315)
- at org.eclipse.jdt.internal.core.eval.EvaluationContextWrapper.evaluateCodeSnippet(EvaluationContextWrapper.java:244)
- at org.eclipse.jdt.internal.debug.eval.LocalEvaluationEngine$1.run(LocalEvaluationEngine.java:444)
- at java.lang.Thread.run(Thread.java:679)
-
-
-java.io.FileInputStream fis = new java.io.FileInputStream(new java.io.File("/home/cpw/projects/FML/mcsnapshot/FML/eclipse/simpletestmod/bin/net/minecraft/src/mod_testMod.class"));
-
-System.out.println(new cpw.mods.fml.common.asm.ASMModParser(fis));
-
-
-
-org.objectweb.asm.Type.getDescriptor(net.minecraft.src.CraftingManager.class.getDeclaredMethods()[1])
-
-
-com.google.common.collect.Tables.newCustomTable(new HashMap>(), new com.google.common.base.Supplier() {
-
-});
-
-
-
-
-
-
-byte[] bytes = new byte[] {0, 0, 0, 1, 0, 0, 0, -107, 0, 0, 22, 83, 0, 0, 25, -48, 0, 0, 8, 70, 0, 0, 32, 80, 0, 0, 0, 0, 0, 33, 1, 44, 74, 0, 0, 0, 0, 75, 0, 0, 0, 0, 76, 0, 0, 0, 0, 77, 0, 0, 0, 0, 78, 0, 0, 0, 0, 79, 0, 0, 0, 0, 81, 0, 0, 0, 0, 80, 0, 0, 0, 0, 83, 0, 0, 0, 0, 82, 0, 0, 0, 0, 85, 0, 0, 0, 0, 84, 0, 0, 0, 0, 23, 0, 22, 0, 25, 0, 24, 0, -102, 0, 0, 127, 0, 0, 0, 0};
-new cpw.mods.fml.common.network.EntitySpawnPacket().consumePacket(bytes)
-
-108 - 27 - 4
\ No newline at end of file
diff --git a/fml/eclipse/FML-MockMod/.classpath b/fml/eclipse/FML-MockMod/.classpath
deleted file mode 100644
index 9fae2ab38..000000000
--- a/fml/eclipse/FML-MockMod/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/fml/eclipse/FML-MockMod/.project b/fml/eclipse/FML-MockMod/.project
deleted file mode 100644
index cbfeeb52e..000000000
--- a/fml/eclipse/FML-MockMod/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- FML-MockMod
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
-
-
diff --git a/fml/eclipse/FML-MockMod/.settings/org.eclipse.jdt.core.prefs b/fml/eclipse/FML-MockMod/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8000cd6ca..000000000
--- a/fml/eclipse/FML-MockMod/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,11 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockBlock.java b/fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockBlock.java
deleted file mode 100644
index da9274e7a..000000000
--- a/fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockBlock.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cpw.mods.mockmod;
-
-import cpw.mods.fml.common.Mod.Instance;
-import net.minecraft.src.Block;
-import net.minecraft.src.Material;
-
-public class MockBlock extends Block
-{
- static
- {
- Thread.dumpStack();
- }
- @Instance("mod_testMod")
- public static Object tstInstance;
-
- public MockBlock(int id)
- {
- super(id,Material.field_76259_v);
- }
-}
diff --git a/fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockMod.java b/fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockMod.java
deleted file mode 100644
index 2b602d737..000000000
--- a/fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockMod.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package cpw.mods.mockmod;
-
-import net.minecraft.src.GuiErrorScreen;
-import net.minecraft.src.ItemBlock;
-import net.minecraft.src.NetHandler;
-import net.minecraft.src.NetworkManager;
-import net.minecraft.src.Packet131MapData;
-import net.minecraft.src.Packet250CustomPayload;
-import net.minecraft.src.FontRenderer;
-import cpw.mods.fml.client.CustomModLoadingErrorDisplayException;
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.Mod.Block;
-import cpw.mods.fml.common.Mod.Init;
-import cpw.mods.fml.common.Mod.Instance;
-import cpw.mods.fml.common.Mod.Metadata;
-import cpw.mods.fml.common.Mod.PreInit;
-import cpw.mods.fml.common.Side;
-import cpw.mods.fml.common.SidedProxy;
-import cpw.mods.fml.common.asm.SideOnly;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.network.IPacketHandler;
-import cpw.mods.fml.common.network.ITinyPacketHandler;
-import cpw.mods.fml.common.network.NetworkMod;
-import cpw.mods.fml.common.network.NetworkMod.SidedPacketHandler;
-import cpw.mods.fml.common.network.Player;
-import cpw.mods.fml.common.ModMetadata;
-
-@Mod(modid="MockMod", name="Mock Mod",version="1.2.3", dependencies="after:FML@[3.1.29,)", useMetadata=true,acceptedMinecraftVersions="[1.3,),[12w27a,)")
-@NetworkMod(channels={"MockMod"},clientSideRequired=true,packetHandler=MockMod.PacketHandler.class,clientPacketHandlerSpec=
-@SidedPacketHandler(packetHandler=TestClass.class,channels={"Fish"}),tinyPacketHandler=MockMod.PacketHandler.class)
-public class MockMod
-{
- public static class PacketHandler implements IPacketHandler, ITinyPacketHandler
- {
- @Override
- public void onPacketData(NetworkManager manager, Packet250CustomPayload packet, Player player)
- {
- }
-
- @Override
- public void handle(NetHandler handler, Packet131MapData mapData)
- {
-
- }
- }
- public class TestItem extends ItemBlock
- {
-
- public TestItem(int id)
- {
- super(id);
- }
-
- }
-
- @Instance
- public static MockMod myInstance;
-
- @Metadata
- private ModMetadata meta;
-
- @SidedProxy(clientSide="cpw.mods.mockmod.MockProxyClient", serverSide="cpw.mods.mockmod.MockProxy")
- public static MockProxy proxy;
-// @Block(name="MyBlock", itemTypeClass=TestItem.class)
-// private MockBlock myBlock;
-
- @PreInit
- public void preinit(FMLPreInitializationEvent evt)
- {
- System.out.printf("Hello from mockmod preinit %s\n", evt.getSourceFile());
- evt.getModMetadata().description="Fishy fish head";
- evt.getModMetadata().autogenerated = false;
- }
- @Init
- public void init(FMLInitializationEvent evt)
- {
- System.out.printf("Hello from mockmod init : %s %s %s\n", myInstance, meta, MockBlock.tstInstance);
- }
-}
diff --git a/fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockProxy.java b/fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockProxy.java
deleted file mode 100644
index e9fdb3f7d..000000000
--- a/fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockProxy.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package cpw.mods.mockmod;
-
-public class MockProxy
-{
- public void throwError()
- {
- throw new RuntimeException();
- }
-}
diff --git a/fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockProxyClient.java b/fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockProxyClient.java
deleted file mode 100644
index 145235425..000000000
--- a/fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockProxyClient.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package cpw.mods.mockmod;
-
-import net.minecraft.src.FontRenderer;
-import net.minecraft.src.GuiErrorScreen;
-import cpw.mods.fml.client.CustomModLoadingErrorDisplayException;
-
-public class MockProxyClient extends MockProxy
-{
- @Override
- public void throwError()
- {
- throw new CustomModLoadingErrorDisplayException()
- {
-
- @Override
- public void drawScreen(GuiErrorScreen errorScreen, FontRenderer fontRenderer, int par1, int par2, float par3)
- {
- errorScreen.func_73732_a(fontRenderer, "MockMod doesn't like your installation", errorScreen.field_73880_f / 2, 75, 0xFFFFFF);
-
- }
-
- @Override
- public void initGui(GuiErrorScreen errorScreen, FontRenderer renderer)
- {
- // noop
- }
- };
- }
-}
diff --git a/fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/TestClass.java b/fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/TestClass.java
deleted file mode 100644
index 75cbc1ea3..000000000
--- a/fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/TestClass.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package cpw.mods.mockmod;
-
-import net.minecraft.src.NetworkManager;
-import net.minecraft.src.Packet250CustomPayload;
-import cpw.mods.fml.common.Side;
-
-import cpw.mods.fml.common.asm.SideOnly;
-import cpw.mods.fml.common.network.IPacketHandler;
-import cpw.mods.fml.common.network.Player;
-
-@SideOnly(Side.CLIENT)
-public class TestClass implements IPacketHandler
-{
-
- static
- {
- Thread.dumpStack();
- }
- @Override
- public void onPacketData(NetworkManager manager, Packet250CustomPayload packet, Player player)
- {
- // TODO Auto-generated method stub
-
- }
-
-}
diff --git a/fml/eclipse/MCP-Client/.classpath b/fml/eclipse/MCP-Client/.classpath
deleted file mode 100644
index f8e5fc45c..000000000
--- a/fml/eclipse/MCP-Client/.classpath
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/fml/eclipse/MCP-Client/.project b/fml/eclipse/MCP-Client/.project
deleted file mode 100644
index 1d77050e3..000000000
--- a/fml/eclipse/MCP-Client/.project
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
- MCP-Client
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
-
-
-
- jars
- 2
- MCP_LOC/jars
-
-
- lib
- 2
- MCP_LOC/lib
-
-
- minecraft
- 2
- MCP_LOC/src-renamed/minecraft
-
-
- minecraft/fmlversion.properties
- 1
- MCP_LOC/FML/fmlversion.properties
-
-
-
-
- 1341586110750
- jars
- 13
-
- org.eclipse.ui.ide.multiFilter
- 1.0-name-matches-false-false-bin
-
-
-
-
-
- MCP_LOC
- $%7BPARENT-2-WORKSPACE_LOC%7D
-
-
-
diff --git a/fml/eclipse/MCP-Client/.settings/org.eclipse.jdt.core.prefs b/fml/eclipse/MCP-Client/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8000cd6ca..000000000
--- a/fml/eclipse/MCP-Client/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,11 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/fml/eclipse/coremodtest/.classpath b/fml/eclipse/coremodtest/.classpath
deleted file mode 100644
index 294bff6e8..000000000
--- a/fml/eclipse/coremodtest/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/fml/eclipse/coremodtest/.project b/fml/eclipse/coremodtest/.project
deleted file mode 100644
index bda043346..000000000
--- a/fml/eclipse/coremodtest/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- coremodtest
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
-
-
diff --git a/fml/eclipse/coremodtest/.settings/org.eclipse.jdt.core.prefs b/fml/eclipse/coremodtest/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8000cd6ca..000000000
--- a/fml/eclipse/coremodtest/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,11 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/fml/eclipse/coremodtest/manifest.mf b/fml/eclipse/coremodtest/manifest.mf
deleted file mode 100644
index eda1ba385..000000000
--- a/fml/eclipse/coremodtest/manifest.mf
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-FMLCorePlugin: cpw.mods.testcoremod.FMLLoadPlugin
-
diff --git a/fml/eclipse/coremodtest/src/cpw/mods/testcoremod/FMLLoadPlugin.java b/fml/eclipse/coremodtest/src/cpw/mods/testcoremod/FMLLoadPlugin.java
deleted file mode 100644
index fbec634d5..000000000
--- a/fml/eclipse/coremodtest/src/cpw/mods/testcoremod/FMLLoadPlugin.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package cpw.mods.testcoremod;
-
-import java.util.Map;
-
-import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
-
-public class FMLLoadPlugin implements IFMLLoadingPlugin
-{
- @Override
- public String[] getLibraryRequestClass()
- {
- return null;
- }
-
- @Override
- public String[] getASMTransformerClass()
- {
- return null;
- }
-
- @Override
- public String getModContainerClass()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public String getSetupClass()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public void injectData(Map data)
- {
- // TODO Auto-generated method stub
-
- }
-
-}
diff --git a/fml/eclipse/simpletestmod/.classpath b/fml/eclipse/simpletestmod/.classpath
deleted file mode 100644
index 294bff6e8..000000000
--- a/fml/eclipse/simpletestmod/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/fml/eclipse/simpletestmod/.project b/fml/eclipse/simpletestmod/.project
deleted file mode 100644
index a96e04f8a..000000000
--- a/fml/eclipse/simpletestmod/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- simpletestmod
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
-
-
diff --git a/fml/eclipse/simpletestmod/.settings/org.eclipse.jdt.core.prefs b/fml/eclipse/simpletestmod/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8000cd6ca..000000000
--- a/fml/eclipse/simpletestmod/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,11 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/fml/eclipse/simpletestmod/src/net/minecraft/src/mod_testMod.java b/fml/eclipse/simpletestmod/src/net/minecraft/src/mod_testMod.java
deleted file mode 100644
index a6ea4d6d2..000000000
--- a/fml/eclipse/simpletestmod/src/net/minecraft/src/mod_testMod.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package net.minecraft.src;
-
-import java.util.EnumSet;
-
-import org.lwjgl.input.Keyboard;
-import org.lwjgl.input.Mouse;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.IScheduledTickHandler;
-import cpw.mods.fml.common.ITickHandler;
-import cpw.mods.fml.common.Side;
-import cpw.mods.fml.common.TickType;
-import cpw.mods.fml.common.asm.SideOnly;
-import cpw.mods.fml.common.network.IPacketHandler;
-import cpw.mods.fml.common.network.NetworkMod;
-import cpw.mods.fml.common.network.Player;
-import cpw.mods.fml.common.registry.TickRegistry;
-import net.minecraft.client.Minecraft;
-
-@NetworkMod(channels={"mod_TestMod"},clientSideRequired=true,packetHandler=mod_testMod.PacketHandler.class)
-public class mod_testMod extends BaseMod {
-
- @MLProp
- public static int test = 0;
- public static class PacketHandler implements IPacketHandler
- {
- @Override
- public void onPacketData(NetworkManager manager, Packet250CustomPayload packet, Player player)
- {
- }
- }
-
- private long ts;
- @Override
- public String getVersion() {
- return "test";
- }
-
- @Override
- public void load() {
-// if (1==1) throw new RuntimeException();
-// ModLoader.setInGameHook(this, true, false);
-// ModLoader.setInGUIHook(this, true, false);
-// FMLCommonHandler.instance().registerTickHandler(this);
- ModLoader.registerKey(this, new KeyBinding("Fishhead",Keyboard.KEY_O), true);
- }
-
- @Override
- @SideOnly(Side.CLIENT)
- public void keyboardEvent(KeyBinding event)
- {
- Mouse.setGrabbed(false);
- System.out.println(event.field_74515_c);
- }
-
- @Override
- public boolean onTickInGame(float time, Minecraft minecraftInstance)
- {
- long now = System.currentTimeMillis();
- long del=now-ts;
- ts=now;
- System.out.printf("%d %d %d MLTICK\n",del, ts, now);
- return true;
- }
-
- @Override
- public boolean onTickInGUI(float tick, Minecraft game, GuiScreen gui)
- {
- System.out.printf("%d MLGUITICK\n",System.currentTimeMillis());
- return true;
- }
-
- public class TickTester implements IScheduledTickHandler
- {
- public int interval;
- public long tsg = System.currentTimeMillis();
- @Override
- public void tickStart(EnumSet type, Object... tickData)
- {
- long now = System.currentTimeMillis();
- long del=now-tsg;
- System.out.printf("Begin GAMETICK [%d] %d\n",interval, del);
- }
-
- @Override
- public void tickEnd(EnumSet type, Object... tickData)
- {
- long now = System.currentTimeMillis();
- long del=now-tsg;
- tsg=now;
- System.out.printf("End GAMETICK [%d] %d\n",interval, del);
- }
-
- @Override
- public EnumSet ticks()
- {
- return EnumSet.of(TickType.CLIENT);
- }
-
- /* (non-Javadoc)
- * @see cpw.mods.fml.common.ITickHandler#getLabel()
- */
- @Override
- public String getLabel()
- {
- return "TickTester";
- }
-
- @Override
- public int nextTickSpacing()
- {
- return interval;
- }
- }
-
- @Override
- public String getPriorities()
- {
- return "before:MockMod";
- }
-}
\ No newline at end of file
diff --git a/fml/eclipse/testmod.zip b/fml/eclipse/testmod.zip
deleted file mode 100644
index 717b04903..000000000
Binary files a/fml/eclipse/testmod.zip and /dev/null differ