diff --git a/.gitignore b/.gitignore
index 5ff86d0e3b..4217d8f7b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/forge-*/
/patches-old/
/mcp/
+/eclipse/
\ No newline at end of file
diff --git a/eclipse-workspace-dev.zip b/eclipse-workspace-dev.zip
new file mode 100644
index 0000000000..e92cb557ec
Binary files /dev/null and b/eclipse-workspace-dev.zip differ
diff --git a/eclipse/.metadata/.gitignore b/eclipse/.metadata/.gitignore
deleted file mode 100644
index 4cdddaf6ae..0000000000
--- a/eclipse/.metadata/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/.mylyn/
-.lock
-version.ini
-/*.log
-/SarosLogs/
diff --git a/eclipse/.metadata/.plugins/.gitignore b/eclipse/.metadata/.plugins/.gitignore
deleted file mode 100644
index e34cc863cb..0000000000
--- a/eclipse/.metadata/.plugins/.gitignore
+++ /dev/null
@@ -1,20 +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/
-/org.eclipse.recommenders.rcp/
-/org.eclipse.recommenders.completion.rcp.overrides/
-/org.eclipse.recommenders.completion.rcp.calls/
-/org.eclipse.mylyn.context.core/
-/org.eclipse.search/
-/org.eclipse.jdt.debug.ui/
-/org.eclipse.ui.editors/
-/de.fu_berlin.inf.dpp/
diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.resources/.gitignore b/eclipse/.metadata/.plugins/org.eclipse.core.resources/.gitignore
deleted file mode 100644
index e107de3b9d..0000000000
--- a/eclipse/.metadata/.plugins/org.eclipse.core.resources/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/.safetable/
-/.history/
-/.projects/*/*.snap
-/.projects/*/.syncinfo
-/.projects/*/.markers
-/.projects/*/*/
-/.root/
-/*.snap
diff --git a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/.gitignore b/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/.gitignore
deleted file mode 100644
index 966a69cce4..0000000000
--- a/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/.gitignore
+++ /dev/null
@@ -1,13 +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
-/*.prefs
diff --git a/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/.gitignore b/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/.gitignore
deleted file mode 100644
index 44ba87695c..0000000000
--- a/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*.launch
diff --git a/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Clean-Client.launch b/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Clean-Client.launch
deleted file mode 100644
index 04cc3119ef..0000000000
--- a/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Clean-Client.launch
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Clean-Server.launch b/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Clean-Server.launch
deleted file mode 100644
index 8069261f25..0000000000
--- a/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Clean-Server.launch
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Forge-Client.launch b/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Forge-Client.launch
deleted file mode 100644
index 3d9fa1ea24..0000000000
--- a/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Forge-Client.launch
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Forge-Server.launch b/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Forge-Server.launch
deleted file mode 100644
index 0f58c6e25b..0000000000
--- a/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Forge-Server.launch
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/eclipse/.metadata/.plugins/org.eclipse.debug.ui/.gitignore b/eclipse/.metadata/.plugins/org.eclipse.debug.ui/.gitignore
deleted file mode 100644
index 98148b4c13..0000000000
--- a/eclipse/.metadata/.plugins/org.eclipse.debug.ui/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/dialog_settings.xml
-/launchConfigurationHistory.xml
diff --git a/eclipse/.metadata/.plugins/org.eclipse.e4.workbench/.gitignore b/eclipse/.metadata/.plugins/org.eclipse.e4.workbench/.gitignore
deleted file mode 100644
index db45a35539..0000000000
--- a/eclipse/.metadata/.plugins/org.eclipse.e4.workbench/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*.xmi
diff --git a/eclipse/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/.gitignore b/eclipse/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/.gitignore
deleted file mode 100644
index b878e882ac..0000000000
--- a/eclipse/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*.xml
diff --git a/eclipse/Clean-Client/.classpath b/eclipse/Clean-Client/.classpath
deleted file mode 100644
index 8cd01944ce..0000000000
--- a/eclipse/Clean-Client/.classpath
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/eclipse/Clean-Client/.project b/eclipse/Clean-Client/.project
deleted file mode 100644
index 8de2b265f0..0000000000
--- a/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/eclipse/Clean-Client/.settings/org.eclipse.jdt.core.prefs b/eclipse/Clean-Client/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fff3b334bb..0000000000
--- a/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/eclipse/Forge-Client/.classpath b/eclipse/Forge-Client/.classpath
deleted file mode 100644
index a81087f627..0000000000
--- a/eclipse/Forge-Client/.classpath
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/eclipse/Forge-Client/.gitignore b/eclipse/Forge-Client/.gitignore
deleted file mode 100644
index 50e13221d7..0000000000
--- a/eclipse/Forge-Client/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*.log
diff --git a/eclipse/Forge-Client/.project b/eclipse/Forge-Client/.project
deleted file mode 100644
index a499d093b3..0000000000
--- a/eclipse/Forge-Client/.project
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
- Forge-Client
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
-
-
-
- forge-client
- 2
- MCP_LOC/forge/client
-
-
- forge-common
- 2
- MCP_LOC/forge/common
-
-
- jars
- 2
- MCP_LOC/jars
-
-
- lib
- 2
- MCP_LOC/lib
-
-
- src-client
- 2
- MCP_LOC/src_work/minecraft
-
-
- src-common
- 2
- MCP_LOC/src_work/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-3-PROJECT_LOC%7D
-
-
-
diff --git a/eclipse/Forge-Client/.settings/org.eclipse.jdt.core.prefs b/eclipse/Forge-Client/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8000cd6ca6..0000000000
--- a/eclipse/Forge-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/setup.py b/setup.py
index b5556e7085..9f275a4317 100644
--- a/setup.py
+++ b/setup.py
@@ -41,6 +41,8 @@ def main():
print 'Applying forge patches'
apply_forge_patches(os.path.join(forge_dir, 'fml'), mcp_dir, forge_dir, work_dir, False)
+ setup_eclipse(forge_dir)
+
print '=================================== Setup Finished ================================='
def setup_fml(mcp_dir, fml_dir, dont_extract=False):
@@ -67,5 +69,15 @@ def setup_fml(mcp_dir, fml_dir, dont_extract=False):
from install import fml_main
fml_main(fml_dir, mcp_dir, True)
+def setup_eclipse(forge_dir):
+ eclipse_dir = os.path.join(forge_dir, 'eclipse')
+ eclipse_zip = os.path.join(forge_dir, 'eclipse-workspace-dev.zip')
+
+ if not os.path.isdir(eclipse_dir) and os.path.isfile(eclipse_zip):
+ print 'Extracting Dev Workspace'
+ zf = zipfile.ZipFile(eclipse_zip)
+ zf.extractall(forge_dir)
+ zf.close()
+
if __name__ == '__main__':
main()
\ No newline at end of file