Jump to content

MinecraftForge on GitHub - having trouble committing & pushing FML packages


TheGreyGhost

Recommended Posts

Hi All

 

I'm trying to make some changes to SimpleNetworkWrapper in my fork of MinecraftForge, but I'm having trouble getting it to commit & track my changes properly.

For some reason (legacy issue from FML being a submodule?) the FML package is located in two places

 

C:\Users\TGG\EclipseProjects\MinecraftForge\eclipse\Forge\src\main\java\net\minecraftforge\fml (compiled into the project)

and

C:\Users\TGG\EclipseProjects\MinecraftForge\fml  (synced with the repo)

 

I can make changes to the project location, but if I want them to be committed and pushed to GitHub, then I need to copy the files over to the "repo" location.  Vica versa for updating from the GitHub repo.

 

If I keep doing it like this, guaranteed I'm eventually going to copy the wrong way and destroy an evening's work.

 

Is there a better way?  What am I missing (not really up to speed with Eclipse yet; since IntelliJ seems to break in strange ways with this project)?

 

-TGG

Link to comment
Share on other sites

Rather than copying files, get a program like Beyond Compare.

 

It'll let you select two folder locations and do a recursive scan, looking for changed files (a quick scan just looks at last-modified, takes a fraction of a second, and is usually good enough).  That way you are always making sure to merge in the right direction: red files overwrite black files.

Apparently I'm a complete and utter jerk and come to this forum just like to make fun of people, be confrontational, and make your personal life miserable.  If you think this is the case, JUST REPORT ME.  Otherwise you're just going to get reported when you reply to my posts and point it out, because odds are, I was trying to be nice.

 

Exception: If you do not understand Java, I WILL NOT HELP YOU and your thread will get locked.

 

DO NOT PM ME WITH PROBLEMS. No help will be given.

Link to comment
Share on other sites

The Forge repo is going through a shift. We're trying to clean it up so it isnt two projects. But as is. the 'fml' folder can be treated exactly like the old FML repo. which includes the fact that you can use FG inside it to setup a workspace.

I do Forge for free, however the servers to run it arn't free, so anything is appreciated.
Consider supporting the team on Patreon

Link to comment
Share on other sites

Join the conversation

You can post now and register later. If you have an account, sign in now to post with your account.
Note: Your post will require moderator approval before it will be visible.

Guest
Unfortunately, your content contains terms that we do not allow. Please edit your content to remove the highlighted words below.
Reply to this topic...

×   Pasted as rich text.   Restore formatting

  Only 75 emoji are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.



×
×
  • Create New...

Important Information

By using this site, you agree to our Terms of Use.