search

ThaH3lper / EpicBossRecoded

2 stars 4 forks source link

Adding support for DiabloDrops #2

Closed ToppleTheNun closed 2 years ago

ToppleTheNun commented 11 years ago

The code I submitted for this pull request should add support for DiabloDrops.

It has not been tested.

ThaH3lper commented 11 years ago

I't looks like you made alot of changes but when I look into it you "cleaned" it up making long sentences shorter. Idk about you but I like to keep them long. Also It's very hard to see what changes you made when all code lo oks new on github. However, last time somone made a pullrequest I merged it in but after that i have not been able to sync my files on computer to github :(

ToppleTheNun commented 11 years ago

Here's what you do (if you're using Eclipse):

Step One: Delete your local Git repository on your computer for EpicBossRecoded. Step Two: Delete your project for EpicBossRecoded inside Eclipse. Step Three: Click the "File" menu button in the top left of Eclipse and go all the way down to Import. Step Four: Find the "Import From Git" option. Step Five: Where it says URI, insert the following line: "https://github.com/ThaH3lper/EpicBossRecoded.git". Step Six: It will have fields for your username and password in the bottom of that pane. Put them in and hit "Next," not "Finish." Step Seven: Select the "master" branch and hit "Next." Step Eight: Note the directory that it is putting your project. You will need that in a moment. After noting it and writing it down or something similar, hit "Next." Step Nine: Make sure "Use New Project Wizard" is selected. Click "Finish." Step Ten: Don't give the project a name. Instead of using the default workspace location, use the directory that you noted in Step Eight. Find it and use that location as your workspace location FOR THIS PROJECT ONLY. Step Eleven: Make sure that it tells you that it will automatically format the project and that the name has been automagically filled in for you. If it has, hit finish. If it hasn't, keep trying to get the right directory.

After that's done, you now have a repository that you can commit and push with just a few mouse clicks.

To commit, right click the project, go to Team and select "Commit."

To push to GitHub, right click the project, go to Team and select "Push To Upstream."

If it ever rejects your code due to a reason including "fast-forward," right click the project and select "Fetch From Upstream" and after that, "Pull From Upstream."

This should make your coding much easier to maintain on GitHub.

ToppleTheNun commented 11 years ago

I should also add that you can backup your old .java files before deleting your local repo. You can then replace the ones in the project (after following all of the steps above) with the old .java files, if you'd like.

ThaH3lper commented 11 years ago

Ok I will give it a go, but it stills leaves us with two versions of the code. My latest one, and your for the pulled request :/

ToppleTheNun commented 11 years ago

The way that you can do it is merging the pull request on GitHub and then using "Fetch From Upstream" and then "Pull" in your GitHub. It will give you the new code.

ThaH3lper commented 11 years ago

"This pull request cannot be automatically merged."

ToppleTheNun commented 11 years ago

Probably due to you adding some code that isn't contained in the pull request.

ToppleTheNun commented 11 years ago

You can see the code that I added, you should be able to replicate it in your new code.

ThaH3lper commented 11 years ago

Ok. I will give it a try. but its a hard since you "comprimised" it says that everything is new but you might just added a line in that class. also have you tested if it works?

ToppleTheNun commented 11 years ago

I have not tested it to see if it works. If all else fails, you can add DiabloDrops as a dependency and use our API to add support, as we use regular ItemStacks now.