diff --git a/fml/.gitignore b/fml/.gitignore index b00de09d8c..b93239b719 100644 --- a/fml/.gitignore +++ b/fml/.gitignore @@ -10,3 +10,4 @@ fmlbranding.properties /commands.py.bck /mcp*.zip /mcp +/eclipse diff --git a/fml/build.xml b/fml/build.xml index f4923472e1..6fcb2e0f14 100644 --- a/fml/build.xml +++ b/fml/build.xml @@ -24,12 +24,8 @@ - - - - - + @@ -55,6 +51,7 @@ + @@ -78,9 +75,9 @@ - - - + + + @@ -239,6 +236,7 @@ + Setup complete! You should now be able to open ${basedir}/eclipse as a workspace in eclipse and import/refresh the FML project @@ -314,6 +312,13 @@ + + + Extracting fresh eclipse workspace to ${basedir}/eclipse + + + + diff --git a/fml/eclipse-workspace.zip b/fml/eclipse-workspace.zip new file mode 100644 index 0000000000..2936412569 Binary files /dev/null and b/fml/eclipse-workspace.zip differ diff --git a/fml/eclipse/.gitignore b/fml/eclipse/.gitignore deleted file mode 100644 index 3c4a7e9620..0000000000 --- a/fml/eclipse/.gitignore +++ /dev/null @@ -1,43 +0,0 @@ -/* -!.gitignore -!/Clean/ -/Clean/* -!/Clean/.classpath -!/Clean/.project -!/Clean/.settings/ -/Clean/.settings/* -!/Clean/.settings/org.eclipse.jdt.core.prefs -!/FML/ -/FML/* -!/FML/.classpath -!/FML/.project -!/FML/.settings/ -/FML/.settings/* -!/FML/.settings/org.eclipse.jdt.core.prefs -!/.metadata/ -/.metadata/* -!/.metadata/.plugins/ -/.metadata/.plugins/* -!/.metadata/.plugins/org.eclipse.core.runtime/ -/.metadata/.plugins/org.eclipse.core.runtime/* -!/.metadata/.plugins/org.eclipse.core.runtime/.settings/ -/.metadata/.plugins/org.eclipse.core.runtime/.settings/* -!/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs -!/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs -!/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.gathering.prefs -!/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs -!/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs -!/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs -!/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs -!/.metadata/.plugins/org.eclipse.debug.core/ -/.metadata/.plugins/org.eclipse.debug.core/* -!/.metadata/.plugins/org.eclipse.debug.core/.launches/ -/.metadata/.plugins/org.eclipse.debug.core/.launches/* -!/.metadata/.plugins/org.eclipse.debug.core/.launches/CleanClient.launch -!/.metadata/.plugins/org.eclipse.debug.core/.launches/CleanServer.launch -!/.metadata/.plugins/org.eclipse.debug.core/.launches/FMLClient.launch -!/.metadata/.plugins/org.eclipse.debug.core/.launches/FMLServer.launch -!/.metadata/.plugins/org.eclipse.debug.ui/ -/.metadata/.plugins/org.eclipse.debug.ui/* -!/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml - diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Clean/placeholder b/fml/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Clean/placeholder deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/FML/placeholder b/fml/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/FML/placeholder deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/0.tree b/fml/eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/0.tree deleted file mode 100644 index ff3b00c035..0000000000 Binary files a/fml/eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/0.tree and /dev/null differ 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 466d7f93a1..0000000000 --- a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Sun Jun 05 18:58:07 CEST 2011 -version=1 -eclipse.preferences.version=1 -refresh.enabled=true diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs b/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs deleted file mode 100644 index e2680d2579..0000000000 --- a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs +++ /dev/null @@ -1,6 +0,0 @@ -Console.highWaterMark=88000 -StringVariablePreferencePage=130,107,107,86, -eclipse.preferences.version=1 -org.eclipse.debug.ui.PREF_LAUNCH_PERSPECTIVES=\n\n -org.eclipse.debug.ui.UseContextualLaunch=false -org.eclipse.debug.ui.user_view_bindings=\r\n\r\n\r\n\r\n\r\n\r\n diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.gathering.prefs b/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.gathering.prefs deleted file mode 100644 index 333b991531..0000000000 --- a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.gathering.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Sun Jun 05 18:58:07 CEST 2011 -eclipse.preferences.version=1 -org.eclipse.epp.usagedata.gathering.enabled=false 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 12ec368903..0000000000 --- a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,14 +0,0 @@ -#Sun Sep 18 16:44:39 NZST 2011 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=ignore -org.eclipse.jdt.core.compiler.problem.deprecation=ignore -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore -org.eclipse.jdt.core.compiler.problem.unusedImport=ignore -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.source=1.6 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 316ef6f309..0000000000 --- a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Sun Jun 05 18:58:05 CEST 2011 -spacesForTabs=true -eclipse.preferences.version=1 -overviewRuler_migration=migrated_3.1 diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs b/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs deleted file mode 100644 index d338eab761..0000000000 --- a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs +++ /dev/null @@ -1,9 +0,0 @@ -IMPORT_FILES_AND_FOLDERS_MODE=prompt -IMPORT_FILES_AND_FOLDERS_VIRTUAL_FOLDER_MODE=prompt -PROBLEMS_FILTERS_MIGRATE=true -SAVE_ALL_BEFORE_BUILD=true -TASKS_FILTERS_MIGRATE=true -eclipse.preferences.version=1 -platformState=1349115159163 -quickStart=false -tipsAndTricks=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 08076f236a..0000000000 --- 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.ui/launchConfigurationHistory.xml b/fml/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml deleted file mode 100644 index 1208f602e5..0000000000 --- a/fml/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/fml/eclipse/Clean/.classpath b/fml/eclipse/Clean/.classpath deleted file mode 100644 index e0ab158c6b..0000000000 --- a/fml/eclipse/Clean/.classpath +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/fml/eclipse/Clean/.project b/fml/eclipse/Clean/.project deleted file mode 100644 index 16d23aa3da..0000000000 --- a/fml/eclipse/Clean/.project +++ /dev/null @@ -1,64 +0,0 @@ - - - Clean - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - - - jars - 2 - MCP_LOC/jars - - - mc-client - 2 - MCP_LOC/src-base/minecraft - - - - - 0 - jars - 13 - - org.eclipse.ui.ide.multiFilter - 1.0-name-matches-false-false-bin - - - - 0 - jars/bin - 5 - - org.eclipse.ui.ide.multiFilter - 1.0-name-matches-false-false-*.jar - - - - 0 - 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/.settings/org.eclipse.jdt.core.prefs b/fml/eclipse/Clean/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index fff3b334bb..0000000000 --- a/fml/eclipse/Clean/.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/.classpath b/fml/eclipse/FML/.classpath deleted file mode 100644 index 363aa30fdb..0000000000 --- a/fml/eclipse/FML/.classpath +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/fml/eclipse/FML/.project b/fml/eclipse/FML/.project deleted file mode 100644 index 555365593a..0000000000 --- a/fml/eclipse/FML/.project +++ /dev/null @@ -1,70 +0,0 @@ - - - FML - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - - - fml-client - 2 - FML_LOC/client - - - fml-common - 2 - FML_LOC/common - - - jars - 2 - MCP_LOC/jars - - - lib - 2 - MCP_LOC/lib - - - mc-client - 2 - MCP_LOC/src-work/minecraft - - - fml-common/fmlversion.properties - 1 - FML_LOC/fmlversion.properties - - - - - 0 - jars - 13 - - org.eclipse.ui.ide.multiFilter - 1.0-name-matches-false-false-bin - - - - - - FML_LOC - $%7BPARENT-1-WORKSPACE_LOC%7D - - - MCP_LOC - $%7BPARENT-2-WORKSPACE_LOC%7D - - - diff --git a/fml/eclipse/FML/.settings/org.eclipse.jdt.core.prefs b/fml/eclipse/FML/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 96db542e64..0000000000 --- a/fml/eclipse/FML/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -#Thu Jun 02 15:56:50 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/getversion.py b/fml/getversion.py index 05b816226e..e15ca64fe5 100644 --- a/fml/getversion.py +++ b/fml/getversion.py @@ -54,9 +54,11 @@ def main(): branch, _ = process.communicate() except OSError: print("Git not found") - branch="none" + branch="master" else: branch=os.getenv("GIT_BRANCH").rpartition('/')[2] + if branch == 'HEAD': + branch = "master" with open("fmlversion.properties","w") as f: f.write("%s=%s\n" %("fmlbuild.major.number",major)) diff --git a/fml/install/fml.py b/fml/install/fml.py index 084f619da9..b5ad7b0b08 100644 --- a/fml/install/fml.py +++ b/fml/install/fml.py @@ -274,12 +274,12 @@ def setup_fml(fml_dir, mcp_dir): forkcmd = ('%s -classpath "{classpath}" cpw.mods.fml.common.asm.transformers.AccessTransformer "{jar}" "{fmlconfig}"' % self.cmdjava).format( classpath=class_path, jar=jars[side], fmlconfig=os.path.join(fml_dir, 'common', 'fml_at.cfg')) - forge_cfg = os.path.join(mcp_dir, 'forge', 'common', 'forge_at.cfg') + forge_cfg = os.path.join(fml_dir, '..', 'common', 'forge_at.cfg') if os.path.isfile(forge_cfg): self.logger.info(' Forge config detected') forkcmd += ' "%s"' % forge_cfg - for dirname, dirnames, filenames in os.walk(os.path.join(mcp_dir, 'forge', 'accesstransformers')): + for dirname, dirnames, filenames in os.walk(os.path.join(fml_dir, '..', 'accesstransformers')): for filename in filenames: accesstransformer = os.path.join(dirname, filename) if os.path.isfile(accesstransformer): @@ -383,6 +383,48 @@ def get_joined_srg(mcp_dir): values[pts[0]][pts[1]] = pts[2] return values + +def merge_client_server(mcp_dir): + client = os.path.join(mcp_dir, 'src', 'minecraft') + shared = os.path.join(mcp_dir, 'src', 'common') + + client_jar = os.path.join(mcp_dir, 'jars', 'bin', 'minecraft.jar') + server_jar = os.path.join(mcp_dir, 'jars', 'minecraft_server.jar') + joined_srg = get_joined_srg(mcp_dir)['CL:'] + + if not os.path.isfile(client_jar) or not os.path.isfile(server_jar): + return + + if not os.path.isdir(shared): + os.makedirs(shared) + + server_classes = [] + + zip = ZipFile(server_jar) + for i in zip.filelist: + if i.filename.endswith('.class'): + server_classes.append(i.filename[:-6]) + + for cls in server_classes: + if cls in joined_srg.keys(): + cls = joined_srg[cls] + cls += '.java' + + f_client = os.path.normpath(os.path.join(client, cls.replace('/', os.path.sep))).replace(os.path.sep, '/') + f_shared = os.path.normpath(os.path.join(shared, cls.replace('/', os.path.sep))).replace(os.path.sep, '/') + + if not os.path.isfile(f_client): + print 'Issue Merging File Not Found: ' + cls + continue + + if not cls.rfind('/') == -1: + new_dir = os.path.join(shared, cls.rsplit('/', 1)[0]) + if not os.path.isdir(new_dir): + os.makedirs(new_dir) + + shutil.move(f_client, f_shared) + + cleanDirs(client) def apply_fml_patches(fml_dir, mcp_dir, src_dir, copy_files=True): #Delete /common/cpw to get rid of the Side/SideOnly classes used in decompilation @@ -689,13 +731,13 @@ def setup_mcp(fml_dir, mcp_dir, dont_gen_conf=True): gen_renamed_conf(mcp_dir, fml_dir) - #update workspace - print 'Fixing MCP Workspace' - if not os.path.isdir(os.path.join(fml_dir, 'install')): - mcp_eclipse = os.path.join(mcp_dir, 'eclipse') - if os.path.isdir(mcp_eclipse): - shutil.rmtree(mcp_eclipse) - shutil.copytree(os.path.join(fml_dir, 'eclipse'), mcp_eclipse) +# #update workspace +# print 'Fixing MCP Workspace' +# if not os.path.isdir(os.path.join(fml_dir, 'eclipse', 'Clean-Client')): +# mcp_eclipse = os.path.join(mcp_dir, 'eclipse') +# if os.path.isdir(mcp_eclipse): +# shutil.rmtree(mcp_eclipse) +# shutil.copytree(os.path.join(fml_dir, 'eclipse'), mcp_eclipse) def normaliselines(in_filename): in_filename = os.path.normpath(in_filename)